Merge remote-tracking branch 'origin/master' into bingAttribution

Conflicts: CHANGES.md Source/Scene/CentralBody.js Source/Scene/CentralBodySurface.js
rspalko · Feb 6, 2014 · 287e0f3 · 287e0f3
2 parents 378f473 + c35dcef
commit 287e0f3
Show file tree

Hide file tree

Showing 562 changed files with 76,069 additions and 103,556 deletions.
diff --git a/.project b/.project
@@ -32,7 +32,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1348681628761</id>
+			<id>1391456479002</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -41,7 +41,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1348681628764</id>
+			<id>1391456479007</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -50,14 +50,23 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1348681628769</id>
+			<id>1391456479012</id>
 			<name></name>
 			<type>6</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
 				<arguments>1.0-name-matches-false-false-Cesium-*.zip</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1391456479018</id>
+			<name></name>
+			<type>10</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-.git</arguments>
+			</matcher>
+		</filter>
 		<filter>
 			<id>1336749023862</id>
 			<name>Source</name>

diff --git a/Apps/CesiumViewer/CesiumViewer.js b/Apps/CesiumViewer/CesiumViewer.js
@@ -126,7 +126,7 @@ define([
         }
 
         if (endUserOptions.stats) {
-            scene.getPrimitives().add(new PerformanceDisplay());
+            scene.debugShowFramesPerSecond = true;
         }
 
         var theme = endUserOptions.theme;

diff --git a/Apps/CesiumViewer/Gallery/LotsOfSensors.czml b/Apps/CesiumViewer/Gallery/LotsOfSensors.czml
diff --git a/Apps/CesiumViewer/Gallery/simple.czml b/Apps/CesiumViewer/Gallery/simple.czml
diff --git a/Apps/Sandcastle/gallery/Animations.html b/Apps/Sandcastle/gallery/Animations.html
@@ -35,13 +35,6 @@
         scene.getAnimations().addAlpha(primitive.material, 0.0, 0.5);
     }
 
-    function addErosionAnimation(primitive, scene) {
-        Sandcastle.declare(addErosionAnimation); // For highlighting in Sandcastle.
-        scene.getAnimations().addProperty(primitive.material.uniforms, 'time', 0.0, 1.0, {
-            duration : 1000
-        });
-    }
-
     function addStripeAnimation(primitive, scene) {
         Sandcastle.declare(addStripeAnimation); // For highlighting in Sandcastle.
         scene.getAnimations().addOffsetIncrement(primitive.material);
@@ -63,7 +56,7 @@
                         Cesium.Math.toRadians(20.0),
                         Cesium.Math.toRadians(-80.0),
                         Cesium.Math.toRadians(50.0)),
-            material : Cesium.Material.fromType('Erosion')
+            material : Cesium.Material.fromType('Color')
         });
         primitives.add(extent);
 
@@ -99,13 +92,6 @@
         Sandcastle.highlight(addAlphaAnimation);
     });
 
-    Sandcastle.addToolbarButton('Erosion Animation', function() {
-        scene.getAnimations().removeAll();
-        resetExtentPropeties(extent);
-        addErosionAnimation(extent, scene);
-        Sandcastle.highlight(addErosionAnimation);
-    });
-
     Sandcastle.addToolbarButton('Stripe Animation', function() {
         scene.getAnimations().removeAll();
         addStripeAnimation(rectangularSensor, scene);

diff --git a/Apps/Sandcastle/gallery/Circles and Ellipses.html b/Apps/Sandcastle/gallery/Circles and Ellipses.html
@@ -55,7 +55,7 @@
                 ellipsoid,
                 ellipsoid.cartographicToCartesian(Cesium.Cartographic.fromDegrees(-90.0, 35.0)),
                 400000.0),
-            material : Cesium.Material.fromType(Cesium.Material.TyeDyeType)
+            material : Cesium.Material.fromType(Cesium.Material.GridType)
         }));
         Sandcastle.declare(circle2); // For highlighting on mouseover in Sandcastle.
 

diff --git a/Apps/Sandcastle/gallery/Ellipsoid Surface.html b/Apps/Sandcastle/gallery/Ellipsoid Surface.html
@@ -56,7 +56,7 @@
         })
     }));
 
-    // Grass Material
+    // Checkerboard Material
     primitives.add(new Cesium.Primitive({
         geometryInstances : new Cesium.GeometryInstance({
             geometry : new Cesium.ExtentGeometry({
@@ -65,11 +65,11 @@
             })
         }),
         appearance : new Cesium.EllipsoidSurfaceAppearance({
-            material : Cesium.Material.fromType('Grass')
+            material : Cesium.Material.fromType('Checkerboard')
         })
     }));
 
-    // Wood Material    
+    // Grid Material    
     primitives.add(new Cesium.Primitive({
         geometryInstances : new Cesium.GeometryInstance({
             geometry : new Cesium.ExtentGeometry({
@@ -78,7 +78,7 @@
             })
         }),
         appearance : new Cesium.EllipsoidSurfaceAppearance({
-            material : Cesium.Material.fromType('Wood')
+            material : Cesium.Material.fromType('Grid')
         })
     }));
 

diff --git a/Apps/Sandcastle/gallery/Ellipsoid Surface.jpg b/Apps/Sandcastle/gallery/Ellipsoid Surface.jpg
diff --git a/Apps/Sandcastle/gallery/Material.html b/Apps/Sandcastle/gallery/Material.html
@@ -48,7 +48,7 @@
         })
     }));
 
-    // Brick Wall
+    // Striped Wall
     scene.getPrimitives().add(new Cesium.Primitive({
         geometryInstances : new Cesium.GeometryInstance({
             geometry : new Cesium.WallGeometry({
@@ -59,7 +59,7 @@
             })
         }),
         appearance : new Cesium.MaterialAppearance({
-            material : Cesium.Material.fromType('Brick'),
+            material : Cesium.Material.fromType('Stripe'),
             faceForward : true
         })
     }));

diff --git a/Apps/Sandcastle/gallery/Material.jpg b/Apps/Sandcastle/gallery/Material.jpg
diff --git a/Apps/Sandcastle/gallery/Materials.html b/Apps/Sandcastle/gallery/Materials.html
@@ -52,21 +52,6 @@
         });
     }
 
-    function applyAsphaltMaterial(primitive, scene) {
-        Sandcastle.declare(applyAsphaltMaterial);   // For highlighting in Sandcastle.
-        primitive.material = Cesium.Material.fromType('Asphalt');
-    }
-
-    function applyBlobMaterial(primitive, scene) {
-        Sandcastle.declare(applyBlobMaterial);  // For highlighting in Sandcastle.
-        primitive.material = Cesium.Material.fromType('Blob');
-    }
-
-    function applyBrickMaterial(primitive, scene) {
-        Sandcastle.declare(applyBrickMaterial); // For highlighting in Sandcastle.
-        primitive.material = Cesium.Material.fromType('Brick');
-    }
-
     function applyBumpMapMaterial(primitive, scene) {
         Sandcastle.declare(applyBumpMapMaterial);   // For highlighting in Sandcastle.
         primitive.material = new Cesium.Material({
@@ -95,11 +80,6 @@
         });
     }
 
-    function applyCementMaterial(primitive, scene) {
-        Sandcastle.declare(applyCementMaterial);    // For highlighting in Sandcastle.
-        primitive.material = Cesium.Material.fromType('Cement');
-    }
-
     function applyCheckerboardMaterial(primitive, scene) {
         Sandcastle.declare(applyCheckerboardMaterial);  // For highlighting in Sandcastle.
         primitive.material = Cesium.Material.fromType('Checkerboard');
@@ -110,40 +90,8 @@
         primitive.material = Cesium.Material.fromType('Color');
     }
 
-    function applyCompositeMaterial1(primitive, scene) {
-        Sandcastle.declare(applyCompositeMaterial1);    // For highlighting in Sandcastle.
-        primitive.material = new Cesium.Material({
-            fabric: {
-                materials : {
-                    grass : {
-                        type : 'Grass'
-                    },
-                    asphalt : {
-                        type : 'Asphalt'
-                    },
-                    cement : {
-                        type : 'Cement'
-                    }
-                },
-                source :
-                    'czm_material czm_getMaterial(czm_materialInput materialInput) {' +
-                        'czm_material material = czm_getDefaultMaterial(materialInput);' +
-                        'float distanceFromCenter = abs(materialInput.st - vec2(0.5)).x;' +
-                        'if (distanceFromCenter > 0.3) { ' +
-                            'material.diffuse = grass.diffuse;' +
-                        '} else if (distanceFromCenter > 0.2) { ' +
-                            'material.diffuse = cement.diffuse;' +
-                        '} else {' +
-                            'material.diffuse = asphalt.diffuse;' +
-                        '}' +
-                        'return material;' +
-                    '}'
-            }
-        });
-    }
-
-    function applyCompositeMaterial2(primitive, scene) {
-        Sandcastle.declare(applyCompositeMaterial2);    // For highlighting in Sandcastle.
+    function applyCompositeMaterial(primitive, scene) {
+        Sandcastle.declare(applyCompositeMaterial);    // For highlighting in Sandcastle.
         primitive.material = new Cesium.Material({
                 fabric: {
                     uniforms : {
@@ -220,11 +168,6 @@
         });
     }
 
-    function applyFacetMaterial(primitive, scene) {
-        Sandcastle.declare(applyFacetMaterial); // For highlighting in Sandcastle.
-        primitive.material = Cesium.Material.fromType('Facet');
-    }
-
     function applyWaterMaterial(primitive, scene) {
         Sandcastle.declare(applyWaterMaterial); // For highlighting in Sandcastle.
 
@@ -290,11 +233,6 @@
         });
     }
 
-    function applyGrassMaterial(primitive, scene) {
-        Sandcastle.declare(applyGrassMaterial); // For highlighting in Sandcastle.
-        primitive.material = Cesium.Material.fromType('Grass');
-    }
-
     function applyGridMaterial(primitive, scene) {
         Sandcastle.declare(applyGridMaterial); // For highlighting in Sandcastle.
         primitive.material = Cesium.Material.fromType('Grid');
@@ -421,24 +359,6 @@
         primitive.material = Cesium.Material.fromType('Stripe');
     }
 
-    function applyTieDyeMaterial(primitive, scene) {
-        Sandcastle.declare(applyTieDyeMaterial);    // For highlighting in Sandcastle.
-        primitive.material = Cesium.Material.fromType('TieDye');
-    }
-
-    function applyWoodMaterial(primitive, scene) {
-        Sandcastle.declare(applyWoodMaterial);  // For highlighting in Sandcastle.
-        primitive.material = Cesium.Material.fromType('Wood');
-    }
-
-    function applyErosionMaterial(primitive, scene) {
-        Sandcastle.declare(applyErosionMaterial);  // For highlighting in Sandcastle.
-        primitive.material = Cesium.Material.fromType('Erosion');
-        scene.getAnimations().addProperty(primitive.material.uniforms, 'time', 0.0, 1.0, {
-            duration : 1500
-        });
-    }
-
     function applyRimLightingMaterial(primitive, scene) {
         Sandcastle.declare(applyRimLightingMaterial);  // For highlighting in Sandcastle.
         primitive.material = Cesium.Material.fromType('RimLighting');
@@ -517,34 +437,6 @@
 
         var proceduralTextureOptions = [{
             text : 'Procedural textures'
-        }, {
-            text : 'Asphalt',
-            onselect : function() {
-                toggleExtentVisibility();
-                applyAsphaltMaterial(extent, scene);
-                Sandcastle.highlight(applyAsphaltMaterial);
-            }
-        }, {
-            text : 'Blob',
-            onselect : function() {
-                toggleExtentVisibility();
-                applyBlobMaterial(extent, scene);
-                Sandcastle.highlight(applyBlobMaterial);
-            }
-        }, {
-            text : 'Brick',
-            onselect : function() {
-                toggleExtentVisibility();
-                applyBrickMaterial(extent, scene);
-                Sandcastle.highlight(applyBrickMaterial);
-            }
-        }, {
-            text : 'Cement',
-            onselect : function() {
-                toggleExtentVisibility();
-                applyCementMaterial(extent, scene);
-                Sandcastle.highlight(applyCementMaterial);
-            }
         }, {
             text : 'Checkerboard',
             onselect : function() {
@@ -559,20 +451,6 @@
                 applyDotMaterial(extent, scene);
                 Sandcastle.highlight(applyDotMaterial);
             }
-        }, {
-            text : 'Facet',
-            onselect : function() {
-                toggleExtentVisibility();
-                applyFacetMaterial(extent, scene);
-                Sandcastle.highlight(applyFacetMaterial);
-            }
-        }, {
-            text : 'Grass',
-            onselect : function() {
-                toggleExtentVisibility();
-                applyGrassMaterial(extent, scene);
-                Sandcastle.highlight(applyGrassMaterial);
-            }
         }, {
             text : 'Grid',
             onselect : function() {
@@ -587,20 +465,6 @@
                 applyStripeMaterial(extent, scene);
                 Sandcastle.highlight(applyStripeMaterial);
             }
-        }, {
-            text : 'TieDye',
-            onselect : function() {
-                toggleExtentVisibility();
-                applyTieDyeMaterial(extent, scene);
-                Sandcastle.highlight(applyTieDyeMaterial);
-            }
-        }, {
-            text : 'Wood',
-            onselect : function() {
-                toggleExtentVisibility();
-                applyWoodMaterial(extent, scene);
-                Sandcastle.highlight(applyWoodMaterial);
-            }
         }];
 
         Sandcastle.addToolbarMenu(proceduralTextureOptions, function() {
@@ -680,13 +544,6 @@
 
         var miscMaterialOptions = [{
             text : 'Misc materials'
-        }, {
-            text : 'Erosion',
-            onselect : function() {
-                toggleExtentVisibility();
-                applyErosionMaterial(extent, scene);
-                Sandcastle.highlight(applyErosionMaterial);
-            }
         }, {
             text : 'Rim Lighting',
             onselect : function() {
@@ -710,18 +567,11 @@
         var compositeMaterialOptions = [{
             text : 'Example composite materials'
         }, {
-            text : 'Composite Example 1',
-            onselect : function() {
-                toggleExtentVisibility();
-                applyCompositeMaterial1(extent, scene);
-                Sandcastle.highlight(applyCompositeMaterial1);
-            }
-        }, {
-            text : 'Composite Example 2',
+            text : 'Composite Example',
             onselect : function() {
                 toggleWorldExtentVisibility();
-                applyCompositeMaterial2(worldExtent, scene);
-                Sandcastle.highlight(applyCompositeMaterial2);
+                applyCompositeMaterial(worldExtent, scene);
+                Sandcastle.highlight(applyCompositeMaterial);
             }
         }];