From e3663cdfa9eba5b3809390cbc46516f50cb244bc Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 14 Jun 2010 20:46:52 +0900 Subject: [PATCH] fix. --- swig/blender/bl24.py | 6 ++++-- swig/blender/bl25.py | 8 +++++++- swig/blender/pmd_export.py | 18 ++++++++++-------- swig/blender/pmd_import.py | 11 +++-------- swig/blender24/pmd_export.py | 29 ++++++++++++++++++++--------- 5 files changed, 44 insertions(+), 28 deletions(-) diff --git a/swig/blender/bl24.py b/swig/blender/bl24.py index 5209561..a1a5133 100644 --- a/swig/blender/bl24.py +++ b/swig/blender/bl24.py @@ -794,8 +794,10 @@ def objectShapeKeys(o): return o.getData(mesh=True).key.blocks def meshVertexGroup(meshObject, name): + indices=[] for index in meshObject.getData(mesh=True).getVertsFromGroup(name): - yield index + indices.append(index) + return indices def materialGet(scene, material_name): return Blender.Material.Get(material_name) @@ -819,7 +821,7 @@ def ikChainLen(c): return c[Blender.Constraint.Settings.CHAINLEN] def ikTarget(c): - return c[Blender.Constraint.Settings.BONE]) + return c[Blender.Constraint.Settings.BONE] def ikItration(c): return c[Blender.Constraint.Settings.ITERATIONS] diff --git a/swig/blender/bl25.py b/swig/blender/bl25.py index a8bc8e5..85284f3 100644 --- a/swig/blender/bl25.py +++ b/swig/blender/bl25.py @@ -341,8 +341,12 @@ def meshAddUV(mesh): def meshVertsDelete(mesh, remove_vertices): enterEditMode() bpy.ops.mesh.select_all(action='DESELECT') + exitEditMode() + for i in remove_vertices: mesh.verts[i].selected=True + + enterEditMode() bpy.ops.mesh.delete(type='VERT') exitEditMode() @@ -433,10 +437,12 @@ def objectShapeKeys(o): return o.data.shape_keys.keys def meshVertexGroup(meshObject, name): + indices=[] for i, v in enumerate(meshObject.data.verts): for g in v.groups: if meshObject.vertex_groups[g.group].name==name: - yield(i) + indices.append(i) + return indices def materialGet(scene, material_name): return bpy.data.materials[material_name] diff --git a/swig/blender/pmd_export.py b/swig/blender/pmd_export.py index 433cf5b..2e8703d 100644 --- a/swig/blender/pmd_export.py +++ b/swig/blender/pmd_export.py @@ -374,7 +374,6 @@ class OneSkinMesh(object): # base for b in bl.objectShapeKeys(obj): if b.name==BASE_SHAPE_NAME: - print(b.name) baseMorph=self.__getOrCreateMorph('base', 0) relativeIndex=0 basis=b @@ -390,6 +389,7 @@ class OneSkinMesh(object): break assert(basis) + print(basis.name, len(baseMorph.offsets)) if(len(baseMorph.offsets)>0): baseMorph.sort() @@ -407,11 +407,12 @@ class OneSkinMesh(object): bl.shapeKeys(basis), bl.shapeKeys(b)): offset=[dst[0]-src[0], dst[1]-src[1], dst[2]-src[2]] + if offset[0]==0 and offset[1]==0 and offset[2]==0: + continue if index in vg: indices=self.vertexArray.getMappedIndices(index) for i in indices: morph.add(indexRelativeMap[i], offset) - #assert(len(morph.offsets)==len(baseMorph.offsets)) # sort skinmap original=self.morphList[:] @@ -610,6 +611,7 @@ class PmdExporter(object): for node in object_node_map.values(): if node.o.parent: object_node_map[node.o.parent].children.append(node) + # ルートを得る root=object_node_map[scene.objects.active] @@ -717,13 +719,9 @@ class PmdExporter(object): assert(i1: + original=self.morphList[:] + def getIndex(morph): + for i, v in enumerate(englishmap.skinMap): + if v[0]==morph.name: + return i + #print(morph) + return 0 + self.morphList.sort(lambda l, r: getIndex(l)-getIndex(r)) def __getOrCreateMorph(self, name, type): for m in self.morphList: @@ -612,12 +614,14 @@ class PmdExporter(object): self.__createOneSkinMesh(child) def write(self, path): + print('write') io=pmd.IO() io.name=self.name io.comment="blender export" io.version=1.0 # 頂点 + print('vertices') for pos, normal, uv, b0, b1, weight in self.oneSkinMesh.vertexArray.zip(): # convert right-handed z-up to left-handed y-up v=io.addVertex() @@ -635,6 +639,7 @@ class PmdExporter(object): v.edge_flag=0 # edge flag, 0: enable edge, 1: not edge # 面とマテリアル + print('faces and materials') vertexCount=self.oneSkinMesh.getVertexCount() for m, indices in self.oneSkinMesh.vertexArray.indexArrays.items(): m=Blender.Material.Get(m) @@ -670,6 +675,7 @@ class PmdExporter(object): #io.indices.append(indices[i+2]) # bones + print('bones') for b in self.builder.bones: if b.name.endswith("_t"): if b.name.startswith("arm twist1_") or b.name.startswith("arm twist2_"): @@ -718,6 +724,7 @@ class PmdExporter(object): bone.pos.z=b.pos[1] if not near(b.pos[1], 0) else 0 # IK + print('ik') for ik in self.builder.ik_list: solver=io.addIK() solver.index=self.builder.getIndex(ik.target) @@ -731,6 +738,7 @@ class PmdExporter(object): solver.weight=ik.weight # 表情 + print('shape keys') for i, m in enumerate(self.oneSkinMesh.morphList): # morph morph=io.addMorph() @@ -749,6 +757,7 @@ class PmdExporter(object): morph.vertex_count=len(m.offsets) # 表情枠 + print('display list') # type==0はbase for i, m in enumerate(self.oneSkinMesh.morphList): if m.type==3: @@ -764,6 +773,7 @@ class PmdExporter(object): io.face_list.append(i) # ボーン表示枠 + print('bone display list') def createBoneDisplayName(name, english): boneDisplayName=io.addBoneDisplayName() boneDisplayName.name=name.decode('utf-8').encode('cp932') @@ -783,6 +793,7 @@ class PmdExporter(object): io.addBoneDisplay(i, getBoneDisplayGroup(b)) # English + print('english') io.english_name="blender export" io.english_coment="blender export" @@ -790,7 +801,7 @@ class PmdExporter(object): io.getToonTexture(i).name="toon%02d.bmp\n" % i # 書き込み - return io.write(path.encode(FS_ENCODING)) + return io.write(path) def getBoneDisplayGroup(bone): -- 2.11.0