-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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.
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
scale geometric error with tileset #7411
Merged
hpinkos
merged 10 commits into
CesiumGS:scale-geometric-error
from
geoscan:geometric-error-scale
Sep 19, 2019
+102
−26
Merged
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
3632059
scale geometric error alongside tileset
geoscan-builder 4a8c92d
refs #5152 option to switch normal shading
geoscan-builder ca38e70
refs #7398 moved getRotation method to Matrix3,
geoscan-builder fd5f6a6
refs #5152 revert commit
geoscan-builder 899f799
Merge remote-tracking branch 'cesium/master' into geometric-error-scale
geoscan-builder 905d783
added unit tests for getRotation function, little cleanup
geoscan-builder ebb058f
added rotation matrix specs
geoscan-builder ed7bd07
Merge branch 'cesium-master' into geometric-error-scale
geoscan-builder 698cc16
refs #7398: moved Matrix4.getRotation to Matrix4.getMatrix3
geoscan-builder 36e569a
added missing semicolon
geoscan-builder File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
added rotation matrix specs
- workspaces
- pre-template-literals
- pre-prettier-v3
- pre-prettier
- pre-let-const
- post-workspaces
- post-template-literals
- post-prettier-v3
- post-prettier
- post-let-const
- cesium-workspaces
- 1.127
- 1.126
- 1.125
- 1.124
- 1.123.1
- 1.123
- 1.122
- 1.121.1
- 1.121
- 1.120
- 1.119
- 1.118.2
- 1.118.1
- 1.118
- 1.117
- 1.116
- 1.115
- 1.114
- 1.113
- 1.112
- 1.111
- 1.111-release
- 1.110.1
- 1.110
- 1.109
- 1.108
- 1.107.2
- 1.107.1
- 1.107
- 1.106.1
- 1.106
- 1.105.2
- 1.105.1
- 1.105
- 1.104
- 1.103
- 1.102
- 1.101
- 1.100
- 1.99
- 1.98.1
- 1.98
- 1.97
- 1.96
- 1.95
- 1.94.3
- 1.94.2
- 1.94.1
- 1.94
- 1.93
- 1.92
- 1.91
- 1.90
- 1.89
- 1.88
- 1.87.1
- 1.87
- 1.86.1
- 1.86
- 1.85
- 1.84
- 1.83
- 1.82
- 1.81
- 1.80
- 1.79.1
- 1.79
- 1.78
- 1.77
- 1.76
- 1.75
- 1.74
- 1.73
- 1.72
- 1.71
- 1.70.1
- 1.70
- 1.69
- 1.68
- 1.67
- 1.66
- 1.65
- 1.64
- 1.63.1
- 1.63
- 1.62
commit ebb058fb4c182b1ff435a4189176257e848bc90b
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -642,11 +642,18 @@ defineSuite([ | |
it('getRotation returns matrix without scale', function() { | ||
var matrix = new Matrix3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); | ||
var result = new Matrix3(); | ||
var expected = Matrix3.fromArray([ | ||
0.12309149097933272, 0.4923659639173309, 0.8616404368553291, | ||
0.20739033894608505, 0.5184758473652127, 0.8295613557843402, | ||
0.26726124191242440, 0.5345224838248488, 0.8017837257372732 | ||
]); | ||
var scale = new Cartesian3(); | ||
var expectedScale = new Cartesian3(1.0, 1.0, 1.0); | ||
result = Matrix3.getRotation(matrix, result); | ||
console.log(result); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Remove |
||
var resultScale = Matrix3.getScale(result, scale); | ||
expect(resultScale).toEqualEpsilon(expectedScale, CesiumMath.EPSILON14); | ||
lilleyse marked this conversation as resolved.
Show resolved
Hide resolved
|
||
expect(result).toEqualEpsilon(expected, CesiumMath.EPSILON14); | ||
}); | ||
|
||
it('getRotation does not modify rotation matrix', function() { | ||
|
@@ -661,6 +668,12 @@ defineSuite([ | |
expect(rotation).not.toBe(result); | ||
}); | ||
|
||
it('getRotation throws without a matrix', function() { | ||
expect(function() { | ||
return Matrix3.getRotation(); | ||
}).toThrowDeveloperError(); | ||
}); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also add a separate check for |
||
|
||
it('transpose works with a result parameter that is an input result parameter', function() { | ||
lilleyse marked this conversation as resolved.
Show resolved
Hide resolved
|
||
var matrix = new Matrix3(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0); | ||
var expected = new Matrix3(1.0, 4.0, 7.0, 2.0, 5.0, 8.0, 3.0, 6.0, 9.0); | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.