Skip to content
This repository was archived by the owner on Dec 21, 2025. It is now read-only.

Commit fa6e241

Browse files
Update MTL Loader
1 parent c365e18 commit fa6e241

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

viewers/static/jsm/loaders/MTLLoader.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ class MaterialCreator {
363363

364364
const exr_or_hdr = ( value.toLowerCase().endsWith( '.exr' ) || value.toLowerCase().endsWith( '.hdr' ) );
365365

366-
const texParams = scope.getTextureParams( original_mat[ prop ] );
366+
const texParams = scope.getTextureParams( original_mat[ prop ], params );
367367
const map = scope.loadTexture( resolveURL( scope.baseUrl, value ) );
368368

369369
map.repeat.copy( texParams.scale );
@@ -463,16 +463,6 @@ class MaterialCreator {
463463
setMapForType( 'displacementMap', value, lprop );
464464
break;
465465

466-
case 'disp_b':
467-
// Displacement bias
468-
params.displacementBias = parseFloat( value );
469-
break;
470-
471-
case 'disp_s':
472-
// Displacement scale
473-
params.displacementScale = parseFloat( value );
474-
break;
475-
476466
case 'pli':
477467
// Lightmap intensity
478468
params.lightMapIntensity = parseFloat( value );
@@ -841,7 +831,7 @@ class MaterialCreator {
841831

842832
}
843833

844-
getTextureParams( value ) {
834+
getTextureParams( value, matParams ) {
845835

846836
const texParams = {
847837

@@ -886,6 +876,16 @@ class MaterialCreator {
886876

887877
}
888878

879+
pos = items.indexOf( '-mm' );
880+
881+
if ( pos >= 0 ) {
882+
883+
matParams.displacementBias = parseFloat( items[ pos + 1 ] );
884+
matParams.displacementScale = parseFloat( items[ pos + 2 ] );
885+
items.splice( pos, 3 );
886+
887+
}
888+
889889
pos = items.indexOf( '-r' );
890890

891891
if ( pos >= 0 ) {

viewers/static/jsm/loaders/MTLLoader.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)