immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix

dev-ui
Piotr Dziwinski 2012-09-03 22:37:28 +02:00
parent 09fd0e205e
commit 08f1b68ffd
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/graphics/engine/modelfile.cpp
View File

@ -144,7 +144,7 @@ void WriteTextVertexTex2(const Gfx::VertexTex2& vertex, std::ostream& stream)
stream << "c " << vertex.coord.x << " " << vertex.coord.y << " " << vertex.coord.z; stream << "c " << vertex.coord.x << " " << vertex.coord.y << " " << vertex.coord.z;
stream << " n " << vertex.normal.x << " " << vertex.normal.y << " " << vertex.normal.z; stream << " n " << vertex.normal.x << " " << vertex.normal.y << " " << vertex.normal.z;
stream << " t1 " << vertex.texCoord.x << " " << vertex.texCoord.y; stream << " t1 " << vertex.texCoord.x << " " << vertex.texCoord.y;
stream << " t2 " << vertex.texCoord.x << " " << vertex.texCoord.y; stream << " t2 " << vertex.texCoord2.x << " " << vertex.texCoord2.y;
stream << std::endl; stream << std::endl;
} }
@ -809,7 +809,8 @@ bool Gfx::CModelFile::ReadTextModel(std::istream& stream)
ReadLineValue<std::string>(stream, "tex2", t.tex2Name) && ReadLineValue<std::string>(stream, "tex2", t.tex2Name) &&
ReadLineValue<char>(stream, "var_tex2", varTex2Ch) && ReadLineValue<char>(stream, "var_tex2", varTex2Ch) &&
ReadLineValue<float>(stream, "min", t.min) && ReadLineValue<float>(stream, "min", t.min) &&
ReadLineValue<float>(stream, "max", t.max); ReadLineValue<float>(stream, "max", t.max) &&
ReadLineValue<int>(stream, "state", t.state);
if (!triOk || !stream.good()) if (!triOk || !stream.good())
{ {
@ -834,6 +835,7 @@ bool Gfx::CModelFile::ReadTextModel(std::istream& stream)
triangle.variableTex2 = t.variableTex2; triangle.variableTex2 = t.variableTex2;
triangle.min = t.min; triangle.min = t.min;
triangle.max = t.max; triangle.max = t.max;
triangle.state = t.state;
m_triangles.push_back(triangle); m_triangles.push_back(triangle);
@ -916,6 +918,7 @@ bool Gfx::CModelFile::WriteTextModel(std::ostream& stream)
t.variableTex2 = m_triangles[i].variableTex2; t.variableTex2 = m_triangles[i].variableTex2;
t.min = m_triangles[i].min; t.min = m_triangles[i].min;
t.max = m_triangles[i].max; t.max = m_triangles[i].max;
t.state = m_triangles[i].state;
stream << "p1 "; stream << "p1 ";
WriteTextVertexTex2(t.p1, stream); WriteTextVertexTex2(t.p1, stream);
@ -931,6 +934,7 @@ bool Gfx::CModelFile::WriteTextModel(std::ostream& stream)
stream << "var_tex2 " << (t.variableTex2 ? 'Y' : 'N') << std::endl; stream << "var_tex2 " << (t.variableTex2 ? 'Y' : 'N') << std::endl;
stream << "min " << t.min << std::endl; stream << "min " << t.min << std::endl;
stream << "max " << t.max << std::endl; stream << "max " << t.max << std::endl;
stream << "state " << t.state << std::endl;
stream << std::endl; stream << std::endl;