Skip to content

Commit

Permalink
Merge pull request #1774 from AnalyticalGraphicsInc/referenceProperties
Browse files Browse the repository at this point in the history
Reference properties
  • Loading branch information
shunter committed Jun 5, 2014
2 parents 38889b0 + fa40155 commit 76317d6
Show file tree
Hide file tree
Showing 7 changed files with 858 additions and 330 deletions.
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
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ Beta Releases
* 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.
* Replaced `color`, `outlineColor`, and `outlineWidth` in `DynamicPath` with a `material` property.
* 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.
* Added 'PolylineGlowMaterialProperty' which enables data sources to use the PolylineGlow material.
Expand Down
445 changes: 241 additions & 204 deletions Source/DynamicScene/CzmlDataSource.js

Large diffs are not rendered by default.

Loading

0 comments on commit 76317d6

Please sign in to comment.