diff --git a/gen/obj_factories.cpp b/gen/obj_factories.cpp
index f373730e4be6b140fcfdaa5cee1d84538dd77f21..f1a657f70428491f1594f09f895a3dd4d12dca7e 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 4bb3a4d552f9d906cd4d6a834a4dfd8ee7a5b123..ea0fb2dccc2394f077411b310f947773b7a7b705 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 79784c8540fdeaddcec59b752859d67318f77cbd..94d9ff1e3a1571602dc5ceb6b4c54ad1a691bd8c 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 f6066b9c585c3c20a538275121899d10ca6ba66a..e26439541916b9b9080b01f4d622566cb1b57082 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 9614d13124dd37ad605f93d3bfeae245e0e22c5b..a5786ded873cbd5883f304210f276891f7d1e8e5 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 ac3334e012eac3798dd95a84e5f273a5776b55b9..7435fdc9759a6cf0aa96b7d1aa49412e9c735651 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 cf3cc4fc14f39140508625068c3f38d931d342d2..34fcf04483dd6017ae7ceaf7d13af36715db7008 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 f96534625596a0ed855825aa68bab127c6186064..160397c13219b4996651d2e1e9960cc4e33816bc 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"