broken something?

Author: NikitaWeW

shaders/geometry.glsl

@@ -1,47 +1,65 @@
 #shader vertex
 #version 430 core
 layout(location = 0) in vec4 a_position;
+layout(location = 1) in vec4 a_normal;
 layout(location = 2) in vec2 a_texCoord;
 
 uniform mat4 u_modelMat;
 uniform mat4 u_viewMat;
+uniform mat4 u_normalMat;
 uniform mat4 u_projectionMat;
 
-
 out VS_OUT {
     vec2 v_texCoord;
+    vec3 v_normal;
 };
 
 void main() {
     gl_Position = u_projectionMat * u_viewMat * u_modelMat * a_position;
     v_texCoord = a_texCoord;
+    v_normal = vec3(normalize(a_normal));
 }
 
 #shader geometry
 #version 430 core
 
 in VS_OUT {
     vec2 v_texCoord;
+    vec3 v_normal;
 } gs_in[];
 out GS_OUT {
     vec2 v_texCoord;
 };
 
+uniform float u_timepoint;
+
 layout (triangles) in;
 layout (triangle_strip, max_vertices=3) out;
+vec4 explode(vec4 position, vec3 normal)
+{
+    float magnitude = 2.0;
+    vec3 direction = normal * ((sin(u_timepoint) + 1.0) / 2) * magnitude; 
+    return position + vec4(direction, 0.0);
+}
+
+vec3 GetNormal()
+{
+    vec3 a = vec3(gl_in[0].gl_Position) - vec3(gl_in[1].gl_Position);
+    vec3 b = vec3(gl_in[2].gl_Position) - vec3(gl_in[1].gl_Position);
+    return normalize(cross(a, b));
+}
 void main() {
+    vec3 normal = GetNormal(); // FIXME: gs_in[0].v_normal is wrong
+
+    gl_Position = explode(gl_in[0].gl_Position, normal);
     v_texCoord = gs_in[0].v_texCoord;
-    gl_Position = gl_in[0].gl_Position;
     EmitVertex();
-
+    gl_Position = explode(gl_in[1].gl_Position, normal);
     v_texCoord = gs_in[1].v_texCoord;
-    gl_Position = gl_in[1].gl_Position;
     EmitVertex();
-
+    gl_Position = explode(gl_in[2].gl_Position, normal);
     v_texCoord = gs_in[2].v_texCoord;
-    gl_Position = gl_in[2].gl_Position;
     EmitVertex();
-
     EndPrimitive();
 }
 
@@ -59,6 +77,6 @@ in GS_OUT {
 uniform Material u_material;
 
 void main() {
-    // o_color = texture(u_material.diffuse, v_texCoord);
-    o_color = vec4(1);
+    o_color = texture(u_material.diffuse, v_texCoord);
+    // o_color = vec4(1);
 }

src/main.cpp

@@ -123,6 +123,9 @@ if(!fastLoad) {
     glCullFace(GL_BACK);
     glFrontFace(GL_CCW);
 
+    glDisable(GL_CULL_FACE);
+
+
     glfwSwapInterval(0);
     glfwSetInputMode(window, GLFW_CURSOR, camera.locked ? GLFW_CURSOR_DISABLED : GLFW_CURSOR_NORMAL);
     glfwSetWindowUserPointer(window, &camera);
@@ -154,7 +157,7 @@ if(!fastLoad) {
         app.models[app.currentModelIndex].rotate(app.models[app.currentModelIndex].m_rotation);
         app.models[app.currentModelIndex].scale(app.models[app.currentModelIndex].m_scale);
 
-        glUniform1f(currentShader.getUniform("u_timepoint"), start.time_since_epoch().count());
+        glUniform1f(currentShader.getUniform("u_timepoint"), glfwGetTime());
         glUniform1i(currentShader.getUniform("u_skybox"), 1);
         app.textures[app.currentTextureIndex].bind();
         renderer.drawLighting(app.models[app.currentModelIndex], currentShader, camera); 

src/utils/Model.cpp

@@ -93,9 +93,9 @@ Mesh Model::processMesh(aiMesh *aimesh, bool flipTextures) {
     }
 
     VertexBufferLayout layout;
-    layout.push(3, GL_FLOAT, 0);
-    layout.push(3, GL_FLOAT, positions.size() * sizeof(positions[0]));
-    layout.push(2, GL_FLOAT, positions.size() * sizeof(positions[0]) + normals.size()   * sizeof(normals[0]));
+    /*  positions */ layout.push(3, GL_FLOAT, 0);
+    /*   normals  */ layout.push(3, GL_FLOAT, positions.size() * sizeof(positions[0]));
+    /* tex coords */ layout.push(2, GL_FLOAT, positions.size() * sizeof(positions[0]) + normals.size()   * sizeof(normals[0]));
 
     mesh.va.bind();
     mesh.ib = IndexBuffer {indices.data(),  indices.size()  * sizeof(unsigned)};