Merge pull request #6592 from AnalyticalGraphicsInc/update-ground-veh…

…icle Update ground vehicle to glTF 2.0 final.
CesiumGS · May 18, 2018 · 010c2d4 · 010c2d4
2 parents 33f5225 + d5d7817
commit 010c2d4
Show file tree

Hide file tree

Showing 26 changed files with 31 additions and 1,639 deletions.
diff --git a/Apps/SampleData/models/CesiumGround/Cesium_Ground.dae b/Apps/SampleData/models/CesiumGround/Cesium_Ground.dae
diff --git a/Apps/SampleData/models/CesiumGround/Cesium_Ground.glb b/Apps/SampleData/models/CesiumGround/Cesium_Ground.glb
diff --git a/Apps/SampleData/models/CesiumGround/Cesium_Ground.gltf b/Apps/SampleData/models/CesiumGround/Cesium_Ground.gltf
diff --git a/Apps/SampleData/models/CesiumGround/images/0_Cesium_Ground-wheel.jpg b/Apps/SampleData/models/CesiumGround/images/0_Cesium_Ground-wheel.jpg
diff --git a/Apps/SampleData/models/CesiumGround/images/1_Cesium_Ground-body.jpg b/Apps/SampleData/models/CesiumGround/images/1_Cesium_Ground-body.jpg
diff --git a/Apps/SampleData/models/GroundVehicle/GroundVehicle.glb b/Apps/SampleData/models/GroundVehicle/GroundVehicle.glb
diff --git a/Apps/SampleData/models/GroundVehiclePBR/CougarBulbs_BaseColor.png b/Apps/SampleData/models/GroundVehiclePBR/CougarBulbs_BaseColor.png
diff --git a/Apps/SampleData/models/GroundVehiclePBR/CougarBulbs_Emissive.png b/Apps/SampleData/models/GroundVehiclePBR/CougarBulbs_Emissive.png
diff --git a/Apps/SampleData/models/GroundVehiclePBR/CougarBulbs_Normal.png b/Apps/SampleData/models/GroundVehiclePBR/CougarBulbs_Normal.png
diff --git a/Apps/SampleData/models/GroundVehiclePBR/CougarBulbs_OcclusionRoughnessMetallic.png b/Apps/SampleData/models/GroundVehiclePBR/CougarBulbs_OcclusionRoughnessMetallic.png
diff --git a/Apps/SampleData/models/GroundVehiclePBR/CougarOne_Normal.png b/Apps/SampleData/models/GroundVehiclePBR/CougarOne_Normal.png
diff --git a/Apps/SampleData/models/GroundVehiclePBR/CougarOne_OcclusionRoughnessMetallic.jpg b/Apps/SampleData/models/GroundVehiclePBR/CougarOne_OcclusionRoughnessMetallic.jpg
diff --git a/Apps/SampleData/models/GroundVehiclePBR/CougarOne_Rust_BaseColor.jpg b/Apps/SampleData/models/GroundVehiclePBR/CougarOne_Rust_BaseColor.jpg
diff --git a/Apps/SampleData/models/GroundVehiclePBR/CougarTwo_Normal.png b/Apps/SampleData/models/GroundVehiclePBR/CougarTwo_Normal.png
diff --git a/Apps/SampleData/models/GroundVehiclePBR/CougarTwo_OcclusionRoughnessMetallic.jpg b/Apps/SampleData/models/GroundVehiclePBR/CougarTwo_OcclusionRoughnessMetallic.jpg
diff --git a/Apps/SampleData/models/GroundVehiclePBR/CougarTwo_Rust_BaseColor.jpg b/Apps/SampleData/models/GroundVehiclePBR/CougarTwo_Rust_BaseColor.jpg
diff --git a/Apps/SampleData/models/GroundVehiclePBR/GroundVehicle.bin b/Apps/SampleData/models/GroundVehiclePBR/GroundVehicle.bin
diff --git a/Apps/SampleData/models/GroundVehiclePBR/GroundVehiclePBR.gltf b/Apps/SampleData/models/GroundVehiclePBR/GroundVehiclePBR.gltf
diff --git a/Apps/Sandcastle/gallery/3D Models Coloring.html b/Apps/Sandcastle/gallery/3D Models Coloring.html
@@ -203,22 +203,22 @@
         createModel('../../SampleData/models/CesiumAir/Cesium_Air.glb', 5000.0);
     }
 }, {
-    text : 'Ground vehicle',
+    text : 'Ground Vehicle',
     onselect : function() {
-        createModel('../../SampleData/models/CesiumGround/Cesium_Ground.glb', 0);
+        createModel('../../SampleData/models/GroundVehicle/GroundVehicle.glb', 0);
     }
 }, {
     text : 'Hot Air Balloon',
     onselect : function() {
         createModel('../../SampleData/models/CesiumBalloon/CesiumBalloon.glb', 1000.0);
     }
 }, {
-    text : 'Milk truck',
+    text : 'Milk Truck',
     onselect : function() {
         createModel('../../SampleData/models/CesiumMilkTruck/CesiumMilkTruck-kmc.glb', 0);
     }
 }, {
-    text : 'Skinned character',
+    text : 'Skinned Character',
     onselect : function() {
         createModel('../../SampleData/models/CesiumMan/Cesium_Man.glb', 0);
     }

diff --git a/Apps/Sandcastle/gallery/3D Models.html b/Apps/Sandcastle/gallery/3D Models.html
@@ -65,22 +65,22 @@
         createModel('../../SampleData/models/CesiumAir/Cesium_Air.glb', 5000.0);
     }
 }, {
-    text : 'Ground vehicle',
+    text : 'Ground Vehicle',
     onselect : function() {
-        createModel('../../SampleData/models/CesiumGround/Cesium_Ground.glb', 0);
+        createModel('../../SampleData/models/GroundVehicle/GroundVehicle.glb', 0);
     }
 }, {
     text : 'Hot Air Balloon',
     onselect : function() {
         createModel('../../SampleData/models/CesiumBalloon/CesiumBalloon.glb', 1000.0);
     }
 }, {
-    text : 'Milk truck',
+    text : 'Milk Truck',
     onselect : function() {
         createModel('../../SampleData/models/CesiumMilkTruck/CesiumMilkTruck-kmc.glb', 0);
     }
 }, {
-    text : 'Skinned character',
+    text : 'Skinned Character',
     onselect : function() {
         createModel('../../SampleData/models/CesiumMan/Cesium_Man.glb', 0);
     }

diff --git a/Apps/Sandcastle/gallery/Distance Display Conditions.html b/Apps/Sandcastle/gallery/Distance Display Conditions.html
@@ -66,7 +66,7 @@
             distanceDisplayCondition : new Cesium.DistanceDisplayCondition(250.5)
         },
         model : {
-            uri : '../../SampleData/models/CesiumGround/Cesium_Ground.glb',
+            uri : '../../SampleData/models/GroundVehicle/GroundVehicle.glb',
             distanceDisplayCondition : new Cesium.DistanceDisplayCondition(0.0, 250.5)
         }
     });

diff --git a/Apps/Sandcastle/gallery/Physically-Based Materials.html b/Apps/Sandcastle/gallery/Physically-Based Materials.html
@@ -10,10 +10,12 @@
     <script type="text/javascript" src="../Sandcastle-header.js"></script>
     <script type="text/javascript" src="../../../ThirdParty/requirejs-2.1.20/require.js"></script>
     <script type="text/javascript">
-        require.config({
-            baseUrl : '../../../Source',
-            waitSeconds : 60
-        });
+        if(typeof require === "function") {
+            require.config({
+                baseUrl : '../../../Source',
+                waitSeconds : 120
+            });
+        }
     </script>
 </head>
 <body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
@@ -51,7 +53,7 @@
 viewer.scene.globe.depthTestAgainstTerrain = true;
 
 var position = new Cesium.Cartesian3(-1371108.6511167218, -5508684.080096612, 2901825.449865087);
-var heading = Cesium.Math.toRadians(180);
+var heading = Cesium.Math.toRadians(90);
 var pitch = Cesium.Math.toRadians(2);
 var roll = Cesium.Math.toRadians(-6);
 var hpr = new Cesium.HeadingPitchRoll(heading, pitch, roll);
@@ -62,11 +64,12 @@
     position : position,
     orientation : orientation,
     model : {
-        uri : '../../SampleData/models/GroundVehiclePBR/GroundVehiclePBR.gltf',
+        uri : '../../SampleData/models/GroundVehicle/GroundVehicle.glb',
         heightReference : Cesium.HeightReference.CLAMP_TO_GROUND,
         minimumPixelSize : 128,
         maximumScale : 20,
-        scale : 8.0
+        scale : 8.0,
+        runAnimations : false
     }
 });
 
@@ -142,7 +145,7 @@
     }
 }], 'toolbar');
 //Sandcastle_End
-Sandcastle.finishedLoading();
+    Sandcastle.finishedLoading();
 }
 if (typeof Cesium !== "undefined") {
     startup(Cesium);

diff --git a/Apps/Sandcastle/gallery/Shadows.html b/Apps/Sandcastle/gallery/Shadows.html
@@ -52,7 +52,7 @@
     name : 'Ground Vehicle',
     height : 0.0,
     model : {
-        uri : '../../SampleData/models/CesiumGround/Cesium_Ground.glb'
+        uri : '../../SampleData/models/GroundVehicle/GroundVehicle.glb'
     }
 });
 

diff --git a/Apps/Sandcastle/gallery/development/3D Models Instancing.html b/Apps/Sandcastle/gallery/development/3D Models Instancing.html
@@ -193,21 +193,21 @@
         reset();
     }
 }, {
-    text : 'Ground vehicle',
+    text : 'Ground Vehicle',
     onselect : function() {
-        url = '../../SampleData/models/CesiumGround/Cesium_Ground.gltf';
+        url = '../../SampleData/models/GroundVehicle/GroundVehicle.glb';
         spacing = 0.00008;
         reset();
     }
 }, {
-    text : 'Milk truck',
+    text : 'Milk Truck',
     onselect : function() {
         url = '../../SampleData/models/CesiumMilkTruck/CesiumMilkTruck.gltf';
         spacing = 0.00008;
         reset();
     }
 }, {
-    text : 'Skinned character',
+    text : 'Skinned Character',
     onselect : function() {
         url = '../../SampleData/models/CesiumMan/Cesium_Man.gltf';
         spacing = 0.00001;

diff --git a/Apps/Sandcastle/gallery/development/3D Models.html b/Apps/Sandcastle/gallery/development/3D Models.html
@@ -63,6 +63,7 @@
     'use strict';
 //Sandcastle_Begin
 var viewer = new Cesium.Viewer('cesiumContainer', {
+    shouldAnimate : true,
     shadows : true
 });
 
@@ -185,17 +186,17 @@
         createModel('../../SampleData/models/CesiumAir/Cesium_Air.glb', height, heading, pitch, roll);
     }
 }, {
-    text : 'Ground vehicle',
+    text : 'Ground Vehicle',
     onselect : function() {
-        createModel('../../SampleData/models/CesiumGround/Cesium_Ground.glb');
+        createModel('../../SampleData/models/GroundVehicle/GroundVehicle.glb');
     }
 }, {
-    text : 'Milk truck',
+    text : 'Milk Truck',
     onselect : function() {
         createModel('../../SampleData/models/CesiumMilkTruck/CesiumMilkTruck.glb');
     }
 }, {
-    text : 'Skinned character',
+    text : 'Skinned Character',
     onselect : function() {
         createModel('../../SampleData/models/CesiumMan/Cesium_Man.glb');
     }

diff --git a/Apps/Sandcastle/gallery/development/Display Conditions.html b/Apps/Sandcastle/gallery/development/Display Conditions.html
@@ -70,7 +70,7 @@
     });
 
     scene.primitives.add(Cesium.Model.fromGltf({
-        url : '../../SampleData/models/CesiumGround/Cesium_Ground.glb',
+        url : '../../SampleData/models/GroundVehicle/GroundVehicle.glb',
         modelMatrix : Cesium.Transforms.eastNorthUpToFixedFrame(position),
         distanceDisplayCondition : new Cesium.DistanceDisplayCondition(0.0, 250.5)
     }));