update specs for frame rate monitor class

CesiumGS · Sep 26, 2024 · 4a9e21f · 4a9e21f
1 parent 6f270f9
commit 4a9e21f
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 0 deletions.
diff --git a/packages/engine/Specs/Scene/FrameRateMonitorSpec.js b/packages/engine/Specs/Scene/FrameRateMonitorSpec.js
@@ -58,13 +58,15 @@ describe(
  monitor = new FrameRateMonitor({
  scene: scene,
  samplingWindow: 3.0,
+ averageFrameRateWindow: 20,
  quietPeriod: 1.0,
  warmupPeriod: 6.0,
  minimumFrameRateDuringWarmup: 1,
  minimumFrameRateAfterWarmup: 2,
  });
 
  expect(monitor.samplingWindow).toBe(3.0);
+ expect(monitor.averageFrameRateWindow).toBe(20);
  expect(monitor.quietPeriod).toBe(1.0);
  expect(monitor.warmupPeriod).toBe(6.0);
  expect(monitor.minimumFrameRateDuringWarmup).toBe(1);
@@ -251,6 +253,43 @@ describe(
  expect(monitor.lastFramesPerSecond).toBeGreaterThanOrEqual(10);
  expect(nominalListener).toHaveBeenCalled();
  });
+
+ it("returns averageFrameRate, irrespective of quiet period and pauses", function () {
+ monitor = new FrameRateMonitor({
+ scene: scene,
+ quietPeriod: 3,
+ warmupPeriod: 1,
+ samplingWindow: 1,
+ averageFrameRateWindow: 20,
+ minimumFrameRateDuringWarmup: 10,
+ minimumFrameRateAfterWarmup: 10,
+ });
+
+ // Rendering once starts the quiet period
+ scene.render();
+
+ // Render 10 frames at 100 millisecond interval
+ let numFramesRendered = 0;
+ while (numFramesRendered < 10) {
+ scene.render();
+ spinWait(100);
+ numFramesRendered++;
+ }
+
+ monitor.pause();
+
+ // Render 15 more frames at 100 millisecond interval
+ while (numFramesRendered < 25) {
+ scene.render();
+ spinWait(100);
+ numFramesRendered++;
+ }
+
+ monitor.unpause();
+
+ expect(getTimestamp()).toBeLessThan(monitor._quietPeriodEndTime);
+ expect(monitor.averageFramesPerSecond).toBeCloseTo(10, 1);
+ });
  },
  "WebGL"
 );
diff --git a/packages/engine/Specs/Scene/ScreenSpaceCameraControllerSpec.js b/packages/engine/Specs/Scene/ScreenSpaceCameraControllerSpec.js
@@ -22,6 +22,7 @@ import {
 import createCamera from "../../../../Specs/createCamera.js";
 import createCanvas from "../../../../Specs/createCanvas.js";
 import DomEventSimulator from "../../../../Specs/DomEventSimulator.js";
+import Event from "../../Source/Core/Event.js";
 
 describe("Scene/ScreenSpaceCameraController", function () {
  let usePointerEvents;
@@ -41,6 +42,7 @@ describe("Scene/ScreenSpaceCameraController", function () {
  this.screenSpaceCameraController = undefined;
  this.cameraUnderground = false;
  this.globeHeight = 0.0;
+ this.preUpdate = new Event();
  }
 
  function MockGlobe(ellipsoid) {