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.

Sign up for GitHub

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

Update ground vehicle to glTF 2.0 final. #6592

Merged
merged 1 commit into from
May 18, 2018
Merged

Update ground vehicle to glTF 2.0 final. #6592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
381 changes: 0 additions & 381 deletions Apps/SampleData/models/CesiumGround/Cesium_Ground.dae
View file
Open in desktop

This file was deleted.

Binary file removed Apps/SampleData/models/CesiumGround/Cesium_Ground.glb
View file
Open in desktop
Binary file not shown.
747 changes: 0 additions & 747 deletions Apps/SampleData/models/CesiumGround/Cesium_Ground.gltf
View file
Open in desktop

This file was deleted.

Binary file removed Apps/SampleData/models/CesiumGround/images/0_Cesium_Ground-wheel.jpg
View file
Open in desktop
Binary file not shown.
Binary file removed Apps/SampleData/models/CesiumGround/images/1_Cesium_Ground-body.jpg
View file
Open in desktop
Binary file not shown.
Binary file added Apps/SampleData/models/GroundVehicle/GroundVehicle.glb
View file
Open in desktop
Binary file not shown.
Binary file removed Apps/SampleData/models/GroundVehiclePBR/CougarBulbs_BaseColor.png
View file
Open in desktop
Binary file not shown.
Binary file removed Apps/SampleData/models/GroundVehiclePBR/CougarBulbs_Emissive.png
View file
Open in desktop
Binary file not shown.
Binary file removed Apps/SampleData/models/GroundVehiclePBR/CougarBulbs_Normal.png
View file
Open in desktop
Binary file not shown.
Binary file removed Apps/SampleData/models/GroundVehiclePBR/CougarBulbs_OcclusionRoughnessMetallic.png
View file
Open in desktop
Binary file not shown.
Binary file removed Apps/SampleData/models/GroundVehiclePBR/CougarOne_Normal.png
View file
Open in desktop
Binary file not shown.
Binary file removed Apps/SampleData/models/GroundVehiclePBR/CougarOne_OcclusionRoughnessMetallic.jpg
View file
Open in desktop
Binary file not shown.
Binary file removed Apps/SampleData/models/GroundVehiclePBR/CougarOne_Rust_BaseColor.jpg
View file
Open in desktop
Binary file not shown.
Binary file removed Apps/SampleData/models/GroundVehiclePBR/CougarTwo_Normal.png
View file
Open in desktop
Binary file not shown.
Binary file removed Apps/SampleData/models/GroundVehiclePBR/CougarTwo_OcclusionRoughnessMetallic.jpg
View file
Open in desktop
Binary file not shown.
Binary file removed Apps/SampleData/models/GroundVehiclePBR/CougarTwo_Rust_BaseColor.jpg
View file
Open in desktop
Binary file not shown.
Binary file removed Apps/SampleData/models/GroundVehiclePBR/GroundVehicle.bin
View file
Open in desktop
Binary file not shown.
484 changes: 0 additions & 484 deletions Apps/SampleData/models/GroundVehiclePBR/GroundVehiclePBR.gltf
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions Apps/Sandcastle/gallery/3D Models Coloring.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
8 changes: 4 additions & 4 deletions Apps/Sandcastle/gallery/3D Models.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion Apps/Sandcastle/gallery/Distance Display Conditions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
});
Expand Down
19 changes: 11 additions & 8 deletions Apps/Sandcastle/gallery/Physically-Based Materials.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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);
Expand All @@ -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
}
});

Expand Down Expand Up @@ -142,7 +145,7 @@
}
}], 'toolbar');
//Sandcastle_End
Sandcastle.finishedLoading();
Sandcastle.finishedLoading();
}
if (typeof Cesium !== "undefined") {
startup(Cesium);
Expand Down
2 changes: 1 addition & 1 deletion Apps/Sandcastle/gallery/Shadows.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
name : 'Ground Vehicle',
height : 0.0,
model : {
uri : '../../SampleData/models/CesiumGround/Cesium_Ground.glb'
uri : '../../SampleData/models/GroundVehicle/GroundVehicle.glb'
}
});

Expand Down
8 changes: 4 additions & 4 deletions Apps/Sandcastle/gallery/development/3D Models Instancing.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 5 additions & 4 deletions Apps/Sandcastle/gallery/development/3D Models.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
'use strict';
//Sandcastle_Begin
var viewer = new Cesium.Viewer('cesiumContainer', {
shouldAnimate : true,
shadows : true
});

Expand Down Expand Up @@ -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');
}
Expand Down
2 changes: 1 addition & 1 deletion Apps/Sandcastle/gallery/development/Display Conditions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}));
Expand Down