From 8bec9cb203e5d0691122e6dc5abf24d1b058df8c Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 23 Sep 2011 13:00:46 +0900
Subject: [PATCH] Clean up export_mdl() a little.

---
 tools/io_mesh_qfmdl/export_mdl.py | 42 +++++++++++++++----------------
 tools/io_mesh_qfmdl/mdl.py        | 16 +++++++++++-
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/tools/io_mesh_qfmdl/export_mdl.py b/tools/io_mesh_qfmdl/export_mdl.py
index cbdea618b..40fa2921d 100644
--- a/tools/io_mesh_qfmdl/export_mdl.py
+++ b/tools/io_mesh_qfmdl/export_mdl.py
@@ -26,9 +26,10 @@ from mathutils import Vector,Matrix
 from .quakepal import palette
 from .mdl import MDL
 
-def export_mdl(operator, context, filepath):
-    obj = context.active_object
-    mesh = obj.data
+def check_faces(mesh):
+    #Check that all faces are tris because mdl does not support anything else.
+    #Because the diagonal on which a quad is split can make a big difference,
+    #quad to tri conversion will not be done automatically.
     faces_ok = True
     save_select = []
     for f in mesh.faces:
@@ -39,27 +40,14 @@ def export_mdl(operator, context, filepath):
             faces_ok = False
     if not faces_ok:
         mesh.update()
-        operator.report({'ERROR'},
-                        "Mesh has faces with more than 3 vertices.")
-        return {'CANCELLED'}
+        return False
     #reset selection to what it was before the check.
     for f, s in map(lambda x, y: (x, y), mesh.faces, save_select):
         f.select = s
-    mdl = MDL()
-    mdl.name = obj.name
-    mdl.ident = "IDPO"      #only 8 bit for now
-    mdl.version = 6         #write only version 6 (nothing usable uses 3)
-    mdl.scale = (1.0, 1.0, 1.0)         #FIXME
-    mdl.scale_origin = (0.0, 0.0, 0.0)  #FIXME
-    mdl.boundingradius = 1.0            #FIXME
-    mdl.eyeposition = (0.0, 0.0, 0.0)   #FIXME
-    mdl.synctype = 0        #FIXME config (right default?)
-    mdl.flags = 0           #FIXME config
-    mdl.size = 0            #FIXME ???
-    mdl.skins = []
-    mdl.stverts = []
-    mdl.tris = []
-    mdl.frames = []
+    mesh.update()
+    return True
+
+def make_skin(mdl, mesh):
     if (not mesh.uv_textures or not mesh.uv_textures[0].data
         or not mesh.uv_textures[0].data[0].image):
         mdl.skinwidth = mdl.skinheight = 4
@@ -91,5 +79,15 @@ def export_mdl(operator, context, filepath):
                         best = (r, i)
                 skin.pixels[outind] = best[1]
     mdl.skins.append(skin)
-    mdl.write (filepath)
+
+def export_mdl(operator, context, filepath):
+    obj = context.active_object
+    mesh = obj.data
+    if not check_faces (mesh):
+        operator.report({'ERROR'},
+                        "Mesh has faces with more than 3 vertices.")
+        return {'CANCELLED'}
+    mdl = MDL(obj.name)
+    make_skin(mdl, mesh)
+    mdl.write(filepath)
     return {'FINISHED'}
diff --git a/tools/io_mesh_qfmdl/mdl.py b/tools/io_mesh_qfmdl/mdl.py
index 9e760d961..41f4ac44c 100644
--- a/tools/io_mesh_qfmdl/mdl.py
+++ b/tools/io_mesh_qfmdl/mdl.py
@@ -207,7 +207,21 @@ class MDL:
         data = data.encode()
         self.write_bytes(data, size)
 
-    def __init__(self):
+    def __init__(self, name = "mdl"):
+        self.name = name
+        self.ident = "IDPO"     #only 8 bit for now
+        self.version = 6        #write only version 6 (nothing usable uses 3)
+        self.scale = (1.0, 1.0, 1.0)        #FIXME
+        self.scale_origin = (0.0, 0.0, 0.0) #FIXME
+        self.boundingradius = 1.0           #FIXME
+        self.eyeposition = (0.0, 0.0, 0.0)  #FIXME
+        self.synctype = 0       #FIXME config (right default?)
+        self.flags = 0          #FIXME config
+        self.size = 0           #FIXME ???
+        self.skins = []
+        self.stverts = []
+        self.tris = []
+        self.frames = []
         pass
     def read(self, filepath):
         self.file = open(filepath, "rb")