Changeset 4d84c72 in opengl-game for new-game.cpp
- Timestamp:
- Oct 3, 2019, 3:41:36 AM (5 years ago)
- Branches:
- feature/imgui-sdl, master, points-test
- Children:
- 7d2b0b9
- Parents:
- 40995d3
- git-author:
- Dmitry Portnoy <dmp1488@…> (10/03/19 03:39:17)
- git-committer:
- Dmitry Portnoy <dmp1488@…> (10/03/19 03:41:36)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
new-game.cpp
r40995d3 r4d84c72 412 412 glfwSetMouseButtonCallback(window, mouse_button_callback); 413 413 glfwSetKeyCallback(window, key_callback); 414 glfwSetWindowSizeCallback(window, window_size_callback); 414 415 /*** END OF REFACTORED CODE ***/ 415 416 glfwSetWindowSizeCallback(window, window_size_callback);417 416 418 417 const GLubyte* renderer = glGetString(GL_RENDERER); … … 488 487 489 488 modelGroups[TYPE_SHIP] = createModelGroup( 490 loadShaderProgram(" ./ship.vert", "./ship.frag"));489 loadShaderProgram("gl-shaders/ship.vert", "gl-shaders/ship.frag")); 491 490 shaderBufferInfo[modelGroups[TYPE_SHIP].shaderProgram] = BufferInfo(); // temporary 492 491 … … 508 507 509 508 modelGroups[TYPE_ASTEROID] = createModelGroup( 510 loadShaderProgram(" ./asteroid.vert", "./asteroid.frag"));509 loadShaderProgram("gl-shaders/asteroid.vert", "gl-shaders/asteroid.frag")); 511 510 shaderBufferInfo[modelGroups[TYPE_ASTEROID].shaderProgram] = BufferInfo(); // temporary 512 511 … … 528 527 529 528 modelGroups[TYPE_LASER] = createModelGroup( 530 loadShaderProgram(" ./laser.vert", "./laser.frag"));529 loadShaderProgram("gl-shaders/laser.vert", "gl-shaders/laser.frag")); 531 530 shaderBufferInfo[modelGroups[TYPE_LASER].shaderProgram] = BufferInfo(); // temporary 532 531 … … 548 547 549 548 modelGroups[TYPE_EXPLOSION] = createModelGroup( 550 loadShaderProgram(" ./explosion.vert", "./explosion.frag"));549 loadShaderProgram("gl-shaders/explosion.vert", "gl-shaders/explosion.frag")); 551 550 shaderBufferInfo[modelGroups[TYPE_EXPLOSION].shaderProgram] = BufferInfo(); // temporary 552 551
Note:
See TracChangeset
for help on using the changeset viewer.