fix test

[meshio/pymeshio.git] / pymeshio / pmx / __init__.py

diff --git a/pymeshio/pmx/__init__.py b/pymeshio/pmx/__init__.py
index 90caeb2..d5665dc 100644 (file)
--- a/pymeshio/pmx/__init__.py
+++ b/pymeshio/pmx/__init__.py
@@ -74,12 +74,12 @@ class Bone(object):
             'ik',\r
             ]\r
     def __init__(self,\r
-            name: str,\r
-            english_name: str,\r
-            position: common.Vector3,\r
-            parent_index: int,\r
-            layer: int,\r
-            flag: int\r
+            name,\r
+            english_name,\r
+            position,\r
+            parent_index,\r
+            layer,\r
+            flag\r
             ):\r
         self.name=name,\r
         self.english_name=english_name\r
@@ -88,25 +88,25 @@ class Bone(object):
         self.layer=layer\r
         self.flag=flag\r
 \r
-    def getConnectionFlag(self) -> int:\r
+    def getConnectionFlag(self):\r
         return self.flag & 0x0001\r
 \r
-    def getIkFlag(self) -> int:\r
+    def getIkFlag(self):\r
         return (self.flag & 0x0020) >> 5\r
 \r
-    def getRotationFlag(self) -> int:\r
+    def getRotationFlag(self):\r
         return (self.flag & 0x0100) >> 8\r
 \r
-    def getTranslationFlag(self) -> int:\r
+    def getTranslationFlag(self):\r
         return (self.flag & 0x0200) >> 9\r
 \r
-    def getFixedAxisFlag(self) -> int:\r
+    def getFixedAxisFlag(self):\r
         return (self.flag & 0x0400) >> 10\r
 \r
-    def getLocalCoordinateFlag(self) -> int:\r
+    def getLocalCoordinateFlag(self):\r
         return (self.flag &  0x0800) >> 11\r
     \r
-    def getExternalParentDeformFlag(self) -> int:\r
+    def getExternalParentDeformFlag(self):\r
         return (self.flag &  0x2000) >> 13\r
 \r
  \r
@@ -132,23 +132,23 @@ class Material(object):
             'toon_sharing_flag',\r
             'toon_texture_index',\r
             'comment',\r
-            'index_count',\r
+            'vertex_count',\r
             ]\r
     def __init__(self,\r
-            name: str,\r
-            english_name: str,\r
-            diffuse_color: common.RGB,\r
-            diffuse_alpha: float,\r
-            specular_color: common.RGB,\r
-            specular_factor: float,\r
-            ambient_color: common.RGB,\r
-            flag: int,\r
-            edge_color: common.RGBA,\r
-            edge_size: float,\r
-            texture_index: int,\r
-            sphia_texture_index: int,\r
-            sphia_mode: int,\r
-            toon_sharing_flag: int\r
+            name,\r
+            english_name,\r
+            diffuse_color,\r
+            diffuse_alpha,\r
+            specular_color,\r
+            specular_factor,\r
+            ambient_color,\r
+            flag,\r
+            edge_color,\r
+            edge_size,\r
+            texture_index,\r
+            sphia_texture_index,\r
+            sphia_mode,\r
+            toon_sharing_flag\r
             ):\r
         self.name=name\r
         self.english_name=english_name\r
@@ -167,7 +167,12 @@ class Material(object):
         #\r
         self.toon_texture_index=None\r
         self.comment=''\r
-        self.index_count=0\r
+        self.vertex_count=0\r
+\r
+    def __str__(self):\r
+        return ("<pmx.Material {name}>".format(\r
+            name=self.english_name\r
+            ))\r
 \r
 \r
 class Deform(object):\r
@@ -179,9 +184,9 @@ class Bdef1(object):
 \r
     Attributes: see __init__\r
     """\r
-    __slots__=[ 'bone_index']\r
-    def __init__(self, bone_index: int):\r
-        self.bone_index=bone_index\r
+    __slots__=[ 'index0']\r
+    def __init__(self, index0):\r
+        self.index0=index0\r
 \r
 \r
 class Bdef2(object):\r
@@ -191,9 +196,9 @@ class Bdef2(object):
     """\r
     __slots__=[ 'index0', 'index1', 'weight0']\r
     def __init__(self, \r
-            index0: int,\r
-            index1: int,\r
-            weight0: float):\r
+            index0,\r
+            index1,\r
+            weight0):\r
         self.index0=index0\r
         self.index1=index1\r
         self.weight0=weight0\r
@@ -206,11 +211,11 @@ class Vertex(object):
     """\r
     __slots__=[ 'position', 'normal', 'uv', 'deform', 'edge_factor' ]\r
     def __init__(self, \r
-            position: common.Vector3, \r
-            normal: common.Vector3, \r
-            uv: common.Vector2, \r
-            deform: Deform, \r
-            edge_factor: float):\r
+            position, \r
+            normal, \r
+            uv, \r
+            deform, \r
+            edge_factor):\r
         self.position=position \r
         self.normal=normal\r
         self.uv=uv\r
@@ -340,7 +345,7 @@ class RigidBody(object):
         english_name: \r
         bone_index:\r
         collision_group:\r
-        no_collision_flag:\r
+        no_collision_group:\r
         shape:\r
         param:\r
         mode:\r
@@ -350,7 +355,7 @@ class RigidBody(object):
             'english_name',\r
             'bone_index',\r
             'collision_group',\r
-            'no_collision_flag',\r
+            'no_collision_group',\r
             'shape',\r
             'param',\r
             'mode',\r
@@ -360,7 +365,7 @@ class RigidBody(object):
             english_name,\r
             bone_index,\r
             collision_group,\r
-            no_collision_flag,\r
+            no_collision_group,\r
             shape_type,\r
             shape_size,\r
             shape_position,\r
@@ -376,7 +381,7 @@ class RigidBody(object):
         self.english_name=english_name\r
         self.bone_index=bone_index\r
         self.collision_group=collision_group\r
-        self.no_collision_flag=no_collision_flag\r
+        self.no_collision_group=no_collision_group\r
         if shape_type==0:\r
             self.shape=SphereShape(shape_size.x)\r
         elif shape_type==1:\r
@@ -501,3 +506,10 @@ class Model(object):
         self.rigidbodies=[]\r
         self.joints=[]\r
 \r
+    def __str__(self):\r
+        return ('<pmx-{version} "{name}" {vertices}vertices>'.format(\r
+            version=self.version,\r
+            name=self.english_name,\r
+            vertices=len(self.vertices)\r
+            ))\r
+\r