CesiumGS · lilleyse · Apr 26, 2019 · Jan 28, 2019 · Jan 28, 2019 · Jan 28, 2019
diff --git a/Apps/Sandcastle/gallery/development/3D Tiles Performance Testing.html b/Apps/Sandcastle/gallery/development/3D Tiles Performance Testing.html
@@ -0,0 +1,188 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
+    <meta name="description" content="Measure 3D Tiles streaming and rendering performance.">
+    <meta name="cesium-sandcastle-labels" content="Development">
+    <title>Streaming Performance Testing</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">
+        if(typeof require === "function") {
+            require.config({
+                baseUrl : '../../../Source',
+                waitSeconds : 120
+            });
+        }
+    </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 scene = viewer.scene;
+var camera = scene.camera;
+var globe = scene.globe;
+var statistics = Cesium.RequestScheduler.statistics;
+
+var startTime;
+var flightComplete;
+var monitor;
+var minFrameRate = 1000;
+var maxFrameRate = 0;
+var sumFrameRate = 0.0;
+var frameRateSamples = 0;
+var doAlert = false;
+var tileset;
+
+viewer.scene.debugShowFramesPerSecond = true;
+/*
+This Sandcastle makes it easy to test streaming performance for 3D Tiles & terrain. `startTest()` will begin a
+counter, and end once both the globe and the tileset finish resolving. If a tileset is not defined, it will
+only check the globe, and vice versa.
+
+Set `doAlert = true` above to make it report the timings in an alert window instead of the console.
+
+To test flythroughs do:
+
+- Set the camera's position
+- startTest()
+- start flythrough
+
+To test how long just teleporting to a particular view takes:
+
+- startTest()
+- Set the camera's position
+*/
+
+function startTest() {
+    flightComplete = false;
+    minFrameRate = 1000;
+    maxFrameRate = 0;
+    sumFrameRate = 0.0;
+    frameRateSamples = 0;
+    statistics.numberOfActiveRequestsEver = 0;
+    monitor = new Cesium.FrameRateMonitor({
+        scene: scene,
+        samplingWindow: 1.0,
+        quietPeriod: 0.0,
+        warmupPeriod: 0.0,
+        minimumFrameRateDuringWarmup: 0,
+        minimumFrameRateAfterWarmup: 0
+    });
+    scene.preUpdate.addEventListener(measureFrameRate);
+    startTime = window.performance.now();
+    window.setTimeout(function() {
+        scene.postRender.addEventListener(viewReady);
+    }, 500);
+}
+
+function measureFrameRate() {
+    var frameRate = monitor.lastFramesPerSecond;
+    if (frameRate === undefined || frameRate !== frameRate) {
+        return;
+    }
+
+    ++frameRateSamples;
+    sumFrameRate += frameRate;
+    minFrameRate = Math.min(minFrameRate, frameRate);
+    maxFrameRate = Math.max(maxFrameRate, frameRate);
+}
+
+function viewReady(scene, time) {
+    var globeReady = true;
+    var tilesetReady = true;
+    if (globe !== undefined) {
+        globeReady = globe._surface.tileProvider.ready && globe._surface._tileLoadQueueHigh.length === 0 && globe._surface._tileLoadQueueMedium.length === 0 && globe._surface._tileLoadQueueLow.length === 0 && globe._surface._debug.tilesWaitingForChildren === 0;
+    }
+    if (tileset !== undefined) {
+        tilesetReady = tileset.tilesLoaded;
+    }
+
+    if (flightComplete && globeReady && tilesetReady) {
+        var endTime = window.performance.now();
+        var duration = endTime - startTime;
+        var message = '';
+        if (isNaN(sumFrameRate / frameRateSamples)) {
+            // We should really just be computing a running average of FPS instead of "samples".
+            message = (duration / 1000).toFixed(2) + ' seconds ' + statistics.numberOfActiveRequestsEver + ' requests. Not enough time for FPS average';
+            if (doAlert) {
+                alert(message);
+            } else {
+                console.log(message);
+            }
+
+        } else {
+            message = (duration / 1000).toFixed(2) + ' seconds ' + statistics.numberOfActiveRequestsEver + ' requests, min/max/avg frame FPS ' + minFrameRate.toFixed(0) + '/' + maxFrameRate.toFixed(0) + '/' + (sumFrameRate / frameRateSamples).toFixed(0);
+            if (doAlert) {
+                alert(message);
+            } else {
+                console.log(message);
+            }
+
+        }
+
+        scene.postRender.removeEventListener(viewReady);
+        scene.preUpdate.removeEventListener(measureFrameRate);
+    }
+}
+
+Sandcastle.addToolbarButton('View NYC', function() {
+    // Start counting. This will automatically finish once the scene resolves.
+    startTest();
+    // Set the camera's positon
+    camera.position = new Cesium.Cartesian3(1333659.545421253, -4655803.231585404, 4137013.427090627);
+    camera.direction = new Cesium.Cartesian3(0.0016392394248821367, 0.8493471478486977, 0.5278321090416825);
+    camera.right = new Cesium.Cartesian3(0.9758518210834544, 0.11393464773820028, -0.18636555296748974);
+    camera.up = new Cesium.Cartesian3(0.2184274162787582, -0.5153914225965105, 0.8286501947937569);
+    flightComplete = true;
+
+});
+
+Sandcastle.addToolbarButton('Print flyto', function() {
+    var position = camera.position;
+    var direction = camera.direction;
+    var up = camera.up;
+
+    var cameraString = 'camera.flyTo({\n\
+        destination : new Cesium.Cartesian3(' + position.x + ', ' + position.y + ', ' + position.z + '),\n\
+        orientation : {\n\
+            direction : new Cesium.Cartesian3(' + direction.x + ', ' + direction.y + ', ' + direction.z + '),\n\
+            up : new Cesium.Cartesian3(' + up.x + ', ' + up.y + ', ' + up.z + '),\n\
+        },\n\
+        duration : 1,\n\
+        complete : function() {\n\
+            flightComplete = true;\n\
+        }\n\
+    });';
+    console.log(cameraString);
+});
+
+Sandcastle.addToolbarButton('Print view', function() {
+    var cameraString = 'camera.position = new Cesium.Cartesian3(' + camera.positionWC.x + ', ' + camera.positionWC.y + ', ' + camera.positionWC.z + ');\n'+
+                       'camera.direction = new Cesium.Cartesian3(' + camera.directionWC.x + ', ' + camera.directionWC.y + ', ' + camera.directionWC.z + ');\n'+
+                       'camera.right = new Cesium.Cartesian3(' + camera.rightWC.x + ', ' + camera.rightWC.y + ', ' + camera.rightWC.z + ');\n'+
+                       'camera.up = new Cesium.Cartesian3(' + camera.upWC.x + ', ' + camera.upWC.y + ', ' + camera.upWC.z + ');\n' +
+                       'flightComplete = true;\n';
+    console.log(cameraString);
+});//Sandcastle_End
+    Sandcastle.finishedLoading();
+}
+if (typeof Cesium !== "undefined") {
+    startup(Cesium);
+} else if (typeof require === "function") {
+    require(["Cesium"], startup);
+}
+</script>
+</body>
+</html>
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,9 @@ Change Log
 ##### Additions :tada:
 * Added support for the `KHR_texture_transform` glTF extension. [#7549](https://github.com/AnalyticalGraphicsInc/cesium/pull/7549)
 * Added support for color-to-alpha with a threshold on imagery layers. [#7727](https://github.com/AnalyticalGraphicsInc/cesium/pull/7727)
+* `CesiumMath.toSNorm` documentation changed to reflect the function's implementation.
+* Added `CesiumMath.normalize` to convert a scalar value in an arbitrary range to a scalar in the range [0.0, 1.0] .
+* Added `Cesium3DTileStatistics.numberOfLoadedTilesTotal` to capture the running total of loaded tiles for the lifetime of a session.
 
 ##### Fixes :wrench:
 * Fixed an error where `clampToHeightMostDetailed` or `sampleHeightMostDetailed` would crash if entities were created when the promise resolved. [#7690](https://github.com/AnalyticalGraphicsInc/cesium/pull/7690)

diff --git a/Source/Core/Math.js b/Source/Core/Math.js
@@ -227,29 +227,41 @@ define([
     };
 
     /**
-     * Converts a scalar value in the range [-1.0, 1.0] to a SNORM in the range [0, rangeMax]
+     * Converts a scalar value in the range [-1.0, 1.0] to a SNORM in the range [0, rangeMaximum]
      * @param {Number} value The scalar value in the range [-1.0, 1.0]
-     * @param {Number} [rangeMax=255] The maximum value in the mapped range, 255 by default.
-     * @returns {Number} A SNORM value, where 0 maps to -1.0 and rangeMax maps to 1.0.
+     * @param {Number} [rangeMaximum=255] The maximum value in the mapped range, 255 by default.
+     * @returns {Number} A SNORM value, where 0 maps to -1.0 and rangeMaximum maps to 1.0.
      *
      * @see CesiumMath.fromSNorm
      */
-    CesiumMath.toSNorm = function(value, rangeMax) {
-        rangeMax = defaultValue(rangeMax, 255);
-        return Math.round((CesiumMath.clamp(value, -1.0, 1.0) * 0.5 + 0.5) * rangeMax);
+    CesiumMath.toSNorm = function(value, rangeMaximum) {
+        rangeMaximum = defaultValue(rangeMaximum, 255);
+        return Math.round((CesiumMath.clamp(value, -1.0, 1.0) * 0.5 + 0.5) * rangeMaximum);
     };
 
     /**
-     * Converts a SNORM value in the range [0, rangeMax] to a scalar in the range [-1.0, 1.0].
-     * @param {Number} value SNORM value in the range [0, 255]
-     * @param {Number} [rangeMax=255] The maximum value in the SNORM range, 255 by default.
+     * Converts a SNORM value in the range [0, rangeMaximum] to a scalar in the range [-1.0, 1.0].
+     * @param {Number} value SNORM value in the range [0, rangeMaximum]
+     * @param {Number} [rangeMaximum=255] The maximum value in the SNORM range, 255 by default.
      * @returns {Number} Scalar in the range [-1.0, 1.0].
      *
      * @see CesiumMath.toSNorm
      */
-    CesiumMath.fromSNorm = function(value, rangeMax) {
-        rangeMax = defaultValue(rangeMax, 255);
-        return CesiumMath.clamp(value, 0.0, rangeMax) / rangeMax * 2.0 - 1.0;
+    CesiumMath.fromSNorm = function(value, rangeMaximum) {
+        rangeMaximum = defaultValue(rangeMaximum, 255);
+        return CesiumMath.clamp(value, 0.0, rangeMaximum) / rangeMaximum * 2.0 - 1.0;
+    };
+
+    /**
+     * Converts a scalar value in the range [rangeMinimum, rangeMaximum] to a scalar in the range [0.0, 1.0]
+     * @param {Number} value The scalar value in the range [rangeMinimum, rangeMaximum]
+     * @param {Number} rangeMinimum The minimum value in the mapped range.
+     * @param {Number} rangeMaximum The maximum value in the mapped range.
+     * @returns {Number} A scalar value, where rangeMinimum maps to 0.0 and rangeMaximum maps to 1.0.
+     */
+    CesiumMath.normalize = function(value, rangeMinimum, rangeMaximum) {
+        rangeMaximum = Math.max(rangeMaximum - rangeMinimum, 0.0);
+        return rangeMaximum === 0.0 ? 0.0 : CesiumMath.clamp((value - rangeMinimum) / rangeMaximum, 0.0, 1.0);
     };
 
     /**

diff --git a/Source/Core/RequestScheduler.js b/Source/Core/RequestScheduler.js
@@ -34,7 +34,8 @@ define([
         numberOfCancelledRequests : 0,
         numberOfCancelledActiveRequests : 0,
         numberOfFailedRequests : 0,
-        numberOfActiveRequestsEver : 0
+        numberOfActiveRequestsEver : 0,
+        lastNumberOfActiveRequests : 0
     };
 
     var priorityHeapLength = 20;
@@ -373,34 +374,34 @@ define([
         return issueRequest(request);
     };
 
-    function clearStatistics() {
-        statistics.numberOfAttemptedRequests = 0;
-        statistics.numberOfCancelledRequests = 0;
-        statistics.numberOfCancelledActiveRequests = 0;
-    }
-
     function updateStatistics() {
         if (!RequestScheduler.debugShowStatistics) {
             return;
         }
 
-        if (statistics.numberOfAttemptedRequests > 0) {
-            console.log('Number of attempted requests: ' + statistics.numberOfAttemptedRequests);
-        }
-        if (statistics.numberOfActiveRequests > 0) {
-            console.log('Number of active requests: ' + statistics.numberOfActiveRequests);
-        }
-        if (statistics.numberOfCancelledRequests > 0) {
-            console.log('Number of cancelled requests: ' + statistics.numberOfCancelledRequests);
-        }
-        if (statistics.numberOfCancelledActiveRequests > 0) {
-            console.log('Number of cancelled active requests: ' + statistics.numberOfCancelledActiveRequests);
-        }
-        if (statistics.numberOfFailedRequests > 0) {
-            console.log('Number of failed requests: ' + statistics.numberOfFailedRequests);
+        if (statistics.numberOfActiveRequests === 0 && statistics.lastNumberOfActiveRequests > 0) {
+            if (statistics.numberOfAttemptedRequests > 0) {
+                console.log('Number of attempted requests: ' + statistics.numberOfAttemptedRequests);
+                statistics.numberOfAttemptedRequests = 0;
+            }
+
+            if (statistics.numberOfCancelledRequests > 0) {
+                console.log('Number of cancelled requests: ' + statistics.numberOfCancelledRequests);
+                statistics.numberOfCancelledRequests = 0;
+            }
+
+            if (statistics.numberOfCancelledActiveRequests > 0) {
+                console.log('Number of cancelled active requests: ' + statistics.numberOfCancelledActiveRequests);
+                statistics.numberOfCancelledActiveRequests = 0;
+            }
+
+            if (statistics.numberOfFailedRequests > 0) {
+                console.log('Number of failed requests: ' + statistics.numberOfFailedRequests);
+                statistics.numberOfFailedRequests = 0;
+            }
         }
 
-        clearStatistics();
+        statistics.lastNumberOfActiveRequests = statistics.numberOfActiveRequests;
     }
 
     /**
@@ -427,6 +428,7 @@ define([
         statistics.numberOfCancelledActiveRequests = 0;
         statistics.numberOfFailedRequests = 0;
         statistics.numberOfActiveRequestsEver = 0;
+        statistics.lastNumberOfActiveRequests = 0;
     };
 
     /**