Skip to content
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

Jump to bottom

ColladaLoader2: Improve processing of visual scene #11446

Merged
merged 1 commit into from
Jun 5, 2017
Merged

ColladaLoader2: Improve processing of visual scene #11446

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
82 changes: 66 additions & 16 deletions examples/js/loaders/ColladaLoader2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* @author mrdoob / http://mrdoob.com/
* @author Mugen87 / https://github.com/Mugen87
*/

THREE.ColladaLoader = function ( manager ) {
Expand Down Expand Up @@ -438,6 +439,22 @@ THREE.ColladaLoader.prototype = {

}

function buildController( data ) {

// for now, we only return the id of the skin in order to get the corresponding geometry

var keys = Object.keys( data.skin );

return { id: keys[ 0 ] };

}

function getController( id ) {

return getBuild( library.controllers[ id ], buildController );

}

// image

function parseImage( xml ) {
Expand Down Expand Up @@ -1276,9 +1293,6 @@ THREE.ColladaLoader.prototype = {
}
break;

default:
console.log( child );

}

}
Expand Down Expand Up @@ -1525,6 +1539,7 @@ THREE.ColladaLoader.prototype = {
matrix: new THREE.Matrix4(),
nodes: [],
instanceCameras: [],
instanceControllers: [],
instanceLights: [],
instanceGeometries: [],
instanceNodes: []
Expand Down Expand Up @@ -1553,12 +1568,16 @@ THREE.ColladaLoader.prototype = {
data.instanceCameras.push( parseId( child.getAttribute( 'url' ) ) );
break;

case 'instance_controller':
data.instanceControllers.push( parseNodeInstance( child ) );
break;

case 'instance_light':
data.instanceLights.push( parseId( child.getAttribute( 'url' ) ) );
break;

case 'instance_geometry':
data.instanceGeometries.push( parseNodeInstanceGeometry( child ) );
data.instanceGeometries.push( parseNodeInstance( child ) );
break;

case 'instance_node':
Expand Down Expand Up @@ -1607,7 +1626,7 @@ THREE.ColladaLoader.prototype = {

}

function parseNodeInstanceGeometry( xml ) {
function parseNodeInstance( xml ) {

var data = {
id: parseId( xml.getAttribute( 'url' ) ),
Expand All @@ -1618,21 +1637,29 @@ THREE.ColladaLoader.prototype = {

var child = xml.childNodes[ i ];

if ( child.nodeName === 'bind_material' ) {
switch ( child.nodeName ) {

var instances = child.getElementsByTagName( 'instance_material' );
case 'bind_material':
var instances = child.getElementsByTagName( 'instance_material' );

for ( var j = 0; j < instances.length; j ++ ) {
for ( var j = 0; j < instances.length; j ++ ) {

var instance = instances[ j ];
var symbol = instance.getAttribute( 'symbol' );
var target = instance.getAttribute( 'target' );
var instance = instances[ j ];
var symbol = instance.getAttribute( 'symbol' );
var target = instance.getAttribute( 'target' );

data.materials[ symbol ] = parseId( target );
data.materials[ symbol ] = parseId( target );

}
}

break;
break;

case 'skeleton':
data.skeleton = parseId( child.textContent );;
break;

default:
break;

}

Expand All @@ -1649,6 +1676,7 @@ THREE.ColladaLoader.prototype = {
var matrix = data.matrix;
var nodes = data.nodes;
var instanceCameras = data.instanceCameras;
var instanceControllers = data.instanceControllers;
var instanceLights = data.instanceLights;
var instanceGeometries = data.instanceGeometries;
var instanceNodes = data.instanceNodes;
Expand All @@ -1665,6 +1693,28 @@ THREE.ColladaLoader.prototype = {

}

for ( var i = 0, l = instanceControllers.length; i < l; i ++ ) {

var instance = instanceControllers[ i ];
var controller = getController( instance.id );
var geometries = getGeometry( controller.id );

for ( var key in geometries ) {

var object = geometries[ key ].clone();

if ( instance.materials[ key ] !== undefined ) {

object.material = getMaterial( instance.materials[ key ] );

}

objects.push( object );

}

}

for ( var i = 0, l = instanceLights.length; i < l; i ++ ) {

objects.push( getLight( instanceLights[ i ] ).clone() );
Expand Down Expand Up @@ -1825,7 +1875,7 @@ THREE.ColladaLoader.prototype = {
console.time( 'THREE.ColladaLoader: Parse' );

// parseLibrary( collada, 'library_animations', 'animation', parseAnimation );
// parseLibrary( collada, 'library_controllers', 'controller', parseController );
parseLibrary( collada, 'library_controllers', 'controller', parseController );
parseLibrary( collada, 'library_images', 'image', parseImage );
parseLibrary( collada, 'library_effects', 'effect', parseEffect );
parseLibrary( collada, 'library_materials', 'material', parseMaterial );
Expand All @@ -1839,13 +1889,13 @@ THREE.ColladaLoader.prototype = {

console.time( 'THREE.ColladaLoader: Build' );

buildLibrary( library.controllers, buildController );
buildLibrary( library.images, buildImage );
buildLibrary( library.effects, buildEffect );
buildLibrary( library.materials, buildMaterial );
buildLibrary( library.cameras, buildCamera );
buildLibrary( library.lights, buildLight );
buildLibrary( library.geometries, buildGeometry );
// buildLibrary( library.nodes, buildNode );
buildLibrary( library.visualScenes, buildVisualScene );

console.timeEnd( 'THREE.ColladaLoader: Build' );
Expand Down