fix refactoring

[meshio/pymeshio.git] / examples / pmdbuilder.py

diff --git a/examples/pmdbuilder.py b/examples/pmdbuilder.py
index 846c7b2..ee5361f 100644 (file)
--- a/examples/pmdbuilder.py
+++ b/examples/pmdbuilder.py
@@ -3,7 +3,7 @@
 \r
 import time\r
 import os\r
-import pymeshio.pmd\r
+import pymeshio.pmd.reader\r
 import opengl.material\r
 import opengl.texture\r
 import opengl.vertexarray\r
@@ -12,14 +12,14 @@ import opengl.vertexarray
 def build(path):\r
     # load scenee\r
     t=time.time()\r
-    io=pymeshio.pmd.IO()\r
-    if not io.read(path):\r
+    model=pymeshio.pmd.reader.read_from_file(path)\r
+    if not model:\r
         return\r
     print(time.time()-t, "sec")\r
     # build\r
     basedir=os.path.dirname(path)\r
     indexedVertexArray=opengl.vertexarray.IndexedVertexArray()\r
-    for v in io.vertices:\r
+    for v in model.vertices:\r
         # left-handed y-up to right-handed y-up                \r
         indexedVertexArray.addVertex(\r
                 (v.pos[0], v.pos[1], -v.pos[2], 1), \r
@@ -32,18 +32,18 @@ def build(path):
     textureMap={}\r
     faceIndex=0\r
     def indices():\r
-        for i in io.indices:\r
+        for i in model.indices:\r
             yield i\r
     indexGen=indices()\r
-    for i, m in enumerate(io.materials):\r
+    for i, m in enumerate(model.materials):\r
         material=opengl.material.MQOMaterial()\r
         material.vcol=True\r
         material.rgba=(\r
-                m.diffuse[0], \r
-                m.diffuse[1], \r
-                m.diffuse[2], \r
-                m.diffuse[3])\r
-        texturefile=m.texture.decode('cp932')\r
+                m.diffuse_color[0], \r
+                m.diffuse_color[1], \r
+                m.diffuse_color[2], \r
+                m.alpha)\r
+        texturefile=m.texture_file.decode('cp932')\r
         texturepath=os.path.join(basedir, texturefile)\r
         if os.path.isfile(texturepath):\r
             if not texturepath in textureMap:\r