Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed inverseTransposeModel typos #4115

Merged
merged 3 commits into from
Aug 9, 2016
Merged

fixed inverseTransposeModel typos #4115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f51793
fixed inverseTransposeModel typos
andyfry01 Jul 13, 2016
c6ff7de
deleted providerViewModel for discontinued Mapquest open tiles
andyfry01 Jul 13, 2016
6b7579d
corrected remaining transpose typos
andyfry01 Jul 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Documentation/Contributors/TestingGuide/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down Expand Up @@ -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); ' +
Expand Down
2 changes: 1 addition & 1 deletion Source/Renderer/UniformState.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ define([
* @memberof UniformState.prototype
* @private
*/
inverseTranposeModel : {
inverseTransposeModel : {
get : function() {
var m = this._inverseTransposeModel;
if (this._inverseTransposeModelDirty) {
Expand Down
4 changes: 2 additions & 2 deletions Source/Scene/Model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1629,7 +1629,7 @@ define([
}
return undefined;
}

function modifyShaderForQuantizedAttributes(shader, programName, model, context) {
var quantizedUniforms = {};
model._quantizedUniforms[programName] = quantizedUniforms;
Expand Down Expand Up @@ -2386,7 +2386,7 @@ define([
},
MODELINVERSETRANSPOSE : function(uniformState, model) {
return function() {
return uniformState.inverseTranposeModel;
return uniformState.inverseTransposeModel;
};
},
MODELVIEWINVERSETRANSPOSE : function(uniformState, model) {
Expand Down
4 changes: 2 additions & 2 deletions Source/Shaders/Builtin/Functions/transpose.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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);
Expand Down
12 changes: 0 additions & 12 deletions Source/Widgets/BaseLayerPicker/createDefaultImageryProviderViewModels.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
6 changes: 3 additions & 3 deletions Specs/Renderer/BuiltinFunctionsSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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); ' +
Expand All @@ -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); ' +
Expand All @@ -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);' +
Expand Down