Skip to content

[pull] dev from mrdoob:dev #1076

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
pull merged 4 commits into from
Jan 13, 2026
Merged

[pull] dev from mrdoob:dev #1076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ce3c15
USDLoader: Added USDC file support. (#32704)
mrdoob Jan 13, 2026
8084de7
Editor: Debounce Resources panel updates.
mrdoob Jan 13, 2026
1cf2378
Examples: Add missing UnrealBloomPass parameters (#32736)
Methuselah96 Jan 13, 2026
8380531
PMREM: Simplify GGX VNDF importance sampling. (#32737)
Mugen87 Jan 13, 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
22 changes: 16 additions & 6 deletions editor/js/Sidebar.Project.Resources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,22 @@ function SidebarProjectResources( editor ) {

}

signals.editorCleared.add( refreshUI );
signals.sceneGraphChanged.add( refreshUI );
signals.geometryChanged.add( refreshGeometriesUI );
signals.materialAdded.add( refreshMaterialsUI );
signals.materialChanged.add( refreshMaterialsUI );
signals.materialRemoved.add( refreshMaterialsUI );
let timeout;

function refreshUIDelayed() {

clearTimeout( timeout );

timeout = setTimeout( refreshUI, 100 );

}

signals.editorCleared.add( refreshUIDelayed );
signals.sceneGraphChanged.add( refreshUIDelayed );
signals.geometryChanged.add( refreshUIDelayed );
signals.materialAdded.add( refreshUIDelayed );
signals.materialChanged.add( refreshUIDelayed );
signals.materialRemoved.add( refreshUIDelayed );

signals.objectSelected.add( function ( object ) {

Expand Down
25 changes: 19 additions & 6 deletions examples/jsm/loaders/USDLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@ import { USDAParser } from './usd/USDAParser.js';
import { USDCParser } from './usd/USDCParser.js';

/**
* A loader for the USDZ format.
* A loader for the USD format (USDA, USDC, USDZ).
*
* USDZ files that use USDC internally are not yet supported, only USDA.
* Supports both ASCII (USDA) and binary (USDC) USD files, as well as
* USDZ archives containing either format.
*
* ```js
* const loader = new USDZLoader();
* const model = await loader.loadAsync( 'saeukkang.usdz' );
* const loader = new USDLoader();
* const model = await loader.loadAsync( 'model.usdz' );
* scene.add( model );
* ```
*
Expand Down Expand Up @@ -97,13 +98,18 @@ class USDLoader extends Loader {

for ( const filename in zip ) {

if ( filename.endsWith( 'png' ) ) {
if ( filename.endsWith( 'png' ) || filename.endsWith( 'jpg' ) || filename.endsWith( 'jpeg' ) ) {

const blob = new Blob( [ zip[ filename ] ], { type: 'image/png' } );
const type = filename.endsWith( 'png' ) ? 'image/png' : 'image/jpeg';
const blob = new Blob( [ zip[ filename ] ], { type } );
data[ filename ] = URL.createObjectURL( blob );

}

}

for ( const filename in zip ) {

if ( filename.endsWith( 'usd' ) || filename.endsWith( 'usda' ) || filename.endsWith( 'usdc' ) ) {

if ( isCrateFile( zip[ filename ] ) ) {
Expand Down Expand Up @@ -208,6 +214,13 @@ class USDLoader extends Loader {

const file = findUSD( zip );

// Check if the main file is USDC (binary) or USDA (ASCII)
if ( isCrateFile( file ) ) {

return usdc.parse( file.buffer, assets );

}

const text = fflate.strFromU8( file );

return usda.parse( text, assets );
Expand Down
Loading