Changeset 5b02676 in opengl-game for new-game.cpp

Timestamp:

Oct 4, 2019, 8:10:09 PM (6 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

83b5b4b

Parents:

ee75487

Message:

Make vulkangame and openglgame compile on OSX with the new GraphicsPipeline classes

File:

• new-game.cpp (modified) (13 diffs)

new-game.cpp

@@ -166 +166 @@
 void mouse_button_callback(GLFWwindow* window, int button, int action, int mods);
 void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods);
+/*** START OF REFACTORED CODE ***/
 void window_size_callback(GLFWwindow* window, int width, int height);
+/*** END OF REFACTORED CODE ***/
 
 void APIENTRY debugGlCallback(
@@ -486 +488 @@
    map<ObjectType, ShaderModelGroup> modelGroups;
 
+/*** START OF REFACTORED CODE ***/
    modelGroups[TYPE_SHIP] = createModelGroup(
       loadShaderProgram("gl-shaders/ship.vert", "gl-shaders/ship.frag"));
@@ -498 +501 @@
    defineModelGroupAttrib(modelGroups[TYPE_SHIP], "ubo_index", ATTRIB_OBJECT_VARYING,
       1, GL_UNSIGNED_INT, offset_of(&SceneObject::ubo_offset));
+/*** END OF REFACTORED CODE ***/
 
    defineModelGroupUniform(modelGroups[TYPE_SHIP], "view", ATTRIB_UNIFORM,
@@ -506 +510 @@
    initModelGroupAttribs(modelGroups[TYPE_SHIP]);
 
+/*** START OF REFACTORED CODE ***/
    modelGroups[TYPE_ASTEROID] = createModelGroup(
       loadShaderProgram("gl-shaders/asteroid.vert", "gl-shaders/asteroid.frag"));
@@ -518 +523 @@
    defineModelGroupAttrib(modelGroups[TYPE_ASTEROID], "ubo_index", ATTRIB_OBJECT_VARYING,
       1, GL_UNSIGNED_INT, offset_of(&SceneObject::ubo_offset));
+/*** END OF REFACTORED CODE ***/
 
    defineModelGroupUniform(modelGroups[TYPE_ASTEROID], "view", ATTRIB_UNIFORM,
@@ -526 +532 @@
    initModelGroupAttribs(modelGroups[TYPE_ASTEROID]);
 
+/*** START OF REFACTORED CODE ***/
    modelGroups[TYPE_LASER] = createModelGroup(
       loadShaderProgram("gl-shaders/laser.vert", "gl-shaders/laser.frag"));
@@ -536 +543 @@
    defineModelGroupAttrib(modelGroups[TYPE_LASER], "ubo_index", ATTRIB_OBJECT_VARYING,
       1, GL_UNSIGNED_INT, offset_of(&SceneObject::ubo_offset));
+/*** END OF REFACTORED CODE ***/
 
    defineModelGroupUniform(modelGroups[TYPE_LASER], "view", ATTRIB_UNIFORM,
@@ -546 +554 @@
    initModelGroupAttribs(modelGroups[TYPE_LASER]);
 
+/*** START OF REFACTORED CODE ***/
    modelGroups[TYPE_EXPLOSION] = createModelGroup(
       loadShaderProgram("gl-shaders/explosion.vert", "gl-shaders/explosion.frag"));
@@ -556 +565 @@
    defineModelGroupAttrib(modelGroups[TYPE_EXPLOSION], "ubo_index", ATTRIB_OBJECT_VARYING,
       1, GL_UNSIGNED_INT, offset_of(&SceneObject::ubo_offset));
+/*** END OF REFACTORED CODE ***/
 
    defineModelGroupUniform(modelGroups[TYPE_EXPLOSION], "cur_time", ATTRIB_UNIFORM,
@@ -1060 +1070 @@
 }
 
+/*** START OF REFACTORED CODE ***/
 void window_size_callback(GLFWwindow* window, int width, int height) {
    cout << "Window resized to (" << width << ", " << height << ")" << endl;
@@ -1073 +1084 @@
    //glfwSetWindowAttrib(window, GLFW_DECORATED, GLFW_FALSE);
 }
+/*** END OF REFACTORED CODE ***/
 
 void APIENTRY debugGlCallback(
@@ -1945 +1957 @@
 
 void initModelGroupAttribs(ShaderModelGroup& modelGroup) {
+/*** START OF REFACTORED CODE ***/
    glBindVertexArray(modelGroup.vao);
 
    map<string, AttribInfo>::iterator it;
    for (it = modelGroup.attribs.begin(); it != modelGroup.attribs.end(); it++) {
+/*** END OF REFACTORED CODE ***/
       if (it->second.attribType == ATTRIB_UNIFORM) {
          it->second.buffer = glGetUniformLocation(modelGroup.shaderProgram, it->first.c_str());
+/*** START OF REFACTORED CODE ***/
       } else {
          glEnableVertexAttribArray(it->second.index);
@@ -1969 +1984 @@
       }
    }
+/*** START OF REFACTORED CODE ***/
 }