get all materials,

save the texture name for every modl,
program crashes at glfwPollEvents(); fix???
This commit is contained in:
Anakin
2016-10-22 13:49:45 +02:00
parent 03553616e7
commit c0a84c7513
3 changed files with 73 additions and 13 deletions

View File

@@ -309,11 +309,10 @@ void OpenGLController::loadMsh(const char * path)
}
catch (std::invalid_argument e)
{
GLubyte solidColor[4] = { 255,0,0,255 };
GLubyte solidColor[4] = { 255, 0, 0, 255};
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE, (const GLvoid*)solidColor);
}
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);