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

SkinnedMesh: support weight normalization for BufferGeometry #7679

Merged
merged 3 commits into from
Nov 26, 2015
Merged

SkinnedMesh: support weight normalization for BufferGeometry #7679

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ff4b5f
SkinnedMesh: support weight normalization for BufferGeometry
WestLangley Nov 25, 2015
c0b7041
fix typo
WestLangley Nov 25, 2015
578013a
handle case when weights are zero
WestLangley Nov 26, 2015
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
33 changes: 29 additions & 4 deletions src/objects/SkinnedMesh.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ THREE.SkinnedMesh.prototype.normalizeSkinWeights = function () {

if ( this.geometry instanceof THREE.Geometry ) {

for ( var i = 0; i < this.geometry.skinIndices.length; i ++ ) {
for ( var i = 0; i < this.geometry.skinWeights.length; i ++ ) {

var sw = this.geometry.skinWeights[ i ];

Expand All @@ -109,15 +109,40 @@ THREE.SkinnedMesh.prototype.normalizeSkinWeights = function () {

} else {

sw.set( 1 ); // this will be normalized by the shader anyway
// do nothing

}

}

} else {
} else if ( this.geometry instanceof THREE.BufferGeometry ) {

var vec = new THREE.Vector4();

var skinWeight = this.geometry.attributes.skinWeight;

for ( var i = 0; i < skinWeight.count; i ++ ) {

vec.x = skinWeight.getX( i );
vec.y = skinWeight.getY( i );
vec.z = skinWeight.getZ( i );
vec.w = skinWeight.getW( i );

var scale = 1.0 / vec.lengthManhattan();

if ( scale !== Infinity ) {

// skinning weights assumed to be normalized for THREE.BufferGeometry
vec.multiplyScalar( scale );

} else {

// do nothing

}

skinWeight.setXYZ( i, vec.x, vec.y, vec.z, vec.w )
Copy link
Owner

Choose a reason for hiding this comment

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

setXYZW() maybe?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Oops... Good eyes! : - )


}

}

Expand Down