X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=src%2Fmqo.cpp;h=7c6ff3c499b40695b32877abbdbbe5a19aaee045;hb=4b7b856e70fe8047f985e2598020032d0d87a672;hp=d55d070d7169574bfdca9730b683fa7200b2d866;hpb=1ca323cf3d3caa38587749aeabf8f6a31482810a;p=meshio%2Fmeshio.git

diff --git a/src/mqo.cpp b/src/mqo.cpp
index d55d070..7c6ff3c 100644
--- a/src/mqo.cpp
+++ b/src/mqo.cpp
@@ -307,7 +307,7 @@ private:
 					material.ambient=splitter.getFloat();
 				}
 				else if(key=="emi"){
-					material.emmit=splitter.getFloat();
+					material.emit=splitter.getFloat();
 				}
 				else if(key=="spc"){
 					material.specular=splitter.getFloat();
@@ -442,54 +442,54 @@ bool IO::read(const wchar_t *path)
 bool IO::write(binary::IWriter &writer)
 {
 	// header
-	writer.writeLn("Metasequoia Document");
-	writer.writeLn("Format Text Ver 1.0");
-	writer.writeLn("");
+	writer.printLn("Metasequoia Document");
+	writer.printLn("Format Text Ver 1.0");
+	writer.printLn("");
 
 	// scene
-	writer.writeLn("Scene {");
-	writer.writeLn("\tpos 0.0000 0.0000 1500.0000");
-	writer.writeLn("\tlookat 0.0000 0.0000 0.0000");
-	writer.writeLn("\thead -0.5236");
-	writer.writeLn("\tpich 0.5236");
-	writer.writeLn("\tortho 0");
-	writer.writeLn("\tzoom2 5.0000");
-	writer.writeLn("\tamb 0.250 0.250 0.250");
-	writer.writeLn("}");
+	writer.printLn("Scene {");
+	writer.printLn("\tpos 0.0000 0.0000 1500.0000");
+	writer.printLn("\tlookat 0.0000 0.0000 0.0000");
+	writer.printLn("\thead -0.5236");
+	writer.printLn("\tpich 0.5236");
+	writer.printLn("\tortho 0");
+	writer.printLn("\tzoom2 5.0000");
+	writer.printLn("\tamb 0.250 0.250 0.250");
+	writer.printLn("}");
 
 	// materials
 	if(materials.size()>0){
-		writer.writeLn("Material %d {", materials.size());
+		writer.printLn("Material %d {", materials.size());
 		for(size_t i=0; i<materials.size(); ++i){
 			Material &m=materials[i];
 		}
-		writer.writeLn("}");
+		writer.printLn("}");
 	}
 
 	// objects
 	for(size_t i=0; i<objects.size(); ++i){
 		Object &o=objects[i];
-		writer.writeLn("Object \"%s\" {", o.name.c_str());
-		writer.writeLn("\tdepth 0");
-		writer.writeLn("\tfolding 0");
-		writer.writeLn("\tscale 1.000000 1.000000 1.000000");
-		writer.writeLn("\trotation 0.000000 0.000000 0.000000");
-		writer.writeLn("\ttranslation 0.000000 0.000000 0.000000");
-		writer.writeLn("\tvisible 15");
-		writer.writeLn("\tlocking 0");
-		writer.writeLn("\tshading 1");
-		writer.writeLn("\tfacet 59.5");
-		writer.writeLn("\tcolor 0.898 0.400 0.137");
-		writer.writeLn("\tcolor_type 0");
+		writer.printLn("Object \"%s\" {", o.name.c_str());
+		writer.printLn("\tdepth 0");
+		writer.printLn("\tfolding 0");
+		writer.printLn("\tscale 1.000000 1.000000 1.000000");
+		writer.printLn("\trotation 0.000000 0.000000 0.000000");
+		writer.printLn("\ttranslation 0.000000 0.000000 0.000000");
+		writer.printLn("\tvisible 15");
+		writer.printLn("\tlocking 0");
+		writer.printLn("\tshading 1");
+		writer.printLn("\tfacet 59.5");
+		writer.printLn("\tcolor 0.898 0.400 0.137");
+		writer.printLn("\tcolor_type 0");
 		// vertex
-		writer.writeLn("\tvertex %d {", o.vertices.size());
+		writer.printLn("\tvertex %d {", o.vertices.size());
 		for(size_t j=0; j<o.vertices.size(); ++j){
 			Vector3 &v=o.vertices[j];
-			writer.writeLn("\t\t%.4f %.4f %.4f", v.x, v.y, v.z);
+			writer.printLn("\t\t%.4f %.4f %.4f", v.x, v.y, v.z);
 		}
-		writer.writeLn("\t}");
+		writer.printLn("\t}");
 		// face
-		writer.writeLn("\tface %d {", o.faces.size());
+		writer.printLn("\tface %d {", o.faces.size());
 		for(size_t j=0; j<o.faces.size(); ++j){
 			Face &f=o.faces[j];
 
@@ -518,14 +518,14 @@ bool IO::write(binary::IWriter &writer)
 			}
 			ss << ")";
 
-			writer.writeLn(ss.str().c_str());
+			writer.printLn(ss.str().c_str());
 		}
-		writer.writeLn("\t}");
+		writer.printLn("\t}");
 		// close
-		writer.writeLn("}");
+		writer.printLn("}");
 	}
 	// Eof
-	writer.writeLn("Eof");
+	writer.printLn("Eof");
 
 	return true;
 }