root
/
cesium
mirror of https://github.com/CesiumGS/cesium.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
42,830 Commits 405 Branches 210 Tags 944 MiB
Commit Graph

6665 Commits

Author SHA1 Message Date
Matthew Amato 9f59674531 Update CHANGES 2012-08-22 15:39:29 -04:00
Patrick Cozzi f9b3628d92 Merge master into depth 2012-08-22 15:15:30 -04:00
Scott Hunter e07e08e9c8 Merge branch 'master' into imagery_layers 2012-08-22 14:47:24 -04:00
Scott Hunter c20281c2b9 Merge branch 'master' into writeTextToCanvas 
Conflicts:
	CHANGES.md
 2012-08-22 13:16:21 -04:00
Dan Bagnell a3c2d245a7 Update CHANGES.md. 2012-08-21 19:10:28 -04:00
Patrick Cozzi 899c5ec00e Updated CHANGES.md 2012-08-21 18:35:53 -04:00
Scott Hunter b2e2d04994 Disallow undefined in Label setters. 2012-08-21 16:28:25 -04:00
Scott Hunter dcdd6c6a8e Fix Label.computeScreenSpacePosition. 
No longer depends on the "actual position of the first billboard.  Now computes an "actual position" for the label itself instead.
 2012-08-21 15:49:14 -04:00
Patrick Cozzi 34195baad6 Tweaked CHANGES.md. 2012-08-16 16:05:05 -03:00
Matthew Amato 816744364b Update CHANGES 2012-08-16 14:26:26 -04:00
Scott Hunter 4920d6ae17 Merge branch 'master' into imagery_layers 2012-08-15 17:57:15 -04:00
Scott Hunter 84c9fb92f1 Merge remote-tracking branch 'origin/master' into writeTextToCanvas 
Conflicts:
	CHANGES.md
 2012-08-15 17:04:54 -04:00
Scott Hunter 8df4273f8e Add writeTextToCanvas to CHANGES.md. 2012-08-15 17:02:57 -04:00
Patrick Cozzi 6b6ffbade1 Tweaked CHANGES.md. 2012-08-15 17:30:01 -03:00
Scott Hunter e882c777ff Merge remote-tracking branch 'origin/master' into imagery_layers 
Conflicts:
	Source/Scene/CentralBody.js
 2012-08-15 12:08:20 -04:00
kristiancalhoun caf1ec33b7 Updated CHANGES.md 2012-08-15 11:13:59 -04:00
Ian Lilley 8018c57f88 fixed conic sensor and did name change from id to type 2012-08-14 14:52:49 -04:00
Ian Lilley b76f923ebb Very small changes 2012-08-13 19:18:08 -04:00
Ian Lilley d5857a5e36 Fixed merge conflict 2012-08-13 12:02:49 -04:00
Scott Hunter 82e82cedac Merge branch 'master' into imagery_layers 2012-08-13 10:44:03 -04:00
Matthew Amato a65841ef11 Update CHANGES, don't initialize scratch variables until they are used. 2012-08-08 13:30:17 -04:00
Scott Hunter c02b4044ae Merge remote-tracking branch 'origin/master' into imagery_layers 
Conflicts:
	Examples/Skeleton/Skeleton.js
	Source/Scene/CentralBody.js
	Source/Widgets/Dojo/CesiumWidget.js
 2012-08-03 15:07:35 -04:00
Ian Lilley d4f21670c5 Moved material stuff to b8 in CHANGES.md 2012-08-02 16:57:44 -04:00
Ian Lilley 9f35cf38bd Merge branch 'master' into visualquality 2012-08-02 16:55:48 -04:00
Ian Lilley 43c5269188 fixed merge conflict 2012-08-02 13:45:23 -04:00
Dan Bagnell 3d20fb7b52 Add template to CHANGES.md for next version. 2012-08-01 20:05:45 -04:00
Dan Bagnell 318dc80a86 Update CHANGES.md and build.xml for b7 release. 2012-08-01 19:42:22 -04:00
Patrick Cozzi 3c92e0b307 Merge pull request #79 from AnalyticalGraphicsInc/polylineCollection 
Polyline collection
 2012-08-01 10:08:13 -07:00
Matthew Ford 09e968122b changes based on code review. 2012-08-01 11:37:04 -04:00
Matthew Ford 256a53bebf merge from master. 2012-08-01 08:55:17 -04:00
Ed Mackey cf745da510 Rename 'Widgets/DojoWidgets' to 'Widgets/Dojo'. 2012-07-31 21:58:33 -04:00
Ed Mackey 391a7ed4c0 Merge remote-tracking branch 'origin/master' into viewer-widget 2012-07-31 21:45:06 -04:00
Scott Hunter 846c29db2a Merge remote-tracking branch 'origin/master' into imagery_layers 
Conflicts:
	Source/Scene/CentralBody.js
 2012-07-31 13:24:50 -04:00
Ian Lilley 675fa8c1a5 Merge branch 'master' into visualquality 2012-07-30 19:14:50 -04:00
Ian Lilley 4930c00da2 Changed ID to Id, added some specs for improved code coverage, and more 2012-07-30 16:06:32 -04:00
Dan Bagnell 1ff269b1c0 Update CHANGES.md. 2012-07-30 15:08:02 -04:00
Matthew Ford 1a24a635f1 update code to reflect changes in master. 2012-07-30 13:40:21 -04:00
Ed Mackey 1458dab011 Merge remote-tracking branch 'origin/master' into viewer-widget 2012-07-26 21:37:51 -04:00
Ed Mackey bee4a0eaff Renamed 'Controls' back to 'Widgets', and moved DojoWidgets to be a subfolder of Widgets. That way, we won't have two different Widgets folders at the same level. 2012-07-26 21:34:46 -04:00
Scott Hunter 9bb94b3863 Merge branch 'master' into imagery_layers 
Conflicts:
	Source/Scene/CentralBody.js
 2012-07-26 15:52:43 -04:00
Ian Lilley c02de8a2d5 Made core/combine more sophisticated and removed extendObject from Material 2012-07-26 15:49:32 -04:00
Scott Hunter 4c48259ee6 Merge pull request #129 from AnalyticalGraphicsInc/matrix4 
Finish Matrix4 implementation.
 2012-07-25 11:55:49 -07:00
Matthew Amato 2abce61db9 Fix typo. 2012-07-25 13:13:50 -04:00
Matthew Amato e845ca4c95 Update CHANGES. 2012-07-24 17:48:11 -04:00
Dan Bagnell 49927529ba Update sandbox example and add example to CHANGES.md. 2012-07-23 17:56:48 -04:00
Dan Bagnell c2dd2fc165 Update CHANGES.md. 2012-07-23 17:36:05 -04:00
Scott Hunter f001744258 Merge remote-tracking branch 'origin/master' into imagery_layers 
Conflicts:
	Source/Core/jsonp.js
	Source/Core/loadImage.js
	Source/Scene/ArcGISTileProvider.js
	Source/Scene/BingMapsTileProvider.js
	Source/ThirdParty/when.js
	Specs/ThirdParty/whenSpec.js
 2012-07-23 15:38:15 -04:00
Patrick Cozzi 75beff0845 CHANGES.md tweak. 2012-07-23 12:22:07 -04:00
Scott Hunter 4b6aff82ca Add `when` promise library and switch some APIs to use them. 
Replace Jobs.downloadImage and getImageFromUrl with promise-based loadImage.
Change jsonp to work in a promise-based way.  Fix some other random documentation
problems I noticed along the way.
 2012-07-23 12:22:06 -04:00
Ed Mackey 1d031a3635 Rename non-Dojo Cesium widgets to "Controls" to keep them separate from Cesium-provided Dojo Widgets. This will be helpful later when we wish to provide demo code that doesn't depend on Dojo, but uses the controls. 2012-07-22 17:18:26 -04:00
Patrick Cozzi 17da8fbabd CHANGES.md tweak. 2012-07-21 23:01:52 -03:00
Scott Hunter 9ded81cfb9 Add `when` promise library and switch some APIs to use them. 
Replace Jobs.downloadImage and getImageFromUrl with promise-based loadImage.
Change jsonp to work in a promise-based way.  Fix some other random documentation
problems I noticed along the way.
 2012-07-20 11:34:50 -04:00
Scott Hunter d1ecaf21ea Merge remote-tracking branch 'origin/master' into imagery_layers 
Conflicts:
	Source/Core/ExtentTessellator.js
	Source/Scene/CentralBody.js
 2012-07-18 13:24:54 -04:00
Matthew Amato 2407d9ed55 Renames for consistency 
Rather than do these renames as part of the other refactoring going on, I thought it was easier to just do it in a seperate pull so that other requests aren't so noisy.  This was a simple find/replace, no other changes were made.

1. multiplyWithMatrix -> multiply
2. All functions starting with multiplyWith now start with multiplyBy, this makes it consistent with divideBy functions.
 2012-07-18 10:24:02 -04:00
Patrick Cozzi d0acdcd925 Tweaked CHANGES.md 2012-07-17 15:26:57 -03:00
Matthew Amato 5c23741ffd Update CHANGES. 2012-07-16 15:40:55 -04:00
Scott Hunter d4df327167 Merge branch 'master' into imagery_layers 
Conflicts:
	Source/Scene/CentralBody.js
 2012-07-16 10:36:40 -04:00
Matthew Amato c5fb59118f Update CHANGES. 2012-07-13 22:21:02 -04:00
Scott Hunter 07b776924b Merge remote-tracking branch 'origin/master' into imagery_layers 
Conflicts:
	Examples/Skeleton/Skeleton.js
	Source/Scene/CentralBody.js
 2012-07-12 16:25:53 -04:00
Matthew Amato a91e1a7df4 Update CHANGES 2012-07-12 15:15:51 -04:00
Patrick Cozzi b7b76a3332 Cartesian tweaks to CHANGES.md. 2012-07-12 15:28:29 -03:00
Matthew Amato 8cbcf73ae4 Finish implementation of Cartesian2 
1. All prototype functions now have a static equivalent.
2. All functions now do proper error checking.
3. All functions no longer require Cartesian2 instances and instead will work with any object that has an x and y property.
4. All functions that produce a Cartesian2 now take an optional result parameter.
5. Code coverage for Cartesian2 is now 100%
 2012-07-12 13:59:39 -04:00
Matthew Amato 20c3d35224 Update CHANGES 2012-07-09 17:07:16 -04:00
Matthew Ford b06b179122 incorporate better logic to switch the buffer usage. 2012-07-09 16:04:58 -04:00
Patrick Cozzi e501d15a04 Merge pull request #92 from AnalyticalGraphicsInc/viewer-mouse 
New Mouse Handling
 2012-07-05 12:20:15 -07:00
Scott Hunter 465916e766 Merge branch 'master' into imagery_layers 
Conflicts:
	Source/Core/Color.js
	Source/Core/jsonp.js
	Source/Scene/ArcGISTileProvider.js
	Source/Scene/BingMapsTileProvider.js
	Source/Scene/CentralBody.js
	Source/Scene/OpenStreetMapTileProvider.js
	Source/Scene/SingleTileProvider.js
	Source/Scene/SolidColorTileProvider.js
	Source/Scene/TexturePool.js
	Source/Scene/Tile.js
 2012-07-05 12:09:01 -04:00
Patrick Cozzi 2cfb1ed6ed Fixed code reference in CHANGES.md. 2012-07-05 10:51:44 -03:00
Dan Bagnell db75bde7c5 Update doc and tests. Add error checking. Remove unused includes, variables and functions. 2012-07-03 14:29:28 -04:00
Dan Bagnell 31805194b4 Update CHANGES.md. 2012-07-02 14:01:06 -04:00
Matthew Amato 5138a0cbda Merge remote-tracking branch 'origin/master' into viewer 
Conflicts:
	CHANGES.md
 2012-06-29 13:38:02 -04:00
Dan Bagnell 1216a2700b Update CHANGES.md 2012-06-29 12:40:55 -04:00
Dan Bagnell 6d9d85d740 Some final tweaks based on review. 2012-06-29 12:20:05 -04:00
Dan Bagnell 6f868d10ef Update CHANGES.md 2012-06-28 19:51:26 -04:00
Patrick Cozzi cb3f206c34 Fixed CHANGES.md. 2012-06-27 20:36:48 -03:00
Dan Bagnell 4bd27a9562 Add tests and update doc. 2012-06-27 17:11:42 -04:00
Matthew Amato 85ac799fe6 A bunch of changes based on review. 2012-06-27 15:53:58 -04:00
Matthew Amato 8e8694dc6e Update CHANGES. 2012-06-27 12:53:26 -04:00
Dan Bagnell 6974273d9e Change pickEllipsoid to use world coordinates, make the ellipsoid parameter optional, and add doc. 2012-06-26 15:25:49 -04:00
Scott Hunter 73b388c6e0 Merge branch 'master' into imagery_layers 
Conflicts:
	Examples/Skeleton/Skeleton.js
	Source/Scene/CentralBody.js
 2012-06-25 14:08:11 -04:00
Matthew Amato 9f28a6847b Merge branch 'master' into viewer 2012-06-23 08:58:51 -04:00
Ed Mackey bd32d91663 Merge remote-tracking branch 'origin/master' into keyboard-handling 
Conflicts:
	CHANGES.md
 2012-06-22 17:23:44 -04:00
Dan Bagnell b8dd907f9e Update CHANGES.md breaking changes. 2012-06-22 17:12:30 -04:00
Patrick Cozzi 15c0c24a49 Fixed code formatting in CHANGES.md. 2012-06-22 17:02:58 -03:00
Ian Lilley b904c448f8 Made changes.md example better, got rid of satellite from several billboards demo, and fixed green pixels in specs for firefox 2012-06-22 15:31:03 -04:00
Matthew Amato 19247a1a0a Merge remote-tracking branch 'origin/master' into viewer 2012-06-20 20:12:59 -04:00
Ian Lilley 1d55b589b3 Merge branch 'master' into dynamic-texture-atlas 2012-06-20 17:05:57 -04:00
Ian Lilley 09a6187f2a Some small documentation changes 2012-06-20 17:05:27 -04:00
Scott Hunter ff97a97d4d Merge remote-tracking branch 'origin/master' into imagery_layers 2012-06-20 16:42:00 -04:00
Scott Hunter fa573e9102 Put back section for b7. 2012-06-20 16:25:44 -04:00
Scott Hunter def90bd46c Re-tag and re-release b6 as b6a with corrected zip contents. 2012-06-20 14:49:42 -04:00
Ian Lilley 1d2392a883 Moved texture atlas changes to b7 in CHANGES.md 2012-06-20 10:14:07 -04:00
Ian Lilley 1d30d2ce1d Merge branch 'master' into dynamic-texture-atlas 2012-06-20 10:13:02 -04:00
Ian Lilley c4b333cff2 Made changes to CHANGES.md 2012-06-20 10:10:53 -04:00
Patrick Cozzi b3683b05c1 Add section for b7 to CHANGES.md 2012-06-20 08:40:35 -03:00
Matthew Amato db27e17e86 Merge remote-tracking branch 'origin/master' into viewer 
Conflicts:
	CHANGES.md
 2012-06-18 16:56:30 -04:00
Dan Bagnell a8334f36e6 Update CHANGES.md for b6 release. 2012-06-18 16:41:21 -03:00
Patrick Cozzi a5c04d6c4b Fixed CHANGES.md formatting. 2012-06-18 12:45:05 -03:00
Scott Hunter 404b684d61 Rename Texture2DPool to TexturePool. 2012-06-14 10:32:50 -04:00
Matthew Amato 540f8447c9 Merge branch 'master' into viewer 
Conflicts:
	CHANGES.md
	Source/Core/Cartesian3.js
	Source/Core/Quaternion.js
	Source/Renderer/TextureAtlas.js
	Source/Scene/Polygon.js
	Specs/Core/Cartesian3Spec.js
	Specs/Core/QuaternionSpec.js
	Specs/Renderer/TextureAtlasSpec.js
	Specs/addDefaultMatchers.js
 2012-06-08 15:08:39 -04:00
Patrick Cozzi 87b9792089 Added affectedByLighting to CHANGES.md. 2012-06-07 17:08:37 -03:00
Matthew Amato 7780b81ac0 Merge remote-tracking branch 'origin/master' into viewer 
Conflicts:
	Source/Scene/Polygon.js
 2012-06-07 14:04:48 -04:00
Scott Hunter cedaed1eeb Merge remote-tracking branch 'origin/master' into scene-state 
Conflicts:
	CHANGES.md
 2012-06-06 17:18:04 -04:00
Matthew Amato d1b4d5c0df Merge remote-tracking branch 'origin/master' into viewer 
Conflicts:
	CHANGES.md
 2012-06-06 10:02:39 -04:00
Scott Hunter 749f89a023 Scene state and camera refactoring. 
SceneState is now a class with documented properties.  Added camera to SceneState, removed
camera from CentralBody constructor.  Removed the need for a separate state object in CentralBody.update.
Added morphTime to Scene and SceneState, and remove the code in SceneTransitioner that updated morphTime
in all primitives.  Added functions to Camera to get position/direction/up/right in world coordinates.
Refactored Camera.update to only recompute values that have changed based on dependent values.
 2012-06-05 15:24:30 -04:00
Patrick Cozzi 24f524f5fe Added showThroughEllipsoid to CustomSensorVolume and RectangularPyramidSensorVolume to allow sensors to draw through Earth. 2012-06-05 12:47:42 -04:00
Patrick Cozzi 248f0f30db Tweaked CHANGES.md 2012-06-01 14:54:31 -03:00
Matthew Amato cdd1f379ac Updating CHANGES. 2012-06-01 11:45:39 -04:00
Patrick Cozzi 832631693b Added CHANGES.md to configureExtent. 2012-05-31 18:04:11 -03:00
Patrick Cozzi b9f1b26b32 CHANGES.md tweaks. 2012-05-31 16:35:41 -03:00
Dan Bagnell 9330963653 Update CHANGES.md 2012-05-31 15:14:02 -04:00
Patrick Cozzi a8dcb5c6ba CHANGES.md tweak. 2012-05-23 17:29:27 -03:00
kristiancalhoun 1129a25930 Updated CHANGES file with breaking Tipsify changes. 2012-05-21 16:07:04 -04:00
Patrick Cozzi d5e45346fe Merge remote-tracking branch 'origin/master' into changes 
Conflicts:
	CHANGES
 2012-05-16 19:06:22 -04:00
Patrick Cozzi bd1c73015f Updated CHANGES.md to use markdown syntax. 2012-05-15 18:47:52 -03:00
Patrick Cozzi 5bf0f90a0c Renamed CHANGES to CHANGES.md 2012-05-15 17:00:11 -04:00