X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fmesh.py;fp=blender%2Fio_mspgl%2Fmesh.py;h=3a24db96a07f29a8cd9aacff8e6ede446f7cc81a;hp=ba9db8022c7e50652e5ed6258fab1821e1b7f229;hb=2bf43ec60f148fe2c9a4ed2a322118860be3b25c;hpb=9eb9f592d37e9a1e05c2ff70887a1c5f26b98864

diff --git a/blender/io_mspgl/mesh.py b/blender/io_mspgl/mesh.py
index ba9db802..3a24db96 100644
--- a/blender/io_mspgl/mesh.py
+++ b/blender/io_mspgl/mesh.py
@@ -78,6 +78,7 @@ class VertexGroup:
 class Batch:
 	def __init__(self, pt):
 		self.primitive_type = pt
+		self.patch_size = 0
 		self.vertices = []
 
 
@@ -164,6 +165,7 @@ class Mesh:
 		self.use_uv = mesh.use_uv
 		self.tangent_uvtex = mesh.tangent_uvtex
 		self.use_strips = mesh.use_strips
+		self.use_patches = mesh.use_patches
 		self.use_lines = mesh.use_lines
 		self.vertex_groups = mesh.vertex_groups
 
@@ -211,7 +213,7 @@ class Mesh:
 		# where they don't exist
 		edge_map = {e.key: e for e in self.edges}
 		for f in self.faces:
-			if len(f.vertices)>4:
+			if len(f.vertices)>4 and not mesh.use.patches:
 				raise ValueError("Unsupported face on mesh {}: N-gon".format(self.name))
 
 			f.vertices = [self.vertices[i] for i in f.vertices]
@@ -229,7 +231,7 @@ class Mesh:
 				v.edges.append(e)
 
 		# Store loose edges as lines
-		if mesh.use_lines:
+		if mesh.use_lines and not mesh.use_patches:
 			self.lines = [Line(e) for e in self.edges if not e.faces]
 		else:
 			self.lines = []
@@ -311,6 +313,9 @@ class Mesh:
 		self.lines += other.lines
 
 	def prepare_triangles(self, task):
+		if self.use_patches:
+			return
+
 		face_count = len(self.faces)
 		for i in range(face_count):
 			f = self.faces[i]
@@ -637,17 +642,24 @@ class Mesh:
 			task.set_progress(i/len(self.vertices))
 
 	def prepare_sequence(self, task):
-		subtask = task.task("Reordering faces", 0.5)
-		self.reorder_faces(subtask)
+		if self.use_patches:
+			subtask = task.task("Reordering patches", 0.5)
+			self.reorder_patches(subtask)
 
-		subtask = task.task("Building sequence", 1.0)
-		if self.use_strips:
-			self.build_tristrip_sequence(subtask)
+			subtask = task.task("Building sequence", 1.0)
+			self.build_patch_sequence(subtask)
 		else:
-			self.build_triangle_sequence(subtask)
+			subtask = task.task("Reordering faces", 0.5)
+			self.reorder_faces(subtask)
+
+			subtask = task.task("Building sequence", 1.0)
+			if self.use_strips:
+				self.build_tristrip_sequence(subtask)
+			else:
+				self.build_triangle_sequence(subtask)
 
-		if self.use_lines:
-			self.build_line_sequence()
+			if self.use_lines:
+				self.build_line_sequence()
 
 		self.reorder_vertices()
 
@@ -693,7 +705,17 @@ class Mesh:
 			batch.vertices += l.vertices
 		self.batches.append(batch)
 
-		self.reorder_vertices()
+	def build_patch_sequence(self, task):
+		current_size = 0
+		sequence = None
+		for f in self.faces:
+			if len(f.vertices)!=current_size:
+				current_size = len(f.vertices)
+				self.batches.append(Batch("PATCHES"))
+				self.batches[-1].patch_size = current_size
+				sequence = self.batches[-1].vertices
+
+			sequence += f.vertices
 
 	def reorder_faces(self, task):
 		# Tom Forsyth's vertex cache optimization algorithm
@@ -778,6 +800,34 @@ class Mesh:
 		for i, f in enumerate(self.faces):
 			f.index = i
 
+	def reorder_patches(self, task):
+		for f in self.faces:
+			f.flag = False
+
+		reordered_faces = []
+		n_processed = 0
+
+		while 1:
+			current_size = 0
+
+			for f in self.faces:
+				if f.flag:
+					continue
+
+				if not current_size:
+					current_size = len(f.vertices)
+				elif len(f.vertices)!=current_size:
+					continue
+
+				reordered_faces.append(f)
+				f.flag = True
+
+				n_processed += 1
+				task.set_progress(n_processed/len(self.faces))
+
+			if not current_size:
+				break
+
 	def reorder_vertices(self):
 		for v in self.vertices:
 			v.index = -1