Merge pull request #3039 from tfili/glTF-1.0

glTF 1.0 Changes
CesiumGS · Oct 29, 2015 · bc2c8a6 · bc2c8a6
2 parents 33529f4 + 7da25eb
commit bc2c8a6
Show file tree

Hide file tree

Showing 66 changed files with 17,658 additions and 2,568 deletions.
diff --git a/Apps/SampleData/models/CesiumAir/Cesium_Air.bgltf b/Apps/SampleData/models/CesiumAir/Cesium_Air.bgltf
diff --git a/Apps/SampleData/models/CesiumAir/Cesium_Air.glb b/Apps/SampleData/models/CesiumAir/Cesium_Air.glb
diff --git a/Apps/SampleData/models/CesiumAir/Cesium_Air.gltf b/Apps/SampleData/models/CesiumAir/Cesium_Air.gltf
diff --git a/...a/models/CesiumGround/Cesium_Ground.bgltf → ...ata/models/CesiumGround/Cesium_Ground.glb b/...a/models/CesiumGround/Cesium_Ground.bgltf → ...ata/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/...pleData/models/CesiumMan/Cesium_Man.bgltf → ...ampleData/models/CesiumMan/Cesium_Man.glb b/...pleData/models/CesiumMan/Cesium_Man.bgltf → ...ampleData/models/CesiumMan/Cesium_Man.glb
diff --git a/Apps/SampleData/models/CesiumMan/Cesium_Man.gltf b/Apps/SampleData/models/CesiumMan/Cesium_Man.gltf
diff --git a/...els/CesiumMilkTruck/CesiumMilkTruck.bgltf → ...s/CesiumMilkTruck/CesiumMilkTruck-kmc.glb b/...els/CesiumMilkTruck/CesiumMilkTruck.bgltf → ...s/CesiumMilkTruck/CesiumMilkTruck-kmc.glb
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
@@ -333,7 +333,7 @@
         <light id="Light-polyRender006" name="Render">
             <technique_common>
                 <ambient>
-                    <color sid="ambient_light_rgb">0 0 0</color>
+                    <color sid="ambient_light_rgb">0.2 0.2 0.2</color>
                 </ambient>
             </technique_common>
         </light>

diff --git a/Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck.glb b/Apps/SampleData/models/CesiumMilkTruck/CesiumMilkTruck.glb