Scale bounding sphere #1155
Merged
Scale bounding sphere #1155
Conversation
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
| @@ -701,6 +701,7 @@ define([ | |||
| * @exception {DeveloperError} sphere is required. | |||
| * @exception {DeveloperError} transform is required. | |||
| */ | |||
| var radiusScratch = new Cartesian3(); | |||
There was a problem hiding this comment.
This needs a better name. Radius is a scalar. This is a vector.
There was a problem hiding this comment.
The variable also needs to be placed before the JSDoc comment above, so that the JSDoc is correctly attached to BoundingSphere.transform.
|
@pjcozzi anything else? |
| Cartesian3.clone(transformCart4, result.center); | ||
| result.radius = sphere.radius; | ||
| result.center = Cartesian3.clone(transformCart4, result.center); | ||
| result.radius = Math.max(Cartesian3.magnitude(Matrix4.getColumn(transform, 0, columnScratch)), Cartesian3.magnitude(Matrix4.getColumn(transform, 1, columnScratch)), Cartesian3.magnitude(Matrix4.getColumn(transform, 2, columnScratch))) * sphere.radius; |
There was a problem hiding this comment.
I meant make one call to Math.max. I would still split the arguments across multiple lines despite what the Eclipse formatter wants. We don't have lines this long anywhere else in Cesium.
|
@hpinkos can you merge in master? Is this ready? |
added 2 commits
September 23, 2013 15:36
Conflicts: Source/Core/BoundingSphere.js
|
@pjcozzi this is ready |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
fixes Issue #1153