Changeset 4d84c72 in opengl-game

Timestamp:

Oct 3, 2019, 3:41:36 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

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)

Message:

Move the OpenGL shaders to a gl-shaders folder

Files:

• gl-shaders/asteroid.frag (moved) (moved from asteroid.frag )
• gl-shaders/asteroid.vert (moved) (moved from asteroid.vert )
• gl-shaders/explosion.frag (moved) (moved from explosion.frag )
• gl-shaders/explosion.vert (moved) (moved from explosion.vert )
• gl-shaders/laser.frag (moved) (moved from laser.frag )
• gl-shaders/laser.vert (moved) (moved from laser.vert )
• gl-shaders/ship.frag (moved) (moved from ship.frag )
• gl-shaders/ship.vert (moved) (moved from ship.vert )
• new-game.cpp (modified) (5 diffs)

new-game.cpp

@@ -412 +412 @@
    glfwSetMouseButtonCallback(window, mouse_button_callback);
    glfwSetKeyCallback(window, key_callback);
+   glfwSetWindowSizeCallback(window, window_size_callback);
 /*** END OF REFACTORED CODE ***/
-
-   glfwSetWindowSizeCallback(window, window_size_callback);
 
    const GLubyte* renderer = glGetString(GL_RENDERER);
@@ -488 +487 @@
 
    modelGroups[TYPE_SHIP] = createModelGroup(
-      loadShaderProgram("./ship.vert", "./ship.frag"));
+      loadShaderProgram("gl-shaders/ship.vert", "gl-shaders/ship.frag"));
    shaderBufferInfo[modelGroups[TYPE_SHIP].shaderProgram] = BufferInfo(); // temporary
 
@@ -508 +507 @@
 
    modelGroups[TYPE_ASTEROID] = createModelGroup(
-      loadShaderProgram("./asteroid.vert", "./asteroid.frag"));
+      loadShaderProgram("gl-shaders/asteroid.vert", "gl-shaders/asteroid.frag"));
    shaderBufferInfo[modelGroups[TYPE_ASTEROID].shaderProgram] = BufferInfo(); // temporary
 
@@ -528 +527 @@
 
    modelGroups[TYPE_LASER] = createModelGroup(
-      loadShaderProgram("./laser.vert", "./laser.frag"));
+      loadShaderProgram("gl-shaders/laser.vert", "gl-shaders/laser.frag"));
    shaderBufferInfo[modelGroups[TYPE_LASER].shaderProgram] = BufferInfo(); // temporary
 
@@ -548 +547 @@
 
    modelGroups[TYPE_EXPLOSION] = createModelGroup(
-      loadShaderProgram("./explosion.vert", "./explosion.frag"));
+      loadShaderProgram("gl-shaders/explosion.vert", "gl-shaders/explosion.frag"));
    shaderBufferInfo[modelGroups[TYPE_EXPLOSION].shaderProgram] = BufferInfo(); // temporary