Merge branch 'main' into asgmnt3/lighting-terrain

michaelbrusegard · Oct 3, 2024 · c2b83b0 · c2b83b0
2 parents 4db9459 + 510f75a
commit c2b83b0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/assignments/Computer_Graphics___Assignment_2.pdf b/assignments/Computer_Graphics___Assignment_2.pdf
diff --git a/gloom-rs/shaders/fragShaderRestCode.txt b/gloom-rs/shaders/fragShaderRestCode.txt
@@ -125,4 +125,4 @@ float sdTriangle(vec2 p1, vec2 p2, vec2 p3, vec2 p)
                      vec2(dot(pq2, pq2), s*(f2.x*e2.y - f2.y*e2.x)));
 
     return -sqrt(d.x)*sign(d.y);
-}
+}
diff --git a/gloom-rs/shaders/simple.frag b/gloom-rs/shaders/simple.frag
@@ -10,6 +10,7 @@ in vec3 fPosition; // for phong lighting
 in vec4 fColor;
 in vec3 fNormal;
 out vec4 color;
+in vec4 vertColor;
 
 // Globals
 vec3 lightDirection = normalize(vec3(0.8, -0.5, 0.6));
-Original file line number
+Diff line change
@@ Expand Up / @@ -125,4 +125,4 @@ float sdTriangle(vec2 p1, vec2 p2, vec2 p3, vec2 p) @@
                          vec2(dot(pq2, pq2), s*(f2.x*e2.y - f2.y*e2.x)));
         return -sqrt(d.x)*sign(d.y);
-    }
+    }