X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=include%2Fmqo.h;h=ec7a8c952288433d7c0fe982eebf1489e1a5e871;hb=68a0b4bad4103f2c036484bcfbf5743ca5d6380b;hp=fb932dab5fb3b5f1eca5d2843e1139bfc7c9c361;hpb=dc93b705e08b1bcee4099e180d39b364cb5f5ea8;p=meshio%2Fmeshio.git

diff --git a/include/mqo.h b/include/mqo.h
index fb932da..ec7a8c9 100644
--- 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