X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_mesh.py;h=012386185faa7755388f3aa108e5d02a093446ec;hb=a741acd5c501c03de5181656498d2bcbe0df9157;hp=f54a05fd2a6c0b3f39844f16d294a0a57e6d0981;hpb=e8f17d44584e6d9c47f91ff7570ef839ef866b7b;p=libs%2Fgl.git diff --git a/blender/io_mspgl/export_mesh.py b/blender/io_mspgl/export_mesh.py index f54a05fd..01238618 100644 --- a/blender/io_mspgl/export_mesh.py +++ b/blender/io_mspgl/export_mesh.py @@ -1,23 +1,21 @@ -import itertools -import os -import bpy -import mathutils - class MeshExporter: - def export_mesh(self, context, mesh_or_obj, progress): + def export_mesh(self, ctx, mesh_or_obj): from .mesh import Mesh, create_mesh_from_object 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() + task = ctx.task("Preparing mesh", 0.9) + mesh = create_mesh_from_object(task, mesh_or_obj) from .datafile import Resource, Statement, Token resource = Resource(mesh.name+".mesh", "mesh") statements = resource.statements + task = ctx.task("Creating statements", 1.0) + + statements.append(Statement("winding", Token('COUNTERCLOCKWISE'))) + st = Statement("vertices", Token("VERTEX3_FLOAT")) stride = 12 if mesh.vertices[0].color: @@ -110,9 +108,6 @@ class MeshExporter: st.sub.append(Statement("indices", *(v.index for v in l.vertices))) statements.append(st) - if mesh.winding_test: - statements.append(Statement("winding", Token('COUNTERCLOCKWISE'))) - - progress.set_progress(1.0) + task.set_progress(1.0) return resource