From: ousttrue <ousttrue@gmail.com>
Date: Sun, 20 Jun 2010 14:24:15 +0000 (+0900)
Subject: fix pmd. fix mqo.
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=1e3c090a4bd6b08e5b20758a4e2c896bbe932090;p=meshio%2Fmeshio.git

fix pmd. fix mqo.
---

diff --git a/swig/blender/bl24.py b/swig/blender/bl24.py
index a843938..4eceed0 100644
--- a/swig/blender/bl24.py
+++ b/swig/blender/bl24.py
@@ -532,7 +532,7 @@ def meshAddMaterial(mesh, material):
 def meshAddMqoGeometry(mesh, o, materials, imageMap, scale):
     # add vertices
     mesh.verts.extend(Mathutils.Vector(0, 0, 0)) # dummy
-    mesh.verts.extend([(v.x, -v.z, v.y) for v in o.vertices])
+    mesh.verts.extend([(v.x * scale, -v.z * scale, v.y * scale) for v in o.vertices])
     # add faces
     mesh_faces=[]
     for face in o.faces:
@@ -779,6 +779,13 @@ def boneLayerMask(bone, layers):
             mask+=(1<<i)
     bone.layerMask=mask
 
+def objectLayerMask(object, layers):
+    mask=0
+    for i, enable in enumerate(layers):
+        if enable!=0:
+            mask+=(1<<i)
+    object.layerMask=mask
+
 def objectPinShape(o):
     o.pinShape=True
 
diff --git a/swig/blender/bl25.py b/swig/blender/bl25.py
index 536b1c0..6b8d723 100644
--- a/swig/blender/bl25.py
+++ b/swig/blender/bl25.py
@@ -424,6 +424,15 @@ def boneLayerMask(bone, layers):
             layer.append(False)
     bone.layer=layer
 
+def objectLayerMask(object, layers):
+    layer=[]
+    for i in range(20):
+        try:
+            layer.append(True if layers[i]!=0 else False)
+        except IndexError:
+            layer.append(False)
+    object.layers=layer
+
 def objectPinShape(o):
     o.shape_key_lock=True
 
diff --git a/swig/blender/mqo_export.py b/swig/blender/mqo_export.py
index c80f608..55a3668 100644
--- a/swig/blender/mqo_export.py
+++ b/swig/blender/mqo_export.py
@@ -82,10 +82,12 @@ class ObjectInfo(object):
 
 
 class MqoExporter(object):
-    __slots__=["materials", "objects"]
-    def __init__(self):
+    __slots__=["materials", "objects", 'scale',]
+    def __init__(self, scale):
         self.objects=[]
         self.materials=[]
+        self.scale=scale
+        print('scaling', self.scale)
 
     def setup(self, scene):
         # 木構造を構築する
@@ -187,7 +189,7 @@ class MqoExporter(object):
         # mirroring                
         isMirrorring=False
         for mod in obj.modifiers:
-                if mod.name=="Mirror":
+                if mod.name.upper()=="MIRROR":
                         isMirrorring=True
                         break
         if isMirrorring:
@@ -198,7 +200,8 @@ class MqoExporter(object):
         io.write("\tvertex %d {\r\n" % len(mesh.verts))
         for vert in mesh.verts:
             x, y, z = convert_to_mqo(vert.co)
-            io.write("\t\t%f %f %f\r\n" % (x, y, z)) # rotate to y-up
+            io.write("\t\t%f %f %f\r\n" % 
+                    (x*self.scale, y*self.scale, z*self.scale)) # rotate to y-up
         io.write("\t}\r\n")
 
         # faces
@@ -207,7 +210,11 @@ class MqoExporter(object):
             count=bl.faceVertexCount(face)
             # V
             io.write("\t\t%d V(" % count)
+            face_list=[]
             for j in bl.faceVertices(face):
+                face_list.insert(0, j)
+            # flip face
+            for j in face_list:
                 io.write("%d " % j)
             io.write(")")
             # mat
@@ -217,8 +224,12 @@ class MqoExporter(object):
             # UV
             if bl.meshHasUV(mesh) and bl.faceHasUV(mesh, i, face):
                 io.write(" UV(")
+                uv_list=[]
                 for uv in bl.faceGetUV(mesh, i, face, count):
                     # reverse vertical value
+                    uv_list.insert(0, uv)
+                # flip face
+                for uv in uv_list:
                     io.write("%f %f " % (uv[0], 1.0-uv[1])) 
                 io.write(")")
             io.write("\r\n")
@@ -231,7 +242,7 @@ class MqoExporter(object):
 
 
 def __execute(filename, scene, scale):
-    exporter=MqoExporter()
+    exporter=MqoExporter(scale)
     exporter.setup(scene)
     exporter.write(filename, scene)
 
@@ -287,18 +298,18 @@ else:
                 name="Directory", 
                 description="Directory of the file.")
 
+        scale = FloatProperty(
+                name="Scale", 
+                description="Scale the MQO by this value", 
+                min=0.0001, max=1000000.0, 
+                soft_min=0.001, soft_max=100.0, default=100.0)
+
         check_existing = BoolProperty(
                 name="Check Existing",
                 description="Check and warn on overwriting existing files",
                 default=True,
                 options=set('HIDDEN'))
 
-        scale = FloatProperty(
-                name="Scale", 
-                description="Scale the MQO by this value", 
-                min=0.0001, max=1000000.0, 
-                soft_min=0.001, soft_max=100.0, default=1.0)
-
         def execute(self, context):
             execute_25(
                     self.properties.path, 
diff --git a/swig/blender/mqo_import.py b/swig/blender/mqo_import.py
index 7f38f0e..d5c7142 100644
--- a/swig/blender/mqo_import.py
+++ b/swig/blender/mqo_import.py
@@ -21,6 +21,7 @@ This script imports a mqo into Blender for editing.
 0.5 20100311: create armature from mikoto bone.
 0.6 20100505: C extension.
 0.7 20100606: integrate 2.4 and 2.5.
+0.8 20100619: fix multibyte object name.
 '''
 
 
@@ -98,7 +99,7 @@ def __createMaterials(scene, mqo, directory):
     return materials, imageMap
 
 
-def __createObjects(scene, mqo, root, materials, imageMap, scale=1.0):
+def __createObjects(scene, mqo, root, materials, imageMap, scale):
     """
     create blender mesh objects.
     """
@@ -117,15 +118,12 @@ def __createObjects(scene, mqo, root, materials, imageMap, scale=1.0):
         bl.objectMakeParent(stack[-1], mesh_object)
         stack.append(mesh_object)
 
-        if o.name.startswith('sdef'):
-            # add sdef object
+        if o.getName().startswith('sdef'):
             objects.append(mesh_object)
-        elif o.name.startswith('anchor'):
-            #print("hide %s" % o.name)
-            #mesh_object.restrictDisplay=False
-            mesh_object.layers=[2]
-        elif o.name.startswith('bone'):
-            mesh_object.layers=[2]
+        elif o.getName().startswith('anchor'):
+            bl.objectLayerMask(mesh_object, [0, 1])
+        elif o.getName().startswith('bone'):
+            bl.objectLayerMask(mesh_object, [0, 1])
 
         bl.meshAddMqoGeometry(mesh, o, materials, imageMap, scale)
 
@@ -214,7 +212,7 @@ else:
                 name="Scale", 
                 description="Scale the MQO by this value", 
                 min=0.0001, max=1000000.0, 
-                soft_min=0.001, soft_max=100.0, default=1.0)
+                soft_min=0.001, soft_max=100.0, default=0.01)
 
         def execute(self, context):
             execute_25(
diff --git a/swig/blender/pmd_import.py b/swig/blender/pmd_import.py
index 3f7b33b..7ae67a4 100644
--- a/swig/blender/pmd_import.py
+++ b/swig/blender/pmd_import.py
@@ -25,6 +25,7 @@ This script imports a pmd into Blender for editing.
 1.0: 20100530: add invisilbe bone tail(armature layer 2).
 1.1: 20100608: integrate 2.4 and 2.5.
 1.2: 20100616: implement rigid body.
+1.3: 20100619: fix for various models.
 """
 
 MMD_SHAPE_GROUP_NAME='_MMD_SHAPE'
@@ -99,8 +100,16 @@ def to_radian(degree):
 
 
 def get_bone_name(l, index):
-    name=englishmap.getEnglishBoneName(l.bones[index].getName())
-    return name if name else l.bones[index].getName()
+    if index==0xFFFF:
+        return l.bones[0].getName()
+
+    if index < len(l.bones):
+        name=englishmap.getEnglishBoneName(l.bones[index].getName())
+        if name:
+            return name
+        return l.bones[index].getName()
+    print('invalid bone index', index)
+    return l.bones[0].getName()
 
 def __importShape(obj, l, vertex_map):
     if len(l.morph_list)==0:
@@ -209,12 +218,9 @@ def __build(armature, b, p, parent):
 
     bone=bl.createArmatureBone(armature, name)
 
-    if b.tail_index==0:
-        # 先端ボーン
-        assert(b.type==6 or b.type==7 or b.type==9)
+    if parent and (b.tail_index==0 or b.type==6 or b.type==7 or b.type==9):
         bone.head = bl.createVector(*convert_coord(b.pos))
         bone.tail=bone.head+bl.createVector(0, 1, 0)
-        assert(parent)
         bone.parent=parent
         if bone.name=="center_t":
             # センターボーンは(0, 1, 0)の方向を向いていないと具合が悪い
@@ -222,7 +228,11 @@ def __build(armature, b, p, parent):
             bone.head=parent.tail
             bone.tail=bone.head+bl.createVector(0, 1, 0)
         else:
-            assert(parent.tail==bone.head)
+            if parent.tail==bone.head:
+                pass
+            else:
+                print('diffurence with parent.tail and head', name)
+
         bl.boneSetConnected(bone)
         # armature layer 2
         bl.boneLayerMask(bone, [0, 1])
@@ -531,7 +541,6 @@ def __importMesh(scene, io, tex_dir):
     while material_offset<len(io.materials):
         mesh, meshObject=bl.createMesh(scene, 'mesh')
         # create object
-        #meshObject.layers = [1]
         mesh_objects.append(meshObject)
 
         # activate object
diff --git a/swig/setup.py b/swig/setup.py
index 9202076..61652f9 100644
--- a/swig/setup.py
+++ b/swig/setup.py
@@ -64,7 +64,7 @@ else:
 for i in range(len(ext_modules)+1):
     try:
         setup(name="meshio",
-                version='0.8',
+                version='0.9',
                 description='polygon mesh io utilities',
                 author='ousttrue',
                 author_email='ousttrue@gmail.com',