X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fmesh.py;h=bf5d108ba5e27caa68c9767638702aca3b9ea7d6;hb=2b1dc627491c987b0459226dcb8ac6aadd7ee4d3;hp=fb568ec416fb04739ef7b49c8b2bbd0a1f9f972e;hpb=308dc6b8f5ee1aa3bb8f205e2ed6464749eebbe5;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/mesh.py b/blender/io_mspgl/mesh.py
index fb568ec4..bf5d108b 100644
--- a/blender/io_mspgl/mesh.py
+++ b/blender/io_mspgl/mesh.py
@@ -1,4 +1,3 @@
-import bpy
 import math
 import mathutils
 import itertools
@@ -155,7 +154,6 @@ class Mesh:
 	def __init__(self, mesh):
 		self.name = mesh.name
 
-		self.winding_test = mesh.winding_test
 		self.smoothing = mesh.smoothing
 		self.use_uv = mesh.use_uv
 		self.tangent_uvtex = mesh.tangent_uvtex
@@ -181,7 +179,7 @@ class Mesh:
 		if mesh.use_uv=='NONE' or not mesh.uv_layers:
 			self.uv_layers = []
 		else:
-			self.uv_layers = [UvLayer(u) for u in mesh.uv_layers]
+			self.uv_layers = [UvLayer(u) for u in mesh.uv_layers if u.data]
 
 			# Assign texture unit numbers to UV layers that lack one
 			missing_unit = [u for u in self.uv_layers if u.unit is None]
@@ -193,7 +191,7 @@ class Mesh:
 
 			self.uv_layers = sorted(self.uv_layers, key=(lambda u: u.unit))
 
-			if mesh.use_uv=='UNIT0':
+			if mesh.use_uv=='UNIT0' and self.uv_layers:
 				self.uv_layers = [self.uv_layers[0]]
 				if self.uv_layers[0].unit!=0:
 					self.uv_layers = []
@@ -259,12 +257,12 @@ class Mesh:
 
 		# Merge materials and form a lookup from source material indices to the
 		# merged material list
-		material_atlas = []
+		material_lookup = []
 		for m in other.materials:
 			if m in self.materials:
-				material_atlas.append(self.materials.index(m))
+				material_lookup.append(self.materials.index(m))
 			else:
-				material_atlas.append(len(self.materials))
+				material_lookup.append(len(self.materials))
 				self.materials.append(m)
 
 		# Append data and adjust indices where necessary.  Since the data is
@@ -295,7 +293,7 @@ class Mesh:
 			f.index += offset
 			f.loop_indices = range(f.loop_indices.start+offset, f.loop_indices.stop+offset)
 			if other.materials:
-				f.material_index = material_atlas[f.material_index]
+				f.material_index = material_lookup[f.material_index]
 
 		offset = len(self.edges)
 		self.edges += other.edges
@@ -413,30 +411,6 @@ class Mesh:
 				for g in v.groups:
 					g.group = group_index_map[g.group]
 
-	def apply_material_atlas(self, material_atlas):
-		for m in self.materials:
-			if m.name not in material_atlas.material_names:
-				raise Exception("Material atlas {} is not compatible with Mesh {}".format(material_atlas.name, self.name))
-
-		if self.use_uv=='NONE':
-			return
-
-		layer = UvLayer("material_atlas")
-		if self.use_uv=='UNIT0':
-			self.uv_layers = [layer]
-			layer.unit = 0
-		else:
-			self.uv_layers.append(layer)
-			used_units = [u.unit for u in self.uv_layers]
-			layer.unit = next(i for i in itertools.count() if i not in used_units)
-			self.uv_layers.sort(key=lambda u: u.unit)
-
-		layer.uvs = [(0.0, 0.0)]*len(self.loops)
-		for f in self.faces:
-			uv = material_atlas.get_material_uv(self.materials[f.material_index])
-			for i in f.loop_indices:
-				layer.uvs[i] = uv
-
 	def prepare_uv(self, task):
 		# Form a list of UV layers referenced by materials with the array atlas
 		# property set
@@ -708,7 +682,8 @@ class Mesh:
 		# Keep track of the score and number of unused faces for each vertex
 		vertex_info = [[0, len(v.faces)] for v in self.vertices]
 		for vi in vertex_info:
-			vi[0] = valence_boost_scale*(vi[1]**valence_boost_power)
+			if vi[1]:
+				vi[0] = valence_boost_scale*(vi[1]**valence_boost_power)
 
 		face = None
 		reordered_faces = []
@@ -783,13 +758,18 @@ class Mesh:
 					v.index = len(reordered_vertices)
 					reordered_vertices.append(v)
 
+		for v in self.vertices:
+			if v.index<0:
+				v.index = len(reordered_vertices)
+				reordered_vertices.append(v)
+
 		self.vertices = reordered_vertices
 
 		for e in self.edges:
 			e.key = make_edge_key(e.vertices[0].index, e.vertices[1].index)
 
 
-def create_mesh_from_object(ctx, obj, material_atlas):
+def create_mesh_from_object(ctx, obj):
 	if obj.type!="MESH":
 		raise Exception("Object {} is not a mesh".format(obj.name))
 
@@ -812,7 +792,6 @@ def create_mesh_from_object(ctx, obj, material_atlas):
 		bmesh = eval_obj.to_mesh()
 
 		# Object.to_mesh does not copy custom properties
-		bmesh.winding_test = o.data.winding_test
 		bmesh.smoothing = o.data.smoothing
 		bmesh.use_lines = o.data.use_lines
 		bmesh.vertex_groups = o.data.vertex_groups
@@ -835,9 +814,6 @@ def create_mesh_from_object(ctx, obj, material_atlas):
 
 	mesh.name = obj.data.name
 
-	if material_atlas:
-		mesh.apply_material_atlas(material_atlas)
-
 	task = ctx.task("Triangulating", 0.3)
 	mesh.prepare_triangles(task)
 	task = ctx.task("Smoothing", 0.5)