fix emmit typo. update maaterial import.

[meshio/meshio.git] / include / mqo.h

diff --git a/include/mqo.h b/include/mqo.h
index fb932da..ec7a8c9 100644 (file)
--- a/include/mqo.h
+++ b/include/mqo.h
@@ -85,7 +85,7 @@ struct Material
        RGBA color;
        float diffuse;
        float ambient;
-       float emmit;
+       float emit;
        float specular;
        float power;
        std::string texture;
@@ -94,7 +94,7 @@ struct Material
        int vcol;
 
        Material()
-               : shader(0), diffuse(1), ambient(0), emmit(0), specular(0), power(0),
+               : shader(0), diffuse(1), ambient(0), emit(0), specular(0), power(0),
                vcol(0)
                {}
 
@@ -111,7 +111,7 @@ inline std::ostream &operator<<(std::ostream &os, const Material &rhs)
                << ", color:" << rhs.color
                << ", diffuse:" << rhs.diffuse
                << ", ambient:" << rhs.ambient
-               << ", emmit:" << rhs.emmit
+               << ", emit:" << rhs.emit
                << ", specular:" << rhs.specular
                << ", power:" << rhs.power
                << ", texture:\"" << rhs.texture << '"'
@@ -219,8 +219,11 @@ struct Object
        std::vector<Face> faces;
 
        Object()
-               : mirror(0)
+               : depth(0), folding(0), visible(1), locking(0), shading(0), 
+               smoothing(60.0f), color_type(0), mirror(0)
        {}
+
+       std::wstring getName()const;
 };
 inline std::ostream &operator<<(std::ostream &os, const Object &rhs)
 {
@@ -245,7 +248,11 @@ struct IO
 
        bool read(binary::IReader &reader);
        bool read(const char *path);
-       bool write(std::ostream &os);
+//#ifdef _WIN32
+       bool read(const wchar_t *path);
+//#endif
+       bool write(binary::IWriter &writer);
+       bool write(const char *path);
 };
 
 } // namespace mqo