itdominator
/
SWBF2-Classic-Msh-Viewer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup code

This commit is contained in:
Anakin 2017-01-02 14:14:27 +01:00
parent fa8808fea8
commit 876c689a1d
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QtMeshViewer/Source/GeometryEngine.cpp
View File

@ -10,7 +10,7 @@ GeometryEngine::GeometryEngine()
{ {
initializeOpenGLFunctions(); initializeOpenGLFunctions();
loadFile("..\\Release\\Msh\\4-Poly.msh"); loadFile("..\\Release\\Msh\\5-Poly.msh");
} }
GeometryEngine::~GeometryEngine() GeometryEngine::~GeometryEngine()

11
QtMeshViewer/Source/MshFile.cpp
View File

@ -452,11 +452,7 @@ void MshFile::analyseSegmChunks(Model * dataDestination, std::list<ChunkHeader*>
for (unsigned int tri = 0; tri < tmp_multiPolySize - 2; tri++) for (unsigned int tri = 0; tri < tmp_multiPolySize - 2; tri++)
// ..calculate the edge indices // ..calculate the edge indices
for (int triEdge = 0; triEdge < 3; triEdge++) for (int triEdge = 0; triEdge < 3; triEdge++)
new_segment->indices.push_back((GLuint)(tri + triEdge - ((tri % 2) * (triEdge - 1) * 2))); new_segment->indices.push_back((GLuint)tmp_buffer[(tri + triEdge - ((tri % 2) * (triEdge - 1) * 2))]);
}
else
{
//TODO: this shouldn't happen only once
} }
} // if 2 high bits are set } // if 2 high bits are set
@ -478,11 +474,6 @@ void MshFile::analyseSegmChunks(Model * dataDestination, std::list<ChunkHeader*>
for (int triEdge = 0; triEdge < 3; triEdge++) for (int triEdge = 0; triEdge < 3; triEdge++)
new_segment->indices.push_back((GLuint)tmp_buffer[(tri + triEdge - ((tri % 2) * (triEdge - 1) * 2))]); new_segment->indices.push_back((GLuint)tmp_buffer[(tri + triEdge - ((tri % 2) * (triEdge - 1) * 2))]);
} }
else
{
//TODO: this shouldn't happen
std::cout << "Where am i??" << std::endl;
}
} }
} }