From b342b65215aa66d4b34c559e33f92a722b947ee9 Mon Sep 17 00:00:00 2001
From: Shon Ferguson <shonferg@users.sourceforge.net>
Date: Sun, 20 Aug 2006 05:04:50 +0000
Subject: [PATCH] Added Key templates to Python wrapper. Renamed CreateBlock to
CreateObject and made it clear that it is not necessary for the user to call
this function unless s/he is working through Python. Removed BlocksInMemory
function. Call NiObject::NumObjectsInMemory instead. Removed CreateBlock
template since new keyword can be used. Implemented GetScale and SetScale
functions of bhkNiTriStripsShape to fix linker errors when compiling Python
wrapper.
---
gen/obj_factories.cpp | 2 +-
niflib.cpp | 13 ++++-------
niflib.h | 45 +++++++++----------------------------
obj/NiObject.cpp | 2 +-
obj/NiObject.h | 3 ---
obj/bhkNiTriStripsShape.cpp | 8 +++++++
obj/bhkNiTriStripsShape.h | 2 +-
pyniflib.i | 14 ++++++++++--
8 files changed, 38 insertions(+), 51 deletions(-)
diff --git a/gen/obj_factories.cpp b/gen/obj_factories.cpp
index f373730e..f1a657f7 100644
--- a/gen/obj_factories.cpp
+++ b/gen/obj_factories.cpp
@@ -371,7 +371,7 @@ NiObject * CreateNiZBufferProperty() { return new NiZBufferProperty; }
NiObject * CreateRootCollisionNode() { return new RootCollisionNode; }
namespace Niflib {
-//This function registers the factory functions with global_block_map which is used by CreateBlock
+//This function registers the factory functions with global_block_map which is used by CreateNiObject
void RegisterBlockFactories() {
global_block_map["bhkBlendCollisionObject"] = CreatebhkBlendCollisionObject;
global_block_map["bhkBlendController"] = CreatebhkBlendController;
diff --git a/niflib.cpp b/niflib.cpp
index 4bb3a4d5..ea0fb2dc 100644
--- a/niflib.cpp
+++ b/niflib.cpp
@@ -42,8 +42,9 @@ NiObjectRef FindRoot( vector<NiObjectRef> const & blocks );
void RegisterBlockFactories ();
NiObjectRef GetObjectByType( const NiObjectRef & root, const Type & block_type );
+
//--Function Bodies--//
-NiObjectRef CreateBlock( string block_type ) {
+NiObjectRef CreateObject( string block_type ) {
//Initialize the global block list if it hasn't been done yet
if ( global_block_map_init == false ) {
@@ -221,7 +222,7 @@ vector<NiObjectRef> ReadNifList( istream & in ) {
#endif
//Create Block of the type that was found
- blocks[i] = CreateBlock(objectType);
+ blocks[i] = CreateObject(objectType);
//Check for an unknown block type
if ( blocks[i] == NULL ) {
@@ -637,12 +638,6 @@ void WriteFileGroup( string const & file_name, NiObjectRef const & root_block, u
throw runtime_error("Not yet implemented.");
};
-
-//Returns the total number of blocks in memory
-unsigned int BlocksInMemory() {
- return NiObject::NumObjectsInMemory();
-}
-
void MapNodeNames( map<string,NiNodeRef> & name_map, const Ref<NiNode> & par ) {
//Add the par node to the map, and then call this function for each of its children
name_map[par->GetName()] = par;
@@ -827,7 +822,7 @@ void MergeNifTrees( const Ref<NiNode> & target, const Ref<NiControllerSequence>
//If the controller wasn't found, create one of the right type and attach it
if ( ctlr == NULL ) {
- NiObjectRef new_ctlr = CreateBlock( ctlr_type );
+ NiObjectRef new_ctlr = CreateObject( ctlr_type );
ctlr = DynamicCast<NiSingleInterpolatorController>( new_ctlr );
if ( ctlr == NULL ) {
throw runtime_error ("Non-NiSingleInterpolatorController controller found in KF file.");
diff --git a/niflib.h b/niflib.h
index 79784c85..94d9ff1e 100644
--- a/niflib.h
+++ b/niflib.h
@@ -246,45 +246,22 @@ NIFLIB_API void SendNifTreeToBindPos( const Ref<NiNode> & root );
//string GetFileVersion(string file_name);
/*!
- * Creates a new block of the given type and returns a reference to it
+ * Creates a new block of the given type and returns a reference to it.
+ * In C++, it is not necessary to call this function as you can create
+ * objects with the new keyword. In Python, however, this is the only
+ * way to create new objects for now.
+ * This is
* \param block_type – The type of block you want to create. This value is case sensitive and spelling is important. Ex. NiNode, NiTriShapeData, NiParticleSystemController, etc.
* \return This function will return a newly created block of the requested type. Beware, if the block type is unrecognized, this function will return a featureless block with whatever you sent it as the type.
- *
- * <b>Example:</b>
- * \code
- * NiObjectRef my_block = CreateBlock("NiNode");
- * \endcode
- *
- * <b>In Python:</b>
- * \code
- * my_block = CreateBlock("NiNode")
- * \endcode
- *
- * sa BlocksInMemory
+ *
+ * sa NiObject::NumObjectsInMemory
*/
-NIFLIB_API Ref<NiObject> CreateBlock( string block_type );
-
-
-/*!
-* Creates a new block of the given type and returns a reference to it
-* \param T – The type of block you want to create. Ex. NiNode, NiTriShapeData, NiParticleSystemController, etc.
-* \return This function will return a newly created block of the requested type.
-*
-* <b>Example:</b>
-* \code
-* NiNodeRef my_block = CreateNiObject<NiNode>();
-* \endcode
-*
-* sa BlocksInMemory
-*/
-#ifndef SWIG
-template<typename T>
-inline Ref<T> CreateNiObject() {
- return DynamicCast<T>(CreateBlock(T::TypeConst().GetTypeName()));
-}
+#ifdef SWIG
+NIFLIB_API Ref<NiObject> CreateObject( string block_type );
+#else
+NIFLIB_HIDDEN Ref<NiObject> CreateObject( string block_type );
#endif
-
/*!
* Returns whether the requested version is supported.
* \param version The version of the nif format to test for availablity.
diff --git a/obj/NiObject.cpp b/obj/NiObject.cpp
index f6066b9c..e2643954 100644
--- a/obj/NiObject.cpp
+++ b/obj/NiObject.cpp
@@ -70,7 +70,7 @@ NiObjectRef NiObject::Clone( unsigned int version, unsigned int user_version ) {
stringstream tmp;
//Create a new object of the same type
- NiObjectRef clone = CreateBlock( this->GetType().GetTypeName() );
+ NiObjectRef clone = CreateObject( this->GetType().GetTypeName() );
//Dummy map
map<NiObjectRef,uint> link_map;
diff --git a/obj/NiObject.h b/obj/NiObject.h
index 9614d131..a5786ded 100644
--- a/obj/NiObject.h
+++ b/obj/NiObject.h
@@ -54,8 +54,6 @@ public:
* my_block = ReadNifTree("test_in.nif")
* print block.GetType()
* \endcode
- *
- * \sa CreateBlock
*/
NIFLIB_API virtual const Type & GetType() const { return TYPE; };
@@ -77,7 +75,6 @@ public:
/*! Returns A new block that contains all the same data that this block does, but occupies a different part of memory. The data stored in a NIF file varies from version to version. Usually you are safe with the default option (the highest availiable version) but you may need to use an earlier version if you need to clone an obsolete piece of information.
* \param version The version number to use in the memory streaming operation. Default is the highest version availiable.
* \return A cloned copy of this block as a new block.
- * \sa CreateBlock
*/
NIFLIB_API NiObjectRef Clone( unsigned int version = 0xFFFFFFFF, unsigned int user_version = 0 );
diff --git a/obj/bhkNiTriStripsShape.cpp b/obj/bhkNiTriStripsShape.cpp
index ac3334e0..7435fdc9 100644
--- a/obj/bhkNiTriStripsShape.cpp
+++ b/obj/bhkNiTriStripsShape.cpp
@@ -52,3 +52,11 @@ void bhkNiTriStripsShape::SetStripsData(int i, Ref<NiTriStripsData> &strips)
stripsData[i] = strips;
}
+Vector3 bhkNiTriStripsShape::GetScale() const {
+ return scale;
+}
+
+void bhkNiTriStripsShape::SetScale( const Vector3 & n ) {
+ scale = n;
+}
+
diff --git a/obj/bhkNiTriStripsShape.h b/obj/bhkNiTriStripsShape.h
index cf3cc4fc..34fcf044 100644
--- a/obj/bhkNiTriStripsShape.h
+++ b/obj/bhkNiTriStripsShape.h
@@ -42,7 +42,7 @@ public:
* Scale. Usually (1.0, 1.0, 1.0).
*/
Vector3 GetScale() const;
- void SetScale( const Vector3 & value );
+ void SetScale( const Vector3 & n );
void SetNumStripsData(int i);
void SetStripsData(int i, Ref<NiTriStripsData> &);
diff --git a/pyniflib.i b/pyniflib.i
index f9653462..160397c1 100644
--- a/pyniflib.i
+++ b/pyniflib.i
@@ -344,8 +344,18 @@ POSSIBILITY OF SUCH DAMAGE. */
%template(vector_SkinPartition) std::vector<Niflib::SkinPartition>;
%template(vector_ShaderTexDesc) std::vector<Niflib::ShaderTexDesc>;
%template(vector_MatchGroup) std::vector<Niflib::MatchGroup>;
-%template(pair_int_float) std::pair<int, float>;
-%template(map_int_float) std::map<int, float>;
+
+%template(Key_float) Niflib::Key<float>;
+%template(Key_Quaternion) Niflib::Key<Quaternion>;
+%template(Key_byte) Niflib::Key<unsigned char>;
+%template(Key_Vector3) Niflib::Key<Vector3>;
+%template(Key_Color4) Niflib::Key<Color4>;
+
+%template(vector_Key_float) std::vector<Niflib::Key<float> >;
+%template(vector_Key_Quaternion) std::vector<Niflib::Key<Quaternion> >;
+%template(vector_Key_byte) std::vector<Niflib::Key<unsigned char> >;
+%template(vector_Key_Vector3) std::vector<Niflib::Key<Vector3> >;
+%template(vector_Key_Color4) std::vector<Niflib::Key<Color4> >;
%include "Ref.h"
%include "Type.h"
--
GitLab