-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7774 from loshjawrence/staging-3dtiles-streaming-…
…optimizations 3DTiles streaming optimizations
- Loading branch information
Showing
28 changed files
with
2,153 additions
and
583 deletions.
There are no files selected for viewing
211 changes: 211 additions & 0 deletions
211
Apps/Sandcastle/gallery/development/3D Tiles Performance Testing.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,211 @@ | ||
| <!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 | ||
| /* | ||
| This Sandcastle makes it easy to test streaming performance for 3D Tiles & terrain. `startTest()` will begin a | ||
| camera tour, and end once both the tileset has finish resolving in the final view. | ||
| It is better to host locally with throttling and disabled cache (f12, networktab). | ||
| You can add more flights to destinationFunctions to change the tour or make it longer. | ||
| The heatmapTileProperty will colorize the tile property in a heatmap. Booleans should set a reference min/max of -1,1 to help with coloring. | ||
| */ | ||
| var viewer = new Cesium.Viewer('cesiumContainer'); | ||
| var scene = viewer.scene; | ||
| var camera = scene.camera; | ||
| var globe = scene.globe; | ||
| var statistics = Cesium.RequestScheduler.statistics; | ||
| var Cartesian3 = Cesium.Cartesian3; | ||
|
|
||
| var tourTime = 0; | ||
| var tourLoads = 0; | ||
| var destinationFunctions = []; | ||
| var lastTotalLoaded = 0; | ||
| var flightDuration = 8.0; | ||
| var doTour = true; | ||
| var currentDestination = 0; | ||
|
|
||
| var referenceMinimum = new Cesium.JulianDate(); | ||
| var referenceMaximum = new Cesium.JulianDate(); | ||
| var heatmapTileProperty = '_foveatedFactor'; | ||
|
|
||
| var tileset = new Cesium.Cesium3DTileset({ | ||
| url: Cesium.IonResource.fromAssetId(5741), | ||
| debugHeatmapTilePropertyName: heatmapTileProperty | ||
| }); | ||
|
|
||
| function updateReferenceMinMax() { | ||
| if (heatmapTileProperty === '_loadTimestamp') { | ||
| Cesium.JulianDate.now(referenceMinimum); | ||
| var viewLoadTime = 10; | ||
| Cesium.JulianDate.addSeconds(referenceMinimum, viewLoadTime, referenceMaximum); | ||
| tileset._heatmap.setReferenceMinimumMaximum(referenceMinimum, referenceMaximum, heatmapTileProperty); | ||
| } else if (heatmapTileProperty === '_priorityDeferred') { | ||
| tileset._heatmap.setReferenceMinimumMaximum(-1, 1, heatmapTileProperty); | ||
| } | ||
| } | ||
|
|
||
| viewer.scene.primitives.add(tileset); | ||
|
|
||
| destinationFunctions[0] = function(){ | ||
| tourTime = 0; | ||
| updateReferenceMinMax(); | ||
| camera.flyTo({ | ||
| destination : new Cartesian3(1333596.036282181, -4655169.681831507, 4137566.3043841794), | ||
| orientation : { | ||
| direction : new Cartesian3(0.16082862107778806, 0.8832766751525227, 0.4404048929947557), | ||
| up : new Cartesian3(0.27688172689171486, -0.4686726309748134, 0.8388578391411791) | ||
| }, | ||
| duration : 0, | ||
| easingFunction: Cesium.EasingFunction.LINEAR_NONE | ||
| }); | ||
| startTimer(); | ||
| }; | ||
|
|
||
| destinationFunctions[1] = function(){ | ||
| updateReferenceMinMax(); | ||
| camera.flyTo({ | ||
| destination : new Cartesian3(1334667.3697728787, -4654198.808294234, 4137970.3278586734), | ||
| orientation : { | ||
| direction : new Cartesian3(-0.27073345520322445, 0.8195770495850765, 0.504972133911511), | ||
| up : new Cartesian3(0.12792976837875633, -0.48927851021971713, 0.8626937543530335) | ||
| }, | ||
| duration : flightDuration, | ||
| easingFunction: Cesium.EasingFunction.LINEAR_NONE, | ||
| maximumHeight : 100 | ||
| }); | ||
| startTimer(); | ||
| }; | ||
|
|
||
| destinationFunctions[2] = function(){ | ||
| updateReferenceMinMax(); | ||
| camera.flyTo({ | ||
| destination : new Cartesian3(1334615.6546409938, -4653003.089826743, 4139331.5003454844), | ||
| orientation : { | ||
| direction : new Cartesian3(-0.2708199805903497, 0.8196978379289465, 0.5047296232713642), | ||
| up : new Cartesian3(0.12789117766285887, -0.48903793608573193, 0.8628358730054139) | ||
| }, | ||
| duration : flightDuration, | ||
| easingFunction: Cesium.EasingFunction.LINEAR_NONE, | ||
| maximumHeight : 100 | ||
| }); | ||
| startTimer(); | ||
| }; | ||
|
|
||
| destinationFunctions[3] = function(){ | ||
| console.log('Total Loads and Time (ignoring first view and flight time): ' + tourLoads + ', ' + tourTime); | ||
| }; | ||
|
|
||
| viewer.scene.debugShowFramesPerSecond = true; | ||
|
|
||
| Sandcastle.addToolbarButton('Start Test', function() { | ||
| currentDestination = 0; | ||
| tourLoads = 0; | ||
| tourTime = 0; | ||
| doTour = true; | ||
| lastTotalLoaded = 0; | ||
| destinationFunctions[0](); | ||
| }); | ||
|
|
||
| Sandcastle.addToolbarButton('View 0', function() { | ||
| destinationFunctions[0](); | ||
| }); | ||
|
|
||
| Sandcastle.addToolbarButton('View 1', function() { | ||
| destinationFunctions[1](); | ||
| }); | ||
|
|
||
| Sandcastle.addToolbarButton('View 2', function() { | ||
| destinationFunctions[2](); | ||
| }); | ||
|
|
||
| function startTimer() { | ||
| var timerStart = window.performance.now(); | ||
| var timerListener = function() { | ||
| if (camera._currentFlight !== undefined) { | ||
| tileset.allTilesLoaded.removeEventListener(timerListener); | ||
| camera.moveEnd.addEventListener(timerListener); | ||
| return; | ||
| } else if (!tileset._tilesLoaded) { | ||
| return; | ||
| } | ||
| var timerEnd = window.performance.now(); | ||
| var duration = (timerEnd - timerStart) / 1000.0; | ||
| var totalLoaded = tileset._statistics.numberOfLoadedTilesTotal; | ||
| duration -= currentDestination === 0 ? 0 : flightDuration; | ||
| var flightLoads = totalLoaded - lastTotalLoaded; | ||
| console.log('view ' + currentDestination + ' flight loads, final view time: ' + flightLoads + ', ' + duration); | ||
| lastTotalLoaded = totalLoaded; | ||
| tourTime += currentDestination === 0 ? 0 : duration; | ||
| tourLoads += currentDestination === 0 ? 0 : flightLoads; | ||
| if (doTour && currentDestination < destinationFunctions.length - 1) { | ||
| destinationFunctions[++currentDestination](); | ||
| } | ||
| tileset.allTilesLoaded.removeEventListener(timerListener); | ||
| camera.moveEnd.removeEventListener(timerListener); | ||
| }; | ||
| window.setTimeout(function() { | ||
| tileset.allTilesLoaded.addEventListener(timerListener); | ||
| }, 50); | ||
| } | ||
|
|
||
| // Add code for flyto | ||
| Sandcastle.addToolbarButton('get cam', function() { | ||
| console.log('requested params for current camera view'); | ||
| var position = camera.position; | ||
| var direction = camera.direction; | ||
| var up = camera.up; | ||
|
|
||
| console.log('\n\ | ||
| Sandcastle.addToolbarButton(VIEW, function() {\n\ | ||
| camera.flyTo({\n\ | ||
| destination : new Cartesian3(' + position.x + ', ' + position.y + ', ' + position.z + '),\n\ | ||
| orientation : {\n\ | ||
| direction : new Cartesian3(' + direction.x + ', ' + direction.y + ', ' + direction.z + '),\n\ | ||
| up : new Cartesian3(' + up.x + ', ' + up.y + ', ' + up.z + '),\n\ | ||
| },\n\ | ||
| duration : flightDuration,\n\ | ||
| easingFunction: Cesium.EasingFunction.LINEAR_NONE,\n\ | ||
| });\n\ | ||
| timeAll();\n\ | ||
| });'); | ||
| });//Sandcastle_End | ||
| Sandcastle.finishedLoading(); | ||
| } | ||
| if (typeof Cesium !== "undefined") { | ||
| startup(Cesium); | ||
| } else if (typeof require === "function") { | ||
| require(["Cesium"], startup); | ||
| } | ||
| </script> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.