X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=mesh_export.py;h=b2d75d6b52ea136f8a689cc02a4addaa58077f39;hb=54b22ff744391e49e5a402acb98c0c3bdd0031a7;hp=1ed2dcde60074c8aeba7dc9635a1af08febd9f6f;hpb=712d77b12b4bfee6d1f2e7436247ade5405e8f90;p=libs%2Fgl.git

diff --git a/mesh_export.py b/mesh_export.py
index 1ed2dcde..b2d75d6b 100644
--- a/mesh_export.py
+++ b/mesh_export.py
@@ -15,6 +15,16 @@ import Blender
 def make_edge_key(i1, i2):
 	return (min(i1, i2), max(i1, i2))
 
+progress_range = (0.0, 1.0, "")
+
+def set_progress(value):
+	Blender.Window.DrawProgressBar(progress_range[0]+progress_range[1]*value, progress_range[2])
+
+def set_progress_range(low, high, text):
+	global progress_range
+	progress_range = (low, high-low, text)
+	set_progress(0.0)
+
 
 class Edge:
 	def __init__(self, me):
@@ -31,9 +41,6 @@ class Edge:
 	def __getattr__(self, attr):
 		return getattr(self._medge, attr)
 
-	def __cmp__(self, other):
-		return self is other
-
 	def check_smooth(self, limit):
 		if len(self.faces)!=2:
 			return
@@ -61,7 +68,6 @@ class Vertex:
 		else:
 			self._mvert = mv
 			self.uv = None
-		self.orig_index = self._mvert.index
 		self.flag = False
 		self.faces = []
 		self.tan = None
@@ -101,15 +107,12 @@ class Face:
 	
 	__repr__ = __str__
 
-	def pivot_vertices(self, reverse, *vt):
-		verts = self.verts[:]
-		if reverse:
-			verts.reverse()
-		flags = [(v in vt) for v in verts]
-		l = len(verts)
+	def pivot_vertices(self, *vt):
+		flags = [(v in vt) for v in self.verts]
+		l = len(self.verts)
 		for i in range(l):
 			if flags[i] and not flags[(i+l-1)%l]:
-				return verts[i:]+verts[:i]
+				return self.verts[i:]+self.verts[:i]
 
 	def get_edge(self, v1, v2):	
 		key = make_edge_key(v1.index, v2.index)
@@ -136,6 +139,7 @@ class Mesh:
 		self._mesh = m
 		self.verts = [Vertex(v) for v in m.verts]
 		self.faces = [Face(f) for f in m.faces]
+		self.materials = m.materials[:]
 
 		for f in self.faces:
 			for i in range(len(f.verts)):
@@ -155,6 +159,7 @@ class Mesh:
 			smooth_limit = math.cos(m.degr*math.pi/180)
 		else:
 			smooth_limit = -1
+
 		for e in self.edges.itervalues():
 			e.v1 = self.verts[e.v1.index]
 			e.v2 = self.verts[e.v2.index]
@@ -163,9 +168,41 @@ class Mesh:
 	def __getattr__(self, attr):
 		return getattr(self._mesh, attr)
 
+	def splice(self, other):
+		material_map = []
+		for m in other.materials:
+			if m in self.materials:
+				material_map.append(self.materials.index(m))
+			else:
+				material_map.append(len(self.materials))
+				self.materials.append(m)
+
+		offset = len(self.verts)
+		for v in other.verts:
+			v.index += offset
+			self.verts.append(v)
+
+		offset = len(self.faces)
+		for f in other.faces:
+			f.index += offset
+			f.mat = material_map[f.mat]
+			self.faces.append(f)
+
+		for e in other.edges.itervalues():
+			e.key = make_edge_key(e.v1.index, e.v2.index)
+			self.edges[e.key] = e
+
+		self.lines += other.lines
+	
+	def generate_material_uv(self):
+		for f in self.faces:
+			f.uv = ([(f.mat+0.5)/len(self.materials), 0.5],)*len(f.verts)
+		self.faceUV = True
+
 	def split_vertices(self, find_group_func, debug):
 		groups = []
-		for v in self.verts:
+		for i in range(len(self.verts)):
+			v = self.verts[i]
 			for f in v.faces:
 				f.flag = False
 
@@ -176,6 +213,8 @@ class Mesh:
 
 			groups.append(vg)
 
+			set_progress(i*0.5/len(self.verts))
+
 		for i in range(len(self.verts)):
 			if len(groups[i])==1:
 				continue
@@ -222,6 +261,8 @@ class Mesh:
 					f.verts[f.verts.index(self.verts[i])] = v
 					v.faces.append(f)
 
+			set_progress(0.5+i*0.5/len(self.verts))
+
 	def split_smooth(self, debug = False):
 		self.split_vertices(self.find_smooth_group, debug)
 
@@ -292,7 +333,7 @@ class Mesh:
 			v.tan.normalize()
 			v.bino.normalize()
 
-	def create_strip(self, face, reverse, debug):
+	def create_strip(self, face, max_len, debug):
 		edge = None
 		for e in face.edges:
 			other = e.other_face(face)
@@ -304,20 +345,21 @@ class Mesh:
 			return None
 
 		if debug:
-			print "Starting strip from %s, edge %s, reverse=%s"%([v.index for v in face.verts], (edge.v1.index, edge.v2.index), reverse)
+			print "Starting strip from %s, edge %s"%([v.index for v in face.verts], (edge.v1.index, edge.v2.index))
 
-		verts = face.pivot_vertices(reverse, edge.v1, edge.v2)
+		verts = face.pivot_vertices(edge.v1, edge.v2)
 		if len(verts)==3:
 			result = [verts[-1], verts[0]]
 		else:
 			result = [verts[-2], verts[-1]]
 
 		while 1:
-			verts = face.pivot_vertices(reverse, *result[-2:])
-			k = len(result)%2
 			if debug:
 				print "  Adding %s"%face
 
+			verts = face.pivot_vertices(*result[-2:])
+			k = len(result)%2
+
 			face.flag = True
 			if len(verts)==4 and not k:
 				result.append(verts[3])
@@ -325,6 +367,11 @@ class Mesh:
 			if len(verts)==4 and k:
 				result.append(verts[3])
 
+			if len(result)>=max_len:
+				if debug:
+					print "  Max length exceeded"
+				break
+
 			edge = face.get_edge(*result[-2:])
 
 			if debug:
@@ -341,58 +388,261 @@ class Mesh:
 		return result
 
 
-class Exporter:
+class VertexCache:
+	def __init__(self, size):
+		self.size = size
+		self.slots = [-1]*self.size
+
+	def fetch(self, v):
+		hit = v.index in self.slots
+		if hit:
+			self.slots.remove(v.index)
+		self.slots.append(v.index)
+		if not hit:
+			del self.slots[0]
+		return hit
+
+	def fetch_strip(self, strip):
+		hits = 0
+		for v in strip:
+			if self.fetch(v):
+				hits += 1
+		return hits
+
+	def test_strip(self, strip):
+		hits = 0
+		for i in range(len(strip)):
+			if i>=self.size:
+				break
+			if strip[i].index in self.slots[i:]:
+				hits += 1
+		return hits
+
+
+class OutFile:
 	def __init__(self, fn):
-		self.filename = fn
 		if fn==None:
-			self.out_file = sys.stdout
+			self.file = sys.stdout
 		else:
-			self.out_file = file(fn, "w")
+			self.file = open(fn, "w")
+		self.indent = 0
+
+	def make(self, kwd, *params):
+		pstr = ""
+		for p in params:
+			if type(p)==float:
+				pstr += " %.6g"%p
+			else:
+				pstr += " %s"%p
+		return "%s%s"%(kwd, pstr)
+
+	def write(self, kwd, *params):
+		self.file.write("%s%s;\n"%('\t'*self.indent, self.make(kwd, *params)))
+
+	def begin(self, kwd, *params):
+		i = '\t'*self.indent
+		self.file.write("%s%s\n%s{\n"%(i, self.make(kwd, *params), i))
+		self.indent += 1
+
+	def end(self):
+		self.indent -= 1
+		self.file.write("%s};\n"%('\t'*self.indent))
+
+
+class Exporter:
+	def __init__(self, fn):
+		self.out_file = OutFile(fn)
 		self.use_strips = True
 		self.use_degen_tris = True
-		self.optimize_locality = True
+		self.max_strip_len = 1024
+		self.optimize_cache = False
+		self.cache_size = 64
 		self.export_lines = True
 		self.tbn_vecs = False
+		self.compound = False
+		self.object = False
+		self.material_tex = False
 		self.debug = False
 		self.strip_debug = False
 		self.split_debug = False
 
-	def get_locality(self, strip):
-		total = 0
-		for i in range(1, len(strip)):
-			if strip[i].index!=strip[i-1].index:
-				total += 1.0/(abs(strip[i].index-strip[i-1].index))
-		return total/len(strip)
-
-	def get_followers(self, strip):
-		result = {}
-		for i in range(len(strip)-1):
-			v = strip[i]
-			n = strip[i+1]
-			if v.index!=n.index:
-				if v.index not in result:
-					result[v.index] = {}
-				if n.index not in result[v.index]:
-					result[v.index][n.index] = 1
+	def stripify(self, mesh):
+		for f in mesh.faces:
+			f.flag = False
+
+		faces_done = 0
+		strips = []
+		loose = []
+
+		cache = None
+		if self.optimize_cache:
+			cache = VertexCache(self.cache_size)
+
+		island = []
+		island_strips = []
+		while 1:
+			if not island:
+				queue = []
+				for f in mesh.faces:
+					if not f.flag:
+						f.flag = True
+						queue.append(f)
+						break
+
+				if not queue:
+					break
+
+				while queue:
+					f = queue[0]
+					del queue[0]
+					island.append(f)
+
+					for e in f.edges:
+						other = e.other_face(f)
+						if other and not other.flag:
+							other.flag = True
+							queue.append(other)
+
+				for f in island:
+					f.flag = False
+
+			best = 5
+			face = None
+			for f in island:
+				if f.flag:
+					continue
+				score = 0
+				for e in f.edges:
+					other = e.other_face(f)
+					if other and not other.flag:
+						score += 1
+				if score>0 and score<best:
+					face = f
+					best = score
+
+			if not face:
+				while island_strips:
+					best = 0
+					if cache:
+						best_hits = 0
+						for i in range(len(island_strips)):
+							hits = cache.test_strip(island_strips[i])
+							if hits>best_hits:
+								best = i
+								best_hits = hits
+
+					s = island_strips[best]
+					del island_strips[best]
+					strips.append(s)
+
+					if cache:
+						cache.fetch_strip(s)
+
+				faces_done += len(island)
+				set_progress(float(faces_done)/len(mesh.faces))
+
+				loose += [f for f in island if not f.flag]
+				for f in island:
+					f.flag = True
+
+				island = []
+				island_strips = []
+				continue
+
+			strip = mesh.create_strip(face, self.max_strip_len, self.strip_debug)
+			if strip:
+				island_strips.append(strip)
+
+		if self.debug:
+			print "%d strips:"%len(strips)
+			for i in range(len(strips)):
+				print "  %d: %d indices"%(i, len(strips[i]))
+			print "%d loose faces"%len(loose)
+			nind = sum([len(s) for s in strips])+sum([len(f.verts) for f in loose])
+			print "%d indices total"%nind
+
+		if cache:
+			cache = VertexCache(self.cache_size)
+			total_hits = 0
+
+		if self.use_degen_tris and strips:
+			big_strip = []
+
+			for s in strips:
+				if big_strip:
+					glue = [big_strip[-1], s[0]]
+					if len(big_strip)%2:
+						glue += [s[0]]
+
+					big_strip += glue
+					if cache:
+						total_hits += cache.fetch_strip(glue)
+
+				big_strip += s
+				if cache:
+					total_hits += cache.fetch_strip(s)
+
+			for f in loose:
+				if len(big_strip)%2:
+					order = (-1, -2, 0, 1)
 				else:
-					result[v.index][n.index] += 1
-		return result
+					order = (0, 1, -1, -2)
+				verts = [f.verts[i] for i in order[:len(f.verts)]]
+
+				if big_strip:
+					glue = [big_strip[-1], verts[0]]
+					big_strip += glue
+					if cache:
+						total_hits += cache.fetch_strip(glue)
+
+				big_strip += verts
+				if cache:
+					total_hits += cache.fetch_strip(verts)
+
+			strips = [big_strip]
+			loose = []
+			
+			if self.debug:
+				nind = len(big_strip)
+				print "Big strip has %d indices"%nind
+				if self.optimize_cache:
+					print "%d cache hits"%total_hits
+
+		if self.debug:
+			ntris = sum([len(f.verts)-2 for f in mesh.faces])
+			print "%.2f indices per triangle"%(float(nind)/max(ntris, 1))
+
+		return strips, loose
 
 	def export(self):
 		scene = bpy.data.scenes.active
 
-		obj = scene.objects.active
-		if obj.getType()!="Mesh":
-			raise Exception, "Can only export Mesh data"
+		objs = Blender.Object.GetSelected()
+		if not objs:
+			raise Exception, "Nothing to export"
+		for o in objs:
+			if o.getType()!="Mesh":
+				raise Exception, "Can only export Mesh data"
+
+		Blender.Window.DrawProgressBar(0.0, "Preparing");
 
 		mesh = Blender.Mesh.New("export_tmp")
-		mesh.getFromObject(obj)
+		mesh.getFromObject(objs[0])
 		mesh = Mesh(mesh)
+		if self.compound:
+			# Must keep a ref to each Blender mesh
+			bmeshes = []
+			for o in objs[1:]:
+				bmesh = Blender.Mesh.New("export_tmp")
+				bmesh.getFromObject(o)
+				bmeshes.append(bmesh)
+				mesh.splice(Mesh(bmesh))
 
 		if self.debug:
 			ntris = sum([len(f.verts)-2 for f in mesh.faces])
 			print "Starting with %d vertices, %d faces (%d triangles) and %d edges"%(len(mesh.verts), len(mesh.faces), ntris, len(mesh.edges))
 
+		set_progress_range(0.05, 0.35, "Smoothing")
 		mesh.split_smooth(self.split_debug)
 
 		if self.debug:
@@ -400,7 +650,11 @@ class Exporter:
 
 		mesh.compute_normals()
 
+		if self.material_tex:
+			mesh.generate_material_uv()
+
 		if mesh.faceUV:
+			set_progress_range(0.35, 0.65, "Splitting UVs")
 			mesh.split_uv(self.split_debug)
 			if self.debug:
 				print "After UV splitting %d vertices and %d edges"%(len(mesh.verts), len(mesh.edges))
@@ -409,158 +663,101 @@ class Exporter:
 			if self.tbn_vecs:
 				mesh.compute_tbn()
 
+		set_progress_range(0.65, 0.95, "Creating strips")
 		strips = []
+		loose = mesh.faces
 		if self.use_strips:
-			for f in mesh.faces:
-				f.flag = False
-
-			while 1:
-				best = 5
-				face = None
-				for f in mesh.faces:
-					if f.flag:
-						continue
-					score = 0
-					for e in f.edges:
-						other = e.other_face(f)
-						if other and not other.flag:
-							score += 1
-					if score>0 and score<best:
-						face = f
-						best = score
-
-				if not face:
-					break
-
-				strip = mesh.create_strip(face, self.use_degen_tris and sum([len(s) for s in strips])%2, self.strip_debug)
-				if strip:
-					strips.append(strip)
-
-			if self.debug:
-				print "%d strips:"%len(strips)
-				for i in range(len(strips)):
-					print "  %d: %d indices"%(i, len(strips[i]))
-				print "%d loose faces"%len([f for f in mesh.faces if not f.flag])
-				nind = sum([len(s) for s in strips])+sum([len(f.verts) for f in mesh.faces if not f.flag])
-				print "%d indices total"%nind
-
-			if self.use_degen_tris and strips:
-				big_strip = []
-				for s in strips:
-					if big_strip:
-						big_strip += [big_strip[-1], s[0]]
-					big_strip += s
-
-				for f in mesh.faces:
-					if not f.flag:
-						if len(big_strip)%2:
-							order = (-1, -2, 0, 1)
-						else:
-							order = (0, 1, -1, -2)
-						if big_strip:
-							big_strip += [big_strip[-1], f.verts[order[0]]]
-						big_strip += [f.verts[i] for i in order[:len(f.verts)]]
-						f.flag = True
-
-				strips = [big_strip]
-				
-				if self.debug:
-					nind = len(big_strip)
-					print "Big strip has %d indices"%len(big_strip)
-
-		if self.debug:
-			print "%.2f indices per triangle"%(float(nind)/max(ntris, 1))
-			print "Locality before optimization: "+" ".join(["%.3f"%self.get_locality(s) for s in strips])
-
-		if self.optimize_locality and self.use_strips and strips:
-			followers = {}
-			for s in strips:
-				followers.update(self.get_followers(s))
+			strips, loose = self.stripify(mesh)
 
-			verts2 = []
-			vert = strips[0][0]
-			while 1:
-				vert.flag = True
-				verts2.append(vert)
-
-				next = None
-				if vert.index in followers:
-					flw = followers[vert.index]
-					best = 0
-					for n in flw:
-						if flw[n]>best and not mesh.verts[n].flag:
-							next = mesh.verts[n]
-							best = flw[n]+0.9/abs(vert.index-n)
-
-				if not next:
-					for v in mesh.verts:
-						if not v.flag:
-							next = v
-							break
-					if not next:
-						break
+		Blender.Window.DrawProgressBar(0.95, "Writing file");
 
-				vert = next
+		if self.object:
+			self.out_file.begin("mesh")
 
-			mesh.verts = verts2
-
-			for i in range(len(mesh.verts)):
-				mesh.verts[i].index = i
-
-			if self.debug:
-				print "Locality after optimization: "+" ".join(["%.3f"%self.get_locality(s) for s in strips])
-
-		self.out_file.write("vertices NORMAL3")
+		fmt = "NORMAL3"
 		if mesh.faceUV:
-			self.out_file.write("_TEXCOORD2")
+			fmt += "_TEXCOORD2"
 			if self.tbn_vecs:
-				self.out_file.write("_ATTRIB33_ATTRIB34")
-		self.out_file.write("_VERTEX3\n{\n")
+				fmt += "_ATTRIB33_ATTRIB34"
+		fmt += "_VERTEX3"
+		self.out_file.begin("vertices", fmt)
 		norm = None
 		uv = None
 		tan = None
 		bino = None
 		for v in mesh.verts:
 			if v.no!=norm:
-				self.out_file.write("\tnormal3 %f %f %f;\n"%tuple(v.no))
+				self.out_file.write("normal3", *v.no)
 				norm = v.no
 			if v.uv!=uv:
-				self.out_file.write("\ttexcoord2 %f %f;\n"%tuple(v.uv))
+				self.out_file.write("texcoord2", *v.uv)
 				uv = v.uv
 			if v.tan!=tan:
-				self.out_file.write("\tattrib3 3 %f %f %f;\n"%tuple(v.tan))
+				self.out_file.write("attrib3", 3, *v.tan)
 				tan = v.tan
 			if v.bino!=bino:
-				self.out_file.write("\tattrib3 4 %f %f %f;\n"%tuple(v.bino))
+				self.out_file.write("attrib3", 4, *v.bino)
 				bino = v.bino
-			self.out_file.write("\tvertex3 %f %f %f;\n"%tuple(v.co))
-		self.out_file.write("};\n")
+			self.out_file.write("vertex3", *v.co)
+		self.out_file.end()
 		for s in strips:
-			self.out_file.write("batch TRIANGLE_STRIP\n{\n\tindices")
+			self.out_file.begin("batch", "TRIANGLE_STRIP")
+			indices = []
 			n = 0
 			for v in s:
-				self.out_file.write(" %u"%v.index)
-				n += 1;
-				if n%32==0:
-					self.out_file.write(";\n\tindices")
-			self.out_file.write(";\n};\n")
-
-		first = True
-		for f in mesh.faces:
-			if not f.flag:
-				if first:
-					self.out_file.write("batch TRIANGLES\n{\n")
-					first = False
+				indices.append(v.index)
+				if len(indices)>=32:
+					self.out_file.write("indices", *indices)
+					indices = []
+			if indices:
+				self.out_file.write("indices", *indices)
+			self.out_file.end()
+
+		if loose:
+			self.out_file.begin("batch", "TRIANGLES")
+			for f in loose:
 				for i in range(2, len(f.verts)):
-					self.out_file.write("\tindices %u %u %u;\n"%(f.verts[0].index, f.verts[i-1].index, f.verts[i].index))
-		if not first:
-			self.out_file.write("};\n")
+					self.out_file.write("indices", f.verts[0].index, f.verts[i-1].index, f.verts[i].index)
+			self.out_file.end()
 
 		if self.export_lines and mesh.lines:
-			self.out_file.write("batch LINES\n{\n")
+			self.out_file.write("batch", "LINES")
 			for l in mesh.lines:
-				self.out_file.write("\tindices %u %u;\n"%(l.verts[0].index, l.verts[1].index))
-			self.out_file.write("};\n")
+				self.out_file.write("indices", l.verts[0].index, l.verts[1].index)
+			self.out_file.end()
+
+		if self.object:
+			self.out_file.end()
+			self.out_file.begin("technique")
+			self.out_file.begin("pass", '""')
+			if self.material_tex:
+				self.out_file.begin("material")
+				self.out_file.write("diffuse", 1.0, 1.0, 1.0, 1.0)
+				self.out_file.end()
+				self.out_file.begin("texunit", 0)
+				self.out_file.begin("texture2d")
+				self.out_file.write("min_filter", "NEAREST")
+				self.out_file.write("mag_filter", "NEAREST")
+				self.out_file.write("storage", "RGB", len(mesh.materials), 1)
+				texdata = '"'
+				for m in mesh.materials:
+					texdata += "\\x%02X\\x%02X\\x%02X"%(int(m.R*255), int(m.G*255), int(m.B*255))
+				texdata += '"'
+				self.out_file.write("raw_data", texdata)
+				self.out_file.end()
+				self.out_file.end()
+			elif mesh.materials:
+				m = mesh.materials[0]
+				self.out_file.begin("material")
+				self.out_file.write("diffuse", m.R, m.G, m.B, 1.0)
+				self.out_file.write("ambient", m.R*m.amb, m.G*m.amb, m.B*m.amb, 1.0)
+				self.out_file.write("specular", m.specR*m.spec, m.specG*m.spec, m.specB*m.spec, 1.0)
+				self.out_file.write("shininess", m.hard);
+				self.out_file.end()
+			self.out_file.end()
+			self.out_file.end()
+
+		Blender.Window.DrawProgressBar(1.0, "Done")
 
 
 class FrontEnd:
@@ -571,26 +768,39 @@ class FrontEnd:
 	def run(self):
 		self.use_strips = Blender.Draw.Create(self.config.get('use_strips', True))
 		self.use_degen_tris = Blender.Draw.Create(self.config.get('use_degen_tris', True))
-		self.optimize_locality = Blender.Draw.Create(self.config.get('optimize_locality', True))
+		self.max_strip_len = Blender.Draw.Create(self.config.get('max_strip_len', 1024))
+		self.optimize_cache = Blender.Draw.Create(self.config.get('optimize_cache', False))
+		self.cache_size = Blender.Draw.Create(self.config.get('cache_size', 64))
 		self.export_lines = Blender.Draw.Create(self.config.get('export_lines', False))
 		self.tbn_vecs = Blender.Draw.Create(self.config.get('tbn_vecs', False))
+		self.compound = Blender.Draw.Create(self.config.get('compound', False))
+		self.object = Blender.Draw.Create(self.config.get('object', False))
+		self.material_tex = Blender.Draw.Create(self.config.get('material_tex', False))
 		self.debug = Blender.Draw.Create(self.config.get('debug', False))
 		self.strip_debug = Blender.Draw.Create(self.config.get('strip_debug', False))
 		self.split_debug = Blender.Draw.Create(self.config.get('split_debug', False))
 		ret = Blender.Draw.PupBlock("Export MSP GL mesh",
 			[("Use strips", self.use_strips, "Generage OpenGL triangle strips"),
 				("Use degen tris", self.use_degen_tris, "Use degenerate triangles to combine triangle strips"),
-				("Optimize locality", self.optimize_locality),
+				("Max strip len", self.max_strip_len, 4, 16384, "Maximum length of a triangle strip"),
+				("Optimize cache", self.optimize_cache, "Optimize for vertex cache"),
+				("Cache size", self.cache_size, 8, 1024, "Cache size to optimize for"),
 				("Export lines", self.export_lines, "Export lone edges as lines"),
 				("Compute T/B vecs", self.tbn_vecs, "Compute tangent/binormal vectors for bumpmapping"),
+				("Compound", self.compound, "Create a compound mesh of all selected objects"),
+				("Object", self.object, "Export as an object"),
+				("Material texture", self.material_tex, "Create a texture from material data"),
 				("Debugging options"),
 				("Debug", self.debug),
 				("Debug strips", self.strip_debug),
 				("Debug splitting", self.split_debug)])
 		if ret:
 			dirname = self.temp_config.get("dirname", Blender.sys.dirname(Blender.Get("filename")))
-			obj = bpy.data.scenes.active.objects.active
-			Blender.Window.FileSelector(self.export, "Export MSP GL mesh", "%s/%s.mesh"%(dirname, obj.name))
+			obj = Blender.Object.GetSelected()[0]
+			ext = "mesh"
+			if self.object.val:
+				ext = "object"
+			Blender.Window.FileSelector(self.export, "Export MSP GL mesh", "%s/%s.%s"%(dirname, obj.name, ext))
 
 	def draw(self):
 		pass
@@ -598,9 +808,14 @@ class FrontEnd:
 	def export(self, fn):
 		self.config['use_strips'] = self.use_strips.val
 		self.config['use_degen_tris'] = self.use_degen_tris.val
-		self.config['optimize_locality'] = self.optimize_locality.val
+		self.config['max_strip_len'] = self.max_strip_len.val
+		self.config['optimize_cache'] = self.optimize_cache.val
+		self.config['cache_size'] = self.cache_size.val
 		self.config['export_lines'] = self.export_lines.val
 		self.config['tbn_vecs'] = self.tbn_vecs.val
+		self.config['compound'] = self.compound.val
+		self.config['object'] = self.object.val
+		self.config['material_tex'] = self.material_tex.val
 		self.config['debug'] = self.debug.val
 		self.config['strip_debug'] = self.strip_debug.val
 		self.config['split_debug'] = self.split_debug.val
@@ -613,9 +828,14 @@ class FrontEnd:
 		exp = Exporter(fn)
 		exp.use_strips = self.use_strips.val
 		exp.use_degen_tris = self.use_degen_tris.val
-		exp.optimize_locality = self.optimize_locality.val
+		exp.max_strip_len = self.max_strip_len.val
+		exp.optimize_cache = self.optimize_cache.val
+		exp.cache_size = self.cache_size.val
 		exp.export_lines = self.export_lines.val
 		exp.tbn_vecs = self.tbn_vecs.val
+		exp.compound = self.compound.val
+		exp.object = self.object.val
+		exp.material_tex = self.material_tex.val
 		exp.debug = self.debug.val
 		exp.strip_debug = self.strip_debug.val
 		exp.split_debug = self.split_debug.val