X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_mesh.py;h=e620b86f22ab9f0ebe155eb8ed50d3bcd9615789;hp=3e146cad24699d956b1a48bd537d8ffc6ef4f5a3;hb=6e0a6f7a7a406bd22eb4e3f7fc4bf2bdce01d7f9;hpb=ab60e3a21afcfc970004512044ae32fac5c2112e diff --git a/blender/io_mspgl/export_mesh.py b/blender/io_mspgl/export_mesh.py index 3e146cad..e620b86f 100644 --- a/blender/io_mspgl/export_mesh.py +++ b/blender/io_mspgl/export_mesh.py @@ -25,69 +25,70 @@ class MeshExporter: return big_strip - def export(self, context, out_file, obj=None, progress=None): - if obj is None: - obj = context.active_object + def export_to_file(self, context, out_fn): + obj = context.active_object - from .mesh import create_mesh_from_object from .util import Progress - if not progress: - progress = Progress(self.show_progress and context) - progress.push_task("", 0.0, 0.9) + progress = Progress(self.show_progress and context) + progress.push_task("", 0.0, 0.95) + resource = self.export_mesh(context, obj, progress) - mesh = create_mesh_from_object(context, obj, progress) + with open(out_fn, "w") as out_file: + for s in resource.statements: + s.write_to_file(out_file) - strips = [] - loose = mesh.faces - if self.use_strips: - strips = mesh.vertex_sequence - if self.use_degen_tris: - strips = [self.join_strips(strips)] - loose = [] + def export_mesh(self, context, mesh_or_obj, progress): + from .mesh import Mesh, create_mesh_from_object - progress.set_task("Writing file", 0.9, 1.0) + if type(mesh_or_obj)==Mesh: + mesh = mesh_or_obj + else: + progress.push_task("", 0.0, 0.9) + mesh = create_mesh_from_object(context, mesh_or_obj, progress) + progress.pop_task() - from .outfile import open_output - out_file = open_output(out_file) + from .datafile import Resource, Statement, Token + resource = Resource(mesh.name+".mesh") + statements = resource.statements - fmt = ["NORMAL3"] + st = Statement("vertices", Token("NORMAL3")) if mesh.uv_layers: for u in mesh.uv_layers: size = str(len(u.uvs[0])) if u.unit==0: - fmt.append("TEXCOORD"+size) + st.append(Token("TEXCOORD"+size)) else: - fmt.append("TEXCOORD%s_%d"%(size, u.unit)) + st.append(Token("TEXCOORD{}_{}".format(size, u.unit))) if mesh.tbn_vecs: - fmt += ["TANGENT3", "BINORMAL3"] + st.append(Token("TANGENT3")) + st.append(Token("BINORMAL3")) if mesh.vertex_groups: - fmt.append("ATTRIB%d_5"%(mesh.max_groups_per_vertex*2)) - fmt.append("VERTEX3") - out_file.begin("vertices", *fmt) + st.append(Token("ATTRIB{}_5".format(mesh.max_groups_per_vertex*2))) + st.append(Token("VERTEX3")) + normal = None - uvs = {} + uvs = [None]*len(mesh.uv_layers) tan = None bino = None group = None for v in mesh.vertices: if v.normal!=normal: - out_file.write("normal3", *v.normal) + st.sub.append(Statement("normal", *v.normal)) normal = v.normal for i, u in enumerate(mesh.uv_layers): - if v.uvs[i]!=uvs.get(i): - size = str(len(v.uvs[i])) + if v.uvs[i]!=uvs[i]: if u.unit==0: - out_file.write("texcoord"+size, *v.uvs[i]) + st.sub.append(Statement("texcoord", *v.uvs[i])) else: - out_file.write("multitexcoord"+size, u.unit, *v.uvs[i]) + st.sub.append(Statement("multitexcoord", u.unit, *v.uvs[i])) uvs[i] = v.uvs[i] if mesh.tbn_vecs: if v.tan!=tan: - out_file.write("tangent3", *v.tan) + st.sub.append(Statement("tangent", *v.tan)) tan = v.tan if v.bino!=bino: - out_file.write("binormal3", *v.bino) + st.sub.append(Statement("binormal", *v.bino)) bino = v.bino if mesh.vertex_groups: group_attr = [(group_index_map[g.group], g.weight*v.group_weight_scale) for g in v.groups[:mesh.max_groups_per_vertex]] @@ -95,39 +96,37 @@ class MeshExporter: group_attr.append((0, 0.0)) group_attr = list(itertools.chain(*group_attr)) if group_attr!=group: - out_file.write("attrib%d"%len(group_attr), 5, *group_attr) + st.sub.append(Statement("attrib", 5, *group_attr)) group = group_attr - out_file.write("vertex3", *v.co) - out_file.end() - for s in strips: - out_file.begin("batch", "TRIANGLE_STRIP") - indices = [] - n = 0 - for v in s: - indices.append(v.index) - if len(indices)>=32: - out_file.write("indices", *indices) - indices = [] - if indices: - out_file.write("indices", *indices) - out_file.end() - - if loose: - out_file.begin("batch", "TRIANGLES") - for f in loose: - for i in range(2, len(f.vertices)): - out_file.write("indices", f.vertices[0].index, f.vertices[i-1].index, f.vertices[i].index) - out_file.end() + st.sub.append(Statement("vertex", *v.co)) + + statements.append(st) + + if self.use_strips: + strips = mesh.vertex_sequence + if self.use_degen_tris: + strips = [self.join_strips(strips)] + + for s in strips: + st = Statement("batch", Token("TRIANGLE_STRIP")) + for i in range(0, len(s), 32): + st.sub.append(Statement("indices", *(v.index for v in s[i:i+32]))) + statements.append(st) + else: + st = Statement("batch", Token('TRIANGLES')) + for f in mesh.faces: + st.sub.append(Statement("indices", *(v.index for v in f.vertices))) + statements.append(st) if mesh.lines: - out_file.begin("batch", "LINES") + st = Statement("batch", Token('LINES')) for l in mesh.lines: - out_file.write("indices", l.vertices[0].index, l.vertices[1].index) - out_file.end() + st.sub.append(Statement("indices", *(v.index for v in l.vertices))) + statements.append(st) if mesh.winding_test: - out_file.write("winding", "COUNTERCLOCKWISE") + statements.append(Statement("winding", Token('COUNTERCLOCKWISE'))) - progress.pop_task() + progress.set_progress(1.0) - return mesh + return resource