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.

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 19 commits into from
Jul 9, 2014
Merged

Refactor DynamicScene vertex positions #1881

merged 19 commits into from
Jul 9, 2014

Conversation

mramato
Copy link
Contributor

@mramato mramato commented Jul 2, 2014

  1. Remove DynamicObject.vertexPositions
  2. Add equivalent positions property to DynamicPolygon, DynamicPolyline, and DynamicWall.

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.

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.
@mramato mramato mentioned this pull request Jul 2, 2014
70 tasks
mramato added 10 commits July 2, 2014 18:20
…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
function processVertexPositions(entity, packet, entityCollection, sourceUri) {
var vertexPositionsData = packet.vertexPositions;
if (!defined(vertexPositionsData)) {
function processPositions(entity, positionsData, entityCollection) {
Copy link
Contributor

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.

Copy link
Contributor Author

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.

@mramato
Copy link
Contributor Author

mramato commented Jul 9, 2014

Ready for another look.

shunter added a commit that referenced this pull request Jul 9, 2014
@shunter shunter merged commit 3ffea19 into master Jul 9, 2014
@shunter shunter deleted the vertexPositions branch July 9, 2014 14:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants