X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_object.py;h=b39307c8704fd78a74864a4e012ddda990ca44c3;hb=77b358049bc1ef38ea013175a485cecd71a173c9;hp=32894f7ebc1041d5555ca244d7d93a817381d2b5;hpb=c0b7d6ee4a7478f5aecb1504429ec1fc846d64ed;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py
index 32894f7e..b39307c8 100644
--- a/blender/io_mspgl/export_object.py
+++ b/blender/io_mspgl/export_object.py
@@ -2,19 +2,6 @@ import os
 import mathutils
 
 class ObjectExporter:
-	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]
-		center = (p1+p2)/2
-		radius = (p1-p2).length/2
-		for v in obj.data.vertices:
-			d = v.co-center
-			if d.length>radius:
-				center += d*(1-radius/d.length)/2
-				radius = (radius+d.length)/2
-
-		return center, radius
-
 	def collect_object_lods(self, obj):
 		lods = [obj]
 		lods += sorted([c for c in obj.children if c.lod_for_parent], key=(lambda l: l.lod_index))
@@ -24,32 +11,19 @@ class ObjectExporter:
 
 		return lods
 
-	def create_mesh_exporter(self):
-		from .export_mesh import MeshExporter
-		mesh_export = MeshExporter()
-		return mesh_export
-
-	def create_material_exporter(self):
-		from .export_material import MaterialExporter
-		material_export = MaterialExporter()
-		return material_export
-
-	def create_material_atlas_exporter(self):
-		from .export_material import MaterialAtlasExporter
-		material_atlas_export = MaterialAtlasExporter()
-		return material_atlas_export
-
 	def export_object_resources(self, context, obj, resources, material_atlases, progress):
 		if material_atlases is None:
 			material_atlases = {}
 
 		lods = self.collect_object_lods(obj)
 
+		from .export_mesh import MeshExporter
+		from .export_material import MaterialAtlasExporter, MaterialExporter
 		from .mesh import create_mesh_from_object
-		from .material import create_material_atlas
-		mesh_export = self.create_mesh_exporter()
-		material_export = self.create_material_exporter()
-		material_atlas_export = self.create_material_atlas_exporter()
+		from .material import Material, create_material_atlas
+		mesh_export = MeshExporter()
+		material_export = MaterialExporter()
+		material_atlas_export = MaterialAtlasExporter()
 
 		for i, l in enumerate(lods):
 			lod_index = l.lod_index if l.lod_for_parent else 0
@@ -79,6 +53,7 @@ class ObjectExporter:
 				if material.render_mode!='EXTERNAL':
 					tech_name = material.name+".tech"
 					if tech_name not in resources:
+						material = Material(material)
 						material_export.export_technique_resources(material, resources)
 						resources[tech_name] = material_export.export_technique(material, resources)
 			elif "stub.tech" not in resources:
@@ -102,7 +77,8 @@ class ObjectExporter:
 		obj_res = Resource(obj.name+".object", "object")
 		statements = obj_res.statements
 
-		center, radius = self.compute_bounding_sphere(obj)
+		from .util import compute_bounding_sphere
+		center, radius = compute_bounding_sphere([v.co for v in obj.data.vertices])
 		statements.append(Statement("bounding_sphere_hint", *center, radius))
 
 		prev_mesh = None
@@ -148,11 +124,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("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