From 3f51793db7648c4a23bd7ff8bf17d18129f20298 Mon Sep 17 00:00:00 2001 From: Andrew Fry Date: Wed, 13 Jul 2016 14:55:55 -0400 Subject: [PATCH 1/3] fixed inverseTransposeModel typos --- Source/Renderer/UniformState.js | 2 +- Source/Scene/Model.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Renderer/UniformState.js b/Source/Renderer/UniformState.js index 0e138fbec12a..49ddc5cd50dd 100644 --- 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 index 77f7f67fe898..116ccf447055 100644 --- a/Source/Scene/Model.js +++ b/Source/Scene/Model.js @@ -1629,7 +1629,7 @@ define([ } return undefined; } - + function modifyShaderForQuantizedAttributes(shader, programName, model, context) { var quantizedUniforms = {}; model._quantizedUniforms[programName] = quantizedUniforms; @@ -2386,7 +2386,7 @@ define([ }, MODELINVERSETRANSPOSE : function(uniformState, model) { return function() { - return uniformState.inverseTranposeModel; + return uniformState.inverseTransposeModel; }; }, MODELVIEWINVERSETRANSPOSE : function(uniformState, model) { From c6ff7de690110d816a5335ee5236772d8760fc40 Mon Sep 17 00:00:00 2001 From: Andrew Fry Date: Wed, 13 Jul 2016 16:23:54 -0400 Subject: [PATCH 2/3] deleted providerViewModel for discontinued Mapquest open tiles --- .../createDefaultImageryProviderViewModels.js | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Source/Widgets/BaseLayerPicker/createDefaultImageryProviderViewModels.js b/Source/Widgets/BaseLayerPicker/createDefaultImageryProviderViewModels.js index 0e328f3a3819..433d34841900 100644 --- a/Source/Widgets/BaseLayerPicker/createDefaultImageryProviderViewModels.js +++ b/Source/Widgets/BaseLayerPicker/createDefaultImageryProviderViewModels.js @@ -180,18 +180,6 @@ area washes and organic edges over a paper texture to add warm pop to any map.\n } })); - providerViewModels.push(new ProviderViewModel({ - name : 'MapQuest Open\u00adStreet\u00adMap', - iconUrl : buildModuleUrl('Widgets/Images/ImageryProviders/mapQuestOpenStreetMap.png'), - tooltip : 'OpenStreetMap (OSM) is a collaborative project to create a free editable \ -map of the world.\nhttp://www.openstreetmap.org', - creationFunction : function() { - return createOpenStreetMapImageryProvider({ - url : 'https://otile1-s.mqcdn.com/tiles/1.0.0/osm/' - }); - } - })); - providerViewModels.push(new ProviderViewModel({ name : 'The Black Marble', iconUrl : buildModuleUrl('Widgets/Images/ImageryProviders/blackMarble.png'), From 6b7579d906407afb91436fbbbea132605f22d2f7 Mon Sep 17 00:00:00 2001 From: Andrew Fry Date: Wed, 13 Jul 2016 16:38:31 -0400 Subject: [PATCH 3/3] corrected remaining transpose typos --- Documentation/Contributors/TestingGuide/README.md | 6 +++--- Source/Shaders/Builtin/Functions/transpose.glsl | 4 ++-- Specs/Renderer/BuiltinFunctionsSpec.js | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/Contributors/TestingGuide/README.md b/Documentation/Contributors/TestingGuide/README.md index fb8a5fd3b8e6..cd0bac588d75 100644 --- 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/Shaders/Builtin/Functions/transpose.glsl b/Source/Shaders/Builtin/Functions/transpose.glsl index 7c39ca70d69b..8578d4403875 100644 --- 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 matrix can be + * Returns the transpose of the matrix. The input matrix can be * a mat2, mat3, or mat4. * * @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 index b0bb4c9dc532..9ff5c55e04d3 100644 --- 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);' +