From bc2dda6ff0cb1f317d89c05c0893741b71db1c84 Mon Sep 17 00:00:00 2001
From: Shon Ferguson <shonferg@users.sourceforge.net>
Date: Sat, 30 Sep 2006 01:03:00 +0000
Subject: [PATCH] Fixed a bug in ComplexShape::Merge that occurred when a shape
had no UV set, but, for some reason, had a texture referencing UV set zero.
Changed NiSkinData::NormalizeWeights to use doubles, trying to increase the
accuracy.
---
src/ComplexShape.cpp | 2 +-
src/obj/NiSkinData.cpp | 9 +++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/ComplexShape.cpp b/src/ComplexShape.cpp
index b27c1d07..7e2801ab 100644
--- a/src/ComplexShape.cpp
+++ b/src/ComplexShape.cpp
@@ -344,7 +344,7 @@ void ComplexShape::Merge( const Ref<NiAVObject> & root ) {
niTexProp = DynamicCast<NiTexturingProperty>(niProp);
}
- if ( niTexProp != NULL ) {
+ if ( niTexProp != NULL && shapeUVs.size() != 0 ) {
//Add the UV set to the list for every type of texture slot that uses it
for ( int tex = 0; tex < 8; ++tex ) {
if ( niTexProp->HasTexture(tex) == true ) {
diff --git a/src/obj/NiSkinData.cpp b/src/obj/NiSkinData.cpp
index efc60f9a..24e7619e 100644
--- a/src/obj/NiSkinData.cpp
+++ b/src/obj/NiSkinData.cpp
@@ -84,12 +84,12 @@ NiSkinData::NiSkinData( const Ref<NiGeometry> & owner ) NI_SKIN_DATA_CONSTRUCT {
}
void NiSkinData::NormalizeWeights( unsigned numVertices ) {
- vector<float> totals(numVertices);
+ vector<double> 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;
+ totals[v] = 1.0;
counts[v] = 0;
}
@@ -107,14 +107,15 @@ void NiSkinData::NormalizeWeights( unsigned numVertices ) {
//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]);
+ totals[v] = totals[v] / double(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];
+ double temp = double(sw.weight) + totals[sw.index];
+ sw.weight = float(temp);
}
}
}
--
GitLab