3D Tiles - Point Cloud Styling

Apps/Sandcastle/gallery/3D Tiles.html

@@ -97,7 +97,7 @@
                         "true" : "color('blue')"
                     }
                 },
-//              "show": false
+//              "show": false,
 //              "show" : "${Height} >= 0",
                 "meta" : {
                     "description" : "'Building id ${id} has height ${Height}.'"

Source/Scene/Cesium3DTileStyle.js

@@ -62,6 +62,11 @@ define([
         this._show = undefined;
         this._meta = undefined;
 
+        this._colorShaderFunction = undefined;
+        this._showShaderFunction = undefined;
+        this._colorShaderFunctionReady = false;
+        this._showShaderFunctionReady = false;
+
         var style = this;
         if (typeof data === 'string') {
             RequestScheduler.request(data, loadJson).then(function(styleJson) {
@@ -80,6 +85,17 @@ define([
         that._style = clone(styleJson, true);
 
         styleJson = defaultValue(styleJson, defaultValue.EMPTY_OBJECT);
+
+        if (!defined(styleJson.color)) {
+            // If there is no color style do not create a shader function. Otherwise a function would be created by the default style (white).
+            that._colorShaderFunctionReady = true;
+        }
+
+        if (!defined(styleJson.show)) {
+            // If there is no show style do not create a shader function.
+            that._showShaderFunctionReady = true;
+        }
+
         var colorExpression = defaultValue(styleJson.color, DEFAULT_JSON_COLOR_EXPRESSION);
         var showExpression = defaultValue(styleJson.show, DEFAULT_JSON_BOOLEAN_EXPRESSION);
 
@@ -294,9 +310,62 @@ define([
             set : function(value) {
                 this._meta = value;
             }
-        },
-
+        }
     });
 
+    /**
+     * Gets the color shader function for this style.
+     *
+     * @param {String} name Name to give to the generated function.
+     * @param {String} variablePrefix Prefix that is added to any variable names to access vertex attributes.
+     * @param {Object} info Stores information about the generated shader function.
+     *
+     * @returns {String} The shader function.
+     *
+     * @private
+     */
+    Cesium3DTileStyle.prototype.getColorShaderFunction = function(name, variablePrefix, info) {
+        if (this._colorShaderFunctionReady) {
+            // Return the cached result, may be undefined
+            return this._colorShaderFunction;
+        }
+
+        this._colorShaderFunctionReady = true;
+        this._colorShaderFunction = this.color.getShaderFunction(name, variablePrefix, 'vec4', info);
+        //>>includeStart('debug', pragmas.debug);
+        if (!defined(this._colorShaderFunction)) {
+            throw new DeveloperError('Could not generate valid shader code for the color style.');
+        }
+        //>>includeEnd('debug');
+        return this._colorShaderFunction;
+    };
+
+    /**
+     * Gets the show shader function for this style.
+     *
+     * @param {String} name Name to give to the generated function.
+     * @param {String} variablePrefix Prefix that is added to any variable names to access vertex attributes.
+     * @param {Object} info Stores information about the generated shader function.
+     *
+     * @returns {String} The shader function.
+     *
+     * @private
+     */
+    Cesium3DTileStyle.prototype.getShowShaderFunction = function(name, variablePrefix, info) {
+        if (this._showShaderFunctionReady) {
+            // Return the cached result, may be undefined
+            return this._showShaderFunction;
+        }
+
+        this._showShaderFunctionReady = true;
+        this._showShaderFunction = this.show.getShaderFunction(name, variablePrefix, 'bool', info);
+        //>>includeStart('debug', pragmas.debug);
+        if (!defined(this._showShaderFunction)) {
+            throw new DeveloperError('Could not generate valid shader code for the show style.');
+        }
+        //>>includeEnd('debug');
+        return this._showShaderFunction;
+    };
+
     return Cesium3DTileStyle;
 });

Source/Scene/Cesium3DTileStyleEngine.js

@@ -2,11 +2,13 @@
 define([
        '../Core/Color',
        '../Core/defined',
-       '../Core/defineProperties'
+       '../Core/defineProperties',
+       './PointCloud3DTileContent'
     ], function(
         Color,
         defined,
-        defineProperties) {
+        defineProperties,
+        PointCloud3DTileContent) {
     'use strict';
 
     /**
@@ -74,36 +76,41 @@ define([
                 //   2) this tile is now visible, but it wasn't visible when the style was first assigned
                 if (tile.lastStyleTime !== lastStyleTime) {
                     tile.lastStyleTime = lastStyleTime;
-                    styleCompositeContent(this, tile.content, stats);
+                    styleCompositeContent(this, frameState, tile.content, stats);
 
                     ++stats.numberOfTilesStyled;
                 }
             }
         }
     };
 
-    function styleCompositeContent(styleEngine, content, stats) {
+    function styleCompositeContent(styleEngine, frameState, content, stats) {
         var innerContents = content.innerContents;
         if (defined(innerContents)) {
             var length = innerContents.length;
             for (var i = 0; i < length; ++i) {
                 // Recurse for composites of composites
-                styleCompositeContent(styleEngine, innerContents[i], stats);
+                styleCompositeContent(styleEngine, frameState, innerContents[i], stats);
             }
         } else {
             // Not a composite tile
-            styleContent(styleEngine, content, stats);
+            styleContent(styleEngine, frameState, content, stats);
         }
     }
 
     var scratchColor = new Color();
 
-    function styleContent(styleEngine, content, stats) {
+    function styleContent(styleEngine, frameState, content, stats) {
         var length = content.featuresLength;
         var style = styleEngine._style;
 
         stats.numberOfFeaturesStyled += length;
 
+        // Apply style to point cloud. Only apply style if the point cloud is not backed by a batch table.
+        if ((content instanceof PointCloud3DTileContent) && (length === 0)) {
+            content.applyStyle(frameState, style);
+        }
+
         if (!defined(style)) {
             clearStyle(content);
             return;

Source/Scene/ConditionsExpression.js

@@ -134,12 +134,59 @@ define([
             var length = conditions.length;
             for (var i = 0; i < length; ++i) {
                 var statement = conditions[i];
-                if (statement.condition.evaluate(feature, result)) {
+                if (statement.condition.evaluate(feature)) {
                     return statement.expression.evaluateColor(feature, result);
                 }
             }
         }
     };
 
+    /**
+     * Gets the shader function for this expression.
+     * Returns undefined if the shader function can't be generated from this expression.
+     *
+     * @param {String} name Name to give to the generated function.
+     * @param {String} variablePrefix Prefix that is added to any variable names to access vertex attributes.
+     * @param {String} returnType The return type of the generated function.
+     * @param {Object} info Stores information about the generated shader function.
+     *
+     * @returns {String} The shader function.
+     *
+     * @private
+     */
+    ConditionsExpression.prototype.getShaderFunction = function(name, variablePrefix, returnType, info) {
+        var conditions = this._runtimeConditions;
+        if (!defined(conditions) || conditions.length === 0) {
+            return undefined;
+        }
+
+        var shaderFunction = '';
+        var length = conditions.length;
+        for (var i = 0; i < length; ++i) {
+            var statement = conditions[i];
+            var condition = statement.condition.getShaderExpression(variablePrefix, info);
+            var expression = statement.expression.getShaderExpression(variablePrefix, info);
+
+            if (!defined(condition) || !defined(expression)) {
+                return undefined;
+            }
+
+            // Build the if/else chain from the list of conditions
+            shaderFunction +=
+                '    ' + ((i === 0) ? 'if' : 'else if') + ' (' + condition + ') \n' +
+                '    { \n' +
+                '        return ' + expression + '; \n' +
+                '    } \n';
+        }
+
+        shaderFunction = returnType + ' ' + name + '() \n' +
+            '{ \n' +
+                 shaderFunction +
+            '    return ' + returnType + '(1.0); \n' + // Return a default value if no conditions are met
+            '} \n';
+
+        return shaderFunction;
+    };
+
     return ConditionsExpression;
 });