Commit 876c689a authored by Anakin's avatar Anakin

cleanup code

parent fa8808fe
...@@ -10,7 +10,7 @@ GeometryEngine::GeometryEngine() ...@@ -10,7 +10,7 @@ GeometryEngine::GeometryEngine()
{ {
initializeOpenGLFunctions(); initializeOpenGLFunctions();
loadFile("..\\Release\\Msh\\4-Poly.msh"); loadFile("..\\Release\\Msh\\5-Poly.msh");
} }
GeometryEngine::~GeometryEngine() GeometryEngine::~GeometryEngine()
......
...@@ -452,11 +452,7 @@ void MshFile::analyseSegmChunks(Model * dataDestination, std::list<ChunkHeader*> ...@@ -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*> ...@@ -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;
}
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment