From 1e0ff458d0dcbfe203dba3bb42eb5621840dce1b Mon Sep 17 00:00:00 2001
From: Shon Ferguson <shonferg@users.sourceforge.net>
Date: Sat, 9 Sep 2006 00:42:20 +0000
Subject: [PATCH] Added a max_bones_per_partition parameter to
ComplexShape::Split and NiTriBasedGeom::GenHardwareSkinInfo in anticipation
of Tazpn adding that capability.
---
ComplexShape.cpp | 6 +++---
ComplexShape.h | 2 +-
obj/NiTriBasedGeom.cpp | 2 +-
obj/NiTriBasedGeom.h | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ComplexShape.cpp b/ComplexShape.cpp
index 941dab83..327e37af 100644
--- a/ComplexShape.cpp
+++ b/ComplexShape.cpp
@@ -606,7 +606,7 @@ void ComplexShape::Merge( const Ref<NiAVObject> & root ) {
// }
//}
-Ref<NiAVObject> ComplexShape::Split( Ref<NiNode> & parent, bool hw_skin_data, bool stripify ) const {
+Ref<NiAVObject> ComplexShape::Split( Ref<NiNode> & parent, int max_bones_per_partition, bool stripify ) const {
//Make sure parent is not NULL
if ( parent == NULL ) {
@@ -862,8 +862,8 @@ Ref<NiAVObject> ComplexShape::Split( Ref<NiNode> & parent, bool hw_skin_data, bo
shapes[shape_num]->SetBoneWeights( inf, shapeWeights[ shapeInfluences[inf] ] );
}
- if ( hw_skin_data ) {
- shapes[shape_num]->GenHardwareSkinInfo();
+ if ( max_bones_per_partition > 0 ) {
+ shapes[shape_num]->GenHardwareSkinInfo( max_bones_per_partition );
}
//NiSkinInstanceRef skinInst = shapes[shape_num]->GetSkinInstance();
diff --git a/ComplexShape.h b/ComplexShape.h
index 3ba0328d..f7b3b856 100644
--- a/ComplexShape.h
+++ b/ComplexShape.h
@@ -64,7 +64,7 @@ public:
vector<TexCoord> texCoords;
};
- Ref<NiAVObject> Split( Ref<NiNode> & parent, bool hw_skin_data = false, bool stripify = false ) const;
+ Ref<NiAVObject> Split( Ref<NiNode> & parent, int max_bones_per_partition = 4, bool stripify = false ) const;
void Merge( const Ref<NiAVObject> & root );
void Clear();
diff --git a/obj/NiTriBasedGeom.cpp b/obj/NiTriBasedGeom.cpp
index e90ec6fe..8166162d 100644
--- a/obj/NiTriBasedGeom.cpp
+++ b/obj/NiTriBasedGeom.cpp
@@ -358,7 +358,7 @@ void NiTriBasedGeom::SetBoneWeights( uint bone_index, const vector<SkinWeight> &
skinData->SetBoneWeights( bone_index, n, center, radius );
}
-void NiTriBasedGeom::GenHardwareSkinInfo( ) {
+void NiTriBasedGeom::GenHardwareSkinInfo( int max_bones_per_partition ) {
NiSkinPartitionRef skinPart = new NiSkinPartition( this );
// Set the partition info in both places and it will be handled when exported.
diff --git a/obj/NiTriBasedGeom.h b/obj/NiTriBasedGeom.h
index f6464b1e..5ad3c35e 100644
--- a/obj/NiTriBasedGeom.h
+++ b/obj/NiTriBasedGeom.h
@@ -56,7 +56,7 @@ public:
*/
void SetBoneWeights( uint bone_index, const vector<SkinWeight> & n );
- void GenHardwareSkinInfo( );
+ void GenHardwareSkinInfo( int max_bones_per_partition = 4 );
Ref<NiSkinInstance> GetSkinInstance() const;
--
GitLab