Clean up unused uniforms and matrices from aquarium

Author: Olli Etuaho

aquarium-vr/aquarium-vr.js

@@ -934,7 +934,6 @@ function initialize() {
   var viewProjection = new Float32Array(16);
   var worldViewProjection = new Float32Array(16);
   var viewInverse = new Float32Array(16);
-  var viewProjectionInverse = new Float32Array(16);
   var skyView = new Float32Array(16);
   var skyViewProjection = new Float32Array(16);
   var skyViewProjectionInverse = new Float32Array(16);
@@ -958,20 +957,6 @@ function initialize() {
   var skyConst = {viewProjectionInverse: skyViewProjectionInverse};
   var skyPer = {};
 
-  // Sand uniforms.
-  var sandConst = {
-    viewInverse: viewInverse,
-    lightWorldPos: lightWorldPos,
-    lightColor: one4,
-    specular: one4,
-    shininess: 5,
-    specularFactor: 0.3};
-  var sandPer = {
-    world: world,
-    worldViewProjection: worldViewProjection,
-    worldInverse: worldInverse,
-    worldInverseTranspose: worldInverseTranspose};
-
   // Generic uniforms.
   var genericConst = {
     viewInverse: viewInverse,
@@ -1302,10 +1287,6 @@ function initialize() {
         target,
         up);
     }
-      var uiMatrix = new Float32Array(16);
-    //calculateViewMatrix(uiMatrix, pose.orientation, [0, 0, 10]);
-    //g_ui.render(projection, fast.matrix4.inverse(uiMatrix, fast.matrix4.translation(uiMatrix, [0, 0, 6])));
-    //var uiMatrix = new Float32Array(16);
     if (g.net.slave) {
       // compute X fov from y fov
       var fovy = math.degToRad(g.globals.fieldOfView * g.net.fovFudge);
@@ -1317,8 +1298,6 @@ function initialize() {
     }
     fast.matrix4.inverse(view, viewInverse);
     fast.matrix4.mul(viewProjection, view, projection);
-    fast.matrix4.inverse(viewProjectionInverse, viewProjection);
-    //g_ui.render(projection, fast.matrix4.inverse(uiMatrix, fast.matrix4.translation(uiMatrix, [0, 0, 16])));
 
     fast.matrix4.copy(skyView, view);
     skyView[12] = 0;

aquarium/aquarium.js

@@ -1057,7 +1057,6 @@ function initialize() {
   var viewProjection = new Float32Array(16);
   var worldViewProjection = new Float32Array(16);
   var viewInverse = new Float32Array(16);
-  var viewProjectionInverse = new Float32Array(16);
   var skyView = new Float32Array(16);
   var skyViewProjection = new Float32Array(16);
   var skyViewProjectionInverse = new Float32Array(16);
@@ -1081,20 +1080,6 @@ function initialize() {
   var skyConst = {viewProjectionInverse: skyViewProjectionInverse};
   var skyPer = {};
 
-  // Sand uniforms.
-  var sandConst = {
-    viewInverse: viewInverse,
-    lightWorldPos: lightWorldPos,
-    lightColor: one4,
-    specular: one4,
-    shininess: 5,
-    specularFactor: 0.3};
-  var sandPer = {
-    world: world,
-    worldViewProjection: worldViewProjection,
-    worldInverse: worldInverse,
-    worldInverseTranspose: worldInverseTranspose};
-
   // Generic uniforms.
   var genericConst = {
     viewInverse: viewInverse,
@@ -1426,7 +1411,6 @@ function initialize() {
     }
     fast.matrix4.inverse(view, viewInverse);
     fast.matrix4.mul(viewProjection, view, projection);
-    fast.matrix4.inverse(viewProjectionInverse, viewProjection);
 
     fast.matrix4.copy(skyView, view);
     skyView[12] = 0;