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.

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

glTF 2.0 morph animation support #11350

Merged
merged 7 commits into from
May 20, 2017
Merged
Changes from 4 commits
Commits
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
156 changes: 146 additions & 10 deletions examples/js/loaders/GLTF2Loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,8 @@ THREE.GLTF2Loader = ( function () {
var PATH_PROPERTIES = {
scale: 'scale',
translation: 'position',
rotation: 'quaternion'
rotation: 'quaternion',
weights: 'morphTargetInfluences'
};

var INTERPOLATION = {
Expand Down Expand Up @@ -2111,6 +2112,93 @@ THREE.GLTF2Loader = ( function () {
meshNode = new THREE.Mesh( geometry, material );
meshNode.castShadow = true;

if ( primitive.targets !== undefined ) {

geometry.morphTargets = [];
Copy link
Collaborator

@Mugen87 Mugen87 May 17, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If #11285 is merged, creating geometry.morphTargets = []; should not be necessary anymore. Instead, you need to set the name of a morph target directly to a morphAttribute, see https://github.com/Mugen87/three.js/blob/f375cf243b9214266e9d40d3bf0e5da7862b47bc/examples/js/loaders/MMDLoader.js#L789

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#11285 has been merged 😊

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yay 🎉 ! 😊


var targets = primitive.targets;
var morphAttributes = geometry.morphAttributes;

for ( var i = 0, il = targets.length; i < il; i ++ ) {

var target = targets[ i ];
geometry.morphTargets.push( { name: 'morphTarget' + i } );

if ( target.POSITION !== undefined ) {

material.morphTargets = true;

if ( morphAttributes.position === undefined ) morphAttributes.position = [];

// Three.js morph formula is
// position
// + weight0 * ( morphTarget0 - position )
// + weight1 * ( morphTarget1 - position )
// ...
// while the glTF one is
// position
// + weight0 * morphTarget0
// + weight1 * morphTarget1
// ...
// then adding position to morphTarget.
// So morphTarget value will depend on mesh's position, then cloning attribute
// for the case if attribute is shared among two or more meshes.

var attribute = dependencies.accessors[ target.POSITION ].clone();
var position = geometry.attributes.position;

for ( var j = 0, jl = attribute.array.length; j < jl; j ++ ) {

attribute.array[ j ] += position.array[ j ];

}

morphAttributes.position.push( attribute );

}

if ( target.NORMAL !== undefined ) {

material.morphNormals = true;

if ( morphAttributes.normal === undefined ) morphAttributes.normal = [];

// see target.POSITION's comment

var attribute = dependencies.accessors[ target.NORMAL ].clone();
var normal = geometry.attributes.normal;

for ( var j = 0, jl = attribute.array.length; j < jl; j ++ ) {

attribute.array[ j ] += normal.array[ j ];

}

morphAttributes.normal.push( attribute );

}

// TODO: implement
if ( target.TANGENT !== undefined ) {

}

}

meshNode.updateMorphTargets();

if ( mesh.weights !== undefined ) {

for ( var i = 0, il = mesh.weights.length; i < il; i ++ ) {

meshNode.morphTargetInfluences[ i ] = mesh.weights[ i ];

}

}

}

} else if ( primitive.mode === WEBGL_CONSTANTS.LINES ) {

geometry = new THREE.BufferGeometry();
Expand Down Expand Up @@ -2286,22 +2374,70 @@ THREE.GLTF2Loader = ( function () {
node.updateMatrix();
node.matrixAutoUpdate = true;

var TypedKeyframeTrack = PATH_PROPERTIES[ target.path ] === PATH_PROPERTIES.rotation
? THREE.QuaternionKeyframeTrack
: THREE.VectorKeyframeTrack;
var TypedKeyframeTrack;

switch ( PATH_PROPERTIES[ target.path ] ) {

case PATH_PROPERTIES.weights:

TypedKeyframeTrack = THREE.NumberKeyframeTrack;
break;

case PATH_PROPERTIES.rotation:

TypedKeyframeTrack = THREE.QuaternionKeyframeTrack;
break;

case PATH_PROPERTIES.position:
case PATH_PROPERTIES.scale:
default:

TypedKeyframeTrack = THREE.VectorKeyframeTrack;
break;

}

var targetName = node.name ? node.name : node.uuid;
var interpolation = sampler.interpolation !== undefined ? INTERPOLATION[ sampler.interpolation ] : THREE.InterpolateLinear;

var targetNames = [];

if ( PATH_PROPERTIES[ target.path ] === PATH_PROPERTIES.weights ) {

// node should be THREE.Group here but
// PATH_PROPERTIES.weights(morphTargetInfluences) should be
// the property of a mesh object under node.
// So finding targets here.

node.traverse( function ( object ) {

if ( object.isMesh === true && object.material.morphTargets === true ) {

targetNames.push( object.name ? object.name : object.uuid );

}

} );

} else {

targetNames.push( targetName );

}

// KeyframeTrack.optimize() will modify given 'times' and 'values'
// buffers before creating a truncated copy to keep. Because buffers may
// be reused by other tracks, make copies here.
tracks.push( new TypedKeyframeTrack(
targetName + '.' + PATH_PROPERTIES[ target.path ],
THREE.AnimationUtils.arraySlice( inputAccessor.array, 0 ),
THREE.AnimationUtils.arraySlice( outputAccessor.array, 0 ),
interpolation
) );
for ( var i = 0, il = targetNames.length; i < il; i ++ ) {

tracks.push( new TypedKeyframeTrack(
targetNames[ i ] + '.' + PATH_PROPERTIES[ target.path ],
THREE.AnimationUtils.arraySlice( inputAccessor.array, 0 ),
THREE.AnimationUtils.arraySlice( outputAccessor.array, 0 ),
interpolation
) );

}

}

Expand Down