Separate Model and View Matrices.

src/webgl/GeometryBuilder.js

@@ -46,13 +46,9 @@ class GeometryBuilder {
    * transformations.
    */
   addGeometry(input) {
-    this.renderer.uMVMatrix =
-     this.renderer.uModelMatrix.mult(this.renderer.uViewMatrix);
-    this.hasTransform = !this.renderer.uMVMatrix.mat4
-      .every((v, i) => v === this.identityMatrix.mat4[i]);
 
     if (this.hasTransform) {
-      this.renderer.uNMatrix.inverseTranspose(this.renderer.uMVMatrix);
+      this.renderer.uNMatrix.inverseTranspose(this.renderer.uModelMatrix);
     }
 
     let startIdx = this.geometry.vertices.length;

test/unit/webgl/p5.Camera.js

@@ -386,13 +386,13 @@ suite('p5.Camera', function() {
 
       // Confirmation that the argument camera and the matrix of the camera
       // that received set() match
-      assert.deepEqual(copyCam.cameraMatrix.mat4, myCam.cameraMatrix.mat4);
+      assert.deepEqual(copyCam.modelMatrix.mat4, myCam.modelMatrix.mat4);
       assert.deepEqual(copyCam.projMatrix.mat4, myCam.projMatrix.mat4);
       // If the set()ed camera is active,
       // the renderer's matrix will also change.
       assert.deepEqual(
-        copyCam.cameraMatrix.mat4,
-        myp5._renderer.uMVMatrix.mat4
+        copyCam.modelMatrix.mat4,
+        myp5._renderer.uModelMatrix.mat4
       );
       assert.deepEqual(
         copyCam.projMatrix.mat4,

test/unit/webgl/p5.RendererGL.js

@@ -593,13 +593,23 @@ suite('p5.RendererGL', function() {
   suite('push() and pop() work in WEBGL Mode', function() {
     test('push/pop and translation works as expected in WEBGL Mode', function(done) {
       myp5.createCanvas(100, 100, myp5.WEBGL);
-      var modelView = myp5._renderer.uMVMatrix.copy();
+      var modelMatrixBefore = myp5._renderer.uModelMatrix.copy();
+      var viewMatrixBefore = myp5._renderer.uViewMatrix.copy();
+
       myp5.push();
       myp5.rotateX(Math.random(0, 100));
       myp5.translate(20, 100, 5);
-      assert.notEqual(modelView.mat4, myp5._renderer.uMVMatrix.mat4);
+      // Check if the model matrix has changed
+      assert.notDeepEqual(modelMatrixBefore.mat4,
+        myp5._renderer.uModelMatrix.mat4);
+      // Check if the view matrix has changed
+      assert.deepEqual(viewMatrixBefore.mat4,
+        myp5._renderer.uViewMatrix.mat4);
       myp5.pop();
-      assert.deepEqual(modelView.mat4, myp5._renderer.uMVMatrix.mat4);
+      // Check if both the model and view matrices are restored after popping
+      assert.deepEqual(modelMatrixBefore.mat4,
+        myp5._renderer.uModelMatrix.mat4);
+      assert.deepEqual(viewMatrixBefore.mat4, myp5._renderer.uViewMatrix.mat4);
       done();
     });
 

test/unit/webgl/p5.Shader.js

@@ -67,7 +67,8 @@ suite('p5.Shader', function() {
       var expectedAttributes = ['aPosition', 'aNormal', 'aTexCoord'];
 
       var expectedUniforms = [
-        'uModelViewMatrix',
+        'uModelMatrix',
+        'uViewMatrix',
         'uProjectionMatrix',
         'uNormalMatrix',
         'uAmbientLightCount',
@@ -108,7 +109,8 @@ suite('p5.Shader', function() {
       var expectedAttributes = ['aPosition'];
 
       var expectedUniforms = [
-        'uModelViewMatrix',
+        'uModelMatrix',
+        'uViewMatrix',
         'uProjectionMatrix',
         'uMaterialColor'
       ];
@@ -124,7 +126,8 @@ suite('p5.Shader', function() {
       var expectedAttributes = ['aPosition', 'aVertexColor'];
 
       var expectedUniforms = [
-        'uModelViewMatrix',
+        'uModelMatrix',
+        'uViewMatrix',
         'uProjectionMatrix',
         /*'uResolution',*/
         'uPointSize'
@@ -141,7 +144,8 @@ suite('p5.Shader', function() {
       var expectedAttributes = ['aPosition', 'aNormal'];
 
       var expectedUniforms = [
-        'uModelViewMatrix',
+        'uModelMatrix',
+        'uViewMatrix',
         'uProjectionMatrix',
         'uNormalMatrix'
       ];