Fix export of the stub technique

[libs/gl.git] / blender / io_mspgl / export_object.py

diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py
index 54bde96a5d29962f2ad9bac4279d0fe77d67a2ce..6e91df8db2d0a0b8bf302576c0624486744945f1 100644 (file)
--- a/blender/io_mspgl/export_object.py
+++ b/blender/io_mspgl/export_object.py
@@ -2,12 +2,6 @@ import os
 import mathutils
 
 class ObjectExporter:
-       def __init__(self):
-               self.show_progress = True
-               self.export_all = False
-               self.collection = False
-               self.shared_resources = True
-
        def compute_bounding_sphere(self, obj):
                p1 = max(((v.co, v.co.length) for v in obj.data.vertices), key=lambda x:x[1])[0]
                p2 = max(((v.co, (v.co-p1).length) for v in obj.data.vertices), key=lambda x:x[1])[0]
@@ -26,7 +20,7 @@ class ObjectExporter:
                lods += sorted([c for c in obj.children if c.lod_for_parent], key=(lambda l: l.lod_index))
                for i, l in enumerate(lods):
                        if i>0 and l.lod_index!=i:
-                               raise Exception("Inconsistent LOD indices")
+                               raise Exception("Invalid configuration on object {}: Inconsistent LOD indices".format(obj.name))
 
                return lods
 
@@ -45,48 +39,6 @@ class ObjectExporter:
                material_atlas_export = MaterialAtlasExporter()
                return material_atlas_export
 
-       def export_to_file(self, context, out_fn):
-               if self.export_all:
-                       objs = [o for o in context.selected_objects if o.type=="MESH"]
-               else:
-                       objs = [context.active_object]
-
-               from .util import Progress
-               progress = Progress(self.show_progress and context)
-
-               path, base = os.path.split(out_fn)
-               base, ext = os.path.splitext(base)
-
-               resources = {}
-               for i, obj in enumerate(objs):
-                       if self.export_all:
-                               out_fn = os.path.join(path, obj.name+ext)
-
-                       progress.push_task_slice(obj.name, i, len(objs))
-                       self.export_object_resources(context, obj, resources, None, progress)
-
-                       obj_res = self.export_object(context, obj, resources, progress)
-                       refs = obj_res.collect_references()
-                       if not self.shared_resources:
-                               numbers = {}
-                               for r in refs:
-                                       res_ext = os.path.splitext(r.name)[1]
-                                       n = numbers.get(res_ext, 0)
-                                       if n>0:
-                                               r.name = "{}_{}{}".format(base, n, res_ext)
-                                       else:
-                                               r.name = base+res_ext
-                                       numbers[res_ext] = n+1
-
-                       if self.collection:
-                               obj_res.write_collection(out_fn)
-                       else:
-                               for r in refs:
-                                       r.write_to_file(os.path.join(path, r.name))
-                               obj_res.write_to_file(out_fn)
-
-                       progress.pop_task()
-
        def export_object_resources(self, context, obj, resources, material_atlases, progress):
                if material_atlases is None:
                        material_atlases = {}
@@ -110,7 +62,7 @@ class ObjectExporter:
                                material_atlas_key = mmk(l.data.materials[0])
                                key_mismatch = any(mmk(m)!=material_atlas_key for m in l.data.materials)
                                if not all(atlas_flags) or key_mismatch:
-                                       raise Exception("Conflicting settings in object materials")
+                                       raise Exception("Invalid configuration on object {}: Mixed material atlas state")
 
                                if material_atlas_key in material_atlases:
                                        material_atlas = material_atlases[material_atlas_key]
@@ -140,10 +92,9 @@ class ObjectExporter:
 
                        progress.pop_task()
 
-       def export_object(self, context, obj, resources, progress):
-               if resources is None:
-                       resources = {}
-                       self.export_object_resources(context, obj, resources, None, progress)
+       def export_object(self, obj, resources, progress):
+               if obj.type!='MESH':
+                       raise ValueError("Object {} is not a mesh".format(obj.name))
 
                lods = self.collect_object_lods(obj)
 
@@ -197,11 +148,11 @@ class ObjectExporter:
                return obj_res
 
        def export_stub_technique(self):
-               from .datafile import Resource, Statement
+               from .datafile import Resource, Statement, Token
                tech_res = Resource("stub.tech", "technique")
-               pass_st = Statement("pass", "")
+               pass_st = Statement("method", "")
                tech_res.statements.append(pass_st)
                mat_st = Statement("material")
                pass_st.sub.append(mat_st)
-               mat_st.sub.append(Statement("basic"))
+               mat_st.sub.append(Statement("type", Token("basic")))
                return tech_res