OSDN Git Service

fix 2.4.
authorousttrue <ousttrue@gmail.com>
Fri, 9 Jul 2010 18:38:31 +0000 (03:38 +0900)
committerousttrue <ousttrue@gmail.com>
Fri, 9 Jul 2010 18:38:31 +0000 (03:38 +0900)
swig/blender/bl24.py
swig/blender/bl25.py
swig/blender/pmd_import.py

index 034d461..3732a73 100755 (executable)
@@ -354,7 +354,7 @@ class material:
 
     @staticmethod
     def getTexture(m, index):
-        return m.textures[index]
+        return m.textures[index].tex
 
     @staticmethod
     def hasTexture(m):
@@ -362,10 +362,10 @@ class material:
 
     @staticmethod
     def setUseTexture(m, index, enable):
-        enable_textures=set(m.enabledTextures)
+        enabledTextures=set(m.enabledTextures)
         if enable:
             enabledTextures.add(index)
-        else;
+        else:
             enabledTextures.remove(index)
         m.enabledTextures=list(enabledTextures)
 
index 52a61b1..43fe6d8 100755 (executable)
@@ -327,7 +327,7 @@ class material:
 
     @staticmethod
     def getTexture(material, index):
-        return material.texture_slots[index]
+        return material.texture_slots[index].texture
 
     @staticmethod
     def hasTexture(material):
index 9590d7e..192e995 100755 (executable)
@@ -81,13 +81,7 @@ if isBlender24():
 
     def createPmdMaterial(m, index):
         material=Blender.Material.New()
-        #material.setRef(1)
-        #material.diffuseSize = 3.14/2
-        #material.setDiffuseSmooth(0)
-        #material.setSpecSize(0)
-        #material.setSpec(0)
-        # shader
-        # diffuse
+        # fresnelが無いw
         material.setDiffuseShader(Blender.Material.Shaders.DIFFUSE_TOON)
         material.setRGBCol([m.diffuse.r, m.diffuse.g, m.diffuse.b])
         material.setAlpha(m.diffuse.a)
@@ -115,8 +109,14 @@ if isBlender24():
         elif n.startswith("ankle_"):
             b.lockYRot=True
 
-    def setSphereMap(material, index, blende_type=None):
-        pass
+    def setSphereMap(material, index, blend_type='MULTIPLY'):
+        slot=material.textures[index]
+        slot.mapto=Blender.Texture.MapTo.NOR
+        slot.mapping=Blender.Texture.Mappings.SPHERE
+        if blend_type=='MULTIPLY':
+            slot.blendmode=Blender.Texture.BlendModes.MULTIPLY
+        elif blend_type=='ADD':
+            slot.blendmode=Blender.Texture.BlendModes.ADD
 
 else:
     # for 2.5
@@ -450,7 +450,7 @@ def __import16MaerialAndMesh(meshObject, l,
                 bl.material.getTexture(
                     toon_material, 
                     0 if m.toon_index==0xFF else m.toon_index
-                    ).texture,
+                    ),
                 False)
 
         texture_name=m.getTexture()