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

Finish Matrix4 implementation. #129

Merged
merged 22 commits into from
Jul 25, 2012
Merged

Finish Matrix4 implementation. #129

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6724408
Initial Matrix4 refactoring.
mramato Jul 23, 2012
bc09efc
Ongoing Matrix4 work.
mramato Jul 23, 2012
fe3bb5c
Merge remote-tracking branch 'origin/master' into matrix4
mramato Jul 23, 2012
4b6aff8
Add `when` promise library and switch some APIs to use them.
shunter Jul 20, 2012
75beff0
CHANGES.md tweak.
pjcozzi Jul 22, 2012
de99d9e
Ongoing Matrix4 work.
mramato Jul 23, 2012
5bff297
Ongoing Matrix4 work.
mramato Jul 23, 2012
41483ab
Minor optimization.
mramato Jul 23, 2012
230e872
Merge remote-tracking branch 'origin/master' into matrix4
mramato Jul 23, 2012
395a566
Merge branch 'master' into matrix4
mramato Jul 24, 2012
d3eff78
Fix and optimize Matrix4.inverseTransformation
mramato Jul 24, 2012
d4ad9f2
One line fix for issue #127 which I introduced with c1e68f1
mramato Jul 24, 2012
f646be5
Remove test for an internal function.
bagnell Jul 24, 2012
3b0d1ec
Final Matrix4 changes
mramato Jul 24, 2012
e845ca4
Update CHANGES.
mramato Jul 24, 2012
0928cc9
Add missing test to bring Matrix4 coverage up to 100%
mramato Jul 24, 2012
049ad93
Merge remote-tracking branch 'origin/master' into matrix4
mramato Jul 24, 2012
b735bf0
Optimize Matrix4.multiply my extracting locals.
mramato Jul 25, 2012
a921dd0
Add missing Matrix4 documentation.
mramato Jul 25, 2012
2abce61
Fix typo.
mramato Jul 25, 2012
41c8e7f
Use a custom Jasmine equality tester instead of replacing the default…
shunter Jul 25, 2012
8308afc
Hopefully final Matrix4 changes after review.
mramato Jul 25, 2012
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: 5 additions & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,16 @@ Beta Releases
* `Ellipsoid.toCartographic3s` was renamed to `Ellipsoid.cartesianArrayToCartographicArray`.
* `Ellipsoid.cartographicDegreesToCartesian` was removed. Code that previously looked like `ellipsoid.cartographicDegreesToCartesian(new Cartographic(45, 50, 10))` should now look like `ellipsoid.cartographicToCartesian(Cartographic.fromDegrees(45, 50, 10))`.
* `Math.cartographic3ToRadians`, `Math.cartographic2ToRadians`, `Math.cartographic2ToDegrees`, and `Math.cartographic3ToDegrees` were removed. These functions are no longer needed because Cartographic instances are always represented in radians.
* The `multiplyWithMatrix` function on each `Matrix` type was renamed to `multiply`.
* All functions starting with `multiplyWith` now start with `multiplyBy` to be consistent with functions starting with `divideBy`.
* The `multiplyWithMatrix` function on each `Matrix` type was renamed to `multiply`.
* All three Matrix classes have been largely re-written for consistency and performance. The `values` property has been eliminated and Matrices are no longer immutable. Code that previously looked like `matrix = matrix.setColumn0Row0(12);` now looks like `matrix[Matrix2.COLUMN0ROW0] = 12;`. Code that previously looked like `matrix.setColumn3(cartesian3);` now looked like `matrix.setColum(3, cartesian3, matrix)`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo at the end: setColum

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, fixed.

* All `Cartesian2` operations now have static versions that work with any objects exposing `x` and `y` properties.
* All `Cartesian2` operations now have static versions that work with any objects exposing `x`, `y`, and `z` properties.
* All `Cartesian3` operations now have static versions that work with any objects exposing `x`, `y`, `z` and `w` properties.
* All `Cartographic` operations now have static versions that work with any objects exposing `longitude`, `latitude`, and `height` properties.
* All `Matrix` classes are now indexable like arrays.
* All `Matrix` operations now have static versions of all prototype functions and anywhere we take a Matrix instance as input can now also take an Array or TypedArray.
* All `Matrix`, `Cartesian`, and `Cartographic` operations now take an optional result parameter for object re-use to reduce memory pressure.
* Added `Cartographic.fromDegrees` make creating Cartographic instances from values in degrees easier.
* Added `addImage` to `TextureAtlas` so images can be added to a texture atlas after it is constructed.
* Added `Scene.pickEllipsoid`, which picks either the ellipsoid or the map depending on the current `SceneMode`.
Expand Down
2 changes: 1 addition & 1 deletion Examples/Sandbox/CodeSnippets/Picking.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@

// Setup code
var modelMatrix = Cesium.Transforms.northEastDownToFixedFrame(ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-90.0, 0.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.createTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));

sensors = new Cesium.SensorVolumeCollection(undefined);
sensor = sensors.addRectangularPyramid({
Expand Down
30 changes: 15 additions & 15 deletions Examples/Sandbox/CodeSnippets/SensorVolumes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
Sandbox.RectangularPyramidSensorVolume = function (scene, ellipsoid, primitives) {
this.code = function () {
var modelMatrix = Cesium.Transforms.northEastDownToFixedFrame(ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-90.0, 0.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.createTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));

var sensors = new Cesium.SensorVolumeCollection(undefined);
sensors.addRectangularPyramid({
Expand All @@ -31,7 +31,7 @@
Sandbox.CustomSensorVolume = function (scene, ellipsoid, primitives) {
this.code = function () {
var modelMatrix = Cesium.Transforms.northEastDownToFixedFrame(ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-90.0, 0.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.createTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));

var directions = [];
for (var i = 0; i < 20; ++i) {
Expand All @@ -58,7 +58,7 @@
Sandbox.ConicSensorVolume = function (scene, ellipsoid, primitives) {
this.code = function () {
var modelMatrix = Cesium.Transforms.northEastDownToFixedFrame(ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-90.0, 0.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.createTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));

var sensors = new Cesium.SensorVolumeCollection(undefined);
sensors.addComplexConic({
Expand All @@ -78,7 +78,7 @@
Sandbox.ConicSensorVolumeClockAngles = function (scene, ellipsoid, primitives) {
this.code = function () {
var modelMatrix = Cesium.Transforms.northEastDownToFixedFrame(ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-90.0, 0.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.createTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));

var sensors = new Cesium.SensorVolumeCollection(undefined);
sensors.addComplexConic({
Expand Down Expand Up @@ -147,7 +147,7 @@
Sandbox.StripeSensorMaterial = function (scene, ellipsoid, primitives) {
this.code = function () {
var modelMatrix = Cesium.Transforms.northEastDownToFixedFrame(ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-90.0, 0.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.createTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));

// Also try HorizontalStripeMaterial
var material = new Cesium.HorizontalStripeMaterial(undefined); // Use default colors
Expand All @@ -171,7 +171,7 @@
Sandbox.DistanceIntervalSensorMaterial = function (scene, ellipsoid, primitives) {
this.code = function () {
var modelMatrix = Cesium.Transforms.northEastDownToFixedFrame(ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-90.0, 0.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.createTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));

var material = new Cesium.DistanceIntervalMaterial({
intervals : [
Expand Down Expand Up @@ -224,7 +224,7 @@
Sandbox.CheckerboardSensorMaterial = function (scene, ellipsoid, primitives) {
this.code = function () {
var modelMatrix = Cesium.Transforms.northEastDownToFixedFrame(ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-90.0, 0.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.createTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));

var material = new Cesium.CheckerboardMaterial({
lightColor : {
Expand Down Expand Up @@ -260,7 +260,7 @@
Sandbox.DotSensorMaterial = function (scene, ellipsoid, primitives) {
this.code = function () {
var modelMatrix = Cesium.Transforms.northEastDownToFixedFrame(ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-90.0, 0.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.createTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));

var material = new Cesium.DotMaterial({
lightColor : {
Expand Down Expand Up @@ -296,7 +296,7 @@
Sandbox.TieDyeSensorMaterial = function (scene, ellipsoid, primitives) {
this.code = function () {
var modelMatrix = Cesium.Transforms.northEastDownToFixedFrame(ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-90.0, 0.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.createTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));

var material = new Cesium.TieDyeMaterial(undefined); // Use default colors

Expand All @@ -319,7 +319,7 @@
Sandbox.FacetSensorMaterial = function (scene, ellipsoid, primitives) {
this.code = function () {
var modelMatrix = Cesium.Transforms.northEastDownToFixedFrame(ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-90.0, 0.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.createTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));

var material = new Cesium.FacetMaterial(undefined); // Use default colors

Expand All @@ -342,7 +342,7 @@
Sandbox.BlobSensorMaterial = function (scene, ellipsoid, primitives) {
this.code = function () {
var modelMatrix = Cesium.Transforms.northEastDownToFixedFrame(ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-90.0, 0.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.createTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));

var material = new Cesium.BlobMaterial(undefined); // Use default colors

Expand Down Expand Up @@ -370,7 +370,7 @@
primitives.add(sensors);

var modelMatrix = Cesium.Transforms.northEastDownToFixedFrame(ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-90.0, 0.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.createTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));

var lightColor = {
red : 1.0,
Expand Down Expand Up @@ -428,7 +428,7 @@
Sandbox.ErosionSensorAnimation = function (scene, ellipsoid, primitives) {
this.code = function () {
var modelMatrix = Cesium.Transforms.northEastDownToFixedFrame(ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-90.0, 0.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.createTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));

var material = new Cesium.CheckerboardMaterial(undefined);

Expand All @@ -453,7 +453,7 @@
Sandbox.AlphaSensorAnimation = function (scene, ellipsoid, primitives) {
this.code = function () {
var modelMatrix = Cesium.Transforms.northEastDownToFixedFrame(ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-90.0, 0.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.createTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));

var material = new Cesium.CheckerboardMaterial(undefined);

Expand All @@ -478,7 +478,7 @@
Sandbox.AnimateSensorStripes = function (scene, ellipsoid, primitives) {
this.code = function () {
var modelMatrix = Cesium.Transforms.northEastDownToFixedFrame(ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-90.0, 0.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.createTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));
modelMatrix = modelMatrix.multiply(Cesium.Matrix4.fromTranslation(new Cesium.Cartesian3(3000000.0, 0.0, -3000000.0)));

var material = new Cesium.HorizontalStripeMaterial(undefined); // Use default colors

Expand Down
5 changes: 5 additions & 0 deletions Source/Core/Cartesian3.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,13 @@ define(['./DeveloperError'
* @param {Spherical} spherical The Spherical to be converted to Cartesian3.
* @param {Cartesian3} [cartesian3] The object in which the result will be stored, if undefined a new instance will be created.
* @returns The modified result parameter, or a new instance if none was provided.
*
* @exception {DeveloperError} spherical is required.
*/
Cartesian3.fromSpherical = function(spherical, result) {
if (typeof spherical === 'undefined') {
throw new DeveloperError('spherical is required');
}
if (typeof result === 'undefined') {
result = new Cartesian3();
}
Expand Down
6 changes: 3 additions & 3 deletions Source/Core/EllipsoidTangentPlane.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ define([
var eastNorthUp = Transforms.eastNorthUpToFixedFrame(o, ellipsoid);

this.origin = o;
this.xAxis = Cartesian3.fromCartesian4(eastNorthUp.getColumn0());
this.yAxis = Cartesian3.fromCartesian4(eastNorthUp.getColumn1());
this.normal = Cartesian3.fromCartesian4(eastNorthUp.getColumn2());
this.xAxis = Cartesian3.fromCartesian4(eastNorthUp.getColumn(0));
this.yAxis = Cartesian3.fromCartesian4(eastNorthUp.getColumn(1));
this.normal = Cartesian3.fromCartesian4(eastNorthUp.getColumn(2));
this.d = -o.dot(o);
this.ellipsoid = ellipsoid;
};
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Matrix2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,10 +684,10 @@ define([

/**
* Creates a string representing this Matrix with each row being
* on a separate line and in the format '(column1, column2)'.
* on a separate line and in the format '(column0, column1)'.
* @memberof Matrix2
*
* @return {String} A string representing the provided Matrix with each row being on a separate line and in the format '(column1, column2)'.
* @return {String} A string representing the provided Matrix with each row being on a separate line and in the format '(column0, column1)'.
*/
Matrix2.prototype.toString = function() {
return '(' + this[0] + ', ' + this[2] + ')\n' +
Expand Down
Loading