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

Geometry and Appearances #911

Merged
merged 404 commits into from
Jul 11, 2013
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
404 commits
Select commit Hold shift + click to select a range
20692fa
Fix example code in CHANGES.md.
shunter May 31, 2013
1b6c8c0
Replace pseudo-private functions with file-scoped functions
andr3nun3s Jun 1, 2013
35a0b2e
Update CHANGES
mramato Jun 1, 2013
7265a1b
Replace pseudo-private functions with file-scoped functions
andr3nun3s Jun 1, 2013
8577431
Replace pseudo-private functions with file-scoped functions
andr3nun3s Jun 1, 2013
33fa66f
Replace pseudo-private functions with file-scoped functions
andr3nun3s Jun 1, 2013
bccc55c
Replace pseudo-private functions with file-scoped functions
andr3nun3s Jun 1, 2013
c74a767
Replace pseudo-private functions with file-scoped functions
andr3nun3s Jun 2, 2013
45886e5
Replace pseudo-private functions with file-scoped functions
andr3nun3s Jun 2, 2013
a867bda
Merge branch 'batching' into wallGeometry
bagnell Jun 3, 2013
808bf36
Updates after review.
bagnell Jun 3, 2013
2253893
Update wall Sandcastle example and add temporary wall to CesiumViewer…
bagnell Jun 3, 2013
ff24457
Added EllipsoidSurface appearance
pjcozzi Jun 3, 2013
93d4e39
Merge branch 'batching' into polygonGeometry
bagnell Jun 3, 2013
90e60c5
Merge branch 'batching' into polygonGeometry
bagnell Jun 3, 2013
fc74841
Fixed tests
pjcozzi Jun 3, 2013
7aca322
Fixes after merge.
bagnell Jun 3, 2013
810d0b0
Merge branch 'batching' into polygonGeometry
bagnell Jun 3, 2013
351ab54
More clean up after merge.
bagnell Jun 3, 2013
6fd4fec
Created types for apparances
pjcozzi Jun 3, 2013
34cdefc
Add normal, tangent, and binormal attributes to polygon geometry.
bagnell Jun 3, 2013
a315aab
Re-order wall positions.
bagnell Jun 3, 2013
e8fe89b
Merge branch 'batching' into wallGeometry
pjcozzi Jun 3, 2013
46c2f33
Update and add tests.
bagnell Jun 3, 2013
bcf6f80
Merge branch 'batching' into polygonGeometry
bagnell Jun 3, 2013
d4dac9e
Wall fixes
pjcozzi Jun 3, 2013
cda0e3f
Removed unused parameter
pjcozzi Jun 3, 2013
ca27fc7
Merge pull request #820 from AnalyticalGraphicsInc/wallGeometry
pjcozzi Jun 3, 2013
e9c80df
Updates based on review.
bagnell Jun 3, 2013
22a8b46
Merge pull request #837 from AnalyticalGraphicsInc/polygonGeometry
pjcozzi Jun 4, 2013
71d61c8
Start of instancing
pjcozzi Jun 4, 2013
310cf0a
Finish instancing
pjcozzi Jun 4, 2013
0d9116d
Merge branch 'master' into batching
bagnell Jun 4, 2013
e7e15a3
Change indexLists to a single indexList
pjcozzi Jun 5, 2013
dc61806
Moved PrimitiveType to Geometry
pjcozzi Jun 5, 2013
da2f6cf
Add use of Geometry and GeometryAttribute to Geometry Filter tets
pjcozzi Jun 5, 2013
b1405b5
Removed GeometryIndices.js
pjcozzi Jun 5, 2013
6c83bbb
Merge remote-tracking branch 'origin/master' into batching
pjcozzi Jun 6, 2013
ccf1c6a
Renamed meshes to geometries
pjcozzi Jun 6, 2013
4a8625b
Start of renaming Mesh to Geometry
pjcozzi Jun 6, 2013
4ad864c
Renamed mesh to geometry
pjcozzi Jun 6, 2013
77d9e2e
More mesh renames
pjcozzi Jun 6, 2013
8d1fb53
Attempt to cleanup cloning geometry
pjcozzi Jun 6, 2013
91d319d
Merge remote-tracking branch 'origin/master' into batching
pjcozzi Jun 7, 2013
256c70d
Renamed GeometryFilters file to GeometryPipeline
pjcozzi Jun 7, 2013
cd91b97
Renamed GeometryFilter to GeometryPipeline
pjcozzi Jun 7, 2013
c7185e1
Renamed cleanUp to removeDuplicates
pjcozzi Jun 7, 2013
e72a2c5
Added tests for removeDuplicates
pjcozzi Jun 7, 2013
86ce69c
Added doc for removeDuplicates
pjcozzi Jun 7, 2013
5424394
Merge branch 'master' into batching
bagnell Jun 10, 2013
980018e
Merge remote-tracking branch 'origin/master' into batching
pjcozzi Jun 11, 2013
bad38b7
Another GeometryPipeline rename
pjcozzi Jun 11, 2013
e6397d5
GeometryPipeline improvements
pjcozzi Jun 11, 2013
d5d62ba
More GeometryPipeline improvements
pjcozzi Jun 11, 2013
466ab78
Start modifying geometry to use typed arrays.
bagnell Jun 11, 2013
18e90f1
Merge branch 'batching' into typedArrays
bagnell Jun 11, 2013
f01ed69
Use more typed arrays and fix tests.
bagnell Jun 11, 2013
4c34417
Add more typed arrays and fix tests.
bagnell Jun 12, 2013
6c4c8ca
Merge remote-tracking branch 'origin/master' into batching
pjcozzi Jun 12, 2013
dad356f
More doc including semantics for geometry attributes / vertex format
pjcozzi Jun 12, 2013
46d3120
Made combine work without indices
pjcozzi Jun 12, 2013
ea1fded
More doc
pjcozzi Jun 12, 2013
f000825
Fix test
pjcozzi Jun 12, 2013
672d738
Merge branch 'master' into typedArrays
bagnell Jun 12, 2013
3973f83
Merge branch 'batching' into typedArrays
bagnell Jun 12, 2013
14ee0ce
Fix test after merge.
bagnell Jun 12, 2013
393b6f4
Fix formating after merge.
bagnell Jun 12, 2013
77bf194
Fixed JSHint warning
pjcozzi Jun 13, 2013
37135d2
Geometry.clone - less is more
pjcozzi Jun 13, 2013
24ffc54
More Geometry doc
pjcozzi Jun 13, 2013
2103051
Added doc for Primitive
pjcozzi Jun 13, 2013
632dd01
Rename PerGeometry to PerInstance
pjcozzi Jun 13, 2013
f4d097d
File rename PerGeometry to PerInstance
pjcozzi Jun 13, 2013
5c58b4e
Updated CHANGES.md
pjcozzi Jun 13, 2013
bf736a5
Fix some TODOs in tests
pjcozzi Jun 13, 2013
ebe0774
A bit more doc
pjcozzi Jun 13, 2013
218fb64
Merge branch 'batching' into typedArrays
bagnell Jun 13, 2013
0e7303f
Create short or int array for indices depending on the number of vert…
bagnell Jun 13, 2013
2653a89
Add new double component datatype and modify primitives to use it.
bagnell Jun 14, 2013
cbe8642
Decrease number of partitions when computing ellipsoid for tangent/bi…
bagnell Jun 14, 2013
c92b0c2
Start adding support for 2D and columbus view.
bagnell Jun 14, 2013
e7d0236
Cleanup typed array allocation
pjcozzi Jun 14, 2013
b032c55
Various FLOAT/DOUBLE fixes
pjcozzi Jun 14, 2013
466c08c
Merge pull request #858 from AnalyticalGraphicsInc/typedArrays
pjcozzi Jun 14, 2013
3db7914
Renamed indexList to indices
pjcozzi Jun 14, 2013
313e939
More doc
pjcozzi Jun 14, 2013
7acb718
Merge master to batching
pjcozzi Jun 14, 2013
af9cbd9
Merge branch 'batching' into columbusView
bagnell Jun 14, 2013
26b192e
Merge branch 'master' into batching
bagnell Jun 14, 2013
ee8e960
Merge branch 'batching' into columbusView
bagnell Jun 14, 2013
6c04ada
Merge remote-tracking branch 'origin/master' into batching
pjcozzi Jun 17, 2013
20322b4
More doc
pjcozzi Jun 17, 2013
9085858
Merge branch 'batching' into columbusView
bagnell Jun 17, 2013
330ab40
Ability to change appearance and material
pjcozzi Jun 18, 2013
a07ce2e
Fixed JSHint warning
pjcozzi Jun 18, 2013
eab951e
Merge master to batching
pjcozzi Jun 18, 2013
cadcca8
Merge branch 'batching' into columbusView
bagnell Jun 18, 2013
c94b21f
Fixed ShaderCache false positive bug
pjcozzi Jun 18, 2013
ce7a74c
Remove no-pick optimization
pjcozzi Jun 18, 2013
6ed0fb5
Force transform to world coordinates if 2D positions are to be computed.
bagnell Jun 18, 2013
81cc9c1
Merge master to batching
pjcozzi Jun 19, 2013
02f982f
Procedurally add pick code to appearance vertex shaders
pjcozzi Jun 19, 2013
fa76ed4
Rename positionLow/positionHigh to position3DLow/position3DHigh
pjcozzi Jun 19, 2013
9b7302b
Use semantics when assigning attribute locations
pjcozzi Jun 19, 2013
727a991
Fix SkyBox
pjcozzi Jun 19, 2013
0fae539
Fixed Wall Sandcastle example
pjcozzi Jun 19, 2013
279fd95
Removed commented-out code
pjcozzi Jun 19, 2013
ef83350
Starting to flush out appearances
pjcozzi Jun 19, 2013
ddb9715
More appearances
pjcozzi Jun 19, 2013
844ad08
Add allowColumbusView property to Primitive. Clips indexed triangles …
bagnell Jun 19, 2013
fb26ef4
Merge branch 'batching' into columbusView
bagnell Jun 19, 2013
7ea3de7
Clip un-indexed triangles intersecting the IDL.
bagnell Jun 19, 2013
4bcfd81
Add columbus view support for triangle strips and fans.
bagnell Jun 20, 2013
09e5bc1
Fix geometry clone to set bounding sphere if result parameter is unde…
bagnell Jun 20, 2013
1b829cc
Update appearance shaders.
bagnell Jun 20, 2013
ad5a5c7
Merge remote-tracking branch 'origin/master' into batching
pjcozzi Jun 20, 2013
dd43925
Improved per-instance color appearance
pjcozzi Jun 20, 2013
46f22a7
Cleaned up per-instance flat color
pjcozzi Jun 20, 2013
cea4944
Merge flat color and color appearances
pjcozzi Jun 20, 2013
4e46dc3
Added flat shading option
pjcozzi Jun 20, 2013
23714e2
Appearance cleanup
pjcozzi Jun 20, 2013
087f00c
Added SimplePolylineGeometry.js
pjcozzi Jun 20, 2013
866f1ec
Added ExtentPrimitive
pjcozzi Jun 20, 2013
35ebe19
Changed Polygon to use PolygonGeometry. This breaks some tests until…
pjcozzi Jun 20, 2013
643d940
Added faceForward
pjcozzi Jun 20, 2013
2eb2e71
Merge branch 'batching' into columbusView
bagnell Jun 20, 2013
c18237b
Modify polygon geometry to use typed array for its indices.
bagnell Jun 20, 2013
1e43148
Merge branch 'batching' into columbusView
bagnell Jun 20, 2013
498f592
Remove PolygonPipeline.wrapLongitude. This step is now performed in t…
bagnell Jun 20, 2013
cfe8450
Fix a few Polygon tests
pjcozzi Jun 21, 2013
005b904
Fix clone crash
pjcozzi Jun 21, 2013
8add64c
Added Extent.fromDegrees
pjcozzi Jun 21, 2013
1c46b1f
Minor doc fixes
pjcozzi Jun 21, 2013
0ef9edd
Add columbus view support for lines, line strips and line loops.
bagnell Jun 21, 2013
fdfd79c
Merge branch 'batching' into columbusView
bagnell Jun 21, 2013
f843f19
Fix IDL clipping when the points were on the IDL. Revert/Update the t…
bagnell Jun 21, 2013
e971a3b
Merge master to batching
pjcozzi Jun 24, 2013
876718c
Added DebugAppearance
pjcozzi Jun 24, 2013
a06ca6c
Renamed Appearance to MaterialAppearance
pjcozzi Jun 24, 2013
3b76131
Added streamlined base Appearance
pjcozzi Jun 24, 2013
8214fdb
Procedurally alter vertex shader for columbus view.
bagnell Jun 24, 2013
6031340
Check scene mode and columbus view support before updating.
bagnell Jun 24, 2013
c46e1cb
Merge branch 'batching' into columbusView
bagnell Jun 24, 2013
4ab52ec
Move barycentricCoordinates function to its own file. Modify pointInT…
bagnell Jun 24, 2013
85050ee
Add tests for indexing lines.
bagnell Jun 24, 2013
d4c7699
Add test for computing all attributes when splitting triangles across…
bagnell Jun 24, 2013
f6af1df
Add more tests for splitting lines across the IDL.
bagnell Jun 24, 2013
fdf9fd9
Rename file pointInsideTriangle2D.js -> pointInsideTriangle.js
bagnell Jun 24, 2013
ede6e0f
Rename function pointInsideTriangle2D -> pointInsideTriangle
bagnell Jun 24, 2013
3d5a953
Add tests for barycentric coordinates.
bagnell Jun 24, 2013
0cd6f3a
Add bounding sphere for 2D and columbus view.
bagnell Jun 24, 2013
0dfd3f3
Procedurally generate function to compute position based on columbus …
bagnell Jun 25, 2013
eb581c4
Merge remote-tracking branch 'origin/master' into batching
pjcozzi Jun 25, 2013
89d3007
Merge remote-tracking branch 'origin/master' into columbusView
pjcozzi Jun 25, 2013
f2aea0a
Minor DebugAppearance improvements
pjcozzi Jun 25, 2013
03d5186
Merge branch 'batching' into columbusView
bagnell Jun 25, 2013
3d1b531
Rename pickData -> id.
bagnell Jun 25, 2013
af5b309
Start adding per-instance attributes.
bagnell Jun 25, 2013
2a77d63
Changes based on review.
bagnell Jun 25, 2013
204ee3c
Compute 2D bounding sphere from 8 corner points of cube containing th…
bagnell Jun 26, 2013
e75cff8
Only render depth in Columbus view when terrain is rendered.
bagnell Jun 26, 2013
e555153
Remove unneeded tests.
bagnell Jun 26, 2013
e7f5052
Merge branch 'columbusView' into perInstanceAttributes
bagnell Jun 26, 2013
dbd4a8d
Updates based on review.
bagnell Jun 26, 2013
119b5e3
Update GeometryPipeline tests.
bagnell Jun 26, 2013
0a3b31e
Fix Polygon.configureFromPolygonHierarchy and Polygon tests.
bagnell Jun 26, 2013
1764649
Merge branch 'columbusView' into perInstanceAttributes
bagnell Jun 26, 2013
3d17fd4
Fix more Polygon tests.
bagnell Jun 26, 2013
0f3063b
Merge branch 'columbusView' into perInstanceAttributes
bagnell Jun 26, 2013
198f782
Some reference doc
pjcozzi Jun 26, 2013
4cce108
Merge pull request #895 from AnalyticalGraphicsInc/columbusView
pjcozzi Jun 26, 2013
e374b76
Merge branch 'batching' into perInstanceAttributes
bagnell Jun 26, 2013
cdfda2d
More reference doc
pjcozzi Jun 26, 2013
07bdf4d
Add per-instance attributes to VAOs.
bagnell Jun 26, 2013
5e36ff9
Most of appearance doc
pjcozzi Jun 27, 2013
0888539
More appearance reference doc
pjcozzi Jun 27, 2013
cff3e1c
Finish appearance reference doc
pjcozzi Jun 27, 2013
31eea4c
Start complete re-write of per-instance attributes.
bagnell Jun 27, 2013
8d34314
Added debug for vectors
pjcozzi Jun 27, 2013
18d5943
Merge remote-tracking branch 'origin/master' into batching
pjcozzi Jun 27, 2013
21dd70f
Interleave geometry attributes as part of the geometry pipeline. Remo…
bagnell Jun 27, 2013
10f980a
Add option to specify which attributes to interleave and made Primiti…
bagnell Jun 27, 2013
b973b9b
Start of geometry Sandcastle example
pjcozzi Jun 27, 2013
ce3b635
Merge branch 'batching' into perInstanceAttributes
bagnell Jun 27, 2013
e240194
Fix after merge.
bagnell Jun 27, 2013
83f5834
Compute each geometry's vertex buffers and offset/count in the buffer…
bagnell Jun 28, 2013
4c67b89
Fix writing to vertex buffer by computing offset in bytes.
bagnell Jun 28, 2013
cca4d9e
Modify vertex shader source if show attribute is available. Move prop…
bagnell Jun 28, 2013
0bed54f
Merge remote-tracking branch 'origin/master' into batching
pjcozzi Jun 28, 2013
1e7b5c3
Fix JSHint warnings
pjcozzi Jun 28, 2013
8d1607d
Fix JSHint warning
pjcozzi Jun 28, 2013
cbab302
Update Sandcastle example to use per-instance attributes
pjcozzi Jun 28, 2013
8043431
Minor doc updates
pjcozzi Jun 28, 2013
8010f93
More reference doc
pjcozzi Jun 28, 2013
ccfdff9
Finish Sandcastle example
pjcozzi Jun 28, 2013
e55e359
Polygon doc
pjcozzi Jun 28, 2013
80ce843
Merge branch 'batching' into perInstanceAttributes
bagnell Jun 28, 2013
19020eb
Revert changes to GeometryPipeline, Context, and VertexLayout. Add op…
bagnell Jun 28, 2013
ad3c141
Updates to ColorGeometryInstanceAttribute based on review.
bagnell Jun 28, 2013
2df4507
Fixed Geometry Sandcastle example
pjcozzi Jun 28, 2013
2c4a2bc
duplicate corner positions and correct wall geometry normals/tangents…
Jun 28, 2013
a19c2a4
Update Primitive based on review.
bagnell Jun 28, 2013
36b0581
Merge branch 'batching' into perInstanceAttributes
bagnell Jun 28, 2013
586cef9
Add error checking and change GeometryInstanceAttribute to use typed …
bagnell Jun 28, 2013
c1cdc2c
More reference doc
pjcozzi Jun 28, 2013
941bdea
Fix colors for tangent space debugging
pjcozzi Jun 28, 2013
3e7b42f
Fix Animations and Materials Sandcastle examples.
bagnell Jun 28, 2013
93e84f8
Doc improvements
pjcozzi Jun 28, 2013
8de3469
Merge pull request #905 from AnalyticalGraphicsInc/perInstanceAttributes
pjcozzi Jun 28, 2013
93137fb
Fix Picking and Polygons Sandcastle examples.
bagnell Jun 28, 2013
f85fde9
Add screenshot for Sandcastle example
pjcozzi Jun 28, 2013
034eb69
fixed test errors
Jun 28, 2013
8fa8312
Merge pull request #909 from hpinkos/wallgeo
pjcozzi Jun 28, 2013
92e55dd
Fix Custom Rendering Sandcastle example.
bagnell Jun 28, 2013
1fe6c86
Merge remote-tracking branch 'origin/master' into perInstanceAttributes
pjcozzi Jun 28, 2013
2db463c
Merge branch 'perInstanceAttributes' into batching
pjcozzi Jun 28, 2013
2bab3ce
Add tests for new BoundingSphere functions.
bagnell Jun 29, 2013
86fc005
Add tests for new Extent functions and for ColorGeometryInstanceAttri…
bagnell Jun 29, 2013
2706975
Merge branch 'master' into batching
mramato Jun 29, 2013
bfcb71a
Merge branch 'master' into batching
bagnell Jul 1, 2013
9007ca1
Fix CHANGES.md
pjcozzi Jul 1, 2013
f06712b
Add Geometry* tests.
bagnell Jul 1, 2013
4434e06
Merge branch 'master' into batching
bagnell Jul 1, 2013
9b732f1
Add more tests.
bagnell Jul 2, 2013
53969f8
Add appearance rendering tests.
bagnell Jul 2, 2013
2e113be
Add Primitive and createTangentSpaceDebugPrimitive tests.
bagnell Jul 3, 2013
62e4ffa
Add render tests for Primitive in 2D and Columbus view.
bagnell Jul 3, 2013
9258f92
Add rendering tests for box, circle, and ellipse geometry. Fix ellips…
bagnell Jul 3, 2013
565b64c
Add ellipsoid, extent, and polygon rendering tests. Fix polygon bound…
bagnell Jul 3, 2013
570d60a
Add wall geometry rendering test.
bagnell Jul 8, 2013
aedc2c4
Add simple polyline geometry rendering tests.
bagnell Jul 8, 2013
b245594
Add custom primitive rendering tests.
bagnell Jul 8, 2013
cc984e2
Revert changes to CesiumViewe.
bagnell Jul 8, 2013
0030cb7
Updates based on review.
bagnell Jul 9, 2013
4235b4a
More updates based on review.
bagnell Jul 9, 2013
ba7a1d3
More updates after review.
bagnell Jul 9, 2013
8a5a62a
More updates based on review.
bagnell Jul 9, 2013
36b3cee
Merge branch 'master' into batching
bagnell Jul 9, 2013
20ec9b6
Update Sandcastle example.
bagnell Jul 9, 2013
fd92e7f
Remove conflicting options from PolygonGeometry. Make PolygonGeometry…
bagnell Jul 10, 2013
af31eea
Merge branch 'master' into batching
bagnell Jul 10, 2013
2ae97f8
Update pointInsideTriangle doc and more updates based on review.
bagnell Jul 10, 2013
950a6bd
Fix texture coordinates for ellipses/circles.
bagnell Jul 10, 2013
fa661fe
More updates based on review.
bagnell Jul 10, 2013
0cb46af
Merge branch 'master' into batching
bagnell Jul 10, 2013
3d8fe82
More changes based on review.
bagnell Jul 10, 2013
bfbb8cc
Fix faceforward for apearances with materials.
bagnell Jul 10, 2013
4d47639
Update doc.
bagnell Jul 10, 2013
0d3eb09
Fix per-instance attributes by using any object for the id (not just …
bagnell Jul 11, 2013
c630ff3
Merge remote-tracking branch 'origin/master' into batching
mramato Jul 11, 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
51 changes: 17 additions & 34 deletions Apps/Sandcastle/gallery/Animations.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
{
"use strict";

var polygon;
var extent;
var rectangularSensor;

function addAlphaAnimation(primitive, scene) {
Expand All @@ -49,37 +49,30 @@
});
}

function addHeightAnimation(primitive, scene) {
Sandcastle.declare(addHeightAnimation); // For highlighting in Sandcastle.
scene.getAnimations().addProperty(primitive, 'height', 5000000.0, 0.0, {
duration : 1000
});
}

function addStripeAnimation(primitive, scene) {
Sandcastle.declare(addStripeAnimation); // For highlighting in Sandcastle.
scene.getAnimations().addOffsetIncrement(primitive.material);
}

function resetPolygonPropeties(polygon) {
polygon.height = 0.0;
polygon.material.uniforms.time = 1.0;
polygon.material.uniforms.color = new Cesium.Color(1.0, 0.0, 0.0, 0.5);
function resetExtentPropeties(extent) {
extent.material.uniforms.time = 1.0;
extent.material.uniforms.color = new Cesium.Color(1.0, 0.0, 0.0, 0.5);
}

function createPrimitives(widget) {
var ellipsoid = widget.centralBody.getEllipsoid();
var scene = widget.scene;
var primitives = scene.getPrimitives();

polygon = new Cesium.Polygon();
polygon.configureExtent(new Cesium.Extent(
Cesium.Math.toRadians(-120.0),
Cesium.Math.toRadians(20.0),
Cesium.Math.toRadians(-80.0),
Cesium.Math.toRadians(50.0)));
polygon.material = Cesium.Material.fromType(scene.getContext(), 'Erosion');
primitives.add(polygon);
extent = new Cesium.ExtentPrimitive({
extent : new Cesium.Extent(
Cesium.Math.toRadians(-120.0),
Cesium.Math.toRadians(20.0),
Cesium.Math.toRadians(-80.0),
Cesium.Math.toRadians(50.0)),
material : Cesium.Material.fromType(scene.getContext(), 'Erosion')
});
primitives.add(extent);

var modelMatrix = Cesium.Transforms.northEastDownToFixedFrame(
ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-45.0, 45.0)));
Expand All @@ -105,8 +98,8 @@
label : 'Alpha Animation',
onClick : function() {
scene.getAnimations().removeAll();
resetPolygonPropeties(polygon);
addAlphaAnimation(polygon, scene);
resetExtentPropeties(extent);
addAlphaAnimation(extent, scene);
Sandcastle.highlight(addAlphaAnimation);
}
}).placeAt('toolbar');
Expand All @@ -115,22 +108,12 @@
label : 'Erosion Animation',
onClick : function() {
scene.getAnimations().removeAll();
resetPolygonPropeties(polygon);
addErosionAnimation(polygon, scene);
resetExtentPropeties(extent);
addErosionAnimation(extent, scene);
Sandcastle.highlight(addErosionAnimation);
}
}).placeAt('toolbar');

new Button({
label : 'Height Animation',
onClick : function() {
scene.getAnimations().removeAll();
resetPolygonPropeties(polygon);
addHeightAnimation(polygon, scene);
Sandcastle.highlight(addHeightAnimation);
}
}).placeAt('toolbar');

new Button({
label : 'Stripe Animation',
onClick : function() {
Expand Down
Loading