diff --git a/Apps/Sandcastle/gallery/3D Tiles Adjust Height.html b/Apps/Sandcastle/gallery/3D Tiles Adjust Height.html new file mode 100644 index 000000000000..09813d39da55 --- /dev/null +++ b/Apps/Sandcastle/gallery/3D Tiles Adjust Height.html @@ -0,0 +1,93 @@ + + + + + + + + + Cesium Demo + + + + + + +
+

Loading...

+
+
Height
+ + +
+ + + diff --git a/Apps/Sandcastle/gallery/3D Tiles Adjust Height.jpg b/Apps/Sandcastle/gallery/3D Tiles Adjust Height.jpg new file mode 100644 index 000000000000..2a34dcd6f2ee Binary files /dev/null and b/Apps/Sandcastle/gallery/3D Tiles Adjust Height.jpg differ diff --git a/Apps/Sandcastle/gallery/3D Tiles BIM.html b/Apps/Sandcastle/gallery/3D Tiles BIM.html new file mode 100644 index 000000000000..e87706a39f3e --- /dev/null +++ b/Apps/Sandcastle/gallery/3D Tiles BIM.html @@ -0,0 +1,53 @@ + + + + + + + + + Cesium Demo + + + + + + +
+

Loading...

+ + + diff --git a/Apps/Sandcastle/gallery/3D Tiles BIM.jpg b/Apps/Sandcastle/gallery/3D Tiles BIM.jpg new file mode 100644 index 000000000000..60b6c34a7198 Binary files /dev/null and b/Apps/Sandcastle/gallery/3D Tiles BIM.jpg differ diff --git a/Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.html b/Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.html index 2bbd03a82163..13252ef12ec6 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.html +++ b/Apps/Sandcastle/gallery/3D Tiles Batch Table Hierarchy.html @@ -29,7 +29,7 @@ 'use strict'; //Sandcastle_Begin -// In this demo doorknobs, doors, roofs, and walls are styled via the batch table hierarchy. +// Doorknobs, doors, roofs, and walls are styled with the batch table hierarchy. // Since buildings and zones are not backed by geometry they are not styled directly. However // styles may be written that take building and zone properties into account. // @@ -82,17 +82,11 @@ // * doorknob_name var viewer = new Cesium.Viewer('cesiumContainer'); -viewer.extend(Cesium.viewerCesium3DTilesInspectorMixin); -var inspectorViewModel = viewer.cesium3DTilesInspector.viewModel; - viewer.clock.currentTime = new Cesium.JulianDate(2457522.154792); -var scene = viewer.scene; -var url = '../../../Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchy'; -var tileset = scene.primitives.add(new Cesium.Cesium3DTileset({ - url : url +var tileset = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({ + url : '../../../Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchy' })); -inspectorViewModel.tileset = tileset; tileset.readyPromise.then(function() { var boundingSphere = tileset.boundingSphere; @@ -185,33 +179,28 @@ // When a feature is left clicked, print its class name and properties handler.setInputAction(function(movement) { - if (!inspectorViewModel.picking) { + var feature = viewer.scene.pick(movement.position); + if (!Cesium.defined(feature)) { return; } - - var feature = inspectorViewModel.feature; - if (Cesium.defined(feature)) { - console.log('Class: ' + feature.getExactClassName()); - console.log('Properties:'); - var propertyNames = feature.getPropertyNames(); - var length = propertyNames.length; - for (var i = 0; i < length; ++i) { - var name = propertyNames[i]; - var value = feature.getProperty(name); - console.log(' ' + name + ': ' + value); - } + console.log('Class: ' + feature.getExactClassName()); + console.log('Properties:'); + var propertyNames = feature.getPropertyNames(); + var length = propertyNames.length; + for (var i = 0; i < length; ++i) { + var name = propertyNames[i]; + var value = feature.getProperty(name); + console.log(' ' + name + ': ' + value); } }, Cesium.ScreenSpaceEventType.LEFT_CLICK); // When a feature is middle clicked, hide it handler.setInputAction(function(movement) { - if (!inspectorViewModel.picking) { + var feature = viewer.scene.pick(movement.position); + if (!Cesium.defined(feature)) { return; } - - if (Cesium.defined(inspectorViewModel.feature)) { - inspectorViewModel.feature.show = false; - } + feature.show = false; }, Cesium.ScreenSpaceEventType.MIDDLE_CLICK); //Sandcastle_End diff --git a/Apps/Sandcastle/gallery/3D Tiles Feature Picking.html b/Apps/Sandcastle/gallery/3D Tiles Feature Picking.html new file mode 100644 index 000000000000..2a3997d385b0 --- /dev/null +++ b/Apps/Sandcastle/gallery/3D Tiles Feature Picking.html @@ -0,0 +1,161 @@ + + + + + + + + + Cesium Demo + + + + + + +
+

Loading...

+ + + diff --git a/Apps/Sandcastle/gallery/3D Tiles Feature Picking.jpg b/Apps/Sandcastle/gallery/3D Tiles Feature Picking.jpg new file mode 100644 index 000000000000..58b906feac90 Binary files /dev/null and b/Apps/Sandcastle/gallery/3D Tiles Feature Picking.jpg differ diff --git a/Apps/Sandcastle/gallery/3D Tiles Feature Styling.html b/Apps/Sandcastle/gallery/3D Tiles Feature Styling.html new file mode 100644 index 000000000000..ebecd503e3e9 --- /dev/null +++ b/Apps/Sandcastle/gallery/3D Tiles Feature Styling.html @@ -0,0 +1,162 @@ + + + + + + + + + Cesium Demo + + + + + + +
+

Loading...

+
+ + + diff --git a/Apps/Sandcastle/gallery/3D Tiles Feature Styling.jpg b/Apps/Sandcastle/gallery/3D Tiles Feature Styling.jpg new file mode 100644 index 000000000000..90c37da1b2d8 Binary files /dev/null and b/Apps/Sandcastle/gallery/3D Tiles Feature Styling.jpg differ diff --git a/Apps/Sandcastle/gallery/3D Tiles.html b/Apps/Sandcastle/gallery/3D Tiles Formats.html similarity index 57% rename from Apps/Sandcastle/gallery/3D Tiles.html rename to Apps/Sandcastle/gallery/3D Tiles Formats.html index 39427cc36075..960ab825fc5e 100644 --- a/Apps/Sandcastle/gallery/3D Tiles.html +++ b/Apps/Sandcastle/gallery/3D Tiles Formats.html @@ -4,7 +4,7 @@ - + Cesium Demo @@ -19,33 +19,17 @@

Loading...

-
Shadows
-
Right click action:
-
Zoom to feature
-
Annotate
-
Middle click action:
-
Hide feature
+
Shadows
+ + + + + +
+

Loading...

+ + + diff --git a/Apps/Sandcastle/gallery/3D Tiles Inspector.jpg b/Apps/Sandcastle/gallery/3D Tiles Inspector.jpg new file mode 100644 index 000000000000..b4d88422d8a3 Binary files /dev/null and b/Apps/Sandcastle/gallery/3D Tiles Inspector.jpg differ diff --git a/Apps/Sandcastle/gallery/3D Tiles Interactivity.html b/Apps/Sandcastle/gallery/3D Tiles Interactivity.html new file mode 100644 index 000000000000..ea23ca6d9399 --- /dev/null +++ b/Apps/Sandcastle/gallery/3D Tiles Interactivity.html @@ -0,0 +1,196 @@ + + + + + + + + + Cesium Demo + + + + + + +
+

Loading...

+
+
Right click action:
+
Annotate
+
Print metadata
+
Zoom to feature
+
Middle click action:
+
Hide feature
+
+ + + diff --git a/Apps/Sandcastle/gallery/3D Tiles Interactivity.jpg b/Apps/Sandcastle/gallery/3D Tiles Interactivity.jpg new file mode 100644 index 000000000000..769b5f69603b Binary files /dev/null and b/Apps/Sandcastle/gallery/3D Tiles Interactivity.jpg differ diff --git a/Apps/Sandcastle/gallery/3D Tiles Interior.html b/Apps/Sandcastle/gallery/3D Tiles Interior.html new file mode 100644 index 000000000000..637b347a1e9c --- /dev/null +++ b/Apps/Sandcastle/gallery/3D Tiles Interior.html @@ -0,0 +1,54 @@ + + + + + + + + + Cesium Demo + + + + + + +
+

Loading...

+
+ + + diff --git a/Apps/Sandcastle/gallery/3D Tiles Interior.jpg b/Apps/Sandcastle/gallery/3D Tiles Interior.jpg new file mode 100644 index 000000000000..ba3bd9f48ea7 Binary files /dev/null and b/Apps/Sandcastle/gallery/3D Tiles Interior.jpg differ diff --git a/Apps/Sandcastle/gallery/3D Tiles Photogrammetry.html b/Apps/Sandcastle/gallery/3D Tiles Photogrammetry.html new file mode 100644 index 000000000000..42e95739b13d --- /dev/null +++ b/Apps/Sandcastle/gallery/3D Tiles Photogrammetry.html @@ -0,0 +1,52 @@ + + + + + + + + + Cesium Demo + + + + + + +
+

Loading...

+ + + diff --git a/Apps/Sandcastle/gallery/3D Tiles Photogrammetry.jpg b/Apps/Sandcastle/gallery/3D Tiles Photogrammetry.jpg new file mode 100644 index 000000000000..682e87cf161d Binary files /dev/null and b/Apps/Sandcastle/gallery/3D Tiles Photogrammetry.jpg differ diff --git a/Apps/Sandcastle/gallery/3D Tiles Point Cloud Styling.html b/Apps/Sandcastle/gallery/3D Tiles Point Cloud Styling.html index 6829e5da9e55..614c9563a6d2 100644 --- a/Apps/Sandcastle/gallery/3D Tiles Point Cloud Styling.html +++ b/Apps/Sandcastle/gallery/3D Tiles Point Cloud Styling.html @@ -30,22 +30,20 @@ //Sandcastle_Begin var viewer = new Cesium.Viewer('cesiumContainer'); -viewer.extend(Cesium.viewerCesium3DTilesInspectorMixin); -var inspectorViewModel = viewer.cesium3DTilesInspector.viewModel; viewer.clock.currentTime = new Cesium.JulianDate(2457522.154792); var scene = viewer.scene; -var url = '../../../Specs/Data/Cesium3DTiles/PointCloud/PointCloudWithPerPointProperties/'; var tileset = scene.primitives.add(new Cesium.Cesium3DTileset({ - url : url + url : '../../../Specs/Data/Cesium3DTiles/PointCloud/PointCloudWithPerPointProperties/' })); -inspectorViewModel.tileset = tileset; tileset.readyPromise.then(function() { var boundingSphere = tileset.boundingSphere; viewer.camera.viewBoundingSphere(boundingSphere, new Cesium.HeadingPitchRange(0.0, -1.0, 50.0)); viewer.camera.lookAtTransform(Cesium.Matrix4.IDENTITY); +}).otherwise(function(error) { + throw(error); }); var styles = []; diff --git a/Apps/Sandcastle/gallery/3D Tiles Point Cloud.html b/Apps/Sandcastle/gallery/3D Tiles Point Cloud.html new file mode 100644 index 000000000000..1c8ebe13c6aa --- /dev/null +++ b/Apps/Sandcastle/gallery/3D Tiles Point Cloud.html @@ -0,0 +1,53 @@ + + + + + + + + + Cesium Demo + + + + + + +
+

Loading...

+ + + diff --git a/Apps/Sandcastle/gallery/3D Tiles Point Cloud.jpg b/Apps/Sandcastle/gallery/3D Tiles Point Cloud.jpg new file mode 100644 index 000000000000..7142aeddc1f9 Binary files /dev/null and b/Apps/Sandcastle/gallery/3D Tiles Point Cloud.jpg differ