Skip to content

Web Viewer UI Improvements #2798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jstone-lucasfilm merged 2 commits into from
Mar 5, 2026
Merged

Web Viewer UI Improvements #2798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a327fe3
- add FPS
kwokcb Mar 3, 2026
1783fae
Merge remote-tracking branch 'upstream/main' into web_fps
kwokcb Mar 4, 2026
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
71 changes: 62 additions & 9 deletions javascript/MaterialXView/index.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,43 @@
<style>
body {
margin: 0;
font-family: Arial
font-family: "Segoe UI", Roboto, Arial, sans-serif;
font-size: 12px;
}

/* Responsive select menus */
select {
max-width: 40vw;
width: 100%;
box-sizing: border-box;
white-space: normal;
overflow-wrap: break-word;
word-break: break-word;
background: #000;
color: #fff;
border: 1px solid #444;
font-family: inherit;
font-size: inherit;
}

select option {
background: #000;
color: #fff;
font-family: inherit;
font-size: inherit;
}

.select-row {
color: rgb(255, 255, 255);
background: rgba(0,0,0,0.4);
position: absolute;
margin: 1em;
display: flex;
align-items: center;
gap: 0.5em;
}


/* Property editor item color */
.peditoritem {
background-color: #334444;
Expand All @@ -20,32 +54,51 @@
background-color: #333333;
}

/* Move property editor down to align with Material row */
.lil-gui {
top: 1.0em !important;
}

.peditor_material_assigned {
background-color: #006cb8;
}
.peditor_material_assigned:hover {
background-color: #32adff;
}

.fps-overlay {
position: fixed;
left: 10px;
bottom: 10px;
padding: 4px 10px;
background: rgba(0,0,0,0.4);
color: rgb(255, 255, 255);
font-family: inherit;
font-size: inherit;
z-index: 1000;
pointer-events: none;
}

</style>
</head>
<body style="margin: 0px; overflow: hidden;">
<div id="container">
<div style="color:white; position: absolute; top: 0em; margin: 1em">
<label for="materials">Material:</label>
<select name="materials" id="materials">
<div class="select-row" style="top: 0em;">
<label for="materials" style="margin: 0; padding: 0 0.2em; font-family: inherit; font-size: inherit;">Material:</label>
<select name="materials" id="materials" style="flex: 1 1 0; min-width: 0;">
<% materials.forEach(function(m){ %>
<option value="<%-m.value%>">
<%-m.name%>
<%- m.name.replace(/_/g, ' ').replace(/\.(mtlx|glb)$/, '').replace(/\w\S*/g, function(txt){return ' ' + txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();}) %>
</option>
<% }); %>
</select>
</div>
<div style="color:white; position: absolute; top: 1.5em; margin: 1em">
<label for="geometry">Geometry:</label>
<select name="geometry" id="geometry">
<div class="select-row" style="top: 1.5em;">
<label for="geometry" style="margin: 0; padding: 0 0.2em; font-family: inherit; font-size: inherit;">Geometry:</label>
<select name="geometry" id="geometry" style="flex: 1 1 0; min-width: 0;">
<% geometry.forEach(function(m){ %>
<option value="<%-m.value%>">
<%-m.name%>
<%- m.name.replace(/_/g, ' ').replace(/\.(mtlx|glb)$/, '').replace(/\w\S*/g, function(txt){return ' ' + txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();}) %>
</option>
<% }); %>
</select>
Expand Down
51 changes: 47 additions & 4 deletions javascript/MaterialXView/source/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ import { dropHandler, dragOverHandler, setLoadingCallback, setSceneLoadingCallba

let renderer, orbitControls;

// FPS overlay state
let fpsOverlay = null;
let showFPS = true;
let lastFrameTime = performance.now();
let frameCount = 0;
let fps = 0;

// Turntable option. For now the step size is fixed.
let turntableEnabled = false;
let turntableSteps = 360;
Expand All @@ -25,6 +32,24 @@ if (!materialFilename)
}

let viewer = Viewer.create();

// Create FPS overlay
function createFPSOverlay() {
fpsOverlay = document.createElement('div');
fpsOverlay.className = 'fps-overlay';
fpsOverlay.innerText = 'FPS: 0';
document.body.appendChild(fpsOverlay);
}

function setFPSOverlayVisible(visible) {
if (fpsOverlay) {
fpsOverlay.style.display = visible ? 'block' : 'none';
}
}

createFPSOverlay();
setFPSOverlayVisible(showFPS);

init();
viewer.getEditor().updateProperties(0.9);

Expand Down Expand Up @@ -81,10 +106,16 @@ function init()

// Add hotkey 'f' to capture the current frame and save an image file.
// See check inside the render loop when a capture can be performed.
document.addEventListener('keydown', (event) =>
{
if (event.key === 'f')
{

document.addEventListener('keydown', (event) => {
// Toggle FPS timer with T key
if (event.key === 't' || event.key === 'T') {
showFPS = !showFPS;
setFPSOverlayVisible(showFPS);
event.preventDefault();
}
// Capture frame with Shift+F
else if ((event.key === 'f' || event.key === 'F') && event.shiftKey) {
captureRequested = true;
}
});
Expand Down Expand Up @@ -165,6 +196,18 @@ function animate()
requestAnimationFrame(animate);
const scene = viewer.getScene();

// Compute FPS and update overlay every 1/2 second.
const now = performance.now();
frameCount++;
if (now - lastFrameTime >= 500) {
fps = Math.round((frameCount * 1000) / (now - lastFrameTime));
if (fpsOverlay && showFPS) {
fpsOverlay.innerText = `FPS: ${fps}`;
}
lastFrameTime = now;
frameCount = 0;
}

if (turntableEnabled)
{
turntableStep = (turntableStep + 1) % 360;
Expand Down