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

Reference properties #1774

Merged
merged 28 commits into from
Jun 5, 2014
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
73a47bb
Start refactoring reference properties.
mramato May 21, 2014
0918e85
Merge branch 'master' into referenceProperties
mramato May 21, 2014
5f6239d
Ongoing reference property work.
mramato May 22, 2014
d52c064
Merge branch 'master' into referenceProperties
mramato May 27, 2014
5c27734
Merge branch 'master' into referenceProperties
mramato May 29, 2014
4ce4442
Merge remote-tracking branch 'origin/master' into referenceProperties
mramato May 30, 2014
15f4834
Ongoing ReferenceProperty work.
mramato May 30, 2014
6545b41
Ongoing ReferenceProperty work
mramato May 30, 2014
36fd98b
Ongoing ReferenceProperty work
mramato May 30, 2014
72fde3c
Merge remote-tracking branch 'origin/master' into referenceProperties
mramato May 30, 2014
6184679
Start adding CZML reference property tests
mramato May 30, 2014
6437c69
Specs and implementation for CZML reference property parsing.
mramato Jun 2, 2014
3463a72
Improve ReferenceProperty documentation.
mramato Jun 2, 2014
d309c79
More ReferenceProperty cleanup.
mramato Jun 2, 2014
a85c104
Move changes to 1.0.
mramato Jun 2, 2014
8bb4ff8
Update outdated doc.
mramato Jun 2, 2014
caa19fb
Merge remote-tracking branch 'origin/master' into referenceProperties
mramato Jun 2, 2014
b10a636
Fix crash do to use of undefined variable.
mramato Jun 3, 2014
1dd4611
Merge remote-tracking branch 'origin/master' into referenceProperties
mramato Jun 4, 2014
223c002
Minor clean up after merge.
mramato Jun 4, 2014
528b33f
Changes after review.
mramato Jun 5, 2014
428bd0b
Merge remote-tracking branch 'origin/master' into referenceProperties
mramato Jun 5, 2014
4ab9261
Changes after review.
mramato Jun 5, 2014
93505e4
Clean up doc.
mramato Jun 5, 2014
6454c03
Merge remote-tracking branch 'origin/master' into referenceProperties
mramato Jun 5, 2014
5acc86d
More cleanup after review.
mramato Jun 5, 2014
0c83811
Improve error message.
mramato Jun 5, 2014
fa40155
Merge remote-tracking branch 'origin/master' into referenceProperties
mramato Jun 5, 2014
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
12 changes: 6 additions & 6 deletions Apps/CesiumViewer/Gallery/simple.czml
Original file line number Diff line number Diff line change
Expand Up @@ -3866,8 +3866,8 @@
},
"vertexPositions":{
"references":[
"Satellite/Geoeye1.position",
"Satellite/ISS.position"
"Satellite/Geoeye1#position",
"Satellite/ISS#position"
]
}
},
Expand Down Expand Up @@ -3946,8 +3946,8 @@
},
"vertexPositions":{
"references":[
"Facility/AGI.position",
"Satellite/ISS.position"
"Facility/AGI#position",
"Satellite/ISS#position"
]
}
},
Expand All @@ -3966,8 +3966,8 @@
},
"vertexPositions":{
"references":[
"Facility/AGI.position",
"Satellite/Geoeye1/Sensor/Sensor.position"
"Facility/AGI#position",
"Satellite/Geoeye1/Sensor/Sensor#position"
]
}
}
Expand Down
9 changes: 6 additions & 3 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@ Beta Releases
### 1.0 - 2014-07-01

* Breaking changes ([why so many?](https://groups.google.com/forum/#!topic/cesium-dev/Y_mG11IZD9k))
* Renamed `Simon1994PlanetaryPositions` functions `ComputeSunPositionInEarthInertialFrame` and `ComputeMoonPositionInEarthInertialFrame` to `computeSunPositionInEarthInertialFrame` and `computeMoonPositionInEarthInertialFrame`, respectively.
* Replaced `Scene.scene2D.projection` property with read-only `Scene.mapProjection`. Set this with the `mapProjection` option for the `Viewer`, `CesiumWidget`, or `Scene` constructors.
* `Scene` constructor function now takes an `options` parameter instead of individual parameters.
* Renamed `Simon1994PlanetaryPositions` functions `ComputeSunPositionInEarthInertialFrame` and `ComputeMoonPositionInEarthInertialFrame` to `computeSunPositionInEarthInertialFrame` and `computeMoonPositionInEarthInertialFrame`, respectively.
* Replaced `Scene.scene2D.projection` property with read-only `Scene.mapProjection`. Set this with the `mapProjection` option for the `Viewer`, `CesiumWidget`, or `Scene` constructors.
* `Scene` constructor function now takes an `options` parameter instead of individual parameters.
* CZML property references now use a `#` symbol to separate identifier from property path. `objectId.position` should now be `objectId#position`.
* `DynamicObject.id` can now include period characters.
* `ReferenceProperty` can now handle sub-properties, for example, `myObject#billboard.scale`.
* Added `Cesium.VERSION` to the combined `Cesium.js` file.
* Fixed support for embedded resources in glTF models.

Expand Down
445 changes: 241 additions & 204 deletions Source/DynamicScene/CzmlDataSource.js

Large diffs are not rendered by default.

Loading