CesiumGS · pjcozzi · Dec 15, 2017 · Dec 1, 2017 · Dec 1, 2017 · Dec 1, 2017
diff --git a/Apps/Sandcastle/gallery/3D Tiles Photogrammetry Classification.html b/Apps/Sandcastle/gallery/3D Tiles Photogrammetry Classification.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">  <!-- Use Chrome Frame in IE -->
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
+    <meta name="description" content="Sample photogrammetry and classification datasets both rendered with 3D Tiles.">
+    <meta name="cesium-sandcastle-labels" content="Showcases, 3D Tiles">
+    <title>Cesium Demo</title>
+    <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
+    });
+    </script>
+</head>
+<body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
+<style>
+    @import url(../templates/bucket.css);
+</style>
+<div id="cesiumContainer" class="fullSize"></div>
+<div id="loadingOverlay"><h1>Loading...</h1></div>
+<div id="toolbar"></div>
+<script id="cesium_sandcastle_script">
+function startup(Cesium) {
+    'use strict';
+//Sandcastle_Begin
+var viewer = new Cesium.Viewer('cesiumContainer');
+
+var tileset = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
+    url : 'https://beta.cesium.com/api/assets/1458?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIxYmJiNTAxOC1lOTg5LTQzN2EtODg1OC0zMWJjM2IxNGNlYmMiLCJpZCI6NDQsImFzc2V0cyI6WzE0NThdLCJpYXQiOjE0OTkyNjM4MjB9.1WKijRa-ILkmG6utrhDWX6rDgasjD7dZv-G5ZyCmkKg'
+}));
+
+tileset.readyPromise.then(function() {
+    var boundingSphere = tileset.boundingSphere;
+    viewer.camera.viewBoundingSphere(boundingSphere, new Cesium.HeadingPitchRange(0.0, -0.5, boundingSphere.radius));
+    viewer.camera.lookAtTransform(Cesium.Matrix4.IDENTITY);
+}).otherwise(function(error) {
+    throw(error);
+});
+
+var classification = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
+    url: 'https://beta.cesium.com/api/assets/3486?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIzZjM4MjljZi0xNTAzLTQ0MzctODhlZi0zOTU3Njg5ODA1Y2QiLCJpZCI6OCwiaWF0IjoxNDgxODI5ODMyfQ.dYlV8_PoXcFNlPHGook5kMzuJMS-Bb9DCMzI1mFVvgE',
+    classificationType : Cesium.ClassificationType.CESIUM_3D_TILE
+}));
+
+classification.readyPromise.then(function() {
+    classification.style = new Cesium.Cesium3DTileStyle({
+        color : 'rgba(255, 0, 0, 0.5)'
+    });
+}).otherwise(function(error) {
+    throw(error);
+});
+
+var nonClassification = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
+    url: 'https://beta.cesium.com/api/assets/3486?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIzZjM4MjljZi0xNTAzLTQ0MzctODhlZi0zOTU3Njg5ODA1Y2QiLCJpZCI6OCwiaWF0IjoxNDgxODI5ODMyfQ.dYlV8_PoXcFNlPHGook5kMzuJMS-Bb9DCMzI1mFVvgE',
+    show : false
+}));
+nonClassification.readyPromise.then(function() {
+    nonClassification.style = new Cesium.Cesium3DTileStyle({
+        color : 'rgba(255, 0, 0, 0.5)'
+    });
+}).otherwise(function(error) {
+    throw(error);
+});
+
+Cesium.when.join(classification.readyPromise, nonClassification.readyPromise).then(function() {
+    Sandcastle.addToggleButton('Show classification', true, function(checked) {
+        classification.show = checked;
+        nonClassification.show = !checked;
+    });
+});
+//Sandcastle_End
+Sandcastle.finishedLoading();
+}
+if (typeof Cesium !== "undefined") {
+    startup(Cesium);
+} else if (typeof require === "function") {
+    require(["Cesium"], startup);
+}
+</script>
+</body>
+</html>
diff --git a/Apps/Sandcastle/gallery/3D Tiles Photogrammetry Classification.jpg b/Apps/Sandcastle/gallery/3D Tiles Photogrammetry Classification.jpg
diff --git a/Apps/Sandcastle/gallery/3D Tiles Photogrammetry.html b/Apps/Sandcastle/gallery/3D Tiles Photogrammetry.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">  <!-- Use Chrome Frame in IE -->
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
-    <meta name="description" content="A sample photgrammetry dataset rendered with 3D Tiles.">
+    <meta name="description" content="A sample photogrammetry dataset rendered with 3D Tiles.">
     <meta name="cesium-sandcastle-labels" content="Showcases, 3D Tiles">
     <title>Cesium Demo</title>
     <script type="text/javascript" src="../Sandcastle-header.js"></script>

diff --git a/Apps/Sandcastle/gallery/3D Tiles Point Cloud Classification.html b/Apps/Sandcastle/gallery/3D Tiles Point Cloud Classification.html
@@ -37,7 +37,7 @@
 // For more details, see:
 //    https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/vector-tiles/TileFormats/VectorData
 var classification = viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
-    url: 'https://beta.cesium.com/api/assets/3394?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIzZjM4MjljZi0xNTAzLTQ0MzctODhlZi0zOTU3Njg5ODA1Y2QiLCJpZCI6OCwiaWF0IjoxNDgxODI5ODMyfQ.dYlV8_PoXcFNlPHGook5kMzuJMS-Bb9DCMzI1mFVvgE',
+    url: 'https://beta.cesium.com/api/assets/3469?access_token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiIzZjM4MjljZi0xNTAzLTQ0MzctODhlZi0zOTU3Njg5ODA1Y2QiLCJpZCI6OCwiaWF0IjoxNDgxODI5ODMyfQ.dYlV8_PoXcFNlPHGook5kMzuJMS-Bb9DCMzI1mFVvgE',
     skipLevelOfDetail : false,
     classificationType : Cesium.ClassificationType.CESIUM_3D_TILE
 }));

diff --git a/CHANGES.md b/CHANGES.md
@@ -9,6 +9,13 @@ Change Log
     * Added `Plane.transformPlane` function to apply a transformation to a plane. [#5966](https://github.com/AnalyticalGraphicsInc/cesium/pull/5966)
     * Added `PlaneGeometry`, `PlaneOutlineGeometry`, `PlaneGeometryUpdater`, and `PlaneOutlineGeometryUpdater` classes to render plane primitives. [#5996](https://github.com/AnalyticalGraphicsInc/cesium/pull/5996)
     * Added `PlaneGraphics` class and `plane` property to `Entity`. [#5996](https://github.com/AnalyticalGraphicsInc/cesium/pull/5996)
+* Added `AttributeCompression.zigZagDeltaDecode` which will decode delta and ZigZag encoded buffers in place.
+* Added `pack` and `unpack` functions to `OrientedBoundingBox` for packing to and unpacking from a flat buffer.
+* Added experimental support for [3D Tiles Vector Data](https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/vector-tiles/TileFormats/VectorData) ([#4665](https://github.com/AnalyticalGraphicsInc/cesium/pull/4665)). The new and modified Cesium APIs are:
+   * `Cesium3DTileStyle` has expanded for styling point features. See the [styling specification](https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/vector-tiles/Styling#vector-data) for details.
+   * `Cesium3DTileFeature` can modify `color` and `show` properties for polygon, polyline, and geometry features.
+   * `Cesium3DTilePointFeature` can modify the styling options for a point feature.
+* Added `Cesium3DTileset.classificationType` to specify if a tileset classifies terrain, another 3D Tiles tileset, or both. This only applies to vector, geometry and batched 3D model tilesets. See [#6033](https://github.com/AnalyticalGraphicsInc/cesium/pull/6033) for limitations on the glTF contained in the b3dm tile.
 
 ### 1.40 - 2017-12-01
 
@@ -29,13 +36,6 @@ Change Log
 * Added ability to support touch event in Imagery Layers Split Sandcastle example. [#5948](https://github.com/AnalyticalGraphicsInc/cesium/pull/5948)
 * Added a new `@experimental` tag to the documentation. A small subset of the Cesium API tagged as such are subject to breaking changes without deprecation. See the [Coding Guide](https://github.com/AnalyticalGraphicsInc/cesium/tree/master/Documentation/Contributors/CodingGuide#deprecation-and-breaking-changes) for further explanation. [#6010](https://github.com/AnalyticalGraphicsInc/cesium/pull/6010)
 * Moved terrain and imagery credits to a lightbox that pops up when you click a link in the onscreen credits [#3013](https://github.com/AnalyticalGraphicsInc/cesium/issues/3013)
-* Added `AttributeCompression.zigZagDeltaDecode` which will decode delta and ZigZag encoded buffers in place.
-* Added `pack` and `unpack` functions to `OrientedBoundingBox` for packing to and unpacking from a flat buffer.
-* Added experimental support for [3D Tiles Vector Data](https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/vector-tiles/TileFormats/VectorData) ([#4665](https://github.com/AnalyticalGraphicsInc/cesium/pull/4665)). The new and modified Cesium APIs are:
-   * `Cesium3DTileset.classificationType` to specify if a vector tileset classifies terrain, another 3D Tiles tileset, or both.
-   * `Cesium3DTileStyle` has expanded for styling point features. See the [styling specification](https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/vector-tiles/Styling#vector-data) for details.
-   * `Cesium3DTileFeature` can modify `color` and `show` properties for polygon, polyline, geometry, and mesh features.
-   * `Cesium3DTilePointFeature` can modify the styling options for a point feature.
 
 ### 1.39 - 2017-11-01
 

diff --git a/Source/Renderer/Pass.js b/Source/Renderer/Pass.js
@@ -24,10 +24,11 @@ define([
         CESIUM_3D_TILE : 4,
         CESIUM_3D_TILE_CLASSIFICATION : 5,
         CESIUM_3D_TILE_CLASSIFICATION_IGNORE_SHOW : 6,
-        OPAQUE : 7,
-        TRANSLUCENT : 8,
-        OVERLAY : 9,
-        NUMBER_OF_PASSES : 10
+        CLASSIFICATION : 7,
+        OPAQUE : 8,
+        TRANSLUCENT : 9,
+        OVERLAY : 10,
+        NUMBER_OF_PASSES : 11
     };
 
     return freezeObject(Pass);

diff --git a/Source/Scene/Batched3DModel3DTileContent.js b/Source/Scene/Batched3DModel3DTileContent.js
@@ -17,8 +17,9 @@ define([
         './Cesium3DTileBatchTable',
         './Cesium3DTileFeature',
         './Cesium3DTileFeatureTable',
-        './getAttributeOrUniformBySemantic',
-        './Model'
+        './ClassificationModel',
+        './Model',
+        './ModelUtility'
     ], function(
         ClippingPlaneCollection,
         Color,
@@ -38,8 +39,9 @@ define([
         Cesium3DTileBatchTable,
         Cesium3DTileFeature,
         Cesium3DTileFeatureTable,
-        getAttributeOrUniformBySemantic,
-        Model) {
+        ClassificationModel,
+        Model,
+        ModelUtility) {
     'use strict';
 
     // Bail out if the browser doesn't support typed arrays, to prevent the setup function
@@ -193,9 +195,9 @@ define([
     var sizeOfUint32 = Uint32Array.BYTES_PER_ELEMENT;
 
     function getBatchIdAttributeName(gltf) {
-        var batchIdAttributeName = getAttributeOrUniformBySemantic(gltf, '_BATCHID');
+        var batchIdAttributeName = ModelUtility.getAttributeOrUniformBySemantic(gltf, '_BATCHID');
         if (!defined(batchIdAttributeName)) {
-            batchIdAttributeName = getAttributeOrUniformBySemantic(gltf, 'BATCHID');
+            batchIdAttributeName = ModelUtility.getAttributeOrUniformBySemantic(gltf, 'BATCHID');
             if (defined(batchIdAttributeName)) {
                 Batched3DModel3DTileContent._deprecationWarning('b3dm-legacy-batchid', 'The glTF in this b3dm uses the semantic `BATCHID`. Application-specific semantics should be prefixed with an underscore: `_BATCHID`.');
             }
@@ -207,8 +209,9 @@ define([
         return function(vs) {
             var batchTable = content._batchTable;
             var gltf = content._model.gltf;
+            var handleTranslucent = !defined(content._tileset.classificationType);
             var batchIdAttributeName = getBatchIdAttributeName(gltf);
-            var callback = batchTable.getVertexShaderCallback(true, batchIdAttributeName);
+            var callback = batchTable.getVertexShaderCallback(handleTranslucent, batchIdAttributeName);
             return defined(callback) ? callback(vs) : vs;
         };
     }
@@ -227,12 +230,27 @@ define([
         return function(fs) {
             var batchTable = content._batchTable;
             var gltf = content._model.gltf;
-            var diffuseUniformName = getAttributeOrUniformBySemantic(gltf, '_3DTILESDIFFUSE');
-            var callback = batchTable.getFragmentShaderCallback(true, diffuseUniformName);
+            var handleTranslucent = !defined(content._tileset.classificationType);
+            var diffuseUniformName = ModelUtility.getAttributeOrUniformBySemantic(gltf, '_3DTILESDIFFUSE');
+            var callback = batchTable.getFragmentShaderCallback(handleTranslucent, diffuseUniformName);
             return defined(callback) ? callback(fs) : fs;
         };
     }
 
+    function getClassificationFragmentShaderCallback(content) {
+        return function(fs) {
+            var batchTable = content._batchTable;
+            var callback = batchTable.getClassificationFragmentShaderCallback();
+            return defined(callback) ? callback(fs) : fs;
+        };
+    }
+
+    function createColorChangedCallback(content) {
+        return function(batchId, color) {
+            content._model.updateCommands(batchId, color);
+        };
+    }
+
     function initialize(content, arrayBuffer, byteOffset) {
         var tileset = content._tileset;
         var tile = content._tile;
@@ -334,7 +352,12 @@ define([
             }
         }
 
-        var batchTable = new Cesium3DTileBatchTable(content, batchLength, batchTableJson, batchTableBinary);
+        var colorChangeCallback;
+        if (defined(tileset.classificationType)) {
+            colorChangeCallback = createColorChangedCallback(content);
+        }
+
+        var batchTable = new Cesium3DTileBatchTable(content, batchLength, batchTableJson, batchTableBinary, colorChangeCallback);
         content._batchTable = batchTable;
 
         var gltfByteLength = byteStart + byteLength - byteOffset;
@@ -356,35 +379,56 @@ define([
             primitive : tileset
         };
 
-        // PERFORMANCE_IDEA: patch the shader on demand, e.g., the first time show/color changes.
-        // The pick shader still needs to be patched.
-        content._model = new Model({
-            gltf : gltfView,
-            cull : false,           // The model is already culled by 3D Tiles
-            releaseGltfJson : true, // Models are unique and will not benefit from caching so save memory
-            opaquePass : Pass.CESIUM_3D_TILE, // Draw opaque portions of the model during the 3D Tiles pass
-            basePath : basePath,
-            requestType : RequestType.TILES3D,
-            modelMatrix : tile.computedTransform,
-            upAxis : tileset._gltfUpAxis,
-            shadows: tileset.shadows,
-            debugWireframe: tileset.debugWireframe,
-            incrementallyLoadTextures : false,
-            vertexShaderLoaded : getVertexShaderCallback(content),
-            fragmentShaderLoaded : getFragmentShaderCallback(content),
-            uniformMapLoaded : batchTable.getUniformMapCallback(),
-            pickVertexShaderLoaded : getPickVertexShaderCallback(content),
-            pickFragmentShaderLoaded : batchTable.getPickFragmentShaderCallback(),
-            pickUniformMapLoaded : batchTable.getPickUniformMapCallback(),
-            addBatchIdToGeneratedShaders : (batchLength > 0), // If the batch table has values in it, generated shaders will need a batchId attribute
-            pickObject : pickObject,
-            clippingPlanes : new ClippingPlaneCollection({
-                enabled : false
-            })
-        });
-
-        if (defined(tileset.clippingPlanes)) {
-            content._model.clippingPlanes = tileset.clippingPlanes.clone();
+        if (!defined(tileset.classificationType)) {
+            // PERFORMANCE_IDEA: patch the shader on demand, e.g., the first time show/color changes.
+            // The pick shader still needs to be patched.
+            content._model = new Model({
+                gltf : gltfView,
+                cull : false,           // The model is already culled by 3D Tiles
+                releaseGltfJson : true, // Models are unique and will not benefit from caching so save memory
+                opaquePass : Pass.CESIUM_3D_TILE, // Draw opaque portions of the model during the 3D Tiles pass
+                basePath : basePath,
+                requestType : RequestType.TILES3D,
+                modelMatrix : tile.computedTransform,
+                upAxis : tileset._gltfUpAxis,
+                shadows: tileset.shadows,
+                debugWireframe: tileset.debugWireframe,
+                incrementallyLoadTextures : false,
+                vertexShaderLoaded : getVertexShaderCallback(content),
+                fragmentShaderLoaded : getFragmentShaderCallback(content),
+                classificationShaderLoaded : getClassificationFragmentShaderCallback(content),
+                uniformMapLoaded : batchTable.getUniformMapCallback(),
+                pickVertexShaderLoaded : getPickVertexShaderCallback(content),
+                pickFragmentShaderLoaded : batchTable.getPickFragmentShaderCallback(),
+                pickUniformMapLoaded : batchTable.getPickUniformMapCallback(),
+                addBatchIdToGeneratedShaders : (batchLength > 0), // If the batch table has values in it, generated shaders will need a batchId attribute
+                pickObject : pickObject,
+                clippingPlanes : new ClippingPlaneCollection({
+                    enabled : false
+                })
+            });
+            if (defined(tileset.clippingPlanes)) {
+                content._model.clippingPlanes = tileset.clippingPlanes.clone();
+            }
+        } else {
+            // This transcodes glTF to an internal representation for geometry so we can take advantage of the re-batching of vector a geometry data.
+            // For a list of limitations on the input glTF, see the documentation for classificationType of Cesium3DTileset.
+            content._model = new ClassificationModel({
+                gltf : gltfView,
+                cull : false,           // The model is already culled by 3D Tiles
+                basePath : basePath,
+                modelMatrix : tile.computedTransform,
+                upAxis : tileset._gltfUpAxis,
+                debugWireframe : tileset.debugWireframe,
+                vertexShaderLoaded : getVertexShaderCallback(content),
+                classificationShaderLoaded : getClassificationFragmentShaderCallback(content),
+                uniformMapLoaded : batchTable.getUniformMapCallback(),
+                pickVertexShaderLoaded : getPickVertexShaderCallback(content),
+                pickFragmentShaderLoaded : batchTable.getPickFragmentShaderCallback(),
+                pickUniformMapLoaded : batchTable.getPickUniformMapCallback(),
+                classificationType : tileset._classificationType,
+                batchTable : batchTable
+            });
         }
     }
 
@@ -468,7 +512,7 @@ define([
 
         // If any commands were pushed, add derived commands
         var commandEnd = frameState.commandList.length;
-        if ((commandStart < commandEnd) && frameState.passes.render) {
+        if ((commandStart < commandEnd) && frameState.passes.render && !(this._model instanceof ClassificationModel)) {
             var finalResolution = this._tile._finalResolution;
             this._batchTable.addDerivedCommands(frameState, commandStart, finalResolution);
         }

diff --git a/Source/Scene/Cesium3DTileBatchTable.js b/Source/Scene/Cesium3DTileBatchTable.js
@@ -1049,6 +1049,37 @@ define([
         };
     };
 
+    Cesium3DTileBatchTable.prototype.getClassificationFragmentShaderCallback = function() {
+        if (this.featuresLength === 0) {
+            return;
+        }
+        return function(source) {
+            source = ShaderSource.replaceMain(source, 'tile_main');
+            if (ContextLimits.maximumVertexTextureImageUnits > 0) {
+                // When VTF is supported, per-feature show/hide already happened in the fragment shader
+                source +=
+                    'varying vec4 tile_featureColor; \n' +
+                    'void main() \n' +
+                    '{ \n' +
+                    '    gl_FragColor = tile_featureColor; \n' +
+                    '}';
+            } else {
+                source +=
+                    'uniform sampler2D tile_batchTexture; \n' +
+                    'varying vec2 tile_featureSt; \n' +
+                    'void main() \n' +
+                    '{ \n' +
+                    '    vec4 featureProperties = texture2D(tile_batchTexture, tile_featureSt); \n' +
+                    '    if (featureProperties.a == 0.0) { \n' + // show: alpha == 0 - false, non-zeo - true
+                    '        discard; \n' +
+                    '    } \n' +
+                    '    gl_FragColor = featureProperties; \n' +
+                    '} \n';
+            }
+            return source;
+        };
+    };
+
     function getColorBlend(batchTable) {
         var tileset = batchTable._content._tileset;
         var colorBlendMode = tileset.colorBlendMode;