From 18b0fd0ce0989768d9d423df8c0b11c663b1af10 Mon Sep 17 00:00:00 2001
From: Shon Ferguson <shonferg@users.sourceforge.net>
Date: Mon, 2 Apr 2007 06:15:54 +0000
Subject: [PATCH] Changed NiNode AddChild function to keep
NiTriBasedGeom-derived objects at the top of the list. Fixes issue with
Oblivion flattened skin file hierarchies where the NiTriBasedGeom skin was
appearing after the NiNode bones that it used in the child list of their
mutual parent.
---
src/obj/NiNode.cpp | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/obj/NiNode.cpp b/src/obj/NiNode.cpp
index 7480ad0d..b59bc028 100644
--- a/src/obj/NiNode.cpp
+++ b/src/obj/NiNode.cpp
@@ -65,7 +65,24 @@ void NiNode::AddChild( Ref<NiAVObject> obj ) {
throw runtime_error( "You have attempted to add a child to a NiNode which already is the child of another NiNode." );
}
obj->SetParent( this );
- children.push_back( obj );
+ //Sometimes NiTriBasedGeom with skins can be siblings of NiNodes that
+ //represent joints for that same skin. This is not allowed, so we have
+ //to prevent it by always adding NiTriBasedGeom to the begining of the child list.
+ NiTriBasedGeomRef niGeom = DynamicCast<NiTriBasedGeom>(obj);
+ if ( niGeom != NULL ) {
+ //This is a NiTriBasedGeom, so shift all children to the right
+ size_t old_size = children.size();
+ children.resize( children.size() + 1 );
+ for ( size_t i = children.size() - 1; i >= 1; --i ) {
+ children[i] = children[i-1];
+ }
+
+ //Now add the new child to the begining of the list
+ children[0] = obj;
+ } else {
+ //This is some other type of object. Just add it to the end of the list.
+ children.push_back( obj );
+ }
}
void NiNode::RemoveChild( Ref<NiAVObject> obj ) {
--
GitLab