fix refactoring

diff --git a/blender25-meshio/__init__.pyc b/blender25-meshio/__init__.pyc
deleted file mode 100644 (file)
index 24c4690..0000000
Binary files a/blender25-meshio/__init__.pyc and /dev/null differ

diff --git a/examples/mqobuilder.py b/examples/mqobuilder.py
index b0dcd88..abfc9c5 100644 (file)
--- a/examples/mqobuilder.py
+++ b/examples/mqobuilder.py
@@ -10,16 +10,15 @@ import opengl.vertexarraymap
 \r
 \r
 def build(path):\r
-    # load scenee\r
     t=time.time()\r
-    io=pymeshio.mqo.IO()\r
-    if not io.read(path):\r
+    model=pymeshio.mqo.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
     vertexArrayMap=opengl.vertexarraymap.VertexArrayMapWithUV()\r
-    for m in io.materials:\r
+    for m in model.materials:\r
         material=opengl.material.MQOMaterial()\r
         material.rgba=(m.color.r, m.color.g, m.color.b, m.color.a)\r
         if m.tex:\r
@@ -27,7 +26,7 @@ def build(path):
             material.texture=opengl.texture.Texture(texturepath)\r
         vertexArrayMap.addMaterial(material)\r
 \r
-    for o in io.objects:\r
+    for o in model.objects:\r
         # skip mikoto objects\r
         if o.name.startswith("anchor"):\r
             continue\r

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

diff --git a/examples/pmxbuilder.py b/examples/pmxbuilder.py
index 76f39f4..44a6907 100644 (file)
--- a/examples/pmxbuilder.py
+++ b/examples/pmxbuilder.py
@@ -3,16 +3,15 @@
 \r
 import time\r
 import os\r
-import pymeshio.pmx.loader\r
+import pymeshio.pmx.reader\r
 import opengl.material\r
 import opengl.texture\r
 import opengl.vertexarray\r
 \r
 \r
 def build(path):\r
-    # load scenee\r
     t=time.time()\r
-    model=pymeshio.pmx.loader.load(path)\r
+    model=pymeshio.pmx.reader.read_from_file(path)\r
     if not model:\r
         return\r
     print(time.time()-t, "sec")\r

diff --git a/pymeshio/mqo/__init__.py b/pymeshio/mqo/__init__.py
index 45aca2e..6eeda67 100644 (file)
--- a/pymeshio/mqo/__init__.py
+++ b/pymeshio/mqo/__init__.py
@@ -8,7 +8,7 @@ import os
 import sys\r
 import math\r
 import pymeshio.common\r
-import pymeshio.mqo.loader\r
+import pymeshio.mqo.reader\r
 import warnings\r
 \r
 \r
@@ -227,16 +227,3 @@ class Model(object):
         self.objects=[]\r
 \r
 \r
-class IO(object):\r
-    def __init__(self):\r
-        pass\r
-\r
-    def read(self, path):\r
-        warnings.warn("'pymeshio.mqo.IO.read' will be replaced by 'pymeshio.mqo.loader.load'")\r
-        model=pymeshio.mqo.loader.load_from_file(path)\r
-        if model:\r
-            self.has_mikoto=model.has_mikoto\r
-            self.materials=model.materials\r
-            self.objects=model.objects\r
-            return True\r
-\r

diff --git a/pymeshio/mqo/reader.py b/pymeshio/mqo/reader.py
index b3e0919..1b7e365 100644 (file)
--- a/pymeshio/mqo/reader.py
+++ b/pymeshio/mqo/reader.py
@@ -20,7 +20,7 @@ class Reader(object):
     """\r
     __slots__=[\r
             "has_mikoto",\r
-            "eof", "io", "lines",\r
+            "eof", "ios", "lines",\r
             "materials", "objects",\r
             ]\r
     def __init__(self, ios):\r
@@ -169,11 +169,12 @@ class Reader(object):
 \r
 \r
 def read_from_file(path):\r
-    with open(path, 'rb') as ios:\r
-        read(ios)\r
+    with io.open(path, 'rb') as ios:\r
+        return read(ios)\r
 \r
 \r
 def read(ios):\r
+    print(type(ios), ios)\r
     assert(isinstance(ios, io.IOBase))\r
     reader=Reader(ios)\r
     model=pymeshio.mqo.Model()\r

diff --git a/pymeshio/pmd/__init__.py b/pymeshio/pmd/__init__.py
index df77c79..f6c9bb3 100644 (file)
--- a/pymeshio/pmd/__init__.py
+++ b/pymeshio/pmd/__init__.py
@@ -561,13 +561,3 @@ class Model(object):
                 )
 
 
-class IO(object):
-    def __init__(self):
-        pass
-
-    def read(self, path):
-        warnings.warn("'pymeshio.mqo.IO.read' will be replaced by 'pymeshio.mqo.loader.load'")
-        model=pymeshio.pmd.reader.read_from_file(path)
-        if model:
-            return True
-

diff --git a/pymeshio/pmx/reader.py b/pymeshio/pmx/reader.py
index cfb228e..40358bb 100644 (file)
--- a/pymeshio/pmx/reader.py
+++ b/pymeshio/pmx/reader.py
@@ -301,7 +301,7 @@ def read(ios):
     rigidbody_index_size=reader.read_uint(1)\r
     \r
     # pmx custom reader\r
-    reader=Reader(reader.io,\r
+    reader=Reader(reader.ios,\r
             text_encoding,\r
             extended_uv,\r
             vertex_index_size,\r

diff --git a/test/mqo_test.py b/test/mqo_test.py
index cb68799..b2bbd1b 100644 (file)
--- a/test/mqo_test.py
+++ b/test/mqo_test.py
@@ -5,13 +5,9 @@ import sys
 
 MQO_FILE="resources/cube.mqo"
 
-def test_old_mqo_load():
-    io=pymeshio.mqo.IO()
-    assert io.read(MQO_FILE)
 
 def test_mqo_read():
     model=pymeshio.mqo.reader.read_from_file(MQO_FILE)
-    print(model.materials)
     assert pymeshio.mqo.Model==model.__class__
     assert 6==len(model.materials)
     assert 1==len(model.objects)

diff --git a/test/mqo_test.pyc b/test/mqo_test.pyc
index c489dfc..6179dfd 100644 (file)
Binary files a/test/mqo_test.pyc and b/test/mqo_test.pyc differ

diff --git a/test/pmd_test.py b/test/pmd_test.py
index e394045..64eea9d 100644 (file)
--- a/test/pmd_test.py
+++ b/test/pmd_test.py
@@ -10,11 +10,6 @@ import pymeshio.pmd.writer
 PMD_FILE=u'resources/初音ミクVer2.pmd'
 
 
-def test_old_pmd_load():
-    loader=pymeshio.pmd.IO()
-    assert loader.read(PMD_FILE)
-
-
 class TestPmd(unittest.TestCase):
     
     def setUp(self):

diff --git a/test/pmd_test.pyc b/test/pmd_test.pyc
index bc73751..237a34b 100644 (file)
Binary files a/test/pmd_test.pyc and b/test/pmd_test.pyc differ