diff --git a/include/obj/NiGeometry.h b/include/obj/NiGeometry.h
index 54ae3313ed4a79848194c09e6166b877215c8cb9..d000d0ca8d30402b9bbe6510dce959d828f3f4ff 100644
--- a/include/obj/NiGeometry.h
+++ b/include/obj/NiGeometry.h
@@ -92,6 +92,8 @@ public:
*/
void NiGeometry::ApplySkinOffset();
+ void NormalizeSkinWeights();
+
/*
* Used to determine whether this mesh is influenced by bones as a skin.
* \return true if this mesh is a skin, false otherwise.
diff --git a/include/obj/NiSkinData.h b/include/obj/NiSkinData.h
index 247f26f0ea7421e2771f133794374d45b1e4ea5d..a0900716a11a78f9a568ddfc408f249af0f54881 100644
--- a/include/obj/NiSkinData.h
+++ b/include/obj/NiSkinData.h
@@ -53,10 +53,12 @@ public:
uint GetBoneCount() const;
Matrix44 GetBoneTransform( uint bone_index ) const;
vector<SkinWeight> GetBoneWeights( uint bone_index ) const;
- void SetBoneWeights( uint bone_index, const vector<SkinWeight> & n, Vector3 center, float radius );
+ void SetBoneWeights( uint bone_index, const vector<SkinWeight> & n, Vector3 center, float radius );
- Ref<NiSkinPartition> GetSkinPartition() const;
- void SetSkinPartition(Ref<NiSkinPartition> skinPartition);
+ void NormalizeWeights( unsigned numVertices );
+
+ Ref<NiSkinPartition> GetSkinPartition() const;
+ void SetSkinPartition(Ref<NiSkinPartition> skinPartition);
protected:
NI_SKIN_DATA_MEMBERS
diff --git a/src/ComplexShape.cpp b/src/ComplexShape.cpp
index 8f81dbe068108d5294d36ad474ccfab6f6b93831..b27c1d077fd4b8df5d347f18cb112ec29f8d4991 100644
--- a/src/ComplexShape.cpp
+++ b/src/ComplexShape.cpp
@@ -827,7 +827,7 @@ Ref<NiAVObject> ComplexShape::Split( Ref<NiNode> & parent, Matrix44 & transform,
SkinWeight sk;
for ( map<NiNodeRef, float>::iterator wt = cv->weights.begin(); wt != cv->weights.end(); ++wt ) {
//Only record influences that make a noticable contribution
- if ( wt->second > 0.0f ) {
+ if ( wt->second > 0.1f ) {
sk.index = vert_index;
sk.weight = wt->second;
if ( shapeWeights.find( wt->first ) == shapeWeights.end() ) {
@@ -871,6 +871,8 @@ Ref<NiAVObject> ComplexShape::Split( Ref<NiNode> & parent, Matrix44 & transform,
shapes[shape_num]->SetBoneWeights( inf, shapeWeights[ shapeInfluences[inf] ] );
}
+ shapes[shape_num]->NormalizeSkinWeights();
+
if ( max_bones_per_partition > 0 ) {
shapes[shape_num]->GenHardwareSkinInfo( max_bones_per_partition );
}
diff --git a/src/obj/NiGeometry.cpp b/src/obj/NiGeometry.cpp
index 244df7935247fdf9440db458e52d7aeedec2a577..fd441e219d84aecc377a8ab1d4c27871f81849b2 100644
--- a/src/obj/NiGeometry.cpp
+++ b/src/obj/NiGeometry.cpp
@@ -199,7 +199,6 @@ void NiGeometry::ApplySkinOffset() {
continue;
}
if ( below_root ) {
- cout << "Propogating transform of " << *it << endl;
(*it)->PropagateTransform();
}
}
@@ -214,6 +213,20 @@ void NiGeometry::ApplySkinOffset() {
skinInstance->GetSkinData()->ResetOffsets( this );
}
+void NiGeometry::NormalizeSkinWeights() {
+ if ( IsSkin() == false ) {
+ throw runtime_error( "NormalizeSkinWeights called on a mesh that is not a skin." );
+ }
+ NiSkinDataRef niSkinData = this->GetSkinInstance()->GetSkinData();
+
+ NiGeometryDataRef niGeomData = this->GetData();
+ if ( niGeomData == NULL ) {
+ throw runtime_error( "NormalizeSkinWeights called on a mesh with no geometry data." );
+ }
+
+ niSkinData->NormalizeWeights( niGeomData->GetVertexCount() );
+}
+
bool NiGeometry::IsSkin() {
//Determine whether this is a skin by looking for a skin instance and
//skin data
diff --git a/src/obj/NiNode.cpp b/src/obj/NiNode.cpp
index 7bdd567cdadfe27a08afcc7c2efd3a58d4df744f..b20bbe5f4814c3f26e95c9b3c1e56a7d43124866 100644
--- a/src/obj/NiNode.cpp
+++ b/src/obj/NiNode.cpp
@@ -18,13 +18,13 @@ NiNode::NiNode() NI_NODE_CONSTRUCT {
}
NiNode::~NiNode() {
- //Clear Children
- ClearChildren();
-
- //Unbind any attached skins
+ //Unbind any attached skins - must happen before children are cleared
for ( list<NiSkinInstance*>::iterator it = skins.begin(); it != skins.end(); ++it ) {
(*it)->SkeletonLost();
}
+
+ //Clear Children
+ ClearChildren();
}
void NiNode::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) {
diff --git a/src/obj/NiObject.cpp b/src/obj/NiObject.cpp
index d2f8b3e23539a82eb123f63996ad3160b3478fa2..fa1e626343b45ce5cef81c7fa3a618627bd20846 100644
--- a/src/obj/NiObject.cpp
+++ b/src/obj/NiObject.cpp
@@ -41,8 +41,10 @@ void NiObject::AddRef() const {
void NiObject::SubtractRef() const {
_ref_count--;
if ( _ref_count < 1 ) {
- //cout << this->GetIDString() << " died." << endl;
+ //string id = this->GetIDString();
+ //cout << id << " is being destroyed." << endl;
delete this;
+ //cout << "Destruction of " << id << " complete." << endl;
}
}
diff --git a/src/obj/NiPixelData.cpp b/src/obj/NiPixelData.cpp
index 9437fe7850fa2505ec64a6494bdec8bd4410abbd..3f171c787ea3a20174f0bc1f8f83f372a45de964 100644
--- a/src/obj/NiPixelData.cpp
+++ b/src/obj/NiPixelData.cpp
@@ -241,8 +241,6 @@ void NiPixelData::SetColors( const vector<Color4> & new_pixels, bool generate_mi
//Pack pixel data
for (uint i = 0; i < mipmaps.size(); ++i ) {
- cout << "Width: " << mipmaps[i].width << " Height: " << mipmaps[i].height << " Offset: " << mipmaps[i].offset << endl;
-
if ( i > 0 ) {
//Allocate space to store re-sized image.
Color4 * resized = new Color4[ mipmaps[i].width * mipmaps[i].height ];
@@ -250,7 +248,6 @@ void NiPixelData::SetColors( const vector<Color4> & new_pixels, bool generate_mi
//Visit every other pixel in each row and column of the previous image
for ( uint w = 0; w < mipmaps[i-1].width; w+=2 ) {
for ( uint h = 0; h < mipmaps[i-1].height; h+=2 ) {
- //cout << "w: " << w << " h: " << h << endl;
Color4 & av = resized[(h/2) * mipmaps[i].width + (w/2)];
//Start with the value of the current pixel
diff --git a/src/obj/NiSkinData.cpp b/src/obj/NiSkinData.cpp
index a684e3fa9ad7c583179164bdadb2ea6040a94e4c..efc60f9a85373de6f6fd9d02eb0d782286d83016 100644
--- a/src/obj/NiSkinData.cpp
+++ b/src/obj/NiSkinData.cpp
@@ -83,6 +83,42 @@ NiSkinData::NiSkinData( const Ref<NiGeometry> & owner ) NI_SKIN_DATA_CONSTRUCT {
ResetOffsets( owner );
}
+void NiSkinData::NormalizeWeights( unsigned numVertices ) {
+ vector<float> totals(numVertices);
+ vector<int> counts(numVertices);
+
+ //Set all totals to 1.0 and all counts to 0
+ for ( unsigned v = 0; v < numVertices; ++v ) {
+ totals[v] = 1.0f;
+ counts[v] = 0;
+ }
+
+ //Calculate the total error for each vertex by subtracting the weight from
+ //each bone from the starting total of 1.0
+ //Also count the number of bones affecting each vertex
+ for ( unsigned b = 0; b < boneList.size(); ++b ) {
+ for ( unsigned w = 0; w < boneList[b].vertexWeights.size(); ++w ) {
+ SkinWeight & sw = boneList[b].vertexWeights[w];
+ totals[sw.index] -= sw.weight;
+ counts[sw.index]++;
+ }
+ }
+
+ //Divide all error amounts by the number of bones affecting that vertex to
+ //get the amount of error that should be distributed to each bone.
+ for ( unsigned v = 0; v < numVertices; ++v ) {
+ totals[v] = totals[v] / float(counts[v]);
+ }
+
+ //Distribute the calculated error to each weight
+ for ( unsigned b = 0; b < boneList.size(); ++b ) {
+ for ( unsigned w = 0; w < boneList[b].vertexWeights.size(); ++w ) {
+ SkinWeight & sw = boneList[b].vertexWeights[w];
+ sw.weight += totals[sw.index];
+ }
+ }
+}
+
void NiSkinData::ResetOffsets( const Ref<NiGeometry> & owner ) {
//Get skin instance
diff --git a/src/obj/NiSkinInstance.cpp b/src/obj/NiSkinInstance.cpp
index 697609ae531ec38bab8ebd1a68a34a9ad61fee17..67e15094275a62aeefbb6da2936bf4ad5d678dc8 100644
--- a/src/obj/NiSkinInstance.cpp
+++ b/src/obj/NiSkinInstance.cpp
@@ -47,17 +47,15 @@ NiSkinInstance::NiSkinInstance( Ref<NiNode> skeleton_root, vector< Ref<NiNode> >
}
NiSkinInstance::~NiSkinInstance() {
- //Probably not necessary, and not very safe
- ////Unflag any bones that were part of this skin instance
- //for ( uint i = 0; i < bones.size(); ++i ) {
- // cout << "Bone " << i << ":";
- // cout << bones[i]->GetIDString() << endl;
- // bones[i]->SetSkinFlag(false);
- //}
+ //Unflag any bones that were part of this skin instance
+ for ( uint i = 0; i < bones.size(); ++i ) {
+ bones[i]->SetSkinFlag(false);
+ }
//Inform Skeleton Root of detatchment and clear it.
if ( skeletonRoot != NULL ) {
skeletonRoot->RemoveSkin( this );
+ skeletonRoot = NULL;
}
}