Merge pull request #8294 from AnalyticalGraphicsInc/reduce-zip-file-size

Reduce sample data size
CesiumGS · Oct 24, 2019 · af4c339 · af4c339
2 parents 8cc27c8 + aded377
commit af4c339
Show file tree

Hide file tree

Showing 34 changed files with 9 additions and 6,732 deletions.
diff --git a/Apps/SampleData/fire.png b/Apps/SampleData/fire.png
diff --git a/Apps/SampleData/models/CesiumAir/0_Cesium_Air.png b/Apps/SampleData/models/CesiumAir/0_Cesium_Air.png
diff --git a/Apps/SampleData/models/CesiumAir/1_Cesium_Air_Prop.png b/Apps/SampleData/models/CesiumAir/1_Cesium_Air_Prop.png
diff --git a/Apps/SampleData/models/CesiumAir/Cesium_Air.dae b/Apps/SampleData/models/CesiumAir/Cesium_Air.dae
diff --git a/Apps/SampleData/models/CesiumAir/Cesium_Air.gltf b/Apps/SampleData/models/CesiumAir/Cesium_Air.gltf
diff --git a/Apps/SampleData/models/CesiumBalloon/CesiumBalloon.dae b/Apps/SampleData/models/CesiumBalloon/CesiumBalloon.dae
diff --git a/Apps/SampleData/models/CesiumBalloon/CesiumBalloonPrint_singleDot.png b/Apps/SampleData/models/CesiumBalloon/CesiumBalloonPrint_singleDot.png
diff --git a/Apps/SampleData/models/CesiumBalloon/FlameGrate.png b/Apps/SampleData/models/CesiumBalloon/FlameGrate.png
diff --git a/Apps/SampleData/models/CesiumBalloon/WickerRepeat.jpg b/Apps/SampleData/models/CesiumBalloon/WickerRepeat.jpg
diff --git a/Apps/SampleData/models/CesiumMan/Cesium_Man.dae b/Apps/SampleData/models/CesiumMan/Cesium_Man.dae
diff --git a/Apps/SampleData/models/CesiumMan/Cesium_Man.gltf b/Apps/SampleData/models/CesiumMan/Cesium_Man.gltf
diff --git a/Apps/SampleData/models/CesiumMan/Cesium_Man.jpg b/Apps/SampleData/models/CesiumMan/Cesium_Man.jpg
diff --git a/Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck-kmc.gltf b/Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck-kmc.gltf
diff --git a/Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck.dae b/Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck.dae
diff --git a/Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck.gltf b/Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck.gltf
diff --git a/Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck.png b/Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck.png
diff --git a/Apps/Sandcastle/gallery/Image-Based Lighting.html b/Apps/Sandcastle/gallery/Image-Based Lighting.html
@@ -38,7 +38,7 @@
     window.alert('This browser does not support specular environment maps.');
 }
 
-var environmentMapURL = '../../SampleData/EnvironmentMap/kiara_6_afternoon_2k_ibl.ktx';
+var environmentMapURL = 'https://cesium.com/assets/kiara_6_afternoon_2k_ibl.ktx';
 var modelURL = '../../SampleData/models/Pawns/Pawns.glb';
 
 // This environment map was processed using Google's Filament project. To process your own:

diff --git a/Apps/Sandcastle/gallery/Interpolation.html b/Apps/Sandcastle/gallery/Interpolation.html
@@ -97,7 +97,7 @@
 
     //Load the Cesium plane model to represent the entity
     model : {
-        uri : '../../SampleData/models/CesiumAir/Cesium_Air.gltf',
+        uri : '../../SampleData/models/CesiumAir/Cesium_Air.glb',
         minimumPixelSize : 64
     },
 

diff --git a/Apps/Sandcastle/gallery/Particle System Tails.html b/Apps/Sandcastle/gallery/Particle System Tails.html
@@ -56,7 +56,7 @@
 var orientation = Cesium.Transforms.headingPitchRollQuaternion(planePosition, hpr);
 var entity = viewer.entities.add({
     model : {
-        uri : '../../SampleData/models/CesiumAir/Cesium_Air.gltf',
+        uri : '../../SampleData/models/CesiumAir/Cesium_Air.glb',
         scale : 3.5
     },
     position : planePosition,

diff --git a/Apps/Sandcastle/gallery/development/3D Models Instancing.html b/Apps/Sandcastle/gallery/development/3D Models Instancing.html
@@ -33,7 +33,7 @@
 var instancedArraysExtension = context._instancedArrays;
 var count = 1024;
 var spacing = 0.0002;
-var url = '../../SampleData/models/CesiumAir/Cesium_Air.gltf';
+var url = '../../SampleData/models/CesiumAir/Cesium_Air.glb';
 var useCollection = true;
 
 var centerLongitude = -75.61209431;
@@ -181,7 +181,7 @@
 Sandcastle.addToolbarMenu([ {
     text : 'Aircraft',
     onselect : function() {
-        url = '../../SampleData/models/CesiumAir/Cesium_Air.gltf';
+        url = '../../SampleData/models/CesiumAir/Cesium_Air.glb';
         spacing = 0.0002;
         reset();
     }
@@ -195,14 +195,14 @@
 }, {
     text : 'Milk Truck',
     onselect : function() {
-        url = '../../SampleData/models/CesiumMilkTruck/CesiumMilkTruck.gltf';
+        url = '../../SampleData/models/CesiumMilkTruck/CesiumMilkTruck.glb';
         spacing = 0.00008;
         reset();
     }
 }, {
     text : 'Skinned Character',
     onselect : function() {
-        url = '../../SampleData/models/CesiumMan/Cesium_Man.gltf';
+        url = '../../SampleData/models/CesiumMan/Cesium_Man.glb';
         spacing = 0.00001;
         reset();
     }

diff --git a/Apps/Sandcastle/gallery/development/Picking.html b/Apps/Sandcastle/gallery/development/Picking.html
@@ -270,7 +270,7 @@
         }
 
         primitive = scene.primitives.add(new Cesium.ModelInstanceCollection({
-            url : '../../SampleData/models/CesiumAir/Cesium_Air.gltf',
+            url : '../../SampleData/models/CesiumAir/Cesium_Air.glb',
             instances : instances
         }));
 

diff --git a/Specs/Data/Models/PBR/BoomBox/BoomBox_baseColor.png b/Specs/Data/Models/PBR/BoomBox/BoomBox_baseColor.png
diff --git a/Specs/Data/Models/PBR/BoomBox/BoomBox_emissive.png b/Specs/Data/Models/PBR/BoomBox/BoomBox_emissive.png
diff --git a/Specs/Data/Models/PBR/BoomBox/BoomBox_normal.png b/Specs/Data/Models/PBR/BoomBox/BoomBox_normal.png
diff --git a/Specs/Data/Models/PBR/BoomBox/BoomBox_occlusionRoughnessMetallic.jpg b/Specs/Data/Models/PBR/BoomBox/BoomBox_occlusionRoughnessMetallic.jpg
diff --git a/Specs/Data/Models/PBR/BoomBox/BoomBox_occlusionRoughnessMetallic.png b/Specs/Data/Models/PBR/BoomBox/BoomBox_occlusionRoughnessMetallic.png
diff --git a/Specs/Data/Models/PBR/BoomBoxSpecularGlossiness/BoomBox_baseColor.png b/Specs/Data/Models/PBR/BoomBoxSpecularGlossiness/BoomBox_baseColor.png
diff --git a/Specs/Data/Models/PBR/BoomBoxSpecularGlossiness/BoomBox_diffuse.png b/Specs/Data/Models/PBR/BoomBoxSpecularGlossiness/BoomBox_diffuse.png
diff --git a/Specs/Data/Models/PBR/BoomBoxSpecularGlossiness/BoomBox_emissive.png b/Specs/Data/Models/PBR/BoomBoxSpecularGlossiness/BoomBox_emissive.png
diff --git a/Specs/Data/Models/PBR/BoomBoxSpecularGlossiness/BoomBox_normal.png b/Specs/Data/Models/PBR/BoomBoxSpecularGlossiness/BoomBox_normal.png
diff --git a/Specs/Data/Models/PBR/BoomBoxSpecularGlossiness/BoomBox_occlusion.png b/Specs/Data/Models/PBR/BoomBoxSpecularGlossiness/BoomBox_occlusion.png
diff --git a/Specs/Data/Models/PBR/BoomBoxSpecularGlossiness/BoomBox_roughnessMetallic.png b/Specs/Data/Models/PBR/BoomBoxSpecularGlossiness/BoomBox_roughnessMetallic.png
diff --git a/Specs/Data/Models/PBR/BoomBoxSpecularGlossiness/BoomBox_specularGlossiness.png b/Specs/Data/Models/PBR/BoomBoxSpecularGlossiness/BoomBox_specularGlossiness.png
diff --git a/Specs/Scene/ModelSpec.js b/Specs/Scene/ModelSpec.js
@@ -3071,7 +3071,7 @@ describe('Scene/Model', function() {
             };
 
             expect(sceneArgs).toRenderAndCall(function(rgba) {
-                expect(rgba).toEqualEpsilon([153, 6, 5, 255], 5);
+                expect(rgba).toEqualEpsilon([119, 6, 5, 255], 5);
             });
 
             model.imageBasedLightingFactor = new Cartesian2(0.0, 0.0);