refactoring pmd.writer

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

diff --git a/pymeshio/pmx/loader.py b/pymeshio/pmx/loader.py
index 2802b43..b78ed96 100644 (file)
--- a/pymeshio/pmx/loader.py
+++ b/pymeshio/pmx/loader.py
@@ -7,7 +7,7 @@ import pymeshio.pmx
 class Loader(pymeshio.common.BinaryLoader):\r
     """pmx loader\r
     """\r
-    def __init__(self, io,\r
+    def __init__(self, ios,\r
             text_encoding,\r
             extended_uv,\r
             vertex_index_size,\r
@@ -17,7 +17,7 @@ class Loader(pymeshio.common.BinaryLoader):
             morph_index_size,\r
             rigidbody_index_size\r
             ):\r
-        super(Loader, self).__init__(io)\r
+        super(Loader, self).__init__(ios)\r
         self.read_text=self.get_read_text(text_encoding)\r
         if extended_uv>0:\r
             raise pymeshio.common.ParseException(\r
@@ -267,14 +267,14 @@ class Loader(pymeshio.common.BinaryLoader):
                 spring_constant_rotation=self.read_vector3())\r
 \r
 \r
-def load(path):\r
-    # general binary loader\r
-    loader=pymeshio.common.BinaryLoader(\r
-            io.BytesIO(\r
-                pymeshio.common.readall(path)))\r
-    #loader=pymeshio.common.BinaryLoader(open(path, 'rb'))\r
+def load_from_file(path):\r
+    return load(io.BytesIO(pymeshio.common.readall(path)))\r
 \r
 \r
+def load(ios):\r
+    assert(isinstance(ios, io.IOBase))\r
+    loader=pymeshio.common.BinaryLoader(ios)\r
+\r
     # header\r
     signature=loader.unpack("4s", 4)\r
     if signature!=b"PMX ":\r