-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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
Refactor DynamicScene vertex positions #1881
Merged
Merged
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
This change removes DynamicObject.vertexPositions and pushes it down into the objects that use it. CzmlDataSource and GeoJsonDataSource still need to be updated.
We now moved vertexPositions from DynamicObject to the individual graphics. GeoJSON now also uses the Polygon outline settings instead of creating a DynamicPolyline instance.
We now moved vertexPositions from DynamicObject to the individual graphics.
Conflicts: CHANGES.md
Conflicts: CHANGES.md
Conflicts: CHANGES.md
…ntity-show Conflicts: CHANGES.md Source/DataSources/CzmlDataSource.js Source/DataSources/Entity.js Source/DataSources/GeoJsonDataSource.js Source/DataSources/PolygonGeometryUpdater.js Source/DataSources/PolylineGeometryUpdater.js Source/DataSources/WallGeometryUpdater.js Source/DataSources/WallGraphics.js Specs/DataSources/CzmlDataSourceSpec.js Specs/DataSources/PolygonGeometryUpdaterSpec.js Specs/DataSources/PolygonGraphicsSpec.js Specs/DataSources/PolylineGeometryUpdaterSpec.js Specs/DataSources/PolylineGraphicsSpec.js Specs/DataSources/WallGeometryUpdaterSpec.js Specs/DynamicScene/CompositeDynamicObjectCollectionSpec.js
…ions Conflicts: Source/Widgets/Viewer/viewerEntityMixin.js Specs/DataSources/CzmlDataSourceSpec.js
Conflicts: Source/DataSources/Entity.js
function processVertexPositions(entity, packet, entityCollection, sourceUri) { | ||
var vertexPositionsData = packet.vertexPositions; | ||
if (!defined(vertexPositionsData)) { | ||
function processPositions(entity, positionsData, entityCollection) { |
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.
entity
is not really an Entity anymore, is it? It's the PolygonGraphics
(etc.) object.
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.
Yes, this was a merge error on my part.
Ready for another look. |
shunter
added a commit
that referenced
this pull request
Jul 9, 2014
Refactor DynamicScene vertex positions
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.
DynamicObject.vertexPositions
positions
property toDynamicPolygon
,DynamicPolyline
, andDynamicWall
.This goes along with AnalyticalGraphicsInc/czml-writer#70
I was hoping to include support for polygon holes in this update, but that will now happen in a future pull.