Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,15 @@ const ui = {

ui.appVersion.textContent = `Version ${APP_VERSION}`;

const viewer = createViewer($('#canvas-host'));
const viewer = createViewer($('#canvas-host'), {
onFramePresented: (frame) => {
lastFrame = frame;
const now = performance.now();
frameTimes.push(now);
frameTimes = frameTimes.filter((time) => time >= now - FPS_WINDOW_MS);
renderDebug();
}
});
createViewCube($('#view-cube'), viewer);
const debug = createDebugPanel(ui.summary, ui.debug);

Expand Down Expand Up @@ -314,12 +322,10 @@ function trackFrame(frame) {
if (frameSceneAddress && frameSceneAddress !== scene.getAddress()) return;
}

lastFrame = frame;
const now = performance.now();
frameTimes.push(now);
frameTimes = frameTimes.filter((time) => time >= now - FPS_WINDOW_MS);
viewer.renderFrame(frame);
renderDebug();
// Network delivery can be faster than the display loop. Keep only the
// freshest pending state per scene instead of mutating Three.js for frames
// that could never be presented.
viewer.queueFrame(frame);
}

function clearDisconnectCleanupTimer() {
Expand Down
23 changes: 22 additions & 1 deletion src/viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const PALETTE = [
0x2ec4b6 // aqua
];

export function createViewer(host) {
export function createViewer(host, { onFramePresented } = {}) {
const scene = new THREE.Scene();
scene.background = new THREE.Color(0x0c0f14);
scene.fog = new THREE.FogExp2(0x0c0f14, 0.014);
Expand Down Expand Up @@ -106,6 +106,8 @@ export function createViewer(host) {
};

const views = new Map();
// One pending state frame per scene bounds application-side buffering.
const pendingFrames = new Map();
const zoneRenderer = createZoneRenderer();
const unitBox = new THREE.BoxGeometry(1, 1, 1);
const unitBoxEdges = new THREE.EdgesGeometry(unitBox);
Expand Down Expand Up @@ -703,6 +705,22 @@ export function createViewer(host) {
insetAnimationFrame = requestAnimationFrame(tick);
}

function queueFrame(frame) {
const sceneAddress = frame.getSceneInfo().getAddress() || '';
pendingFrames.set(sceneAddress, frame);
}

function flushPendingFrames() {
if (pendingFrames.size === 0) return;

const frames = Array.from(pendingFrames.values());
pendingFrames.clear();
for (const frame of frames) {
renderFrame(frame);
onFramePresented?.(frame);
}
}

function renderFrame(frame) {
const sceneAddress = frame.getSceneInfo().getAddress() || '';
const active = new Set();
Expand Down Expand Up @@ -1086,6 +1104,7 @@ export function createViewer(host) {
}

function clearTracking() {
pendingFrames.clear();
for (const view of views.values()) disposeView(view);
views.clear();

Expand Down Expand Up @@ -1131,12 +1150,14 @@ export function createViewer(host) {
});

renderer.setAnimationLoop(() => {
flushPendingFrames();
controls.update();
zoneRenderer.animate(performance.now());
renderer.render(scene, camera);
});

return {
queueFrame,
renderFrame,
renderSetup,
clearTracking,
Expand Down
Loading