Changeset 0b1b52d in opengl-game for opengl-game.cpp

Timestamp:

Oct 4, 2019, 8:27:07 PM (6 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

771b33a

Parents:

83b5b4b

Message:

In openglgame, port over the functionality to specify and initialize varying attributes

File:

• opengl-game.cpp (modified) (1 diff)

opengl-game.cpp

@@ -108 +108 @@
    ((GameGui_GLFW*)gui)->bindEventHandlers();
 
-   graphicsPipelines.push_back(GraphicsPipeline_OpenGL());
+   graphicsPipelines.push_back(GraphicsPipeline_OpenGL(viewport));
+
+   graphicsPipelines.back().addVaryingAttribute(ATTRIB_POINT_VARYING, 3, GL_FLOAT,
+      offset_of(&SceneObject::points));
+   graphicsPipelines.back().addVaryingAttribute(ATTRIB_POINT_VARYING, 3, GL_FLOAT,
+      offset_of(&SceneObject::colors));
+   graphicsPipelines.back().addVaryingAttribute(ATTRIB_POINT_VARYING, 3, GL_FLOAT,
+      offset_of(&SceneObject::normals));
+   graphicsPipelines.back().addVaryingAttribute(ATTRIB_OBJECT_VARYING, 1, GL_UNSIGNED_INT,
+      offset_of(&SceneObject::ubo_offset));
+
    graphicsPipelines.back().createPipeline("gl-shaders/ship.vert", "gl-shaders/ship.frag");
 
-   graphicsPipelines.push_back(GraphicsPipeline_OpenGL());
+   graphicsPipelines.push_back(GraphicsPipeline_OpenGL(viewport));
+
+   graphicsPipelines.back().addVaryingAttribute(ATTRIB_POINT_VARYING, 3, GL_FLOAT,
+      offset_of(&SceneObject::points));
+   graphicsPipelines.back().addVaryingAttribute(ATTRIB_POINT_VARYING, 3, GL_FLOAT,
+      offset_of(&SceneObject::colors));
+   graphicsPipelines.back().addVaryingAttribute(ATTRIB_POINT_VARYING, 3, GL_FLOAT,
+      offset_of(&SceneObject::normals));
+   graphicsPipelines.back().addVaryingAttribute(ATTRIB_OBJECT_VARYING, 1, GL_UNSIGNED_INT,
+      offset_of(&SceneObject::ubo_offset));
+
    graphicsPipelines.back().createPipeline("gl-shaders/asteroid.vert", "gl-shaders/asteroid.frag");
 
-   graphicsPipelines.push_back(GraphicsPipeline_OpenGL());
+   graphicsPipelines.push_back(GraphicsPipeline_OpenGL(viewport));
+
+   graphicsPipelines.back().addVaryingAttribute(ATTRIB_POINT_VARYING, 3, GL_FLOAT,
+      offset_of(&SceneObject::points));
+   graphicsPipelines.back().addVaryingAttribute(ATTRIB_POINT_VARYING, 2, GL_FLOAT,
+      offset_of(&SceneObject::texcoords));
+   graphicsPipelines.back().addVaryingAttribute(ATTRIB_OBJECT_VARYING, 1, GL_UNSIGNED_INT,
+      offset_of(&SceneObject::ubo_offset));
+
    graphicsPipelines.back().createPipeline("gl-shaders/laser.vert", "gl-shaders/laser.frag");
 
-   graphicsPipelines.push_back(GraphicsPipeline_OpenGL());
+   graphicsPipelines.push_back(GraphicsPipeline_OpenGL(viewport));
+
+   graphicsPipelines.back().addVaryingAttribute(ATTRIB_POINT_VARYING, 3, GL_FLOAT,
+      offset_of(&ParticleEffect::particleVelocities));
+   graphicsPipelines.back().addVaryingAttribute(ATTRIB_POINT_VARYING, 1, GL_FLOAT,
+      offset_of(&ParticleEffect::particleTimes));
+   graphicsPipelines.back().addVaryingAttribute(ATTRIB_OBJECT_VARYING, 1, GL_UNSIGNED_INT,
+      offset_of(&ParticleEffect::ubo_offset));
+
    graphicsPipelines.back().createPipeline("gl-shaders/explosion.vert", "gl-shaders/explosion.frag");