Merge pull request #4115 from andyfry01/master

fixed inverseTransposeModel typos
CesiumGS · Aug 9, 2016 · 35685df · 35685df
2 parents bb4f85f + 6b7579d
commit 35685df
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/Documentation/Contributors/TestingGuide/README.md b/Documentation/Contributors/TestingGuide/README.md
@@ -171,9 +171,9 @@ It is also possible for Karma to run all tests against each browser installed on
 `npm run test-webgl`
 
 #### Run Only Non-WebGL Tests with Karma
- 
+
  `npm run test-non-webgl`
- 
+
 #### Run All Tests Against the Minified Release Version of Cesium
 
  `npm run test-release`
@@ -381,7 +381,7 @@ afterAll(function() {
     context.destroyForSpecs();
 });
 
-it('has czm_tranpose (2x2)', function() {
+it('has czm_transpose (2x2)', function() {
     var fs =
         'void main() { ' +
         '  mat2 m = mat2(1.0, 2.0, 3.0, 4.0); ' +

diff --git a/Source/Renderer/UniformState.js b/Source/Renderer/UniformState.js
@@ -261,7 +261,7 @@ define([
          * @memberof UniformState.prototype
          * @private
          */
-        inverseTranposeModel : {
+        inverseTransposeModel : {
             get : function() {
                 var m = this._inverseTransposeModel;
                 if (this._inverseTransposeModelDirty) {

diff --git a/Source/Scene/Model.js b/Source/Scene/Model.js
@@ -1671,7 +1671,7 @@ define([
         }
         return undefined;
     }
-    
+
     function modifyShaderForQuantizedAttributes(shader, programName, model, context) {
         var quantizedUniforms = {};
         model._quantizedUniforms[programName] = quantizedUniforms;
@@ -2428,7 +2428,7 @@ define([
         },
         MODELINVERSETRANSPOSE : function(uniformState, model) {
             return function() {
-                return uniformState.inverseTranposeModel;
+                return uniformState.inverseTransposeModel;
             };
         },
         MODELVIEWINVERSETRANSPOSE : function(uniformState, model) {

diff --git a/Source/Shaders/Builtin/Functions/transpose.glsl b/Source/Shaders/Builtin/Functions/transpose.glsl
@@ -1,5 +1,5 @@
 /**
- * Returns the transpose of the matrix.  The input <code>matrix</code> can be 
+ * Returns the transpose of the matrix.  The input <code>matrix</code> can be
  * a <code>mat2</code>, <code>mat3</code>, or <code>mat4</code>.
  *
  * @name czm_transpose
@@ -15,7 +15,7 @@
  * mat3 czm_transpose(mat3 matrix);
  * mat4 czm_transpose(mat4 matrix);
  *
- * // Tranpose a 3x3 rotation matrix to find its inverse.
+ * // Transpose a 3x3 rotation matrix to find its inverse.
  * mat3 eastNorthUpToEye = czm_eastNorthUpToEyeCoordinates(
  *     positionMC, normalEC);
  * mat3 eyeToEastNorthUp = czm_transpose(eastNorthUpToEye);

diff --git a/Specs/Renderer/BuiltinFunctionsSpec.js b/Specs/Renderer/BuiltinFunctionsSpec.js
@@ -25,7 +25,7 @@ defineSuite([
         context.destroyForSpecs();
     });
 
-    it('has czm_tranpose (2x2)', function() {
+    it('has czm_transpose (2x2)', function() {
         var fs =
             'void main() { ' +
             '  mat2 m = mat2(1.0, 2.0, 3.0, 4.0); ' +
@@ -36,7 +36,7 @@ defineSuite([
         context.verifyDrawForSpecs(fs);
     });
 
-    it('has czm_tranpose (3x3)', function() {
+    it('has czm_transpose (3x3)', function() {
         var fs =
             'void main() { ' +
             '  mat3 m = mat3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); ' +
@@ -47,7 +47,7 @@ defineSuite([
         context.verifyDrawForSpecs(fs);
     });
 
-    it('has czm_tranpose (4x4)', function() {
+    it('has czm_transpose (4x4)', function() {
         var fs =
             'void main() { ' +
             '  mat4 m = mat4(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0);' +