Group color with position because it can change a lot

Author: davepagurek

src/webgpu/shaders/color.js

@@ -18,11 +18,11 @@ struct ModelUniforms {
   uModelViewMatrix: mat4x4<f32>,
   uNormalMatrix: mat3x3<f32>,
 // @p5 endif
+  uMaterialColor: vec4<f32>,
 }
 
 // Group 3: Material Properties
 struct MaterialUniforms {
-  uMaterialColor: vec4<f32>,
   uUseVertexColor: u32,
 }
 `;
@@ -64,7 +64,7 @@ fn main(input: VertexInput) -> VertexOutput {
     input.aPosition,
     input.aNormal,
     input.aTexCoord,
-    select(material.uMaterialColor, input.aVertexColor, useVertexColor)
+    select(model.uMaterialColor, input.aVertexColor, useVertexColor)
   );
 
 // @p5 ifdef Vertex getObjectInputs

src/webgpu/shaders/line.js

@@ -15,11 +15,11 @@ struct ModelUniforms {
 // @p5 ifndef StrokeVertex getWorldInputs
   uModelViewMatrix: mat4x4<f32>,
 // @p5 endif
+  uMaterialColor: vec4<f32>,
 }
 
 // Group 3: Stroke Properties
 struct StrokeUniforms {
-  uMaterialColor: vec4<f32>,
   uStrokeWeight: f32,
   uUseLineColor: f32,
   uSimpleLines: f32,
@@ -104,7 +104,7 @@ fn main(input: StrokeVertexInput) -> StrokeVertexOutput {
   if (stroke.uUseLineColor != 0.) {
     lineColor = input.aVertexColor;
   } else {
-    lineColor = stroke.uMaterialColor;
+    lineColor = model.uMaterialColor;
   }
   var inputs = StrokeVertex(
     input.aPosition.xyz,

src/webgpu/shaders/material.js

@@ -16,11 +16,11 @@ struct ModelUniforms {
   uModelViewMatrix: mat4x4<f32>,
   uNormalMatrix: mat3x3<f32>,
 // @p5 endif
+  uMaterialColor: vec4<f32>,
 }
 
 // Group 3: Material Properties
 struct MaterialUniforms {
-  uMaterialColor: vec4<f32>,
   uUseVertexColor: u32,
   uHasSetAmbient: u32,
   uAmbientColor: vec3<f32>,
@@ -98,7 +98,7 @@ fn main(input: VertexInput) -> VertexOutput {
     input.aPosition,
     input.aNormal,
     input.aTexCoord,
-    select(material.uMaterialColor, input.aVertexColor, useVertexColor)
+    select(model.uMaterialColor, input.aVertexColor, useVertexColor)
   );
 
 // @p5 ifdef Vertex getObjectInputs