Per tile stats

Source/Scene/Cesium3DTile.js

@@ -142,6 +142,8 @@ define([
         }
         this._viewerRequestVolume = viewerRequestVolume;
 
+        this._commandsLength = 0;
+
         /**
          * The error, in meters, introduced if this tile is rendered and its children are not.
          * This is used to compute Screen-Space Error (SSE), i.e., the error measured in pixels.
@@ -851,9 +853,11 @@ define([
      * @private
      */
     Cesium3DTile.prototype.update = function(tileset, frameState) {
+        var initCommandLength = frameState.commandList.length;
         applyDebugSettings(this, tileset, frameState);
         this._content.update(tileset, frameState);
         this._transformDirty = false;
+        this._commandsLength = frameState.commandList.length - initCommandLength;
     };
 
     var scratchCommandList = [];

Source/Scene/Cesium3DTileset.js

@@ -401,7 +401,73 @@ define([
          * @default false
          */
         this.debugShowGeometricError = defaultValue(options.debugShowGeometricError, false);
-        this._geometricErrorLabels = undefined;
+        this._tileInfoLabels = undefined;
+
+        /**
+         * This property is for debugging only; it is not optimized for production use.
+         * <p>
+         * When true, draws labels to indicate the number of commands used.
+         * </p>
+         *
+         * @type {Boolean}
+         * @default false
+         */
+        this.debugShowNumberOfCommands = defaultValue(options.debugShowNumberOfCommands, false);
+
+        /**
+         * This property is for debugging only; it is not optimized for production use.
+         * <p>
+         * When true, draws labels to indicate the number of points in each tile.
+         * </p>
+         *
+         * @type {Boolean}
+         * @default false
+         */
+        this.debugShowNumberOfPoints = defaultValue(options.debugShowNumberOfPoints, false);
+
+        /**
+         * This property is for debugging only; it is not optimized for production use.
+         * <p>
+         * When true, draws labels to indicate the number of triangles in each tile.
+         * </p>
+         *
+         * @type {Boolean}
+         * @default false
+         */
+        this.debugShowNumberOfTriangles = defaultValue(options.debugShowNumberOfTriangles, false);
+
+        /**
+         * This property is for debugging only; it is not optimized for production use.
+         * <p>
+         * When true, draws labels to indicate the number of features in each tile.
+         * </p>
+         *
+         * @type {Boolean}
+         * @default false
+         */
+        this.debugShowNumberOfFeatures = defaultValue(options.debugShowNumberOfFeatures, false);
+
+        /**
+         * This property is for debugging only; it is not optimized for production use.
+         * <p>
+         * When true, draws labels to indicate the texture memory usage.
+         * </p>
+         *
+         * @type {Boolean}
+         * @default false
+         */
+        this.debugShowTextureMemoryUsage = defaultValue(options.debugShowTextureMemoryUsage, false);
+
+        /**
+         * This property is for debugging only; it is not optimized for production use.
+         * <p>
+         * When true, draws labels to indicate the vertex memory usage.
+         * </p>
+         *
+         * @type {Boolean}
+         * @default false
+         */
+        this.debugShowVertexMemoryUsage = defaultValue(options.debugShowVertexMemoryUsage, false);
 
         /**
          * The event fired to indicate progress of loading new tiles.  This event is fired when a new tile
@@ -1838,10 +1904,10 @@ define([
 
     var scratchCartesian2 = new Cartesian3();
 
-    function updateGeometricErrorLabels(tileset, frameState) {
+    function updateTileInfoLabels(tileset, frameState) {
         var selectedTiles = tileset._selectedTiles;
         var length = selectedTiles.length;
-        tileset._geometricErrorLabels.removeAll();
+        tileset._tileInfoLabels.removeAll();
         for (var i = 0; i < length; ++i) {
             var tile = selectedTiles[i];
             var boundingVolume = tile._boundingVolume.boundingVolume;
@@ -1858,12 +1924,48 @@ define([
                 normal = Cartesian3.multiplyByScalar(normal, 0.75 * radius, scratchCartesian2);
                 position = Cartesian3.add(normal, boundingVolume.center, scratchCartesian2);
             }
-            tileset._geometricErrorLabels.add({
-                text: tile.geometricError.toString(),
-                position: position
+
+            var labelString = '';
+            var attributes = 0;
+
+            if (tileset.debugShowGeometricError) {
+                labelString += "\nGeometric error: " + tile.geometricError;
+                attributes++;
+            }
+            if (tileset.debugShowNumberOfCommands) {
+                labelString += "\nCommands: " + tile._commandsLength;
+                attributes++;
+            }
+            if (tileset.debugShowNumberOfPoints) {
+                labelString += "\nPoints: " + tile.content.pointsLength;
+                attributes++;
+            }
+            if (tileset.debugShowNumberOfTriangles) {
+                labelString += "\nTriangles: " + tile.content.trianglesLength;
+                attributes++;
+            }
+            if (tileset.debugShowNumberOfFeatures) {
+                labelString += "\nFeatures: " + tile.content.featuresLength;
+                attributes++;
+            }
+            if (tileset.debugShowTextureMemoryUsage) {
+                labelString += "\nTexture Memory: " + tile.content.textureMemorySizeInBytes;
+                attributes++;
+            }
+            if (tileset.debugShowVertexMemoryUsage) {
+                labelString += "\nVertex Memory: " + tile.content.vertexMemorySizeInBytes;
+                attributes++;
+            }
+
+            tileset._tileInfoLabels.add({
+                text : labelString.substring(1),
+                position : position,
+                font : (19-attributes) + 'px sans-serif',
+                showBackground : true,
+                disableDepthTestDistance : Number.POSITIVE_INFINITY
             });
         }
-        tileset._geometricErrorLabels.update(frameState);
+        tileset._tileInfoLabels.update(frameState);
     }
 
     var stencilClearCommand = new ClearCommand({
@@ -1948,13 +2050,15 @@ define([
         // Number of commands added by each update above
         tileset._statistics.numberOfCommands = (commandList.length - numberOfInitialCommands);
 
-        if (tileset.debugShowGeometricError) {
-            if (!defined(tileset._geometricErrorLabels)) {
-                tileset._geometricErrorLabels = new LabelCollection();
+        if (tileset.debugShowGeometricError || tileset.debugShowNumberOfCommands || tileset.debugShowTextureMemoryUsage ||
+            tileset.debugShowVertexMemoryUsage || tileset.debugShowNumberOfPoints || tileset.debugShowNumberOfTriangles ||
+            tileset.debugShowNumberOfFeatures) {
+            if (!defined(tileset._tileInfoLabels)) {
+                tileset._tileInfoLabels = new LabelCollection();
             }
-            updateGeometricErrorLabels(tileset, frameState);
+            updateTileInfoLabels(tileset, frameState);
         } else {
-            tileset._geometricErrorLabels = tileset._geometricErrorLabels && tileset._geometricErrorLabels.destroy();
+            tileset._tileInfoLabels = tileset._tileInfoLabels && tileset._tileInfoLabels.destroy();
         }
     }
 
@@ -2115,6 +2219,11 @@ define([
      * @see Cesium3DTileset#isDestroyed
      */
     Cesium3DTileset.prototype.destroy = function() {
+        // Destroy debug labels
+        if (defined(this._tileInfoLabels)) {
+            this._tileInfoLabels.destroy();
+        }
+
         // Traverse the tree and destroy all tiles
         if (defined(this._root)) {
             var stack = scratchStack;

Source/Scene/Instanced3DModel3DTileContent.js

@@ -82,8 +82,8 @@ define([
         this.featurePropertiesDirty = false;
 
         this._features = undefined;
-
         initialize(this, arrayBuffer, byteOffset);
+
     }
 
     defineProperties(Instanced3DModel3DTileContent.prototype, {

Source/Scene/Model.js

@@ -3356,11 +3356,6 @@ define([
 
     function triangleCountFromPrimitiveIndices(primitive, indicesCount) {
         switch (primitive.mode) {
-            case PrimitiveType.POINTS:
-            case PrimitiveType.LINES:
-            case PrimitiveType.LINE_LOOP:
-            case PrimitiveType.LINE_STRIP:
-                return 0;
             case PrimitiveType.TRIANGLES:
                 return (indicesCount / 3);
             case PrimitiveType.TRIANGLE_STRIP:

Source/Widgets/Cesium3DTilesInspector/Cesium3DTilesInspector.js

@@ -132,6 +132,7 @@ define([
         var updatePanelContents = document.createElement('div');
         var loggingPanelContents = document.createElement('div');
         var stylePanelContents = document.createElement('div');
+        var tileInfoPanelContents = document.createElement('div');
 
         var properties = document.createElement('div');
         properties.className = 'field-group';
@@ -152,7 +153,6 @@ define([
         displayPanelContents.appendChild(makeCheckbox('showBoundingVolumes', 'Bounding Volumes'));
         displayPanelContents.appendChild(makeCheckbox('showContentBoundingVolumes', 'Content Volumes'));
         displayPanelContents.appendChild(makeCheckbox('showRequestVolumes', 'Request Volumes'));
-        displayPanelContents.appendChild(makeCheckbox('showGeometricError', 'Geometric Error'));
 
         updatePanelContents.appendChild(makeCheckbox('freezeFrame', 'Freeze Frame'));
         updatePanelContents.appendChild(makeCheckbox('dynamicScreenSpaceError', 'Dynamic Screen Space Error'));
@@ -196,17 +196,27 @@ define([
         errorBox.setAttribute('data-bind', 'text: editorError');
         stylePanelContents.appendChild(errorBox);
 
+        tileInfoPanelContents.appendChild(makeCheckbox('showGeometricError', 'Geometric Error'));
+        tileInfoPanelContents.appendChild(makeCheckbox('numberOfCommands', 'Number Of Commands'));
+        tileInfoPanelContents.appendChild(makeCheckbox('numberOfPoints', 'Number Of Points'));
+        tileInfoPanelContents.appendChild(makeCheckbox('numberOfTriangles', 'Number Of Triangles'));
+        tileInfoPanelContents.appendChild(makeCheckbox('numberOfFeatures', 'Number Of Features'));
+        tileInfoPanelContents.appendChild(makeCheckbox('textureMemory', 'Texture Memory Usage'));
+        tileInfoPanelContents.appendChild(makeCheckbox('vertexMemory', 'Vertex Memory Usage'));
+
         var tilesetPanel = makeSection('Tileset', 'tilesetVisible', 'toggleTileset', tilesetPanelContents);
         var displayPanel = makeSection('Display', 'displayVisible', 'toggleDisplay', displayPanelContents);
         var updatePanel = makeSection('Update', 'updateVisible', 'toggleUpdate', updatePanelContents);
         var loggingPanel = makeSection('Logging', 'loggingVisible', 'toggleLogging', loggingPanelContents);
+        var tileInfoPanel = makeSection('Tile Info', 'tileInfoVisible', 'toggleTileInfo', tileInfoPanelContents);
         var stylePanel = makeSection('Style', 'styleVisible', 'toggleStyle', stylePanelContents);
 
         // first add and bind all the toggleable panels
         element.appendChild(tilesetPanel);
         element.appendChild(displayPanel);
         element.appendChild(updatePanel);
         element.appendChild(loggingPanel);
+        element.appendChild(tileInfoPanel);
         element.appendChild(stylePanel);
 
         knockout.applyBindings(viewModel, element);