Changeset 4994692 in opengl-game for new-game.cpp

Timestamp:

Apr 19, 2020, 1:23:02 AM (4 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

5ba732a

Parents:

6385d0f

Message:

Change VulkanGame::addObject() to return a reference to the newly-created object

File:

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

new-game.cpp

@@ -501 +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,
@@ -510 +509 @@
    initModelGroupAttribs(modelGroups[TYPE_SHIP]);
 
-/*** START OF REFACTORED CODE ***/
    modelGroups[TYPE_ASTEROID] = createModelGroup(
       loadShaderProgram("gl-shaders/asteroid.vert", "gl-shaders/asteroid.frag"));
@@ -523 +521 @@
    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,
@@ -532 +529 @@
    initModelGroupAttribs(modelGroups[TYPE_ASTEROID]);
 
-/*** START OF REFACTORED CODE ***/
    modelGroups[TYPE_LASER] = createModelGroup(
       loadShaderProgram("gl-shaders/laser.vert", "gl-shaders/laser.frag"));
@@ -543 +539 @@
    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,
@@ -553 +548 @@
 
    initModelGroupAttribs(modelGroups[TYPE_LASER]);
-
-/*** START OF REFACTORED CODE ***/
+/*** END OF REFACTORED CODE ***/
+
    modelGroups[TYPE_EXPLOSION] = createModelGroup(
       loadShaderProgram("gl-shaders/explosion.vert", "gl-shaders/explosion.frag"));
@@ -565 +560 @@
    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,
@@ -829 +823 @@
 
             leftLaser = createLaser(
-               vec3(-0.21f, -1.19f, 1.76f)+offset,
-               vec3(-0.21f, -1.19f, -3.0f)+offset,
+               vec3(-0.21f, -1.19f, 1.76f) + offset,
+               vec3(-0.21f, -1.19f, -3.0f) + offset,
                vec3(0.0f, 1.0f, 0.0f), 0.03f);
             addObjectToScene(leftLaser, shaderBufferInfo, modelGroups, ubo);
@@ -1887 +1881 @@
    // To project point P onto line AB:
    // projection = A + dot(AP,AB) / dot(AB,AB) * AB
-   vec3 projOnLaser = start + glm::dot(cam_pos-start, ray) / (length*length) * ray;
+   vec3 projOnLaser = start + glm::dot(cam_pos - start, ray) / (length * length) * ray;
    vec3 laserToCam = cam_pos - projOnLaser;
 
@@ -1944 +1938 @@
 }
 
+/*** START OF REFACTORED CODE ***/
 void defineModelGroupUniform(ShaderModelGroup& modelGroup, string name, AttribType attribType,
                   GLint size, UniformType type, GLfloat* data) {
@@ -1957 +1952 @@
 
 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);
@@ -1984 +1976 @@
       }
    }
-/*** START OF REFACTORED CODE ***/
-}
+}
+/*** END OF REFACTORED CODE ***/
 
 void bindUniformData(AttribInfo& attrib) {