From 31c29ea482e3bb868e60a0de05d513511a942b97 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sat, 8 Sep 2012 03:05:12 +0200 Subject: CModelFile fixes; test framework - fixes in CModelFile IO - added Google Test framework for automatic testing - rewrote modelfile_test in the new framework --- src/CMakeLists.txt | 3 + src/graphics/engine/modelfile.cpp | 312 +++++++++++++++------------- src/graphics/engine/test/CMakeLists.txt | 25 ++- src/graphics/engine/test/modelfile_test.cpp | 305 +++++++++++++++++++++++---- 4 files changed, 463 insertions(+), 182 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ff271fd..0983a16 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,6 +4,9 @@ add_subdirectory(CBot) # Tools directory is built separately add_subdirectory(tools) +# Tests +add_subdirectory(graphics/engine/test) + # Configure options option(DEBUG "Enable debug output" ON) diff --git a/src/graphics/engine/modelfile.cpp b/src/graphics/engine/modelfile.cpp index 02021c5..2049749 100644 --- a/src/graphics/engine/modelfile.cpp +++ b/src/graphics/engine/modelfile.cpp @@ -44,23 +44,21 @@ const int TRIANGLE_PREALLOCATE_COUNT = 2000; -Gfx::Vertex ReadBinaryVertex(std::istream& stream) +bool ReadBinaryVertex(std::istream& stream, Gfx::Vertex& vertex) { - Gfx::Vertex result; - - result.coord.x = IOUtils::ReadBinaryFloat(stream); - result.coord.y = IOUtils::ReadBinaryFloat(stream); - result.coord.z = IOUtils::ReadBinaryFloat(stream); - result.normal.x = IOUtils::ReadBinaryFloat(stream); - result.normal.y = IOUtils::ReadBinaryFloat(stream); - result.normal.z = IOUtils::ReadBinaryFloat(stream); - result.texCoord.x = IOUtils::ReadBinaryFloat(stream); - result.texCoord.y = IOUtils::ReadBinaryFloat(stream); - - return result; + vertex.coord.x = IOUtils::ReadBinaryFloat(stream); + vertex.coord.y = IOUtils::ReadBinaryFloat(stream); + vertex.coord.z = IOUtils::ReadBinaryFloat(stream); + vertex.normal.x = IOUtils::ReadBinaryFloat(stream); + vertex.normal.y = IOUtils::ReadBinaryFloat(stream); + vertex.normal.z = IOUtils::ReadBinaryFloat(stream); + vertex.texCoord.x = IOUtils::ReadBinaryFloat(stream); + vertex.texCoord.y = IOUtils::ReadBinaryFloat(stream); + + return !stream.fail(); } -void WriteBinaryVertex(Gfx::Vertex vertex, std::ostream& stream) +bool WriteBinaryVertex(Gfx::Vertex vertex, std::ostream& stream) { IOUtils::WriteBinaryFloat(vertex.coord.x, stream); IOUtils::WriteBinaryFloat(vertex.coord.y, stream); @@ -70,27 +68,27 @@ void WriteBinaryVertex(Gfx::Vertex vertex, std::ostream& stream) IOUtils::WriteBinaryFloat(vertex.normal.z, stream); IOUtils::WriteBinaryFloat(vertex.texCoord.x, stream); IOUtils::WriteBinaryFloat(vertex.texCoord.y, stream); + + return !stream.fail(); } -Gfx::VertexTex2 ReadBinaryVertexTex2(std::istream& stream) +bool ReadBinaryVertexTex2(std::istream& stream, Gfx::VertexTex2& vertex) { - Gfx::VertexTex2 result; - - result.coord.x = IOUtils::ReadBinaryFloat(stream); - result.coord.y = IOUtils::ReadBinaryFloat(stream); - result.coord.z = IOUtils::ReadBinaryFloat(stream); - result.normal.x = IOUtils::ReadBinaryFloat(stream); - result.normal.y = IOUtils::ReadBinaryFloat(stream); - result.normal.z = IOUtils::ReadBinaryFloat(stream); - result.texCoord.x = IOUtils::ReadBinaryFloat(stream); - result.texCoord.y = IOUtils::ReadBinaryFloat(stream); - result.texCoord2.x = IOUtils::ReadBinaryFloat(stream); - result.texCoord2.y = IOUtils::ReadBinaryFloat(stream); - - return result; + vertex.coord.x = IOUtils::ReadBinaryFloat(stream); + vertex.coord.y = IOUtils::ReadBinaryFloat(stream); + vertex.coord.z = IOUtils::ReadBinaryFloat(stream); + vertex.normal.x = IOUtils::ReadBinaryFloat(stream); + vertex.normal.y = IOUtils::ReadBinaryFloat(stream); + vertex.normal.z = IOUtils::ReadBinaryFloat(stream); + vertex.texCoord.x = IOUtils::ReadBinaryFloat(stream); + vertex.texCoord.y = IOUtils::ReadBinaryFloat(stream); + vertex.texCoord2.x = IOUtils::ReadBinaryFloat(stream); + vertex.texCoord2.y = IOUtils::ReadBinaryFloat(stream); + + return !stream.fail(); } -void WriteBinaryVertexTex2(Gfx::VertexTex2 vertex, std::ostream& stream) +bool WriteBinaryVertexTex2(Gfx::VertexTex2 vertex, std::ostream& stream) { IOUtils::WriteBinaryFloat(vertex.coord.x, stream); IOUtils::WriteBinaryFloat(vertex.coord.y, stream); @@ -102,82 +100,83 @@ void WriteBinaryVertexTex2(Gfx::VertexTex2 vertex, std::ostream& stream) IOUtils::WriteBinaryFloat(vertex.texCoord.y, stream); IOUtils::WriteBinaryFloat(vertex.texCoord2.x, stream); IOUtils::WriteBinaryFloat(vertex.texCoord2.y, stream); + + return !stream.fail(); } -Gfx::VertexTex2 ReadTextVertexTex2(const std::string& text) +bool ReadTextVertexTex2(const std::string& text, Gfx::VertexTex2& vertex) { std::stringstream stream; stream.str(text); - Gfx::VertexTex2 result; std::string what; stream >> what; if (what != "c") - return Gfx::VertexTex2(); + return false; - stream >> result.coord.x >> result.coord.y >> result.coord.z; + stream >> vertex.coord.x >> vertex.coord.y >> vertex.coord.z; stream >> what; if (what != "n") - return Gfx::VertexTex2(); + return false; - stream >> result.normal.x >> result.normal.y >> result.normal.z; + stream >> vertex.normal.x >> vertex.normal.y >> vertex.normal.z; stream >> what; if (what != "t1") - return Gfx::VertexTex2(); + return false; - stream >> result.texCoord.x >> result.texCoord.y; + stream >> vertex.texCoord.x >> vertex.texCoord.y; stream >> what; if (what != "t2") - return Gfx::VertexTex2(); + return false; - stream >> result.texCoord2.x >> result.texCoord2.y; + stream >> vertex.texCoord2.x >> vertex.texCoord2.y; - return result; + return !stream.fail(); } -void WriteTextVertexTex2(const Gfx::VertexTex2& vertex, std::ostream& stream) +bool WriteTextVertexTex2(const Gfx::VertexTex2& vertex, std::ostream& stream) { stream << "c " << vertex.coord.x << " " << vertex.coord.y << " " << vertex.coord.z; stream << " n " << vertex.normal.x << " " << vertex.normal.y << " " << vertex.normal.z; stream << " t1 " << vertex.texCoord.x << " " << vertex.texCoord.y; stream << " t2 " << vertex.texCoord2.x << " " << vertex.texCoord2.y; stream << std::endl; + + return !stream.fail(); } -Gfx::Material ReadBinaryMaterial(std::istream& stream) +bool ReadBinaryMaterial(std::istream& stream, Gfx::Material& material) { - Gfx::Material result; - - result.diffuse.r = IOUtils::ReadBinaryFloat(stream); - result.diffuse.g = IOUtils::ReadBinaryFloat(stream); - result.diffuse.b = IOUtils::ReadBinaryFloat(stream); - result.diffuse.a = IOUtils::ReadBinaryFloat(stream); + material.diffuse.r = IOUtils::ReadBinaryFloat(stream); + material.diffuse.g = IOUtils::ReadBinaryFloat(stream); + material.diffuse.b = IOUtils::ReadBinaryFloat(stream); + material.diffuse.a = IOUtils::ReadBinaryFloat(stream); - result.ambient.r = IOUtils::ReadBinaryFloat(stream); - result.ambient.g = IOUtils::ReadBinaryFloat(stream); - result.ambient.b = IOUtils::ReadBinaryFloat(stream); - result.ambient.a = IOUtils::ReadBinaryFloat(stream); + material.ambient.r = IOUtils::ReadBinaryFloat(stream); + material.ambient.g = IOUtils::ReadBinaryFloat(stream); + material.ambient.b = IOUtils::ReadBinaryFloat(stream); + material.ambient.a = IOUtils::ReadBinaryFloat(stream); - result.specular.r = IOUtils::ReadBinaryFloat(stream); - result.specular.g = IOUtils::ReadBinaryFloat(stream); - result.specular.b = IOUtils::ReadBinaryFloat(stream); - result.specular.a = IOUtils::ReadBinaryFloat(stream); + material.specular.r = IOUtils::ReadBinaryFloat(stream); + material.specular.g = IOUtils::ReadBinaryFloat(stream); + material.specular.b = IOUtils::ReadBinaryFloat(stream); + material.specular.a = IOUtils::ReadBinaryFloat(stream); - /* emissive.r = */ IOUtils::ReadBinaryFloat(stream); - /* emissive.g = */ IOUtils::ReadBinaryFloat(stream); - /* emissive.b = */ IOUtils::ReadBinaryFloat(stream); - /* emissive.a = */ IOUtils::ReadBinaryFloat(stream); + /* emissive.r = */ IOUtils::ReadBinaryFloat(stream); + /* emissive.g = */ IOUtils::ReadBinaryFloat(stream); + /* emissive.b = */ IOUtils::ReadBinaryFloat(stream); + /* emissive.a = */ IOUtils::ReadBinaryFloat(stream); - /* power = */ IOUtils::ReadBinaryFloat(stream); + /* power = */ IOUtils::ReadBinaryFloat(stream); - return result; + return !stream.fail(); } -void WriteBinaryMaterial(const Gfx::Material& material, std::ostream& stream) +bool WriteBinaryMaterial(const Gfx::Material& material, std::ostream& stream) { IOUtils::WriteBinaryFloat(material.diffuse.r, stream); IOUtils::WriteBinaryFloat(material.diffuse.g, stream); @@ -200,50 +199,78 @@ void WriteBinaryMaterial(const Gfx::Material& material, std::ostream& stream) /* emissive.a */ IOUtils::WriteBinaryFloat(0.0f, stream); /* power */ IOUtils::WriteBinaryFloat(0.0f, stream); + + return !stream.fail(); } -Gfx::Material ReadTextMaterial(const std::string& text) +bool ReadTextMaterial(const std::string& text, Gfx::Material& material) { std::stringstream stream; stream.str(text); - Gfx::Material result; std::string what; stream >> what; if (what != "dif") - return Gfx::Material(); + return false; - stream >> result.diffuse.r >> result.diffuse.g >> result.diffuse.b >> result.diffuse.a; + stream >> material.diffuse.r + >> material.diffuse.g + >> material.diffuse.b + >> material.diffuse.a; stream >> what; if (what != "amb") - return Gfx::Material(); + return false; - stream >> result.ambient.r >> result.ambient.g >> result.ambient.b >> result.ambient.a; + stream >> material.ambient.r + >> material.ambient.g + >> material.ambient.b + >> material.ambient.a; stream >> what; if (what != "spc") - return Gfx::Material(); + return false; - stream >> result.specular.r >> result.specular.g >> result.specular.b >> result.specular.a; + stream >> material.specular.r + >> material.specular.g + >> material.specular.b + >> material.specular.a; - return result; + return !stream.fail(); } -void WriteTextMaterial(const Gfx::Material& material, std::ostream& stream) +bool WriteTextMaterial(const Gfx::Material& material, std::ostream& stream) { - stream << "dif " << material.diffuse.r << " " << material.diffuse.g << " " << material.diffuse.b << " " << material.diffuse.a; - stream << " amb " << material.ambient.r << " " << material.ambient.g << " " << material.ambient.b << " " << material.ambient.a; - stream << " spc " << material.specular.r << " " << material.specular.g << " " << material.specular.b << " " << material.specular.a << std::endl; + stream << "dif " << material.diffuse.r + << " " << material.diffuse.g + << " " << material.diffuse.b + << " " << material.diffuse.a; + + stream << " amb " << material.ambient.r + << " " << material.ambient.g + << " " << material.ambient.b + << " " << material.ambient.a; + + stream << " spc " << material.specular.r + << " " << material.specular.g << " " + << material.specular.b << " " + << material.specular.a; + + stream << std::endl; + + return !stream.fail(); } template bool ReadLineValue(std::istream& stream, const std::string& prefix, T& value) { std::string line; - while (! stream.eof() ) + while (true) { + if (stream.eof() || stream.fail()) + return false; + std::getline(stream, line); if (!line.empty() && line[0] != '#') break; @@ -265,8 +292,11 @@ bool ReadLineValue(std::istream& stream, const std::string& prefix, T& value) bool ReadLineString(std::istream& stream, const std::string& prefix, std::string& value) { std::string line; - while (! stream.eof() ) + while (true) { + if (stream.eof() || stream.fail()) + return false; + std::getline(stream, line); if (!line.empty() && line[0] != '#') break; @@ -280,7 +310,7 @@ bool ReadLineString(std::istream& stream, const std::string& prefix, std::string if (what != prefix) return false; - getline(s, value); + std::getline(s, value); return true; } @@ -417,7 +447,7 @@ bool Gfx::CModelFile::ReadModel(const std::string& fileName) std::ifstream stream; stream.open(fileName.c_str(), std::ios_base::in | std::ios_base::binary); - if (! stream.good()) + if (!stream.good()) { GetLogger()->Error("Could not open file '%s'\n", fileName.c_str()); return false; @@ -439,7 +469,7 @@ bool Gfx::CModelFile::ReadModel(std::istream& stream) header.reserved[i] = IOUtils::ReadBinary<4, int>(stream); - if (! stream.good()) + if (!stream.good()) { GetLogger()->Error("Error reading model file header\n"); return false; @@ -454,16 +484,16 @@ bool Gfx::CModelFile::ReadModel(std::istream& stream) t.used = IOUtils::ReadBinary<1, char>(stream); t.selected = IOUtils::ReadBinary<1, char>(stream); - t.p1 = ReadBinaryVertex(stream); - t.p2 = ReadBinaryVertex(stream); - t.p3 = ReadBinaryVertex(stream); + ReadBinaryVertex(stream, t.p1); + ReadBinaryVertex(stream, t.p2); + ReadBinaryVertex(stream, t.p3); - t.material = ReadBinaryMaterial(stream); + ReadBinaryMaterial(stream, t.material); stream.read(t.texName, 20); t.min = IOUtils::ReadBinaryFloat(stream); t.max = IOUtils::ReadBinaryFloat(stream); - if (! stream.good()) + if (stream.fail()) { GetLogger()->Error("Error reading model data\n"); return false; @@ -490,11 +520,11 @@ bool Gfx::CModelFile::ReadModel(std::istream& stream) t.used = IOUtils::ReadBinary<1, char>(stream); t.selected = IOUtils::ReadBinary<1, char>(stream); - t.p1 = ReadBinaryVertex(stream); - t.p2 = ReadBinaryVertex(stream); - t.p3 = ReadBinaryVertex(stream); + ReadBinaryVertex(stream, t.p1); + ReadBinaryVertex(stream, t.p2); + ReadBinaryVertex(stream, t.p3); - t.material = ReadBinaryMaterial(stream); + ReadBinaryMaterial(stream, t.material); stream.read(t.texName, 20); t.min = IOUtils::ReadBinaryFloat(stream); t.max = IOUtils::ReadBinaryFloat(stream); @@ -505,7 +535,7 @@ bool Gfx::CModelFile::ReadModel(std::istream& stream) t.reserved3 = IOUtils::ReadBinary<2, short>(stream); t.reserved4 = IOUtils::ReadBinary<2, short>(stream); - if (! stream.good()) + if (stream.fail()) { GetLogger()->Error("Error reading model data\n"); return false; @@ -535,11 +565,11 @@ bool Gfx::CModelFile::ReadModel(std::istream& stream) /* padding */ IOUtils::ReadBinary<2, unsigned int>(stream); - t.p1 = ReadBinaryVertexTex2(stream); - t.p2 = ReadBinaryVertexTex2(stream); - t.p3 = ReadBinaryVertexTex2(stream); + ReadBinaryVertexTex2(stream, t.p1); + ReadBinaryVertexTex2(stream, t.p2); + ReadBinaryVertexTex2(stream, t.p3); - t.material = ReadBinaryMaterial(stream); + ReadBinaryMaterial(stream, t.material); stream.read(t.texName, 20); t.min = IOUtils::ReadBinaryFloat(stream); t.max = IOUtils::ReadBinaryFloat(stream); @@ -550,7 +580,7 @@ bool Gfx::CModelFile::ReadModel(std::istream& stream) t.reserved3 = IOUtils::ReadBinary<2, short>(stream); t.reserved4 = IOUtils::ReadBinary<2, short>(stream); - if (! stream.good()) + if (stream.fail()) { GetLogger()->Error("Error reading model data\n"); return false; @@ -597,23 +627,23 @@ bool Gfx::CModelFile::ReadModel(std::istream& stream) m_triangles[i].tex2Name = StrUtils::Replace(m_triangles[i].tex2Name, "bmp", "png"); m_triangles[i].tex2Name = StrUtils::Replace(m_triangles[i].tex2Name, "tga", "png"); - GetLogger()->Info("ModelTriangle %d\n", i+1); + GetLogger()->Trace("ModelTriangle %d\n", i+1); std::string s1 = m_triangles[i].p1.ToString(); - GetLogger()->Info(" p1: %s\n", s1.c_str()); + GetLogger()->Trace(" p1: %s\n", s1.c_str()); std::string s2 = m_triangles[i].p2.ToString(); - GetLogger()->Info(" p2: %s\n", s2.c_str()); + GetLogger()->Trace(" p2: %s\n", s2.c_str()); std::string s3 = m_triangles[i].p3.ToString(); - GetLogger()->Info(" p3: %s\n", s3.c_str()); + GetLogger()->Trace(" p3: %s\n", s3.c_str()); std::string d = m_triangles[i].material.diffuse.ToString(); std::string a = m_triangles[i].material.ambient.ToString(); std::string s = m_triangles[i].material.specular.ToString(); - GetLogger()->Info(" mat: d: %s a: %s s: %s\n", d.c_str(), a.c_str(), s.c_str()); + GetLogger()->Trace(" mat: d: %s a: %s s: %s\n", d.c_str(), a.c_str(), s.c_str()); - GetLogger()->Info(" tex1: %s tex2: %s\n", m_triangles[i].tex1Name.c_str(), + GetLogger()->Trace(" tex1: %s tex2: %s\n", m_triangles[i].tex1Name.c_str(), m_triangles[i].variableTex2 ? "(variable)" : m_triangles[i].tex2Name.c_str()); - GetLogger()->Info(" min: %.2f max: %.2f\n", m_triangles[i].min, m_triangles[i].max); - GetLogger()->Info(" state: %ld\n", m_triangles[i].state); + GetLogger()->Trace(" min: %.2f max: %.2f\n", m_triangles[i].min, m_triangles[i].max); + GetLogger()->Trace(" state: %ld\n", m_triangles[i].state); } return true; @@ -623,7 +653,7 @@ bool Gfx::CModelFile::WriteModel(const std::string& fileName) { std::ofstream stream; stream.open(fileName.c_str(), std::ios_base::out | std::ios_base::binary); - if (! stream.good()) + if (!stream.good()) { GetLogger()->Error("Could not open file '%s'\n", fileName.c_str()); return false; @@ -766,7 +796,7 @@ bool Gfx::CModelFile::ReadTextModel(const std::string& fileName) { std::ifstream stream; stream.open(fileName.c_str(), std::ios_base::in); - if (! stream.good()) + if (!stream.good()) { GetLogger()->Error("Could not open file '%s'\n", fileName.c_str()); return false; @@ -802,9 +832,13 @@ bool Gfx::CModelFile::ReadTextModel(std::istream& stream) char varTex2Ch = 0; bool triOk = ReadLineString(stream, "p1", p1Text) && + ReadTextVertexTex2(p1Text, t.p1) && ReadLineString(stream, "p2", p2Text) && + ReadTextVertexTex2(p2Text, t.p2) && ReadLineString(stream, "p3", p3Text) && + ReadTextVertexTex2(p3Text, t.p3) && ReadLineString(stream, "mat", matText) && + ReadTextMaterial(matText, t.material) && ReadLineValue(stream, "tex1", t.tex1Name) && ReadLineValue(stream, "tex2", t.tex2Name) && ReadLineValue(stream, "var_tex2", varTex2Ch) && @@ -812,16 +846,12 @@ bool Gfx::CModelFile::ReadTextModel(std::istream& stream) ReadLineValue(stream, "max", t.max) && ReadLineValue(stream, "state", t.state); - if (!triOk || !stream.good()) + if (!triOk || stream.fail()) { GetLogger()->Error("Error reading model file header\n"); return false; } - t.p1 = ReadTextVertexTex2(p1Text); - t.p2 = ReadTextVertexTex2(p2Text); - t.p3 = ReadTextVertexTex2(p3Text); - t.material = ReadTextMaterial(matText); t.variableTex2 = varTex2Ch == 'Y'; @@ -850,22 +880,22 @@ bool Gfx::CModelFile::ReadTextModel(std::istream& stream) for (int i = 0; i < static_cast( m_triangles.size() ); ++i) { - GetLogger()->Info("ModelTriangle %d\n", i+1); + GetLogger()->Trace("ModelTriangle %d\n", i+1); std::string s1 = m_triangles[i].p1.ToString(); - GetLogger()->Info(" p1: %s\n", s1.c_str()); + GetLogger()->Trace(" p1: %s\n", s1.c_str()); std::string s2 = m_triangles[i].p2.ToString(); - GetLogger()->Info(" p2: %s\n", s2.c_str()); + GetLogger()->Trace(" p2: %s\n", s2.c_str()); std::string s3 = m_triangles[i].p3.ToString(); - GetLogger()->Info(" p3: %s\n", s3.c_str()); + GetLogger()->Trace(" p3: %s\n", s3.c_str()); std::string d = m_triangles[i].material.diffuse.ToString(); std::string a = m_triangles[i].material.ambient.ToString(); std::string s = m_triangles[i].material.specular.ToString(); - GetLogger()->Info(" mat: d: %s a: %s s: %s\n", d.c_str(), a.c_str(), s.c_str()); + GetLogger()->Trace(" mat: d: %s a: %s s: %s\n", d.c_str(), a.c_str(), s.c_str()); - GetLogger()->Info(" tex1: %s tex2: %s\n", m_triangles[i].tex1Name.c_str(), m_triangles[i].tex2Name.c_str()); - GetLogger()->Info(" min: %.2f max: %.2f\n", m_triangles[i].min, m_triangles[i].max); - GetLogger()->Info(" state: %ld\n", m_triangles[i].state); + GetLogger()->Trace(" tex1: %s tex2: %s\n", m_triangles[i].tex1Name.c_str(), m_triangles[i].tex2Name.c_str()); + GetLogger()->Trace(" min: %.2f max: %.2f\n", m_triangles[i].min, m_triangles[i].max); + GetLogger()->Trace(" state: %ld\n", m_triangles[i].state); } return true; @@ -875,7 +905,7 @@ bool Gfx::CModelFile::WriteTextModel(const std::string &fileName) { std::ofstream stream; stream.open(fileName.c_str(), std::ios_base::out); - if (! stream.good()) + if (!stream.good()) { GetLogger()->Error("Could not open file '%s'\n", fileName.c_str()); return false; @@ -938,7 +968,7 @@ bool Gfx::CModelFile::WriteTextModel(std::ostream& stream) stream << std::endl; - if (! stream.good()) + if (stream.fail()) { GetLogger()->Error("Error writing model file\n"); return false; @@ -952,7 +982,7 @@ bool Gfx::CModelFile::ReadBinaryModel(const std::string& fileName) { std::ifstream stream; stream.open(fileName.c_str(), std::ios_base::in | std::ios_base::binary); - if (! stream.good()) + if (!stream.good()) { GetLogger()->Error("Could not open file '%s'\n", fileName.c_str()); return false; @@ -970,7 +1000,7 @@ bool Gfx::CModelFile::ReadBinaryModel(std::istream& stream) header.version = IOUtils::ReadBinary<4, int>(stream); header.totalTriangles = IOUtils::ReadBinary<4, int>(stream); - if (! stream.good()) + if (!stream.good()) { GetLogger()->Error("Error reading model file header\n"); return false; @@ -983,17 +1013,18 @@ bool Gfx::CModelFile::ReadBinaryModel(std::istream& stream) { NewModelTriangle1 t; - t.p1 = ReadBinaryVertexTex2(stream); - t.p2 = ReadBinaryVertexTex2(stream); - t.p3 = ReadBinaryVertexTex2(stream); - t.material = ReadBinaryMaterial(stream); + ReadBinaryVertexTex2(stream, t.p1); + ReadBinaryVertexTex2(stream, t.p2); + ReadBinaryVertexTex2(stream, t.p3); + ReadBinaryMaterial(stream, t.material); t.tex1Name = IOUtils::ReadBinaryString<1>(stream); t.tex2Name = IOUtils::ReadBinaryString<1>(stream); t.variableTex2 = IOUtils::ReadBinaryBool(stream); t.min = IOUtils::ReadBinaryFloat(stream); t.max = IOUtils::ReadBinaryFloat(stream); + t.state = IOUtils::ReadBinary<4, unsigned int>(stream); - if (! stream.good()) + if (stream.fail()) { GetLogger()->Error("Error reading model data\n"); return false; @@ -1009,6 +1040,7 @@ bool Gfx::CModelFile::ReadBinaryModel(std::istream& stream) triangle.variableTex2 = t.variableTex2; triangle.min = t.min; triangle.max = t.max; + triangle.state = t.state; m_triangles.push_back(triangle); } @@ -1021,22 +1053,22 @@ bool Gfx::CModelFile::ReadBinaryModel(std::istream& stream) for (int i = 0; i < static_cast( m_triangles.size() ); ++i) { - GetLogger()->Info("ModelTriangle %d\n", i+1); + GetLogger()->Trace("ModelTriangle %d\n", i+1); std::string s1 = m_triangles[i].p1.ToString(); - GetLogger()->Info(" p1: %s\n", s1.c_str()); + GetLogger()->Trace(" p1: %s\n", s1.c_str()); std::string s2 = m_triangles[i].p2.ToString(); - GetLogger()->Info(" p2: %s\n", s2.c_str()); + GetLogger()->Trace(" p2: %s\n", s2.c_str()); std::string s3 = m_triangles[i].p3.ToString(); - GetLogger()->Info(" p3: %s\n", s3.c_str()); + GetLogger()->Trace(" p3: %s\n", s3.c_str()); std::string d = m_triangles[i].material.diffuse.ToString(); std::string a = m_triangles[i].material.ambient.ToString(); std::string s = m_triangles[i].material.specular.ToString(); - GetLogger()->Info(" mat: d: %s a: %s s: %s\n", d.c_str(), a.c_str(), s.c_str()); + GetLogger()->Trace(" mat: d: %s a: %s s: %s\n", d.c_str(), a.c_str(), s.c_str()); - GetLogger()->Info(" tex1: %s tex2: %s\n", m_triangles[i].tex1Name.c_str(), m_triangles[i].tex2Name.c_str()); - GetLogger()->Info(" min: %.2f max: %.2f\n", m_triangles[i].min, m_triangles[i].max); - GetLogger()->Info(" state: %ld\n", m_triangles[i].state); + GetLogger()->Trace(" tex1: %s tex2: %s\n", m_triangles[i].tex1Name.c_str(), m_triangles[i].tex2Name.c_str()); + GetLogger()->Trace(" min: %.2f max: %.2f\n", m_triangles[i].min, m_triangles[i].max); + GetLogger()->Trace(" state: %ld\n", m_triangles[i].state); } return true; @@ -1046,7 +1078,7 @@ bool Gfx::CModelFile::WriteBinaryModel(const std::string& fileName) { std::ofstream stream; stream.open(fileName.c_str(), std::ios_base::out | std::ios_base::binary); - if (! stream.good()) + if (!stream.good()) { GetLogger()->Error("Could not open file '%s'\n", fileName.c_str()); return false; @@ -1084,6 +1116,7 @@ bool Gfx::CModelFile::WriteBinaryModel(std::ostream& stream) t.variableTex2 = m_triangles[i].variableTex2; t.min = m_triangles[i].min; t.max = m_triangles[i].max; + t.state = m_triangles[i].state; WriteBinaryVertexTex2(t.p1, stream); WriteBinaryVertexTex2(t.p2, stream); @@ -1094,8 +1127,9 @@ bool Gfx::CModelFile::WriteBinaryModel(std::ostream& stream) IOUtils::WriteBinaryBool(t.variableTex2, stream); IOUtils::WriteBinaryFloat(t.min, stream); IOUtils::WriteBinaryFloat(t.max, stream); + IOUtils::WriteBinary<4, unsigned int>(t.state, stream); - if (! stream.good()) + if (stream.fail()) { GetLogger()->Error("Error writing model file\n"); return false; diff --git a/src/graphics/engine/test/CMakeLists.txt b/src/graphics/engine/test/CMakeLists.txt index bd83773..4e3263b 100644 --- a/src/graphics/engine/test/CMakeLists.txt +++ b/src/graphics/engine/test/CMakeLists.txt @@ -1,7 +1,26 @@ cmake_minimum_required(VERSION 2.8) set(CMAKE_BUILD_TYPE debug) -set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -O0") +set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wold-style-cast -std=gnu++0x") -include_directories(. ../../..) -add_executable(modelfile_test modelfile_test.cpp ../modelfile.cpp ../../../common/logger.cpp ../../../common/stringutils.cpp ../../../common/iman.cpp) +set(MODELFILE_TEST_SOURCES +modelfile_test.cpp +../modelfile.cpp +../../../common/logger.cpp +../../../common/stringutils.cpp +../../../common/iman.cpp +) + +add_definitions(-DMODELFILE_NO_ENGINE) + +include_directories( +. +../../.. +${GTEST_DIR}/include +) + +add_executable(modelfile_test ${MODELFILE_TEST_SOURCES}) + +target_link_libraries(modelfile_test gtest) + +add_test(modelfile_test modelfile_test) diff --git a/src/graphics/engine/test/modelfile_test.cpp b/src/graphics/engine/test/modelfile_test.cpp index f7ed87f..6879a1b 100644 --- a/src/graphics/engine/test/modelfile_test.cpp +++ b/src/graphics/engine/test/modelfile_test.cpp @@ -1,48 +1,273 @@ -#include "graphics/engine/modelfile.h" +// * This file is part of the COLOBOT source code +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) +// * +// * This program is free software: you can redistribute it and/or modify +// * it under the terms of the GNU General Public License as published by +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + + #include "common/iman.h" +#include "common/logger.h" +#include "graphics/engine/modelfile.h" +#include "math/func.h" + +#include "gtest/gtest.h" + +#include +#include + +/* Test model file (new text format) */ +const char* const TEXT_MODEL = +"# Colobot text model\n" +"\n" +"### HEAD\n" +"version 1\n" +"total_triangles 2\n" +"\n" +"### TRIANGLES\n" +"p1 c -12.4099 10.0016 -2.54558 n 1 -0 1.87319e-07 t1 0.970703 0.751953 t2 0 0\n" +"p2 c -12.4099 10.0016 2.54558 n 1 -0 1.87319e-07 t1 0.998047 0.751953 t2 0 0\n" +"p3 c -12.4099 4.00165 -2.54558 n 1 -0 1.87319e-07 t1 0.970703 0.998047 t2 0 0\n" +"mat dif 1 1 1 0 amb 0.5 0.5 0.5 0 spc 0 0 0 0\n" +"tex1 lemt.png\n" +"tex2\n" +"var_tex2 N\n" +"min 200\n" +"max 1e+06\n" +"state 1024\n" +"\n" +"p1 c -19 -1 4 n -1 0 0 t1 0.248047 0.123047 t2 0.905224 0.52067\n" +"p2 c -19 4 4 n -1 0 0 t1 0.248047 0.00195312 t2 0.905224 0.614223\n" +"p3 c -19 4 -4 n -1 0 0 t1 0.00195312 0.00195312 t2 0.0947756 0.614223\n" +"mat dif 1 1 1 0 amb 0.5 0.5 0.5 0 spc 0 0 0 0\n" +"tex1 derrick.png\n" +"tex2\n" +"var_tex2 Y\n" +"min 200\n" +"max 1e+06\n" +"state 0\n" +""; + +// Triangles as defined in model file +Gfx::ModelTriangle TRIANGLE_1; +Gfx::ModelTriangle TRIANGLE_2; + +// Sets triangle data +void Init() +{ + + TRIANGLE_1.p1 = Gfx::VertexTex2(Math::Vector(-12.4099, 10.0016, -2.54558), + Math::Vector(1, 0, 1.87319e-07), + Math::Point(0.970703, 0.751953), + Math::Point(0, 0)); + TRIANGLE_1.p2 = Gfx::VertexTex2(Math::Vector(-12.4099, 10.0016, 2.54558), + Math::Vector(1, 0, 1.87319e-07), + Math::Point(0.998047, 0.751953), + Math::Point(0, 0)); + TRIANGLE_1.p3 = Gfx::VertexTex2(Math::Vector(-12.4099, 4.00165, -2.54558), + Math::Vector(1, 0, 1.87319e-07), + Math::Point(0.970703, 0.998047), + Math::Point(0, 0)); + TRIANGLE_1.material.diffuse = Gfx::Color(1, 1, 1, 0); + TRIANGLE_1.material.ambient = Gfx::Color(0.5, 0.5, 0.5, 0); + TRIANGLE_1.material.specular = Gfx::Color(0, 0, 0, 0); + TRIANGLE_1.tex1Name = "lemt.png"; + TRIANGLE_1.variableTex2 = false; + TRIANGLE_1.min = 200.0f; + TRIANGLE_1.max = 1e+06f; + TRIANGLE_1.state = 1024; + + TRIANGLE_2.p1 = Gfx::VertexTex2(Math::Vector(-19, -1, 4), + Math::Vector(-1, 0, 0), + Math::Point(0.248047, 0.123047), + Math::Point(0.905224, 0.52067)); + TRIANGLE_2.p2 = Gfx::VertexTex2(Math::Vector(-19, 4, 4), + Math::Vector(-1, 0, 0), + Math::Point(0.248047, 0.00195312), + Math::Point(0.905224, 0.614223)); + TRIANGLE_2.p3 = Gfx::VertexTex2(Math::Vector(-19, 4, -4), + Math::Vector(-1, 0, 0), + Math::Point(0.00195312, 0.00195312), + Math::Point(0.0947756, 0.614223)); + TRIANGLE_2.material.diffuse = Gfx::Color(1, 1, 1, 0); + TRIANGLE_2.material.ambient = Gfx::Color(0.5, 0.5, 0.5, 0); + TRIANGLE_2.material.specular = Gfx::Color(0, 0, 0, 0); + TRIANGLE_2.tex1Name = "derrick.png"; + TRIANGLE_2.variableTex2 = true; + TRIANGLE_2.min = 200.0f; + TRIANGLE_2.max = 1e+06f; + TRIANGLE_2.state = 0; +} + + +// Compares vertices (within Math::TOLERANCE) +bool CompareVertices(const Gfx::VertexTex2& v1, const Gfx::VertexTex2& v2) +{ + if ( !( Math::IsEqual(v1.coord.x, v2.coord.x) && + Math::IsEqual(v1.coord.y, v2.coord.y) && + Math::IsEqual(v1.coord.z, v2.coord.z) ) ) + return false; + + if ( !( Math::IsEqual(v1.normal.x, v2.normal.x) && + Math::IsEqual(v1.normal.y, v2.normal.y) && + Math::IsEqual(v1.normal.z, v2.normal.z) ) ) + return false; -#include + if ( !( Math::IsEqual(v1.texCoord.x, v2.texCoord.x) && + Math::IsEqual(v1.texCoord.y, v2.texCoord.y) ) ) + return false; + if ( !( Math::IsEqual(v1.texCoord2.x, v2.texCoord2.x) && + Math::IsEqual(v1.texCoord2.y, v2.texCoord2.y) ) ) + return false; -int main(int argc, char *argv[]) + return true; +} + +// Compares colors (within Math::TOLERANCE) +bool CompareColors(const Gfx::Color& c1, const Gfx::Color& c2) +{ + return Math::IsEqual(c1.r, c2.r) && + Math::IsEqual(c1.g, c2.g) && + Math::IsEqual(c1.b, c2.b) && + Math::IsEqual(c1.a, c2.a); +} + +// Compares model triangles (within Math::TOLERANCE) +bool CompareTriangles(const Gfx::ModelTriangle& t1, const Gfx::ModelTriangle& t2) { - if (argc != 4) - { - std::cerr << "Usage: " << argv[0] << " {mod|dxf} in_file out_file" << std::endl; - return 1; - } + if (! CompareVertices(t1.p1, t2.p1)) + return false; + + if (! CompareVertices(t1.p2, t2.p2)) + return false; + + if (! CompareVertices(t1.p3, t2.p3)) + return false; + + if (! CompareColors(t1.material.diffuse, t2.material.diffuse)) + return false; + + if (! CompareColors(t1.material.ambient, t2.material.ambient)) + return false; + + if (! CompareColors(t1.material.specular, t2.material.specular)) + return false; + + if (t1.tex1Name != t2.tex1Name) + return false; + + if (t1.tex2Name != t2.tex2Name) + return false; + + if (t1.variableTex2 != t2.variableTex2) + return false; + + if (!Math::IsEqual(t1.min, t2.min)) + return false; + + if (!Math::IsEqual(t1.max, t2.max)) + return false; + + if (t1.state != t2.state) + return false; + + return true; +} + +// Tests reading/writing new text model file +TEST(ModelFileTest, RWTxtModel) +{ + std::stringstream str; + str.str(TEXT_MODEL); CInstanceManager iMan; - Gfx::CModelFile modfile(&iMan); - - std::string mode(argv[1]); - if (mode == "mod") - { - if (! modfile.ReadModel(argv[2], false, false) ) - { - std::cerr << "Read error: " << modfile.GetError() << std::endl; - return 2; - } - } - else if (mode == "dxf") - { - if (! modfile.ReadDXF(argv[2], false, false) ) - { - std::cerr << "Read error: " << modfile.GetError() << std::endl; - return 2; - } - } - else - { - std::cerr << "Usage: " << argv[0] << " {mod|dxf} in_file out_file" << std::endl; - return 1; - } - - if (! modfile.WriteModel(argv[3]) ) - { - std::cerr << "Write error: " << modfile.GetError() << std::endl; - return 3; - } - - return 0; + Gfx::CModelFile modelFile(&iMan); + + EXPECT_TRUE(modelFile.ReadTextModel(str)); + + EXPECT_EQ(modelFile.GetTriangleCount(), 2); + EXPECT_TRUE(CompareTriangles(modelFile.GetTriangles()[0], TRIANGLE_1)); + EXPECT_TRUE(CompareTriangles(modelFile.GetTriangles()[1], TRIANGLE_2)); + + str.str(""); + + EXPECT_TRUE(modelFile.WriteTextModel(str)); + str.seekg(0); + EXPECT_TRUE(modelFile.ReadTextModel(str)); + + EXPECT_EQ(modelFile.GetTriangleCount(), 2); + EXPECT_TRUE(CompareTriangles(modelFile.GetTriangles()[0], TRIANGLE_1)); + EXPECT_TRUE(CompareTriangles(modelFile.GetTriangles()[1], TRIANGLE_2)); +} + +// Tests reading/writing new binary model +TEST(ModelFileTest, RWBinModel) +{ + std::stringstream str; + str.str(TEXT_MODEL); + + CInstanceManager iMan; + Gfx::CModelFile modelFile(&iMan); + + EXPECT_TRUE(modelFile.ReadTextModel(str)); + + EXPECT_EQ(modelFile.GetTriangleCount(), 2); + EXPECT_TRUE(CompareTriangles(modelFile.GetTriangles()[0], TRIANGLE_1)); + EXPECT_TRUE(CompareTriangles(modelFile.GetTriangles()[1], TRIANGLE_2)); + + str.str(""); + + EXPECT_TRUE(modelFile.WriteBinaryModel(str)); + str.seekg(0); + EXPECT_TRUE(modelFile.ReadBinaryModel(str)); + + EXPECT_EQ(modelFile.GetTriangleCount(), 2); + EXPECT_TRUE(CompareTriangles(modelFile.GetTriangles()[0], TRIANGLE_1)); + EXPECT_TRUE(CompareTriangles(modelFile.GetTriangles()[1], TRIANGLE_2)); +} + +// Tests reading/writing old model file +TEST(ModelFileTest, RWOldModel) +{ + std::stringstream str; + str.str(TEXT_MODEL); + + CInstanceManager iMan; + Gfx::CModelFile modelFile(&iMan); + + EXPECT_TRUE(modelFile.ReadTextModel(str)); + + EXPECT_EQ(modelFile.GetTriangleCount(), 2); + EXPECT_TRUE(CompareTriangles(modelFile.GetTriangles()[0], TRIANGLE_1)); + EXPECT_TRUE(CompareTriangles(modelFile.GetTriangles()[1], TRIANGLE_2)); + + str.str(""); + + EXPECT_TRUE(modelFile.WriteModel(str)); + str.seekg(0); + EXPECT_TRUE(modelFile.ReadModel(str)); + + EXPECT_EQ(modelFile.GetTriangleCount(), 2); + EXPECT_TRUE(CompareTriangles(modelFile.GetTriangles()[0], TRIANGLE_1)); + EXPECT_TRUE(CompareTriangles(modelFile.GetTriangles()[1], TRIANGLE_2)); +} + +int main(int argc, char **argv) +{ + CLogger logger; + + Init(); + + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); } -- cgit v1.2.3-1-g7c22