Skip to content

T
three.js

Ablesons / three.js
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
T
three.js

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 bc67d5f0 编写于 作者: M Mugen87
浏览文件
操作

3MFLoader: Fix relationship parsing.

上级 ad767947
隐藏空白更改
内联 并排
Showing with 68 addition and 34 deletion
examples/js/loaders/3MFLoader.js
浏览文件 @ bc67d5f0
......@@ -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 );
......@@ -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;
}
......@@ -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 ];
}
}
......@@ -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 ++ ) {
......@@ -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 );
},
......
examples/jsm/loaders/3MFLoader.js
浏览文件 @ bc67d5f0
......@@ -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 );
......@@ -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;
}
......@@ -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 ];
}
}
......@@ -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 ++ ) {
......@@ -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 );
},
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或