Skip to content

3MFLoader: Fix relationship parsing. #17813

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
merged 1 commit into from
Oct 25, 2019
Merged

3MFLoader: Fix relationship parsing. #17813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 34 additions & 17 deletions examples/js/loaders/3MFLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ THREE.ThreeMFLoader.prototype = Object.assign( Object.create( THREE.Loader.proto

printTicketPartNames.push( file );

} else if ( file.match( /^3D\/Texture\/.*/ ) ) {
} else if ( file.match( /^3D\/Textures?\/.*/ ) ) {

texturesPartNames.push( file );

Expand Down Expand Up @@ -193,17 +193,27 @@ THREE.ThreeMFLoader.prototype = Object.assign( Object.create( THREE.Loader.proto

function parseRelsXml( relsFileText ) {

var relationships = [];

var relsXmlData = new DOMParser().parseFromString( relsFileText, 'application/xml' );
var relsNode = relsXmlData.querySelector( 'Relationship' );
var target = relsNode.getAttribute( 'Target' );
var id = relsNode.getAttribute( 'Id' );
var type = relsNode.getAttribute( 'Type' );

return {
target: target,
id: id,
type: type
};
var relsNodes = relsXmlData.querySelectorAll( 'Relationship' );

for ( var i = 0; i < relsNodes.length; i ++ ) {

var relsNode = relsNodes[ i ];

var relationship = {
target: relsNode.getAttribute( 'Target' ), //required
id: relsNode.getAttribute( 'Id' ), //required
type: relsNode.getAttribute( 'Type' ) //required
};

relationships.push( relationship );

}

return relationships;

}

Expand Down Expand Up @@ -1144,15 +1154,20 @@ THREE.ThreeMFLoader.prototype = Object.assign( Object.create( THREE.Loader.proto
var modelsKeys = Object.keys( modelsData );
var textureData = {};

// evaluate model relationship to a texture
// evaluate model relationships to textures

if ( modelRels ) {

var textureKey = modelRels.target.substring( 1 );
for ( var i = 0, l = modelRels.length; i < l; i ++ ) {

var modelRel = modelRels[ i ];
var textureKey = modelRel.target.substring( 1 );

if ( data3mf.texture[ textureKey ] ) {
if ( data3mf.texture[ textureKey ] ) {

textureData[ modelRels.target ] = data3mf.texture[ textureKey ];
textureData[ modelRel.target ] = data3mf.texture[ textureKey ];

}

}

Expand Down Expand Up @@ -1181,10 +1196,12 @@ THREE.ThreeMFLoader.prototype = Object.assign( Object.create( THREE.Loader.proto

}

function build( objects, refs, data3mf ) {
function build( objects, data3mf ) {

var group = new THREE.Group();
var buildData = data3mf.model[ refs[ 'target' ].substring( 1 ) ][ 'build' ];

var relationship = data3mf[ 'rels' ][ 0 ];
var buildData = data3mf.model[ relationship[ 'target' ].substring( 1 ) ][ 'build' ];

for ( var i = 0; i < buildData.length; i ++ ) {

Expand Down Expand Up @@ -1212,7 +1229,7 @@ THREE.ThreeMFLoader.prototype = Object.assign( Object.create( THREE.Loader.proto
var data3mf = loadDocument( data );
var objects = buildObjects( data3mf );

return build( objects, data3mf[ 'rels' ], data3mf );
return build( objects, data3mf );

},

Expand Down
51 changes: 34 additions & 17 deletions examples/jsm/loaders/3MFLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ ThreeMFLoader.prototype = Object.assign( Object.create( Loader.prototype ), {

printTicketPartNames.push( file );

} else if ( file.match( /^3D\/Texture\/.*/ ) ) {
} else if ( file.match( /^3D\/Textures?\/.*/ ) ) {

texturesPartNames.push( file );

Expand Down Expand Up @@ -214,17 +214,27 @@ ThreeMFLoader.prototype = Object.assign( Object.create( Loader.prototype ), {

function parseRelsXml( relsFileText ) {

var relationships = [];

var relsXmlData = new DOMParser().parseFromString( relsFileText, 'application/xml' );
var relsNode = relsXmlData.querySelector( 'Relationship' );
var target = relsNode.getAttribute( 'Target' );
var id = relsNode.getAttribute( 'Id' );
var type = relsNode.getAttribute( 'Type' );

return {
target: target,
id: id,
type: type
};
var relsNodes = relsXmlData.querySelectorAll( 'Relationship' );

for ( var i = 0; i < relsNodes.length; i ++ ) {

var relsNode = relsNodes[ i ];

var relationship = {
target: relsNode.getAttribute( 'Target' ), //required
id: relsNode.getAttribute( 'Id' ), //required
type: relsNode.getAttribute( 'Type' ) //required
};

relationships.push( relationship );

}

return relationships;

}

Expand Down Expand Up @@ -1165,15 +1175,20 @@ ThreeMFLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
var modelsKeys = Object.keys( modelsData );
var textureData = {};

// evaluate model relationship to a texture
// evaluate model relationships to textures

if ( modelRels ) {

var textureKey = modelRels.target.substring( 1 );
for ( var i = 0, l = modelRels.length; i < l; i ++ ) {

var modelRel = modelRels[ i ];
var textureKey = modelRel.target.substring( 1 );

if ( data3mf.texture[ textureKey ] ) {
if ( data3mf.texture[ textureKey ] ) {

textureData[ modelRels.target ] = data3mf.texture[ textureKey ];
textureData[ modelRel.target ] = data3mf.texture[ textureKey ];

}

}

Expand Down Expand Up @@ -1202,10 +1217,12 @@ ThreeMFLoader.prototype = Object.assign( Object.create( Loader.prototype ), {

}

function build( objects, refs, data3mf ) {
function build( objects, data3mf ) {

var group = new Group();
var buildData = data3mf.model[ refs[ 'target' ].substring( 1 ) ][ 'build' ];

var relationship = data3mf[ 'rels' ][ 0 ];
var buildData = data3mf.model[ relationship[ 'target' ].substring( 1 ) ][ 'build' ];

for ( var i = 0; i < buildData.length; i ++ ) {

Expand Down Expand Up @@ -1233,7 +1250,7 @@ ThreeMFLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
var data3mf = loadDocument( data );
var objects = buildObjects( data3mf );

return build( objects, data3mf[ 'rels' ], data3mf );
return build( objects, data3mf );

},

Expand Down