Move what group the normal matrix is in, dedup uniform

Author: davepagurek

src/core/p5.Renderer3D.js

@@ -1456,10 +1456,6 @@ export class Renderer3D extends Renderer {
       this.scratchMat3.inverseTranspose4x4(this.states.uViewMatrix);
       shader.setUniform("uCameraNormalMatrix", this.scratchMat3.mat3);
     }
-    if (shader.uniforms.uCameraRotation) {
-      this.scratchMat3.inverseTranspose4x4(this.states.uViewMatrix);
-      shader.setUniform("uCameraRotation", this.scratchMat3.mat3);
-    }
     shader.setUniform("uViewport", this._viewport);
   }
 

src/webgl/shaders/lighting.glsl

@@ -7,7 +7,6 @@ uniform mat4 uViewMatrix;
 
 uniform bool uUseLighting;
 
-uniform mat3 uCameraRotation;
 uniform int uDirectionalLightCount;
 uniform vec3 uLightingDirection[5];
 uniform vec3 uDirectionalDiffuseColors[5];
@@ -108,7 +107,7 @@ vec2 mapTextureToNormal( vec3 v ){
 vec3 calculateImageDiffuse(vec3 vNormal, vec3 vViewPosition, float metallic){
   // make 2 seperate builds 
   vec3 worldCameraPosition =  vec3(0.0, 0.0, 0.0);  // hardcoded world camera position
-  vec3 worldNormal = normalize(vNormal * uCameraRotation);
+  vec3 worldNormal = normalize(vNormal * uCameraNormalMatrix);
   vec2 newTexCoor = mapTextureToNormal( worldNormal );
   vec4 texture = TEXTURE( environmentMapDiffused, newTexCoor );
   // this is to make the darker sections more dark
@@ -120,7 +119,7 @@ vec3 calculateImageSpecular(vec3 vNormal, vec3 vViewPosition, float shininess, f
   vec3 worldCameraPosition =  vec3(0.0, 0.0, 0.0);
   vec3 worldNormal = normalize(vNormal);
   vec3 lightDirection = normalize( vViewPosition - worldCameraPosition );
-  vec3 R = reflect(lightDirection, worldNormal) * uCameraRotation;
+  vec3 R = reflect(lightDirection, worldNormal) * uCameraNormalMatrix;
   vec2 newTexCoor = mapTextureToNormal( R );
 #ifdef WEBGL2
   // In p5js the range of shininess is >= 1,

src/webgpu/shaders/color.js

@@ -5,14 +5,14 @@ struct CameraUniforms {
 // @p5 ifdef Vertex getWorldInputs
   uViewMatrix: mat4x4<f32>,
 // @p5 endif
+  uCameraNormalMatrix: mat3x3<f32>,
 }
 
 // Group 2: Model Transform
 struct ModelUniforms {
 // @p5 ifdef Vertex getWorldInputs
   uModelMatrix: mat4x4<f32>,
   uModelNormalMatrix: mat3x3<f32>,
-  uCameraNormalMatrix: mat3x3<f32>,
 // @p5 endif
 // @p5 ifndef Vertex getWorldInputs
   uModelViewMatrix: mat4x4<f32>,
@@ -80,7 +80,7 @@ fn main(input: VertexInput) -> VertexOutput {
 // @p5 ifdef Vertex getWorldInputs
   // Already multiplied by the model matrix, just apply view
   inputs.position = (camera.uViewMatrix * vec4<f32>(inputs.position, 1.0)).xyz;
-  inputs.normal = model.uCameraNormalMatrix * inputs.normal;
+  inputs.normal = camera.uCameraNormalMatrix * inputs.normal;
 // @p5 endif
 // @p5 ifndef Vertex getWorldInputs
   // Apply both at once

src/webgpu/shaders/material.js

@@ -3,15 +3,14 @@ const uniforms = `
 struct CameraUniforms {
   uViewMatrix: mat4x4<f32>,
   uProjectionMatrix: mat4x4<f32>,
-  uCameraRotation: mat3x3<f32>,
+  uCameraNormalMatrix: mat3x3<f32>,
 }
 
 // Group 2: Model Transform
 struct ModelUniforms {
 // @p5 ifdef Vertex getWorldInputs
   uModelMatrix: mat4x4<f32>,
   uModelNormalMatrix: mat3x3<f32>,
-  uCameraNormalMatrix: mat3x3<f32>,
 // @p5 endif
 // @p5 ifndef Vertex getWorldInputs
   uModelViewMatrix: mat4x4<f32>,
@@ -115,7 +114,7 @@ fn main(input: VertexInput) -> VertexOutput {
 // @p5 ifdef Vertex getWorldInputs
   // Already multiplied by the model matrix, just apply view
   inputs.position = (camera.uViewMatrix * vec4<f32>(inputs.position, 1.0)).xyz;
-  inputs.normal = model.uCameraNormalMatrix * inputs.normal;
+  inputs.normal = camera.uCameraNormalMatrix * inputs.normal;
 // @p5 endif
 // @p5 ifndef Vertex getWorldInputs
   // Apply both at once
@@ -222,7 +221,7 @@ fn mapTextureToNormal(v: vec3<f32>) -> vec2<f32> {
 fn calculateImageDiffuse(vNormal: vec3<f32>, vViewPosition: vec3<f32>, metallic: f32) -> vec3<f32> {
   // make 2 seperate builds
   let worldCameraPosition = vec3<f32>(0.0, 0.0, 0.0);  // hardcoded world camera position
-  let worldNormal = normalize(vNormal * camera.uCameraRotation);
+  let worldNormal = normalize(vNormal * camera.uCameraNormalMatrix);
   let newTexCoord = mapTextureToNormal(worldNormal);
   let texture = textureSample(environmentMapDiffused, environmentMapDiffused_sampler, newTexCoord);
   // this is to make the darker sections more dark
@@ -234,7 +233,7 @@ fn calculateImageSpecular(vNormal: vec3<f32>, vViewPosition: vec3<f32>, shinines
   let worldCameraPosition = vec3<f32>(0.0, 0.0, 0.0);
   let worldNormal = normalize(vNormal);
   let lightDirection = normalize(vViewPosition - worldCameraPosition);
-  let R = reflect(lightDirection, worldNormal) * camera.uCameraRotation;
+  let R = reflect(lightDirection, worldNormal) * camera.uCameraNormalMatrix;
   let newTexCoord = mapTextureToNormal(R);
 
   // In p5js the range of shininess is >= 1,