1. Add NiClod and NiClodData.

2. Fix PCH project settings.
3. Add NifSkope base partitioning algorithm
4. Add ability to use TriStripper instead of NvStripper for tristripdata
5. Sync with XML and equivalent changes.

include/gen/obj_defines.h

@@ -533,18 +533,17 @@ InternalFixLinks( objects, link_stack, version, user_version ); \
 return InternalGetRefs(); \
 
 #define NI_DYNAMIC_EFFECT_MEMBERS \
-bool hasAffectedNodeList_; \
-uint affectedNodeList_; \
 bool switchState; \
 mutable uint numAffectedNodes; \
 vector<Ref<NiAVObject > > affectedNodes; \
+vector<uint > affectedNodeListPointers; \
 
 #define NI_DYNAMIC_EFFECT_INCLUDE "NiAVObject.h" \
 
 #define NI_DYNAMIC_EFFECT_PARENT NiAVObject \
 
 #define NI_DYNAMIC_EFFECT_CONSTRUCT \
- : hasAffectedNodeList_(false), affectedNodeList_((uint)0), switchState(false), numAffectedNodes((uint)0) \
+ : switchState(false), numAffectedNodes((uint)0) \
 
 #define NI_DYNAMIC_EFFECT_READ \
 InternalRead( in, link_stack, version, user_version ); \
@@ -3364,14 +3363,14 @@ Vector3 lodCenter; \
 mutable uint numLodLevels; \
 vector<LODRange > lodLevels; \
 ushort unknownShort; \
-Ref<NiLODData > rangeData; \
+Ref<NiLODData > lodLevelData; \
 
 #define NI_L_O_D_NODE_INCLUDE "NiNode.h" \
 
 #define NI_L_O_D_NODE_PARENT NiNode \
 
 #define NI_L_O_D_NODE_CONSTRUCT \
- : numLodLevels((uint)0), unknownShort((ushort)0), rangeData(NULL) \
+ : numLodLevels((uint)0), unknownShort((ushort)0), lodLevelData(NULL) \
 
 #define NI_L_O_D_NODE_READ \
 InternalRead( in, link_stack, version, user_version ); \
@@ -4849,7 +4848,7 @@ float boundRadius; \
 Vector3 worldCenter; \
 float worldRadius; \
 mutable uint proportionCount; \
-vector<float > proportion; \
+vector<float > proportionLevels; \
 
 #define NI_SCREEN_L_O_D_DATA_INCLUDE "NiLODData.h" \
 
@@ -5597,6 +5596,57 @@ InternalFixLinks( objects, link_stack, version, user_version ); \
 #define NI_TRI_STRIPS_DATA_GETREFS \
 return InternalGetRefs(); \
 
+#define NI_CLOD_MEMBERS \
+
+#define NI_CLOD_INCLUDE "NiTriBasedGeom.h" \
+
+#define NI_CLOD_PARENT NiTriBasedGeom \
+
+#define NI_CLOD_CONSTRUCT \
+
+#define NI_CLOD_READ \
+InternalRead( in, link_stack, version, user_version ); \
+
+#define NI_CLOD_WRITE \
+InternalWrite( out, link_map, version, user_version ); \
+
+#define NI_CLOD_STRING \
+return InternalAsString( verbose ); \
+
+#define NI_CLOD_FIXLINKS \
+InternalFixLinks( objects, link_stack, version, user_version ); \
+
+#define NI_CLOD_GETREFS \
+return InternalGetRefs(); \
+
+#define NI_CLOD_DATA_MEMBERS \
+array<ushort,5> unknown5Shorts; \
+float unknownFloat; \
+uint unknownInt; \
+array<ushort,44> unknownClodShorts; \
+
+#define NI_CLOD_DATA_INCLUDE "NiTriBasedGeomData.h" \
+
+#define NI_CLOD_DATA_PARENT NiTriBasedGeomData \
+
+#define NI_CLOD_DATA_CONSTRUCT \
+ : unknownFloat(0.0f), unknownInt((uint)0) \
+
+#define NI_CLOD_DATA_READ \
+InternalRead( in, link_stack, version, user_version ); \
+
+#define NI_CLOD_DATA_WRITE \
+InternalWrite( out, link_map, version, user_version ); \
+
+#define NI_CLOD_DATA_STRING \
+return InternalAsString( verbose ); \
+
+#define NI_CLOD_DATA_FIXLINKS \
+InternalFixLinks( objects, link_stack, version, user_version ); \
+
+#define NI_CLOD_DATA_GETREFS \
+return InternalGetRefs(); \
+
 #define NI_U_V_CONTROLLER_MEMBERS \
 ushort unknownShort; \
 Ref<NiUVData > data; \

include/obj/NiClod.h

+/* Copyright (c) 2006, NIF File Format Library and Tools
+All rights reserved.  Please see niflib.h for licence. */
+
+#ifndef _NICLOD_H_
+#define _NICLOD_H_
+
+#include "NiTriBasedGeom.h"
+namespace Niflib {
+
+
+#include "../gen/obj_defines.h"
+
+class NiClod;
+typedef Ref<NiClod> NiClodRef;
+
+/*!
+ * NiClod - A shape node that refers to singular triangle data.
+ */
+
+class NIFLIB_API NiClod : public NI_CLOD_PARENT {
+public:
+	NiClod();
+	~NiClod();
+	//Run-Time Type Information
+	static const Type & TypeConst() { return TYPE; }
+private:
+	static const Type TYPE;
+public:
+	virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version );
+	virtual void Write( ostream& out, map<NiObjectRef,uint> link_map, unsigned int version, unsigned int user_version ) const;
+	virtual string asString( bool verbose = false ) const;
+	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;
+
+protected:
+	NI_CLOD_MEMBERS
+	STANDARD_INTERNAL_METHODS
+};
+
+}
+#endif

include/obj/NiClodData.h

+/* Copyright (c) 2006, NIF File Format Library and Tools
+All rights reserved.  Please see niflib.h for licence. */
+
+#ifndef _NICLODDATA_H_
+#define _NICLODDATA_H_
+
+#include "NiTriBasedGeomData.h"
+namespace Niflib {
+
+
+#include "../gen/obj_defines.h"
+
+class NiClodData;
+typedef Ref<NiClodData> NiClodDataRef;
+
+/*!
+ * NiClodData - A shape node that refers to singular triangle data.
+ */
+
+class NIFLIB_API NiClodData : public NI_CLOD_DATA_PARENT {
+public:
+	NiClodData();
+	~NiClodData();
+	//Run-Time Type Information
+	static const Type & TypeConst() { return TYPE; }
+private:
+	static const Type TYPE;
+public:
+	virtual void Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version );
+	virtual void Write( ostream& out, map<NiObjectRef,uint> link_map, unsigned int version, unsigned int user_version ) const;
+	virtual string asString( bool verbose = false ) const;
+	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;
+
+protected:
+	NI_CLOD_DATA_MEMBERS
+	STANDARD_INTERNAL_METHODS
+};
+
+}
+#endif

include/obj/NiControllerManager.h

@@ -39,7 +39,24 @@ public:
 	virtual list<NiObjectRef> GetRefs() const;
 	virtual const Type & GetType() const;
 
-	//TODO:  This is not a priority but needs to be implemented eventually
+	/*!
+	 * Designates whether animation sequences are cumulative?
+	 */
+	bool GetCumulative() const;
+	void SetCumulative( bool value );
+
+	/*!
+	 * Refers to a list of NiControllerSequence object.
+	 */
+	vector<Ref<NiControllerSequence > > GetControllerSequences() const;
+	void SetControllerSequences( const vector<Ref<NiControllerSequence > >& value );
+
+	/*!
+	 * Refers to a NiDefaultAVObjectPalette.
+	 */
+	Ref<NiDefaultAVObjectPalette > GetObjectPalette() const;
+	void SetObjectPalette( Ref<NiDefaultAVObjectPalette > value );
+
 protected:
 	NI_CONTROLLER_MANAGER_MEMBERS
 	STANDARD_INTERNAL_METHODS

include/obj/NiDefaultAVObjectPalette.h

@@ -37,6 +37,12 @@ public:
 	virtual list<NiObjectRef> GetRefs() const;
 	virtual const Type & GetType() const;
 
+	/*!
+	 * The objects.
+	 */
+	vector<Ref<NiAVObject> > GetObjs() const;
+	void SetObjs( const vector<Ref<NiAVObject> >& value );
+
 protected:
 	NI_DEFAULT_A_V_OBJECT_PALETTE_MEMBERS
 	STANDARD_INTERNAL_METHODS

include/obj/NiDynamicEffect.h

@@ -38,21 +38,6 @@ public:
 	virtual list<NiObjectRef> GetRefs() const;
 	virtual const Type & GetType() const;
 
-	/*!
-	 * Determines whether or not an unknown integer follows.
-	 */
-	bool GetHasAffectedNodeList_() const;
-	void SetHasAffectedNodeList_( bool value );
-
-	/*!
-	 * This is probably the list of affected nodes. For some reason i do not
-	 * know the max exporter seems to write pointers instead of links. But it
-	 * doesn't matter because at least in version 4.0.0.2 the list is
-	 * automagically updated by the engine during the load stage.
-	 */
-	uint GetAffectedNodeList_() const;
-	void SetAffectedNodeList_( uint value );
-
 	/*!
 	 * Turns effect on and off?  Switches list to list of unaffected nodes?
 	 */
@@ -65,6 +50,15 @@ public:
 	vector<Ref<NiAVObject > > GetAffectedNodes() const;
 	void SetAffectedNodes( const vector<Ref<NiAVObject > >& value );
 
+	/*!
+	 * This is probably the list of affected nodes. For some reason i do not
+	 * know the max exporter seems to write pointers instead of links. But it
+	 * doesn't matter because at least in version 4.0.0.2 the list is
+	 * automagically updated by the engine during the load stage.
+	 */
+	vector<uint > GetAffectedNodeListPointers() const;
+	void SetAffectedNodeListPointers( const vector<uint >& value );
+
 protected:
 	NI_DYNAMIC_EFFECT_MEMBERS
 	STANDARD_INTERNAL_METHODS

include/obj/NiSkinPartition.h

@@ -74,6 +74,7 @@ public:
 protected:
    friend class NiTriBasedGeom;
    NiSkinPartition(Ref<NiTriBasedGeom> shape);
+   NiSkinPartition(Ref<NiTriBasedGeom> shape, int maxBonesPerPartition, int maxBonesPerVertex);
 
    void SetNumPartitions( int value );
    void SetWeightsPerVertex( int partition, ushort value );

include/obj/NiTriBasedGeom.h

@@ -56,7 +56,7 @@ public:
 	 */
 	void SetBoneWeights( uint bone_index, const vector<SkinWeight> & n );
 
-   void GenHardwareSkinInfo( int max_bones_per_partition = 4 );
+   void GenHardwareSkinInfo( int max_bones_per_partition = 4, int max_bones_per_vertex = 4 );
 
 	Ref<NiSkinInstance> GetSkinInstance() const;
 

include/obj/NiTriShapeData.h

@@ -35,6 +35,8 @@ public:
 	virtual const Type & GetType() const;
 public:
 
+   NiTriShapeData(const vector<Triangle>& verts);
+
 	//--Match Detection--//
 	
 	//Re-implemented only to casue match detection data to be cleared

include/obj/NiTriStripsData.h

@@ -32,6 +32,9 @@ public:
 	virtual list<NiObjectRef> GetRefs() const;
 	virtual const Type & GetType() const;
 
+
+   NiTriStripsData(const vector<Triangle> &tris, bool nvtristrips = true);
+
 	//--Counts--//
 
 	/*! Used to get the number of triangle strips that this mesh is divided into.
@@ -77,6 +80,8 @@ public:
    virtual void SetTriangles( const vector<Triangle> & in );
 
 private:
+   void SetNvTriangles( const vector<Triangle> & in );
+   void SetTSTriangles( const vector<Triangle> & in );
 	ushort CalcTriangleCount() const;
 
 protected:

niflib.vcproj

@@ -17,8 +17,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(ProjectDir)../Debug"
-			IntermediateDirectory="$(ProjectDir)../Debug"
+			OutputDirectory="$(ProjectDir)obj\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectDir)obj\$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -41,6 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="$(ProjectDir)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -81,8 +82,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(ProjectDir)..\Release"
-			IntermediateDirectory="$(ProjectDir)..\Release"
+			OutputDirectory="$(ProjectDir)obj\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectDir)obj\$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -107,6 +108,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				WholeProgramOptimization="false"
+				AdditionalIncludeDirectories="$(ProjectDir)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -145,8 +147,8 @@
 		</Configuration>
 		<Configuration
 			Name="PyNiflib|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(ProjectDir)obj\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectDir)obj\$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -168,6 +170,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="$(ProjectDir)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -205,8 +208,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release - DLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(ProjectDir)obj\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectDir)obj\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -231,6 +234,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/FI&quot;pch.h&quot;"
 				Optimization="3"
+				AdditionalIncludeDirectories="$(ProjectDir)"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BUILDING_NIFLIB_DLL;USE_NIFLIB_DLL"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -278,8 +282,8 @@
 		</Configuration>
 		<Configuration
 			Name="Debug - PCH|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="$(ProjectDir)obj\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectDir)obj\$(ConfigurationName)"
 			ConfigurationType="4"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -301,16 +305,83 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/FI&quot;$(ProjectDir)pch.h&quot;"
+				AdditionalOptions="/FI&quot;$(ProjectDir)include\pch.h&quot;"
 				Optimization="0"
+				AdditionalIncludeDirectories="$(ProjectDir)"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough=""
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="$(ProjectDir)include\pch.h"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="lib/niflib_debug.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release - PCH|Win32"
+			OutputDirectory="$(ProjectDir)obj\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectDir)obj\$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/FI&quot;$(ProjectDir)include\pch.h&quot;"
+				Optimization="0"
+				WholeProgramOptimization="false"
+				AdditionalIncludeDirectories="$(ProjectDir)"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="$(ProjectDir)include\pch.h"
 				WarningLevel="3"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -323,7 +394,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(ProjectDir)../bin/niflibd.lib"
+				OutputFile="lib/niflib.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -426,6 +497,15 @@
 						PrecompiledHeaderThrough="$(ProjectDir)include/pch.h"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release - PCH|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+						PrecompiledHeaderThrough="$(ProjectDir)include\pch.h"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\src\Type.cpp"
@@ -750,6 +830,14 @@
 					RelativePath=".\src\obj\NiCamera.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\src\obj\NiClod.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\obj\NiClodData.cpp"
+					>
+				</File>
 				<File
 					RelativePath=".\src\obj\NiCollisionData.cpp"
 					>
@@ -1824,6 +1912,14 @@
 					RelativePath=".\include\obj\NiCamera.h"
 					>
 				</File>
+				<File
+					RelativePath=".\include\obj\NiClod.h"
+					>
+				</File>
+				<File
+					RelativePath=".\include\obj\NiClodData.h"
+					>
+				</File>
 				<File
 					RelativePath=".\include\obj\NiCollisionData.h"
 					>

src/gen/obj_factories.cpp

@@ -349,6 +349,10 @@ NiObject * CreateNiTriShapeData() { return new NiTriShapeData; }
 NiObject * CreateNiTriStrips() { return new NiTriStrips; }
 #include "../../include/obj/NiTriStripsData.h"
 NiObject * CreateNiTriStripsData() { return new NiTriStripsData; }
+#include "../../include/obj/NiClod.h"
+NiObject * CreateNiClod() { return new NiClod; }
+#include "../../include/obj/NiClodData.h"
+NiObject * CreateNiClodData() { return new NiClodData; }
 #include "../../include/obj/NiUVController.h"
 NiObject * CreateNiUVController() { return new NiUVController; }
 #include "../../include/obj/NiUVData.h"
@@ -543,6 +547,8 @@ void RegisterBlockFactories() {
 	global_block_map["NiTriShapeData"] = CreateNiTriShapeData;
 	global_block_map["NiTriStrips"] = CreateNiTriStrips;
 	global_block_map["NiTriStripsData"] = CreateNiTriStripsData;
+	global_block_map["NiClod"] = CreateNiClod;
+	global_block_map["NiClodData"] = CreateNiClodData;
 	global_block_map["NiUVController"] = CreateNiUVController;
 	global_block_map["NiUVData"] = CreateNiUVData;
 	global_block_map["NiVectorExtraData"] = CreateNiVectorExtraData;

src/gen/obj_impl.cpp

@@ -175,6 +175,8 @@ using namespace std;
 #include "../../include/obj/NiTriShapeData.h"
 #include "../../include/obj/NiTriStrips.h"
 #include "../../include/obj/NiTriStripsData.h"
+#include "../../include/obj/NiClod.h"
+#include "../../include/obj/NiClodData.h"
 #include "../../include/obj/NiUVController.h"
 #include "../../include/obj/NiUVData.h"
 #include "../../include/obj/NiVectorExtraData.h"
@@ -1146,39 +1148,33 @@ std::list<NiObjectRef> NiAVObject::InternalGetRefs() const {
 void NiDynamicEffect::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) {
 	uint block_num;
 	NiAVObject::Read( in, link_stack, version, user_version );
-	if ( version <= 0x04000002 ) {
-		NifStream( hasAffectedNodeList_, in, version );
-		if ( (hasAffectedNodeList_ != 0) ) {
-			NifStream( affectedNodeList_, in, version );
-		};
-	};
 	if ( version >= 0x0A020000 ) {
 		NifStream( switchState, in, version );
 	};
-	if ( version >= 0x0A010000 ) {
 		NifStream( numAffectedNodes, in, version );
+	if ( version >= 0x0A010000 ) {
 		affectedNodes.resize(numAffectedNodes);
 		for (uint i2 = 0; i2 < affectedNodes.size(); i2++) {
 			NifStream( block_num, in, version );
 			link_stack.push_back( block_num );
 		};
 	};
+	if ( version <= 0x0A000102 ) {
+		affectedNodeListPointers.resize(numAffectedNodes);
+		for (uint i2 = 0; i2 < affectedNodeListPointers.size(); i2++) {
+			NifStream( affectedNodeListPointers[i2], in, version );
+		};
+	};
 }
 void NiDynamicEffect::InternalWrite( ostream& out, map<NiObjectRef,uint> link_map, unsigned int version, unsigned int user_version ) const {
 	NiAVObject::Write( out, link_map, version, user_version );
 	numAffectedNodes = uint(affectedNodes.size());
-	if ( version <= 0x04000002 ) {
-		NifStream( hasAffectedNodeList_, out, version );
-		if ( (hasAffectedNodeList_ != 0) ) {
-			NifStream( affectedNodeList_, out, version );
-		};
-	};
 	if ( version >= 0x0A020000 ) {
 		NifStream( switchState, out, version );
 	};
-	if ( version >= 0x0A010000 ) {
 		NifStream( numAffectedNodes, out, version );
+	if ( version >= 0x0A010000 ) {
 		for (uint i2 = 0; i2 < affectedNodes.size(); i2++) {
 			if ( affectedNodes[i2] != NULL )
 				NifStream( link_map[StaticCast<NiObject>(affectedNodes[i2])], out, version );
@@ -1186,16 +1182,17 @@ void NiDynamicEffect::InternalWrite( ostream& out, map<NiObjectRef,uint> link_ma
 				NifStream( 0xffffffff, out, version );
 		};
 	};
+	if ( version <= 0x0A000102 ) {
+		for (uint i2 = 0; i2 < affectedNodeListPointers.size(); i2++) {
+			NifStream( affectedNodeListPointers[i2], out, version );
+		};
+	};
 }
 std::string NiDynamicEffect::InternalAsString( bool verbose ) const {
 	stringstream out;
 	out << NiAVObject::asString();
 	numAffectedNodes = uint(affectedNodes.size());
-	out << "  Has Affected Node List?:  " << hasAffectedNodeList_ << endl;
-	if ( (hasAffectedNodeList_ != 0) ) {
-		out << "    Affected Node List?:  " << affectedNodeList_ << endl;
-	};
 	out << "  Switch State:  " << switchState << endl;
 	out << "  Num Affected Nodes:  " << numAffectedNodes << endl;
 	for (uint i1 = 0; i1 < affectedNodes.size(); i1++) {
@@ -1205,6 +1202,13 @@ std::string NiDynamicEffect::InternalAsString( bool verbose ) const {
 		};
 		out << "    Affected Nodes[" << i1 << "]:  " << affectedNodes[i1] << endl;
 	};
+	for (uint i1 = 0; i1 < affectedNodeListPointers.size(); i1++) {
+		if ( !verbose && ( i1 > MAXARRAYDUMP ) ) {
+			out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl;
+			break;
+		};
+		out << "    Affected Node List Pointers[" << i1 << "]:  " << affectedNodeListPointers[i1] << endl;
+	};
 	return out.str();
 }
@@ -7486,8 +7490,8 @@ void NiLODNode::InternalWrite( ostream& out, map<NiObjectRef,uint> link_map, uns
 	};
 	if ( version >= 0x0A010000 ) {
 		NifStream( unknownShort, out, version );
-		if ( rangeData != NULL )
-			NifStream( link_map[StaticCast<NiObject>(rangeData)], out, version );
+		if ( lodLevelData != NULL )
+			NifStream( link_map[StaticCast<NiObject>(lodLevelData)], out, version );
 		else
 			NifStream( 0xffffffff, out, version );
 	};
@@ -7511,7 +7515,7 @@ std::string NiLODNode::InternalAsString( bool verbose ) const {
 		out << "    Far Extent:  " << lodLevels[i1].farExtent << endl;
 	};
 	out << "  Unknown Short:  " << unknownShort << endl;
-	out << "  Range Data:  " << rangeData << endl;
+	out << "  LOD Level Data:  " << lodLevelData << endl;
 	return out.str();
 }
@@ -7521,11 +7525,11 @@ void NiLODNode::InternalFixLinks( const vector<NiObjectRef> & objects, list<uint
 		if (link_stack.empty())
 			throw runtime_error("Trying to pop a link from empty stack. This is probably a bug.");
 		if (link_stack.front() != 0xffffffff) {
-			rangeData = DynamicCast<NiLODData>(objects[link_stack.front()]);
-			if ( rangeData == NULL )
+			lodLevelData = DynamicCast<NiLODData>(objects[link_stack.front()]);
+			if ( lodLevelData == NULL )
 				throw runtime_error("Link could not be cast to required type during file read. This NIF file may be invalid or improperly understood.");
 		} else
-			rangeData = NULL;
+			lodLevelData = NULL;
 		link_stack.pop_front();
 	};
 }
@@ -7533,8 +7537,8 @@ void NiLODNode::InternalFixLinks( const vector<NiObjectRef> & objects, list<uint
 std::list<NiObjectRef> NiLODNode::InternalGetRefs() const {
 	list<Ref<NiObject> > refs;
 	refs = NiNode::GetRefs();
-	if ( rangeData != NULL )
-		refs.push_back(StaticCast<NiObject>(rangeData));
+	if ( lodLevelData != NULL )
+		refs.push_back(StaticCast<NiObject>(lodLevelData));
 	return refs;
 }
@@ -10297,40 +10301,40 @@ void NiScreenLODData::InternalRead( istream& in, list<uint> & link_stack, unsign
 	NifStream( worldCenter, in, version );
 	NifStream( worldRadius, in, version );
 	NifStream( proportionCount, in, version );
-	proportion.resize(proportionCount);
-	for (uint i1 = 0; i1 < proportion.size(); i1++) {
-		NifStream( proportion[i1], in, version );
+	proportionLevels.resize(proportionCount);
+	for (uint i1 = 0; i1 < proportionLevels.size(); i1++) {
+		NifStream( proportionLevels[i1], in, version );
 	};
 }
 void NiScreenLODData::InternalWrite( ostream& out, map<NiObjectRef,uint> link_map, unsigned int version, unsigned int user_version ) const {
 	NiLODData::Write( out, link_map, version, user_version );
-	proportionCount = uint(proportion.size());
+	proportionCount = uint(proportionLevels.size());
 	NifStream( boundCenter, out, version );
 	NifStream( boundRadius, out, version );
 	NifStream( worldCenter, out, version );
 	NifStream( worldRadius, out, version );
 	NifStream( proportionCount, out, version );
-	for (uint i1 = 0; i1 < proportion.size(); i1++) {
-		NifStream( proportion[i1], out, version );
+	for (uint i1 = 0; i1 < proportionLevels.size(); i1++) {
+		NifStream( proportionLevels[i1], out, version );
 	};
 }
 std::string NiScreenLODData::InternalAsString( bool verbose ) const {
 	stringstream out;
 	out << NiLODData::asString();
-	proportionCount = uint(proportion.size());
+	proportionCount = uint(proportionLevels.size());
 	out << "  Bound Center:  " << boundCenter << endl;
 	out << "  Bound Radius:  " << boundRadius << endl;
 	out << "  World Center:  " << worldCenter << endl;
 	out << "  World Radius:  " << worldRadius << endl;
 	out << "  Proportion Count:  " << proportionCount << endl;
-	for (uint i1 = 0; i1 < proportion.size(); i1++) {
+	for (uint i1 = 0; i1 < proportionLevels.size(); i1++) {
 		if ( !verbose && ( i1 > MAXARRAYDUMP ) ) {
 			out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl;
 			break;
 		};
-		out << "    Proportion[" << i1 << "]:  " << proportion[i1] << endl;
+		out << "    Proportion Levels[" << i1 << "]:  " << proportionLevels[i1] << endl;
 	};
 	return out.str();
 }
@@ -11734,7 +11738,6 @@ void NiTexturingProperty::InternalRead( istream& in, list<uint> & link_stack, un
 	if ( (textureCount == 8) ) {
 		NifStream( hasDecal1Texture, in, version );
 	};
-	if ( version >= 0x14000004 ) {
 		if ( (((textureCount == 8)) && ((hasDecal1Texture != 0))) ) {
 			NifStream( block_num, in, version );
 			link_stack.push_back( block_num );
@@ -11759,7 +11762,6 @@ void NiTexturingProperty::InternalRead( istream& in, list<uint> & link_stack, un
 				};
 			};
 		};
-	};
 	if ( version >= 0x0A000100 ) {
 		NifStream( numShaderTextures, in, version );
 		shaderTextures.resize(numShaderTextures);
@@ -11997,7 +11999,6 @@ void NiTexturingProperty::InternalWrite( ostream& out, map<NiObjectRef,uint> lin
 	if ( (textureCount == 8) ) {
 		NifStream( hasDecal1Texture, out, version );
 	};
-	if ( version >= 0x14000004 ) {
 		if ( (((textureCount == 8)) && ((hasDecal1Texture != 0))) ) {
 			if ( decal1Texture.source != NULL )
 				NifStream( link_map[StaticCast<NiObject>(decal1Texture.source)], out, version );
@@ -12024,7 +12025,6 @@ void NiTexturingProperty::InternalWrite( ostream& out, map<NiObjectRef,uint> lin
 				};
 			};
 		};
-	};
 	if ( version >= 0x0A000100 ) {
 		NifStream( numShaderTextures, out, version );
 		for (uint i2 = 0; i2 < shaderTextures.size(); i2++) {
@@ -12320,7 +12320,6 @@ void NiTexturingProperty::InternalFixLinks( const vector<NiObjectRef> & objects,
 			decal0Texture.source = NULL;
 		link_stack.pop_front();
 	};
-	if ( version >= 0x14000004 ) {
 		if ( (((textureCount == 8)) && ((hasDecal1Texture != 0))) ) {
 			if (link_stack.empty())
 				throw runtime_error("Trying to pop a link from empty stack. This is probably a bug.");
@@ -12332,7 +12331,6 @@ void NiTexturingProperty::InternalFixLinks( const vector<NiObjectRef> & objects,
 				decal1Texture.source = NULL;
 			link_stack.pop_front();
 		};
-	};
 	if ( version >= 0x0A000100 ) {
 		for (uint i2 = 0; i2 < shaderTextures.size(); i2++) {
 			if ( (shaderTextures[i2].isUsed != 0) ) {
@@ -12746,6 +12744,112 @@ std::list<NiObjectRef> NiTriStripsData::InternalGetRefs() const {
 	return refs;
 }
+void NiClod::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) {
+	NiTriBasedGeom::Read( in, link_stack, version, user_version );
+}
+
+void NiClod::InternalWrite( ostream& out, map<NiObjectRef,uint> link_map, unsigned int version, unsigned int user_version ) const {
+	NiTriBasedGeom::Write( out, link_map, version, user_version );
+}
+
+std::string NiClod::InternalAsString( bool verbose ) const {
+	stringstream out;
+	out << NiTriBasedGeom::asString();
+	return out.str();
+}
+
+void NiClod::InternalFixLinks( const vector<NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) {
+	NiTriBasedGeom::FixLinks( objects, link_stack, version, user_version );
+}
+
+std::list<NiObjectRef> NiClod::InternalGetRefs() const {
+	list<Ref<NiObject> > refs;
+	refs = NiTriBasedGeom::GetRefs();
+	return refs;
+}
+
+void NiClodData::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) {
+	NiTriBasedGeomData::Read( in, link_stack, version, user_version );
+	for (uint i1 = 0; i1 < 5; i1++) {
+		NifStream( unknown5Shorts[i1], in, version );
+	};
+	NifStream( unknownFloat, in, version );
+	NifStream( unknownInt, in, version );
+	if ( (unknownInt == 9) ) {
+		for (uint i2 = 0; i2 < 44; i2++) {
+			NifStream( unknownClodShorts[i2], in, version );
+		};
+	};
+	if ( (unknownInt == 199) ) {
+		for (uint i2 = 0; i2 < 233; i2++) {
+			NifStream( unknownClodShorts[i2], in, version );
+		};
+	};
+	if ( (unknownInt == 24) ) {
+		for (uint i2 = 0; i2 < 57; i2++) {
+			NifStream( unknownClodShorts[i2], in, version );
+		};
+	};
+}
+
+void NiClodData::InternalWrite( ostream& out, map<NiObjectRef,uint> link_map, unsigned int version, unsigned int user_version ) const {
+	NiTriBasedGeomData::Write( out, link_map, version, user_version );
+	for (uint i1 = 0; i1 < 5; i1++) {
+		NifStream( unknown5Shorts[i1], out, version );
+	};
+	NifStream( unknownFloat, out, version );
+	NifStream( unknownInt, out, version );
+	if ( (unknownInt == 9) ) {
+		for (uint i2 = 0; i2 < 44; i2++) {
+			NifStream( unknownClodShorts[i2], out, version );
+		};
+	};
+	if ( (unknownInt == 199) ) {
+		for (uint i2 = 0; i2 < 233; i2++) {
+			NifStream( unknownClodShorts[i2], out, version );
+		};
+	};
+	if ( (unknownInt == 24) ) {
+		for (uint i2 = 0; i2 < 57; i2++) {
+			NifStream( unknownClodShorts[i2], out, version );
+		};
+	};
+}
+
+std::string NiClodData::InternalAsString( bool verbose ) const {
+	stringstream out;
+	out << NiTriBasedGeomData::asString();
+	for (uint i1 = 0; i1 < 5; i1++) {
+		if ( !verbose && ( i1 > MAXARRAYDUMP ) ) {
+			out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl;
+			break;
+		};
+		out << "    Unknown 5 Shorts[" << i1 << "]:  " << unknown5Shorts[i1] << endl;
+	};
+	out << "  Unknown Float:  " << unknownFloat << endl;
+	out << "  Unknown Int:  " << unknownInt << endl;
+	if ( (unknownInt == 9) ) {
+		for (uint i2 = 0; i2 < 44; i2++) {
+			if ( !verbose && ( i2 > MAXARRAYDUMP ) ) {
+				out << "<Data Truncated. Use verbose mode to see complete listing.>" << endl;
+				break;
+			};
+			out << "      Unknown Clod Shorts[" << i2 << "]:  " << unknownClodShorts[i2] << endl;
+		};
+	};
+	return out.str();
+}
+
+void NiClodData::InternalFixLinks( const vector<NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) {
+	NiTriBasedGeomData::FixLinks( objects, link_stack, version, user_version );
+}
+
+std::list<NiObjectRef> NiClodData::InternalGetRefs() const {
+	list<Ref<NiObject> > refs;
+	refs = NiTriBasedGeomData::GetRefs();
+	return refs;
+}
+
 void NiUVController::InternalRead( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) {
 	uint block_num;
 	NiTimeController::Read( in, link_stack, version, user_version );

src/obj/NiClod.cpp

+/* Copyright (c) 2006, NIF File Format Library and Tools
+All rights reserved.  Please see niflib.h for licence. */
+
+#include "../../include/obj/NiClod.h"
+using namespace Niflib;
+
+//Definition of TYPE constant
+const Type NiClod::TYPE("NiClod", &NI_CLOD_PARENT::TypeConst() );
+
+NiClod::NiClod() NI_CLOD_CONSTRUCT {}
+
+NiClod::~NiClod() {}
+
+void NiClod::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) {
+	NI_CLOD_READ
+}
+
+void NiClod::Write( ostream& out, map<NiObjectRef,uint> link_map, unsigned int version, unsigned int user_version ) const {
+	NI_CLOD_WRITE
+}
+
+string NiClod::asString( bool verbose ) const {
+	NI_CLOD_STRING
+}
+
+void NiClod::FixLinks( const vector<NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) {
+	NI_CLOD_FIXLINKS
+}
+
+list<NiObjectRef> NiClod::GetRefs() const {
+	NI_CLOD_GETREFS
+}
+
+const Type & NiClod::GetType() const {
+	return TYPE;
+};
+

src/obj/NiClodData.cpp

+/* Copyright (c) 2006, NIF File Format Library and Tools
+All rights reserved.  Please see niflib.h for licence. */
+
+#include "../../include/obj/NiClodData.h"
+using namespace Niflib;
+
+//Definition of TYPE constant
+const Type NiClodData::TYPE("NiClodData", &NI_CLOD_DATA_PARENT::TypeConst() );
+
+NiClodData::NiClodData() NI_CLOD_DATA_CONSTRUCT {}
+
+NiClodData::~NiClodData() {}
+
+void NiClodData::Read( istream& in, list<uint> & link_stack, unsigned int version, unsigned int user_version ) {
+	NI_CLOD_DATA_READ
+}
+
+void NiClodData::Write( ostream& out, map<NiObjectRef,uint> link_map, unsigned int version, unsigned int user_version ) const {
+	NI_CLOD_DATA_WRITE
+}
+
+string NiClodData::asString( bool verbose ) const {
+	NI_CLOD_DATA_STRING
+}
+
+void NiClodData::FixLinks( const vector<NiObjectRef> & objects, list<uint> & link_stack, unsigned int version, unsigned int user_version ) {
+	NI_CLOD_DATA_FIXLINKS
+}
+
+list<NiObjectRef> NiClodData::GetRefs() const {
+	NI_CLOD_DATA_GETREFS
+}
+
+const Type & NiClodData::GetType() const {
+	return TYPE;
+};
+

src/obj/NiControllerManager.cpp

@@ -37,3 +37,27 @@ const Type & NiControllerManager::GetType() const {
 	return TYPE;
 };
 
+bool NiControllerManager::GetCumulative() const {
+	return cumulative;
+}
+
+void NiControllerManager::SetCumulative( bool value ) {
+	cumulative = value;
+}
+
+vector<Ref<NiControllerSequence > > NiControllerManager::GetControllerSequences() const {
+	return controllerSequences;
+}
+
+void NiControllerManager::SetControllerSequences( const vector<Ref<NiControllerSequence > >& value ) {
+	controllerSequences = value;
+}
+
+Ref<NiDefaultAVObjectPalette > NiControllerManager::GetObjectPalette() const {
+	return objectPalette;
+}
+
+void NiControllerManager::SetObjectPalette( Ref<NiDefaultAVObjectPalette > value ) {
+	objectPalette = value;
+}
+

src/obj/NiDefaultAVObjectPalette.cpp

@@ -37,3 +37,21 @@ const Type & NiDefaultAVObjectPalette::GetType() const {
 	return TYPE;
 };
 
+vector<Ref<NiAVObject> > NiDefaultAVObjectPalette::GetObjs() const {
+   vector<NiAVObjectRef> objRefs;
+   for (vector<AVObject>::const_iterator itr = objs.begin(); itr != objs.end(); ++itr) {
+      objRefs.push_back(itr->avObject);
+   }
+	return objRefs;
+}
+
+void NiDefaultAVObjectPalette::SetObjs( const vector<Ref<NiAVObject> >& value ) {
+   objs.clear();
+   for (vector<NiAVObjectRef>::const_iterator itr = value.begin(); itr != value.end(); ++itr) {
+      AVObject obj;
+      obj.name = (*itr)->GetName();
+      obj.avObject = (*itr).Ptr();
+      objs.push_back(obj);
+   }
+}
+

src/obj/NiDynamicEffect.cpp

@@ -36,22 +36,6 @@ const Type & NiDynamicEffect::GetType() const {
 	return TYPE;
 };
 
-bool NiDynamicEffect::GetHasAffectedNodeList_() const {
-	return hasAffectedNodeList_;
-}
-
-void NiDynamicEffect::SetHasAffectedNodeList_( bool value ) {
-	hasAffectedNodeList_ = value;
-}
-
-uint NiDynamicEffect::GetAffectedNodeList_() const {
-	return affectedNodeList_;
-}
-
-void NiDynamicEffect::SetAffectedNodeList_( uint value ) {
-	affectedNodeList_ = value;
-}
-
 bool NiDynamicEffect::GetSwitchState() const {
 	return switchState;
 }
@@ -68,3 +52,11 @@ void NiDynamicEffect::SetAffectedNodes( const vector<Ref<NiAVObject > >& value )
 	affectedNodes = value;
 }
 
+vector<uint > NiDynamicEffect::GetAffectedNodeListPointers() const {
+	return affectedNodeListPointers;
+}
+
+void NiDynamicEffect::SetAffectedNodeListPointers( const vector<uint >& value ) {
+	affectedNodeListPointers = value;
+}
+

src/obj/NiLODNode.cpp

@@ -54,10 +54,10 @@ void NiLODNode::SetLODLevels( const vector<LODRange >& value ) {
 }
 
 Ref<NiLODData > NiLODNode::GetLODLevelData() const {
-	return rangeData;
+	return lodLevelData;
 }
 
 void NiLODNode::SetLODLevelData( Ref<NiLODData > value ) {
-	rangeData = value;
+	lodLevelData = value;
 }
 

src/obj/NiScreenLODData.cpp

@@ -68,10 +68,10 @@ void NiScreenLODData::SetWorldRadius( float value ) {
 }
 
 vector<float > NiScreenLODData::GetProportionLevels() const {
-	return proportion;
+	return proportionLevels;
 }
 
 void NiScreenLODData::SetProportionLevels( const vector<float >& value ) {
-	proportion = value;
+	proportionLevels = value;
 }