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

DynamicScene ES5 properties #1132

Merged
merged 47 commits into from
Sep 20, 2013
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
9ea51f6
Begin EcmaScript 5 refactoring for DynamicScene
mramato Aug 28, 2013
329cb67
Merge branch 'dynamicScene-properties' into dynamicScene-es5-properties
mramato Aug 29, 2013
5bcdfec
Merge branch 'dynamicScene-properties' into dynamicScene-es5-properties
mramato Aug 29, 2013
caf93ba
Start refactoring CompositeDynamicObjectCollection
mramato Aug 29, 2013
268884e
Merge branch 'dynamicScene-properties' into dynamicScene-es5-properties
mramato Aug 29, 2013
686de88
Ongoing refactoring.
mramato Aug 29, 2013
ccec0eb
Ongoing CompositeDynamicObjectCollection refactor.
mramato Aug 30, 2013
4dc7cd7
Merge branch 'master' into dynamicScene-es5-properties
mramato Aug 30, 2013
4becf30
Merge remote-tracking branch 'origin/issue1094' into dynamicScene-es5…
mramato Aug 30, 2013
f5da874
Merge branch 'master' into dynamicScene-es5-properties
mramato Sep 1, 2013
d644f21
Merge branch 'master' into dynamicScene-es5-properties
mramato Sep 3, 2013
4018d2c
Merge branch 'master' into dynamicScene-es5-properties
mramato Sep 3, 2013
b7402dc
Ongoing CompositeDynamicObjectCollection work.
mramato Sep 4, 2013
0fbac7b
Ongoing CompositeDynamicObjectCollection work.
mramato Sep 4, 2013
e457970
Get all existing CompositeDynamicObjectCollection specs passing.
mramato Sep 4, 2013
e4ee8e1
Start adding ES5 properties to remaining dynamic objects.
mramato Sep 5, 2013
99eb203
Finish refactoring merge for all dynamic objects.
mramato Sep 5, 2013
9a71152
Ongoing property work.
mramato Sep 5, 2013
6cd9fe0
Rename function to match module.
mramato Sep 5, 2013
09a65e0
Merge branch 'master' into dynamicScene-es5-properties
mramato Sep 6, 2013
317700a
Switch most remaining objects over to ES5 properties.
mramato Sep 6, 2013
1650059
Make all visualizers use private properties of DynamicObjects until t…
mramato Sep 6, 2013
e0240c9
Start of CompositeDynamicObjectCollection specs.
mramato Sep 6, 2013
1635f06
Various fixes to CompositeDynamicObjectCollection.
mramato Sep 6, 2013
3219e09
Ongoing CompositeDynamicObjectCollection work.
mramato Sep 9, 2013
53e2976
Add tests for new clone functions
mramato Sep 9, 2013
68bf78c
More specs
mramato Sep 9, 2013
5d62be6
Minor code cleanup.
mramato Sep 9, 2013
1c45250
Bring test coverage up on CompositeDynamicObjectCollection.
mramato Sep 10, 2013
fd81c22
Rename `propertyAssigned` to `propertyChanged`
mramato Sep 10, 2013
6d542dd
A bunch of doc cleanup.
mramato Sep 10, 2013
73c1077
Merge branch 'master' into dynamicScene-es5-properties
mramato Sep 10, 2013
44f6015
Merge branch 'master' into dynamicScene-es5-properties
mramato Sep 13, 2013
0b3161a
Merge branch 'master' into dynamicScene-es5-properties
mramato Sep 15, 2013
b279f48
Merge branch 'master' into dynamicScene-es5-properties
mramato Sep 18, 2013
dea1288
Rename `createObservableProperty` to `createDynamicPropertyDescriptor`
mramato Sep 18, 2013
f4dcdc6
Some changes after review.
mramato Sep 18, 2013
a810fae
Merge remote-tracking branch 'origin/master' into dynamicScene-es5-pr…
mramato Sep 19, 2013
d0f394a
Allow DynamicObject instances to be in multiple CompositeDynamicObjec…
mramato Sep 19, 2013
089e14b
Flesh out specs for DynamicObject
mramato Sep 19, 2013
94c923c
Merge branch 'master' into dynamicScene-es5-properties
mramato Sep 19, 2013
5da5d48
Add test showing a problem when object id collides with property names.
shunter Sep 20, 2013
4c84034
Fix unique key generation to actually be unique.
mramato Sep 20, 2013
1af737c
Merge branch 'master' into dynamicScene-es5-properties
mramato Sep 20, 2013
028626d
Use a scratch variable to relieve memory pressure.
mramato Sep 20, 2013
e1aa2fa
Fix merge conflict in CHANGES.
shunter Sep 20, 2013
85d55c3
Trim trailing whitespace.
shunter Sep 20, 2013
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
2 changes: 1 addition & 1 deletion Apps/CesiumViewer/CesiumViewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ define([
viewer.dataSources.add(source);

if (defined(endUserOptions.lookAt)) {
var dynamicObject = source.getDynamicObjectCollection().getObject(endUserOptions.lookAt);
var dynamicObject = source.getDynamicObjectCollection().getById(endUserOptions.lookAt);
if (defined(dynamicObject)) {
viewer.trackedObject = dynamicObject;
} else {
Expand Down
10 changes: 8 additions & 2 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ if (defined(p) && defined(p.primitive)) {
* Renamed `TextureWrap.CLAMP` to `TextureWrap.CLAMP_TO_EDGE`.
* Removed `getViewMatrix`, `getInverseViewMatrix`, `getInverseTransform`, `getPositionWC`, `getDirectionWC`, `getUpWC` and `getRightWC` from `Camera`. Instead, use the `viewMatrix`, `inverseViewMatrix`, `inverseTransform`, `positionWC`, `directionWC`, `upWC`, and `rightWC` properties.
* Removed `getProjectionMatrix` and `getInfiniteProjectionMatrix` from `PerspectiveFrustum`, `PerspectiveOffCenterFrustum` and `OrthographicFrustum`. Instead, use the `projectionMatrix` and `infiniteProjectionMatrix` properties.
* `DynamicObjectCollection` and `CompositeDynamicObjectCollection` have been largely re-written, see the documentation for complete details. Highlights include:
* `getObject` has been renamed `getById`
* `removeObject` has been renamed `removeById`
* `collectionChanged` event added for notification of objects being added or removed.
* `DynamicScene` graphics object (`DynamicBillboard`, etc...) have had their static `mergeProperties` and `clean` functions removed.
* Added `CorridorOutlineGeometry`.
* Added `PolylineGeometry`, `PolylineColorAppearance`, and `PolylineMaterialAppearance`.
* Added `colors` option to `SimplePolylineGeometry` for per vertex or per segment colors.
Expand All @@ -35,8 +40,9 @@ if (defined(p) && defined(p.primitive)) {
* Made sun size accurate.
* Added `Scene.sunBloom` to enable/disable the bloom filter on the sun. The bloom filter should be disabled for better frame rates on mobile devices.
* Fix geometries not closing completely. [#1093](https://github.com/AnalyticalGraphicsInc/cesium/issues/1093)
* Improved graphics performance. For example, an Everest terrain view went from 135-140 to over 150 frames per second.

* Improved graphics performance. For example, an Everest terrain view went from 135-140 to over 150 frames per second.* Added `propertyChanged` event to `DynamicScene` graphics objects for receiving change notifications.
* Added prototype `clone` and `merge` functions to `DynamicScene` graphics objects .

### b20 - 2013-09-03

_This releases fixes 2D and other issues with Chrome 29.0.1547.57 ([#1002](https://github.com/AnalyticalGraphicsInc/cesium/issues/1002) and [#1047](https://github.com/AnalyticalGraphicsInc/cesium/issues/1047))._
Expand Down
Loading