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

some fixes

This commit is contained in:
Anakin 2016-12-02 13:00:38 +01:00
parent 9b3d12dfeb
commit 3118118953
2 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MshViewer/Source/OpenGlController.cpp
View File

@ -326,6 +326,8 @@ void OpenGLController::updateScene()
// tell sampler to use texture unit 0 // tell sampler to use texture unit 0
glUniform1i(gluiSamplerID, 0); glUniform1i(gluiSamplerID, 0);
if (vModels != NULL)
{
int instanceOffset(0); int instanceOffset(0);
for (unsigned int modelIndex = 0; modelIndex < vModels->size(); modelIndex++) for (unsigned int modelIndex = 0; modelIndex < vModels->size(); modelIndex++)
@ -371,7 +373,7 @@ void OpenGLController::updateScene()
instanceOffset += vertexCount; instanceOffset += vertexCount;
} }
} }
}
glfwSwapBuffers(pWindow); glfwSwapBuffers(pWindow);
glfwPollEvents(); glfwPollEvents();
} }

2
MshViewer/main.cpp
View File

@ -17,7 +17,9 @@ int main(int argc, char** argv)
else else
scene = OpenGLController::getInstance(); scene = OpenGLController::getInstance();
#ifdef _DEBUG
scene->loadMsh("..\\Release\\Msh\\quadPoly.msh"); scene->loadMsh("..\\Release\\Msh\\quadPoly.msh");
#endif // DEBUG
do { do {
scene->updateScene(); scene->updateScene();