Only use texunit zero in exporter-generated techniques

[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 9f1c1e581c286371c44b60918cb5f73d0e58c1c0..abe33630ce29b76b6233dd2173d42acfe95adb2a 100644 (file)
--- a/blender/io_mspgl/export_object.py
+++ b/blender/io_mspgl/export_object.py
@@ -34,15 +34,12 @@ class ObjectExporter:
                self.separate_mesh = False
                self.shared_mesh = True
                self.separate_tech = False
-               self.external_tech = True
                self.shared_tech = True
                self.export_lods = True
 
-       def export(self, context, out_file, objs=None, progress=None):
-               if objs is None:
+       def export(self, context, out_file, obj=None, progress=None):
+               if obj is None:
                        obj = context.active_object
-               else:
-                       obj = objs[0]
 
                lods = [obj]
                for c in obj.children:
@@ -71,10 +68,9 @@ class ObjectExporter:
                for i, l in enumerate(lods):
                        if i>0:
                                out_file.begin("level_of_detail", i)
-                               objs = [l]
 
                        if i==0 or l.data.name!=prev_mesh:
-                               mesh = self.export_object_mesh(context, out_file, l, objs, progress)
+                               mesh = self.export_object_mesh(context, out_file, l, progress)
                                prev_mesh = l.data.name
 
                        same_tech = True
@@ -83,7 +79,7 @@ class ObjectExporter:
                                mat = l.material_slots[0].material.name
                                if mat!=prev_tech[1]:
                                        same_tech = False
-                       if self.external_tech and l.technique!=prev_tech[0]:
+                       if l.technique!=prev_tech[0]:
                                same_tech = False
                        if i==0 or not same_tech:
                                self.export_object_technique(l, mesh, out_file, i)
@@ -92,27 +88,27 @@ class ObjectExporter:
                        if i>0:
                                out_file.end()
 
-       def export_object_mesh(self, context, out_file, lod, objs, progress):
+       def export_object_mesh(self, context, out_file, obj, progress):
                from .export_mesh import MeshExporter
                mesh_export = MeshExporter()
                for k, v in self.__dict__.items():
                        setattr(mesh_export, k, v)
 
                lod_index = 0
-               if lod.lod_for_parent:
-                       lod_index = lod.lod_index
+               if obj.lod_for_parent:
+                       lod_index = obj.lod_index
 
                if self.separate_mesh:
                        from .outfile import open_output
                        path, name = external_name(out_file, ".mesh", lod_index)
                        if self.shared_mesh:
-                               name = lod.data.name+".mesh"
+                               name = obj.data.name+".mesh"
                        mesh_out = open_output(os.path.join(path, name))
-                       mesh = mesh_export.export(context, mesh_out, objs, progress)
+                       mesh = mesh_export.export(context, mesh_out, obj, progress)
                        out_file.write("mesh", '"{}"'.format(name))
                else:
                        out_file.begin("mesh")
-                       mesh = mesh_export.export(context, out_file, objs, progress)
+                       mesh = mesh_export.export(context, out_file, obj, progress)
                        out_file.end()
 
                return mesh
@@ -125,7 +121,7 @@ class ObjectExporter:
                from .outfile import open_output
                path, name = external_name(out_file, ".tech", lod_index)
 
-               if self.external_tech and obj.technique:
+               if obj.technique:
                        if obj.inherit_tech and material and (obj.override_material or material.texture_slots):
                                out_file.begin("technique")
                                out_file.begin("inherit", '"{}"'.format(obj.technique))
@@ -163,11 +159,7 @@ class ObjectExporter:
                                out_file.begin("material")
                                out_file.write("diffuse", 1.0, 1.0, 1.0, 1.0)
                                out_file.end()
-                               index = 0
-                               for u in mesh.uv_layers:
-                                       if u.name=="material_tex":
-                                               index = u.unit
-                               out_file.begin("texunit", index)
+                               out_file.begin("texunit", 0)
                                out_file.begin("texture2d")
                                out_file.write("min_filter", "NEAREST")
                                out_file.write("mag_filter", "NEAREST")
@@ -187,34 +179,26 @@ class ObjectExporter:
                                out_file.end()
 
                        if self.textures!="NONE":
+                               diffuse_tex = None
                                for slot in material.texture_slots:
-                                       if not slot:
-                                               continue
-
-                                       tex = slot.texture
-                                       if tex.type!="IMAGE":
-                                               continue
-
-                                       if slot.uv_layer:
-                                               for u in mesh.uv_layers:
-                                                       if u.name==slot.uv_layer:
-                                                               index = u.unit
-                                       else:
-                                               index = mesh.uv_layers[0].unit
+                                       if slot and slot.texture.type=="IMAGE" and slot.use_map_color_diffuse:
+                                               diffuse_tex = slot.texture
+                                               break
 
-                                       out_file.begin("texunit", index)
+                               if diffuse_tex:
+                                       out_file.begin("texunit", 0)
                                        if self.textures=="INLINE":
                                                out_file.begin("texture2d")
                                                out_file.write("min_filter", "LINEAR")
-                                               out_file.write("storage", "RGBA", tex.image.size[0], tex.image.size[1])
+                                               out_file.write("storage", "RGBA", diffuse_tex.image.size[0], diffuse_tex.image.size[1])
                                                texdata = '"'
-                                               for p in tex.image.pixels:
+                                               for p in diffuse_tex.image.pixels:
                                                        texdata += "\\x%02X"%int(p*255)
                                                texdata += '"'
                                                out_file.write("raw_data", texdata)
                                                out_file.end()
                                        else:
-                                               out_file.write("texture", '"%s"'%image_name(tex.image))
+                                               out_file.write("texture", '"%s"'%image_name(diffuse_tex.image))
                                        out_file.end()
 
                out_file.end()
@@ -232,4 +216,4 @@ class ObjectExporter:
                        out_file.write("ambient", cm(amb.r), cm(amb.g), cm(amb.b), 1.0)
                spec = mat.specular_color*mat.specular_intensity
                out_file.write("specular", spec.r, spec.g, spec.b, 1.0)
-               out_file.write("shininess", mat.specular_hardness);
+               out_file.write("shininess", mat.specular_hardness)