GlobalUniformValues: changed LightColor from vec4 to vec3

stephengold · Aug 9, 2023 · 3280901 · 3280901
1 parent 3a1187e
commit 3280901
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/lib/src/main/java/com/github/stephengold/vsport/GlobalUniformValues.java b/lib/src/main/java/com/github/stephengold/vsport/GlobalUniformValues.java
@@ -69,7 +69,7 @@ class GlobalUniformValues {
     /**
      * color of the lights
      */
-    final private Vector4f lightColor = new Vector4f();
+    final private Vector3f lightColor = new Vector3f(1f, 1f, 1f);
     // *************************************************************************
     // new methods exposed
 
@@ -98,8 +98,8 @@ static int numBytes() {
         result = Utils.align(result, 16);
         result += 3 * Float.BYTES;
 
-        // vec4 LightColor
-        result += 4 * Float.BYTES;
+        // vec3 LightColor
+        result += 3 * Float.BYTES;
 
         // mat4 viewMatrix
         result = Utils.align(result, 16);
@@ -143,9 +143,9 @@ void writeTo(ByteBuffer target) {
         lightDirectionWorldspace.get(byteOffset, target);
         byteOffset += 3 * Float.BYTES;
 
-        // vec4 LightColor
+        // vec3 LightColor
         lightColor.get(byteOffset, target);
-        byteOffset += 4 * Float.BYTES;
+        byteOffset += 3 * Float.BYTES;
 
         // mat4 viewMatrix
         byteOffset = Utils.align(byteOffset, 16);

diff --git a/lib/src/main/resources/Shaders/Phong/Distant/Monochrome.frag b/lib/src/main/resources/Shaders/Phong/Distant/Monochrome.frag
@@ -7,7 +7,7 @@
 layout(binding = 0) uniform Global { // global uniforms:
     float ambientStrength;
     vec3 LightDirection_worldspace;
-    vec4 LightColor;
+    vec3 LightColor;
     mat4 viewMatrix;
     mat4 projectionMatrix;
 } global;
@@ -56,5 +56,5 @@ void main() {
 
     vec3 color = (global.ambientStrength + cosTheta) * ubo.BaseMaterialColor.rgb;
     color = color + cosAlpha8 * ubo.SpecularMaterialColor.rgb;
-    fragColor = color * global.LightColor.rgb;
+    fragColor = color * global.LightColor;
 }
diff --git a/lib/src/main/resources/Shaders/Phong/Distant/Monochrome.vert b/lib/src/main/resources/Shaders/Phong/Distant/Monochrome.vert
@@ -7,7 +7,7 @@
 layout(binding = 0) uniform Global { // global uniforms:
     float ambientStrength;
     vec3 LightDirection_worldspace;
-    vec4 LightColor;
+    vec3 LightColor;
     mat4 viewMatrix;
     mat4 projectionMatrix;
 } global;

diff --git a/lib/src/main/resources/Shaders/Unshaded/Texture.vert b/lib/src/main/resources/Shaders/Unshaded/Texture.vert
@@ -6,7 +6,7 @@
 layout(binding = 0) uniform Global { // global uniforms:
     float ambientStrength;
     vec3 LightDirection_worldspace;
-    vec4 LightColor;
+    vec3 LightColor;
     mat4 viewMatrix;
     mat4 projectionMatrix;
 } global;