Skip to content

Commit a81e8d4

Browse files
committed
3MFLoader: Added another regex condition to parser to add the root model last
1 parent b84c8f1 commit a81e8d4

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

examples/jsm/loaders/3MFLoader.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,12 @@ class ThreeMFLoader extends Loader {
132132

133133
modelRelsName = file;
134134

135-
} else if ( file.match( /^3D\/.*\.model$/ ) ) {
135+
} else if ( file.match( /^3D\/[^\/]*\.model$/ ) ) {
136+
// root model
137+
rootModelFile = file ;
136138

139+
} else if ( file.match( /^3D\/.*\/.*\.model$/ ) ) {
140+
// sub models
137141
modelPartNames.push( file );
138142

139143
} else if ( file.match( /^3D\/Textures?\/.*/ ) ) {
@@ -1468,7 +1472,7 @@ class ThreeMFLoader extends Loader {
14681472
const modelsData = data3mf.model;
14691473
const modelRels = data3mf.modelRels;
14701474
const objects = {};
1471-
const modelsKeys = Object.keys( modelsData ).reverse();
1475+
const modelsKeys = Object.keys( modelsData );
14721476
const textureData = {};
14731477

14741478
// evaluate model relationships to textures

0 commit comments

Comments
 (0)