diff --git a/gen/Bones.cpp b/gen/Bones.cpp
deleted file mode 100644
index 78a6983fa53df362829944a0d990c94bc3c7aff4..0000000000000000000000000000000000000000
--- a/gen/Bones.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Copyright (c) 2006, NIF File Format Library and Tools
-All rights reserved. Please see niflib.h for licence. */
-
-#include "Bones.h"
-#include "../obj/NiNode.h"
-
-//Constructor
-Bones::Bones() : numBones((uint)0) {};
-
-//Destructor
-Bones::~Bones() {};
diff --git a/gen/Bones.h b/gen/Bones.h
deleted file mode 100644
index c818805982fa88a5c9d16eee6ae8515ea21c9fd1..0000000000000000000000000000000000000000
--- a/gen/Bones.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (c) 2006, NIF File Format Library and Tools
-All rights reserved. Please see niflib.h for licence. */
-
-#ifndef _BONES_H_
-#define _BONES_H_
-
-#include "../NIF_IO.h"
-
-// Forward define of referenced blocks
-class NiNode;
-
-/*!
- * This is a list of bone influences. It points to blocks higher in the
- * hierarchy so ints are used to represent the indices.
- */
-struct NIFLIB_API Bones {
- /*! Default Constructor */
- Bones();
- /*! Default Destructor */
- ~Bones();
- /*!
- * The number of node bones referenced as influences.
- */
- uint numBones;
- /*!
- * Block indicies of the bones.
- */
- vector<NiNode * > bones;
-};
-
-#endif
diff --git a/nif_attrs.h b/nif_attrs.h
index 1b1b392afb5fed1c6c16bbcdc54dffae87619aaa..8f9c774668182ef6e1174094de477e6b137fe30f 100644
--- a/nif_attrs.h
+++ b/nif_attrs.h
@@ -446,7 +446,7 @@ public:
private:
Matrix33 * _data;
};
-/*
+
class BoneAttr : public AAttr {
public:
BoneAttr( string const & name, IBlock * owner ) : AAttr(name, owner, first_ver, last_ver) {}
@@ -961,7 +961,7 @@ public:
};*/
-/*class EmitterObjectAttr : public AAttr {
+class EmitterObjectAttr : public AAttr {
public:
EmitterObjectAttr( string const & name, IBlock * owner ) : AAttr(name, owner, first_ver, last_ver) {}
~EmitterObjectAttr() {}
@@ -1009,9 +1009,9 @@ public:
blk_ref asLink() const { return FindTarget(); }
void Set(blk_ref const &) { throw runtime_error("The attribute you tried to set is calculated automatically. You cannot change it directly."); }
-};*/
+};
-/*class SelfLinkAttr : public AAttr {
+class SelfLinkAttr : public AAttr {
public:
SelfLinkAttr( string const & name, IBlock * owner ) : AAttr(name, owner, first_ver, last_ver) {}
~SelfLinkAttr() {}
diff --git a/niflib.cpp b/niflib.cpp
index 6a66e7f1d7297e2f7ec92009e776b5fcb7bff7dd..96234bdfe2d648379450935ea21028c826939ae1 100644
--- a/niflib.cpp
+++ b/niflib.cpp
@@ -9,9 +9,6 @@ All rights reserved. Please see niflib.h for licence. */
#include "obj/NiAVObject.h"
#include "obj/NiNode.h"
#include "obj/NiTextKeyExtraData.h"
-#include <exception>
-#include <stdexcept>
-using namespace std;
//Stores the mapping between block names and factory function pointers to create them
typedef IBlock * (*blk_factory_func)();
@@ -20,7 +17,7 @@ map<string, blk_factory_func> global_block_map;
//Utility Functions
void EnumerateObjects( NiObjectRef const & root, map<Type*,uint> & type_map, map<NiObjectRef, uint> & link_map );
-void BuildUpBindPositions( const NiAVObjectRef & root );
+//void BuildUpBindPositions( const NiAVObjectRef & root );
NiObjectRef FindRoot( vector<NiObjectRef> const & blocks );
void RegisterBlockFactories ();
NiObjectRef GetObjectByType( const NiObjectRef & root, const Type & block_type );
@@ -83,7 +80,7 @@ NiObjectRef FindRoot( vector<NiObjectRef> const & blocks ) {
//Move up the chain to the root node
while ( root->GetParent() != NULL ) {
- root = root->GetParent();
+ root = StaticCast<NiAVObject>(root->GetParent());
}
return StaticCast<NiObject>(root);
@@ -339,11 +336,12 @@ vector<NiObjectRef> ReadNifList( istream & in ) {
blocks[i]->FixLinks( blocks, link_stack, version, user_version );
}
- //Build up the bind pose matricies into their world-space equivalents
- NiAVObjectRef av_root = DynamicCast<NiAVObject>( FindRoot(blocks) );
- if ( av_root != NULL ) {
- BuildUpBindPositions( av_root );
- }
+ //TODO: No longer necessary?
+ ////Build up the bind pose matricies into their world-space equivalents
+ //NiAVObjectRef av_root = DynamicCast<NiAVObject>( FindRoot(blocks) );
+ //if ( av_root != NULL ) {
+ // BuildUpBindPositions( av_root );
+ //}
//TODO: Evaluate this and see if it can be moved to NiTriBasedGeom::FixLinks()
//// Re-position any TriShapes with a SkinInstance
@@ -515,31 +513,31 @@ void EnumerateObjects( NiObjectRef const & root, map<Type*,uint> & type_map, map
}
}
-void BuildUpBindPositions( const NiAVObjectRef & root ) {
-
- //Get parent if there is one
- NiNodeRef par = root->GetParent();
- if ( par != NULL ) {
- //There is a node parent
-
- //Post-multipy the block's bind matrix with the parent's bind matrix
- Matrix44 result = root->GetWorldBindPos() * par->GetWorldBindPos();
-
- //Store result back to block bind position
- root->SetWorldBindPos( result );
- }
-
- //If this is a NiNode, call this function for all child AVObjects
- NiNodeRef node = DynamicCast<NiNode>(root);
- if ( node != NULL ) {
- vector<NiAVObjectRef> children = node->GetChildren();
- for (vector<NiAVObjectRef>::iterator it = children.begin(); it != children.end(); ++it) {
- if ( *it != NULL ) {
- BuildUpBindPositions( *it );
- }
- }
- }
-}
+//void BuildUpBindPositions( const NiAVObjectRef & root ) {
+//
+// //Get parent if there is one
+// NiNodeRef par = root->GetParent();
+// if ( par != NULL ) {
+// //There is a node parent
+//
+// //Post-multipy the block's bind matrix with the parent's bind matrix
+// Matrix44 result = root->GetWorldBindPos() * par->GetWorldBindPos();
+//
+// //Store result back to block bind position
+// root->SetWorldBindPos( result );
+// }
+//
+// //If this is a NiNode, call this function for all child AVObjects
+// NiNodeRef node = DynamicCast<NiNode>(root);
+// if ( node != NULL ) {
+// vector<NiAVObjectRef> children = node->GetChildren();
+// for (vector<NiAVObjectRef>::iterator it = children.begin(); it != children.end(); ++it) {
+// if ( *it != NULL ) {
+// BuildUpBindPositions( *it );
+// }
+// }
+// }
+//}
//TODO: Should this be returning an object of a derived type too?
// Searches for the first object in the hierarchy of type.
diff --git a/niflib.vcproj b/niflib.vcproj
index 668b8e289bcd4cdd179606686e4ec9cf9bb6c9c0..2701b1ee62ed3174329163383342d9a326bdb65c 100644
--- a/niflib.vcproj
+++ b/niflib.vcproj
@@ -1195,10 +1195,6 @@
RelativePath=".\gen\AVObject.cpp"
>
</File>
- <File
- RelativePath=".\gen\Bones.cpp"
- >
- </File>
<File
RelativePath=".\gen\BoundingBox.cpp"
>
@@ -2209,10 +2205,6 @@
RelativePath=".\gen\AVObject.h"
>
</File>
- <File
- RelativePath=".\gen\Bones.h"
- >
- </File>
<File
RelativePath=".\gen\BoundingBox.h"
>
diff --git a/obj/NiAVObject.cpp b/obj/NiAVObject.cpp
index 6a1fb5b02406af6f09c35e0a5aed5ef218b7957b..aa364926ad3c9f0f87ded4d25f8e5167a3508117 100644
--- a/obj/NiAVObject.cpp
+++ b/obj/NiAVObject.cpp
@@ -63,38 +63,6 @@ Matrix44 NiAVObject::GetWorldTransform() const {
return GetLocalTransform();
}
}
-/*!
- * This function returns the bind position world matrix. The bind position (also called the rest position) is the position of an object in a skin and bones system before any posing has been done.
- * \return The 4x4 world bind position matrix of this node.
- * \sa INode::GetLocalBindPos, INode::SetWorldBindPos
- */
-Matrix44 NiAVObject::GetWorldBindPos() const {
- return bindPosition;
-}
-/*! This function returns the bind position world matrix of this node multiplied with the inverse of the bind position world matrix of its parent object if any. Thus it returns the bind position of the object in local coordinates. The bind position (also called the rest position) is the position of an object in a skin and bones system before any posing has been done.
- * \return The 4x4 local bind position matrix of this node.
- * \sa INode::SetWorldBindPos, INode::GetWorldBindPos
- */
-Matrix44 NiAVObject::GetLocalBindPos() const {
- //Get Parent Transform if there is one
- NiNodeRef par = GetParent();
- if ( par != NULL ) {
- //There is a node parent
- //multiply its inverse with this block's bind position to get the local bind position
- return bindPosition * par->GetWorldBindPos().Inverse();
- }
- else {
- //No parent transform, simply return local transform
- return GetWorldBindPos();
- }
-}
-
-/*!
- * This function sets the bind position of this object relative to the origin. The bind position (also called the rest position) is the position of an object in a skin and bones system before any posing has been done. This function must be called on every object in a skin and bones system (the bones and the skinned shapes) in order for skinning information to be written to a Nif file.
- * \param m The 4x4 world bind position matrix of this node
- * \sa INode::GetLocalBindPos, INode::GetWorldBindPos
- */
-void NiAVObject::SetWorldBindPos( Matrix44 const & m ) {}
void NiAVObject::SetParent( NiNode * new_parent ) {
parent = new_parent;
@@ -104,10 +72,6 @@ Ref<NiNode> NiAVObject::GetParent() const {
return parent;
}
-void NiAVObject::ResetSkinnedFlag() {
-
-}
-
void NiAVObject::AddProperty( Ref<NiProperty> & obj ) {
properties.push_back( obj );
}
diff --git a/obj/NiAVObject.h b/obj/NiAVObject.h
index 863cdf373d45676da9e0708676553c708fdcc6d2..47a358bfbe1aa62bf9f8dbafdaac235e29ca10d0 100644
--- a/obj/NiAVObject.h
+++ b/obj/NiAVObject.h
@@ -52,26 +52,6 @@ public:
*/
Matrix44 GetWorldTransform() const;
- /*!
- * This function returns the bind position world matrix. The bind position (also called the rest position) is the position of an object in a skin and bones system before any posing has been done.
- * \return The 4x4 world bind position matrix of this node.
- * \sa INode::GetLocalBindPos, INode::SetWorldBindPos
- */
- Matrix44 GetWorldBindPos() const;
-
- /*! This function returns the bind position world matrix of this node multiplied with the inverse of the bind position world matrix of its parent object if any. Thus it returns the bind position of the object in local coordinates. The bind position (also called the rest position) is the position of an object in a skin and bones system before any posing has been done.
- * \return The 4x4 local bind position matrix of this node.
- * \sa INode::SetWorldBindPos, INode::GetWorldBindPos
- */
- Matrix44 GetLocalBindPos() const;
-
- /*!
- * This function sets the bind position of this object relative to the origin. The bind position (also called the rest position) is the position of an object in a skin and bones system before any posing has been done. This function must be called on every object in a skin and bones system (the bones and the skinned shapes) in order for skinning information to be written to a Nif file.
- * \param m The 4x4 world bind position matrix of this node
- * \sa INode::GetLocalBindPos, INode::GetWorldBindPos
- */
- void SetWorldBindPos( Matrix44 const & m );
-
/*! Meant to be called by NiNode during the addition of new children. Should not be called directly. */
void SetParent( NiNode * new_parent );
@@ -98,12 +78,10 @@ public:
Vector3 GetVelocity() const;
void SetVelocity( const Vector3 & n );
-private:
+protected:
NI_A_V_OBJECT_MEMBERS
NiNode * parent;
- void ResetSkinnedFlag();
- Matrix44 bindPosition;
};
#endif
diff --git a/obj/NiNode.cpp b/obj/NiNode.cpp
index 681e9824c537f29e8b1901443a2b7f5c87374f25..5a038299db9b19e3534a2580c5528b1162ebfda4 100644
--- a/obj/NiNode.cpp
+++ b/obj/NiNode.cpp
@@ -4,6 +4,7 @@ All rights reserved. Please see niflib.h for licence. */
#include "NiNode.h"
#include "NiAVObject.h"
#include "NiDynamicEffect.h"
+#include "NiSkinInstance.h"
//Definition of TYPE constant
const Type NiNode::TYPE("NiNode", &NI_NODE_PARENT::TYPE );
@@ -60,6 +61,11 @@ void NiNode::RemoveChild( Ref<NiAVObject> obj ) {
//Search child list for the one to remove
for ( vector< NiAVObjectRef >::iterator it = children.begin(); it != children.end(); ) {
if ( *it == obj ) {
+ //Ensure that this child is not a skin influence
+ NiNodeRef niNode = DynamicCast<NiNode>((*it));
+ if ( niNode != NULL && niNode->IsSkinInfluence() == true ) {
+ throw runtime_error("You cannot remove a node child that is a skin influence. Detatch the skin first.");
+ }
(*it)->SetParent(NULL);
it = children.erase( it );
} else {
@@ -78,3 +84,71 @@ void NiNode::ClearChildren() {
vector< Ref<NiAVObject> > NiNode::GetChildren() const {
return children;
}
+
+bool NiNode::IsSkeletonRoot() const {
+ return ( skins.size() > 0 );
+}
+
+bool NiNode::IsSkinInfluence() const {
+ return ((flags & 8) == 0);
+}
+
+void NiNode::GoToSkeletonBindPosition() {
+ //TODO:: Implement GoToSkeletonBindPosition()
+}
+
+void NiNode::AddSkin( NiSkinInstance * skin_inst ) {
+ //Ensure that all bones are below this node on the scene graph
+ vector<NiNodeRef> bones = skin_inst->GetBones();
+ for ( uint i = 0; i < bones.size(); ++i ) {
+ bool is_decended = false;
+ NiNodeRef node = bones[i];
+ while ( node != NULL ) {
+ if ( node == this ) {
+ is_decended = true;
+ break;
+ }
+ node = node->GetParent();
+ }
+ if ( is_decended == false ) {
+ throw runtime_error( "All bones must be lower than the skeleton root in the scene graph." );
+ }
+ }
+
+ //Flag any bones that are part of this skin instance
+ for ( uint i = 0; i < bones.size(); ++i ) {
+ bones[i]->SetSkinFlag(true);
+ }
+
+ skins.push_back( skin_inst );
+}
+
+void NiNode::RemoveSkin( NiSkinInstance * skin_inst ) {
+ //Unflag any bones that were part of this skin instance
+ vector<NiNodeRef> bones = skin_inst->GetBones();
+ for ( uint i = 0; i < bones.size(); ++i ) {
+ bones[i]->SetSkinFlag(false);
+ }
+
+ //Remove the reference
+ skins.remove( skin_inst);
+
+ //Ensure that any multiply referenced bone nodes still
+ //have their skin flag set
+ for ( list<NiSkinInstance*>::iterator it = skins.begin(); it != skins.end(); ++it ) {
+ bones = (*it)->GetBones();
+ for ( uint i = 0; i < bones.size(); ++i ) {
+ bones[i]->SetSkinFlag(true);
+ }
+ }
+}
+
+void NiNode::SetSkinFlag( bool n ) {
+ if ( IsSkinInfluence() == n ) {
+ //Already set to the requested value
+ return;
+ } else {
+ //Requested value is different, flip bit
+ flags ^= 8;
+ }
+}
\ No newline at end of file
diff --git a/obj/NiNode.h b/obj/NiNode.h
index 4e436d734b24ccbaaa6ee1611a2cd5e0cf47243b..8a1be016584a5936a851044f30e263ec97d68e37 100644
--- a/obj/NiNode.h
+++ b/obj/NiNode.h
@@ -7,7 +7,6 @@ All rights reserved. Please see niflib.h for licence. */
#include "NiAVObject.h"
// Forward define of referenced blocks
-#include "../Ref.h"
class NiAVObject;
class NiDynamicEffect;
@@ -15,6 +14,7 @@ class NiDynamicEffect;
class NiNode;
class NiAVObject;
+class NiSkinInstance;
typedef Ref<NiNode> NiNodeRef;
/*!
@@ -38,7 +38,36 @@ public:
void RemoveChild( Ref<NiAVObject> obj );
void ClearChildren();
vector< Ref<NiAVObject> > GetChildren() const;
+
+ /*! Checks if this node has any skins attached. */
+ bool IsSkeletonRoot() const;
+
+ /*! Checks if this node influences the vertices in any skins. */
+ bool IsSkinInfluence() const;
+
+ /*! Causes all children's transforms to be changed so that all the skin
+ * pieces line up without any vertex transformations.
+ */
+ void GoToSkeletonBindPosition();
+
+ /*!
+ * Should only be called by NiTriBasedGeom
+ * Adds a new SkinInstance to the specified mesh.
+ * The bones must be below this node in the scene graph tree
+ */
+ void AddSkin( NiSkinInstance * skin_inst );
+
+ /*!
+ * Should only be called by NiTriBasedGeom
+ * Detaches the skin associated with a child mesh.
+ */
+ void RemoveSkin( NiSkinInstance * skin_inst );
+
+ /*! Should not be called directly */
+ void SetSkinFlag( bool n );
+
protected:
+ list<NiSkinInstance*> skins;
NI_NODE_MEMBERS
};
diff --git a/obj/NiSkinInstance.cpp b/obj/NiSkinInstance.cpp
index 9bd21d50b76e38d96e8978cd94b1621f4ff1ee7a..e258d0517edf733b23483e6f68339792427d165a 100644
--- a/obj/NiSkinInstance.cpp
+++ b/obj/NiSkinInstance.cpp
@@ -2,7 +2,6 @@
All rights reserved. Please see niflib.h for licence. */
#include "NiSkinInstance.h"
-#include "../gen/Bones.h"
#include "NiNode.h"
#include "NiSkinData.h"
#include "NiSkinPartition.h"
@@ -39,4 +38,60 @@ const Type & NiSkinInstance::GetType() const {
return TYPE;
};
-NiNode * NiSkinInstance::SkeletonRoot() const { return NULL; }
+vector< Ref<NiNode> > NiSkinInstance::GetBones() const {
+ vector<NiNodeRef> ref_bones( bones.size() );
+ for (uint i = 0; i < bones.size(); ++i ) {
+ ref_bones[i] = bones[i];
+ }
+ return ref_bones;
+}
+
+void NiSkinInstance::Bind( Ref<NiNode> skeleton_root, vector< Ref<NiNode> > bone_nodes ) {
+ //Ensure skin is not aleady bound
+ if ( bones.size() != 0 ) {
+ throw runtime_error("You have attempted to re-bind a skin that is already bound. Unbind it first.");
+ }
+
+ //Add the bones to the internal list
+ bones.resize( bone_nodes.size() );
+ for ( uint i = 0; i < bone_nodes.size(); ++i ) {
+ bones[i] = bone_nodes[i];
+ }
+
+ //Store skeleton root and inform it of this attachment
+ skeletonRoot = skeleton_root;
+ skeletonRoot->AddSkin( this );
+};
+
+void NiSkinInstance::Unbind() {
+ //Inform Skeleton Root of detatchment and clear it.
+ skeletonRoot->RemoveSkin( this );
+ skeletonRoot = NULL;
+
+ //Clear bone list
+ bones.clear();
+
+ //Destroy skin data
+ data = NULL;
+ skinPartition = NULL;
+}
+
+void NiSkinInstance::CalcHardwareSkinningData () {
+
+}
+
+Ref<NiSkinData> NiSkinInstance::GetSkinData() const {
+ return data;
+}
+
+void NiSkinInstance::SetSkinData( const Ref<NiSkinData> & n ) {
+ data = n;
+}
+
+Ref<NiSkinPartition> NiSkinInstance::GetSkinPartition() const {
+ return skinPartition;
+}
+
+void NiSkinInstance::SetSkinPartition( const Ref<NiSkinPartition> & n ) {
+ skinPartition = n;
+}
\ No newline at end of file
diff --git a/obj/NiSkinInstance.h b/obj/NiSkinInstance.h
index bd795943748d203d4e2a2c20dd6ba921f9779eeb..5ebe8dc9ac91ae505cdc1d44cde66b4709bb30c7 100644
--- a/obj/NiSkinInstance.h
+++ b/obj/NiSkinInstance.h
@@ -5,8 +5,6 @@ All rights reserved. Please see niflib.h for licence. */
#define _NISKININSTANCE_H_
#include "NiObject.h"
-// Include structures
-#include "../gen/Bones.h"
// Forward define of referenced blocks
#include "../Ref.h"
@@ -35,8 +33,36 @@ public:
virtual void FixLinks( const vector<NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version );
virtual list<NiObjectRef> GetRefs() const;
virtual const Type & GetType() const;
+
+ vector< Ref<NiNode> > GetBones() const;
+
+ /*!
+ * Binds any geometry that uses this skin instance to a list of bones.
+ * The bones must have a common ancestor in the scenegraph. This becomes
+ * the skeleton root.
+ */
+ void Bind( Ref<NiNode> skeleton_root, vector< Ref<NiNode> > bone_nodes );
+
+ /*!
+ * Detatches this skin instance from any bones it was previously bound to.
+ */
+ void Unbind();
+
+ /*!
+ * Calculates a NiSkinPartition and attaches it to both pointers, the one
+ * used in later versions in this class, and the one in the attached
+ * NiSkinData class. This way it will be written regardless of the
+ * version. SkinData must be set before this can be calculated.
+ */
+ void CalcHardwareSkinningData ();
+
+ Ref<NiSkinData> GetSkinData() const;
+ void SetSkinData( const Ref<NiSkinData> & n );
+
+ Ref<NiSkinPartition> GetSkinPartition() const;
+ void SetSkinPartition( const Ref<NiSkinPartition> & n );
+
protected:
- NiNode * NiSkinInstance::SkeletonRoot() const;
NI_SKIN_INSTANCE_MEMBERS
};
diff --git a/obj/NiTriBasedGeom.cpp b/obj/NiTriBasedGeom.cpp
index 505cd7bd39c991abb9d0b159c06f9158b8cd786c..b8328c7ad98351b728fed042351e4c62309510bf 100644
--- a/obj/NiTriBasedGeom.cpp
+++ b/obj/NiTriBasedGeom.cpp
@@ -66,4 +66,11 @@ void NiTriBasedGeom::SetShader( const string & n ) {
shaderName = n;
}
}
-
\ No newline at end of file
+
+void NiTriBasedGeom::SetSkinInstance( Ref<NiSkinInstance> & n ) {
+ skinInstance = n;
+}
+
+Ref<NiSkinInstance> NiTriBasedGeom::GetSkinInstance() const {
+ return skinInstance;
+}
\ No newline at end of file
diff --git a/obj/NiTriBasedGeom.h b/obj/NiTriBasedGeom.h
index 85034e38a902325a6e71c15f3b90aab20835b022..10c1a165cfc4d0c1124e79d6c563937b4b09edb5 100644
--- a/obj/NiTriBasedGeom.h
+++ b/obj/NiTriBasedGeom.h
@@ -44,6 +44,9 @@ public:
string GetShader() const;
void SetShader( const string & n );
+
+ void SetSkinInstance( Ref<NiSkinInstance> & n );
+ Ref<NiSkinInstance> GetSkinInstance() const;
protected:
NI_TRI_BASED_GEOM_MEMBERS
diff --git a/obj/NiTriBasedGeomData.cpp b/obj/NiTriBasedGeomData.cpp
index 8b8f7daf829defab1296e58bc8bfca284b78879a..06958bb1bae01137a7a6bb59ac46ebfc2c750051 100644
--- a/obj/NiTriBasedGeomData.cpp
+++ b/obj/NiTriBasedGeomData.cpp
@@ -132,7 +132,3 @@ Vector3 NiTriBasedGeomData::GetCenter() const {
float NiTriBasedGeomData::GetRadius() const {
return radius;
}
-
-//TODO: Remove these
-Vector3 NiTriBasedGeomData::Center() const { return center; }
-float NiTriBasedGeomData::Radius() const { return radius; }
diff --git a/obj/NiTriBasedGeomData.h b/obj/NiTriBasedGeomData.h
index c6e65534ddd5050849f6b5d29c2760769ac86f7c..45c81429b959c85a05f541f205239b3b106974db 100644
--- a/obj/NiTriBasedGeomData.h
+++ b/obj/NiTriBasedGeomData.h
@@ -124,8 +124,6 @@ public:
void SetUVSet( int index, const vector<TexCoord> & in );
protected:
- Vector3 Center() const;
- float Radius() const;
NI_TRI_BASED_GEOM_DATA_MEMBERS
};
diff --git a/pch.h b/pch.h
index 273b4cbd5023700bb538de8462529b5b60c624d0..4deff492cd5ec36b3512c9ef00a51ad693c91089 100644
--- a/pch.h
+++ b/pch.h
@@ -10,7 +10,6 @@
//#include "Type.h"
#include "gen/AVObject.h"
-#include "gen/Bones.h"
#include "gen/BoundingBox.h"
#include "gen/ByteArray.h"
#include "gen/ControllerLink.h"