From 302bb8d1d447fb03b2fa9169c9dd0866be52928d Mon Sep 17 00:00:00 2001
From: Tazpn <tazpn@users.sourceforge.net>
Date: Fri, 15 Jun 2007 03:16:56 +0000
Subject: [PATCH] Add x64 support to vcproj. Add miscellaneous collision
support helper methods
---
include/kfm.h | 7 +-
include/obj/bhkConvexVerticesShape.h | 19 ++
include/obj/bhkListShape.h | 25 ++
include/obj/bhkMoppBvTreeShape.h | 25 ++
include/obj/bhkNiTriStripsShape.h | 34 +++
include/obj/bhkPackedNiTriStripsShape.h | 12 +
include/obj/hkPackedNiTriStripsData.h | 26 ++
niflib.vcproj | 316 +++++++++++++++++++++++-
src/obj/NiTriBasedGeom.cpp | 2 +-
src/obj/bhkConvexVerticesShape.cpp | 25 ++
src/obj/bhkListShape.cpp | 21 ++
src/obj/bhkMoppBvTreeShape.cpp | 17 ++
src/obj/bhkNiTriStripsShape.cpp | 42 +++-
src/obj/bhkPackedNiTriStripsShape.cpp | 8 +
src/obj/hkPackedNiTriStripsData.cpp | 32 +++
15 files changed, 596 insertions(+), 15 deletions(-)
diff --git a/include/kfm.h b/include/kfm.h
index 2be82e91..edcc78e2 100644
--- a/include/kfm.h
+++ b/include/kfm.h
@@ -4,6 +4,7 @@
#include <iostream>
#include <string>
#include <vector>
+#include "dll_export.h"
#include "Ref.h"
namespace Niflib {
@@ -66,11 +67,11 @@ struct Kfm {
vector<KfmAction> actions;
// Reads the given file and returns the KFM version.
- unsigned int Read( const string & file_name ); // returns Kfm version
- unsigned int Read( istream & in ); // returns Kfm version
+ NIFLIB_API unsigned int Read( const string & file_name ); // returns Kfm version
+ NIFLIB_API unsigned int Read( istream & in ); // returns Kfm version
// Reads the NIF file and all KF files referred to in this KFM, and returns the root object of the resulting NIF tree.
- Ref<NiObject> MergeActions( const string & path );
+ NIFLIB_API Ref<NiObject> MergeActions( const string & path );
//void Write( string const & file_name, unsigned int version );
//void Write( ostream & out, unsigned int version );
};
diff --git a/include/obj/bhkConvexVerticesShape.h b/include/obj/bhkConvexVerticesShape.h
index a41c0375..00ab1e73 100644
--- a/include/obj/bhkConvexVerticesShape.h
+++ b/include/obj/bhkConvexVerticesShape.h
@@ -53,6 +53,25 @@ public:
NIFLIB_API virtual const Type & GetType() const;
//--BEGIN MISC CUSTOM CODE--//
+
+ /*!
+ * Returns the number of vertices that make up this mesh. This is also the number of normals, colors, and UV coordinates if these are used.
+ * \return The number of vertices that make up this mesh.
+ */
+ NIFLIB_API int GetVertexCount() const;
+
+ /*!
+ * Used to retrieve the vertices used by this mesh. The size of the vector will be the same as the vertex count retrieved with the IShapeData::GetVertexCount function.
+ * \return A vector containing the vertices used by this mesh.
+ */
+ NIFLIB_API vector<Vector3> GetVertices() const;
+
+ /*!
+ * Used to retrieve the normals used by this mesh. The size of the vector will either be zero if no normals are used, or be the same as the vertex count retrieved with the IShapeData::GetVertexCount function.
+ * \return A vector containing the normals used by this mesh, if any.
+ */
+ NIFLIB_API vector<Vector3> GetNormals() const;
+
//--END CUSTOM CODE--//
protected:
/*! Unknown. */
diff --git a/include/obj/bhkListShape.h b/include/obj/bhkListShape.h
index 026a0550..2fd2db4c 100644
--- a/include/obj/bhkListShape.h
+++ b/include/obj/bhkListShape.h
@@ -58,6 +58,31 @@ public:
NIFLIB_API virtual const Type & GetType() const;
//--BEGIN MISC CUSTOM CODE--//
+
+ /*!
+ * Retrieves the child shape objects that this body is using.
+ * \return The shape objects being used by this body.
+ */
+ NIFLIB_API vector<Ref<bhkShape > > GetSubShapes() const;
+
+ /*!
+ * Sets the child shape objects that this body is using.
+ * \param[in] shapes The shape objects being used by this body.
+ */
+ NIFLIB_API void SetSubShapes(const vector<Ref<bhkShape > >& shapes);
+
+ /*!
+ * Get the shape's material. This determines the type of noises the object makes as it collides in Oblivion.
+ * \return The Oblivion material used by this collision shape.
+ */
+ NIFLIB_API HavokMaterial GetMaterial() const;
+
+ /*!
+ * Sets the shape's material. This determines the type of noises the object makes as it collides in Oblivion.
+ * \param[in] value The new material for this shape to use.
+ */
+ NIFLIB_API void SetMaterial( HavokMaterial value );
+
//--END CUSTOM CODE--//
protected:
/*! The number of sub shapes referenced. */
diff --git a/include/obj/bhkMoppBvTreeShape.h b/include/obj/bhkMoppBvTreeShape.h
index d25caf97..25e5a543 100644
--- a/include/obj/bhkMoppBvTreeShape.h
+++ b/include/obj/bhkMoppBvTreeShape.h
@@ -58,6 +58,31 @@ public:
NIFLIB_API virtual const Type & GetType() const;
//--BEGIN MISC CUSTOM CODE--//
+
+ /*!
+ * Retrieves the shape object that this body is using.
+ * \return The shape object being used by this body.
+ */
+ NIFLIB_API Ref<bhkShape > GetShape() const;
+
+ /*!
+ * Sets the shape object that this body will use.
+ * \param[in] value The new shape object for this body to use.
+ */
+ NIFLIB_API void SetShape( bhkShape * value );
+
+ /*!
+ * Get the shape's material. This determines the type of noises the object makes as it collides in Oblivion.
+ * \return The Oblivion material used by this collision shape.
+ */
+ NIFLIB_API HavokMaterial GetMaterial() const;
+
+ /*!
+ * Sets the shape's material. This determines the type of noises the object makes as it collides in Oblivion.
+ * \param[in] value The new material for this shape to use.
+ */
+ NIFLIB_API void SetMaterial( HavokMaterial value );
+
//--END CUSTOM CODE--//
protected:
/*! The shape. */
diff --git a/include/obj/bhkNiTriStripsShape.h b/include/obj/bhkNiTriStripsShape.h
index f8029d19..ba5454aa 100644
--- a/include/obj/bhkNiTriStripsShape.h
+++ b/include/obj/bhkNiTriStripsShape.h
@@ -72,12 +72,23 @@ public:
*/
NIFLIB_API void SetScale( const Vector3 & n );
+ /*!
+ * Gets the number of NiTriStripsData objects referenced by this shape.
+ */
+ NIFLIB_API int GetNumStripsData( );
+
/*!
* Sets the number of NiTriStripsData objects referenced by this shape.
* \param[in] i The new number of NiTriStripsData objects.
*/
NIFLIB_API void SetNumStripsData( int i );
+ /*!
+ * Gets the NiTriStripsData object referenced by this shape at the specified index.
+ * \param[in] index The index at which the given NiTriStripsData object will be referenced. Should be lower than the value set with bhkNiTriStripsShape::SetNumStripsData.
+ */
+ NIFLIB_API Ref<NiTriStripsData> GetStripsData( int index );
+
/*!
* Sets the NiTriStripsData object referenced by this shape at the specified index.
* \param[in] index The index at which the given NiTriStripsData object will be referenced. Should be lower than the value set with bhkNiTriStripsShape::SetNumStripsData.
@@ -97,6 +108,29 @@ public:
*/
NIFLIB_API void SetMaterial( HavokMaterial value );
+ unsigned int GetNumDataLayers() const;
+
+ /*!
+ * Sets the number of OblivionColFilter objects referenced by this shape.
+ * \param[in] i The new number of OblivionColFilter objects.
+ */
+ NIFLIB_API void SetNumDataLayers( unsigned int i );
+
+ /*!
+ * Gets the OblivionLayer referenced for the filter at the specified index.
+ * \param[in] index The index at which the given OblivionLayer will be referenced. Should be lower than the value set with bhkNiTriStripsShape::SetNumDataLayers.
+ */
+ NIFLIB_API OblivionLayer GetOblivionLayer( unsigned int index ) const;
+
+ /*!
+ * Sets the OblivionLayer referenced for the filter at the specified index.
+ * \param[in] index The index at which the given OblivionLayer will be referenced. Should be lower than the value set with bhkNiTriStripsShape::SetNumDataLayers.
+ */
+ NIFLIB_API void SetOblivionLayer( unsigned int index, OblivionLayer layer );
+
+ NIFLIB_API unsigned char GetOblivionFilter( unsigned int index ) const;
+ NIFLIB_API void SetOblivionFilter( unsigned int index, unsigned char filter );
+
//--END CUSTOM CODE--//
protected:
/*! The shape's material. */
diff --git a/include/obj/bhkPackedNiTriStripsShape.h b/include/obj/bhkPackedNiTriStripsShape.h
index be4a490e..377fcf5f 100644
--- a/include/obj/bhkPackedNiTriStripsShape.h
+++ b/include/obj/bhkPackedNiTriStripsShape.h
@@ -59,6 +59,18 @@ public:
NIFLIB_API virtual const Type & GetType() const;
//--BEGIN MISC CUSTOM CODE--//
+ /*!
+ * Retrieves the geometry data object used by this geometry node, if any. This contains the vertices, normals, etc. and can be shared among several geometry nodes.
+ * \return The geometry data object, or NULL if there is none.
+ */
+ NIFLIB_API Ref<hkPackedNiTriStripsData> GetData() const;
+
+ /*!
+ * Sets the geometry data object used by this geometry node. This contains the vertices, normals, etc. and can be shared among several geometry nodes.
+ * \param[in] n The new geometry data object, or NULL to clear the current one.
+ */
+ NIFLIB_API void SetData( hkPackedNiTriStripsData * n );
+
//--END CUSTOM CODE--//
protected:
/*! Number of subparts. */
diff --git a/include/obj/hkPackedNiTriStripsData.h b/include/obj/hkPackedNiTriStripsData.h
index 269932df..61326f47 100644
--- a/include/obj/hkPackedNiTriStripsData.h
+++ b/include/obj/hkPackedNiTriStripsData.h
@@ -56,6 +56,32 @@ public:
NIFLIB_API virtual const Type & GetType() const;
//--BEGIN MISC CUSTOM CODE--//
+
+ /*!
+ * Returns the triangle faces that make up this mesh.
+ * \return A vector containing the triangle faces that make up this mesh.
+ * \sa hkPackedNiTriStripsData::SetTriangles
+ */
+ NIFLIB_API virtual vector<Triangle> GetTriangles() const;
+
+ /*!
+ * Returns the number of vertices that make up this mesh. This is also the number of normals, colors, and UV coordinates if these are used.
+ * \return The number of vertices that make up this mesh.
+ */
+ NIFLIB_API int GetVertexCount() const;
+
+ /*!
+ * Used to retrieve the vertices used by this mesh. The size of the vector will be the same as the vertex count retrieved with the IShapeData::GetVertexCount function.
+ * \return A vector containing the vertices used by this mesh.
+ */
+ NIFLIB_API vector<Vector3> GetVertices() const;
+
+ /*!
+ * Used to retrieve the normals used by this mesh. The size of the vector will either be zero if no normals are used, or be the same as the vertex count retrieved with the IShapeData::GetVertexCount function.
+ * \return A vector containing the normals used by this mesh, if any.
+ */
+ NIFLIB_API vector<Vector3> GetNormals() const;
+
//--END CUSTOM CODE--//
protected:
/*! Number of triangles? */
diff --git a/niflib.vcproj b/niflib.vcproj
index 09202084..e48ea2ad 100644
--- a/niflib.vcproj
+++ b/niflib.vcproj
@@ -11,6 +11,9 @@
<Platform
Name="Win32"
/>
+ <Platform
+ Name="x64"
+ />
</Platforms>
<ToolFiles>
</ToolFiles>
@@ -41,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="$(ProjectDir)"
+ AdditionalIncludeDirectories="$(ProjectDir)include"
PreprocessorDefinitions="NIFLIB_STATIC_LINK; WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -108,8 +111,8 @@
Name="VCCLCompilerTool"
Optimization="0"
WholeProgramOptimization="false"
- AdditionalIncludeDirectories="$(ProjectDir)"
- PreprocessorDefinitions="NIFLIB_STATIC_LINK; WIN32;NDEBUG;_CONSOLE"
+ AdditionalIncludeDirectories="$(ProjectDir)include"
+ PreprocessorDefinitions="NIFLIB_STATIC_LINK;WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough=""
@@ -172,7 +175,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories="$(ProjectDir)"
+ AdditionalIncludeDirectories="$(ProjectDir)include"
PreprocessorDefinitions="BUILDING_NIFLIB_DLL;WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -246,7 +249,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="$(ProjectDir)"
+ AdditionalIncludeDirectories="$(ProjectDir)include"
PreprocessorDefinitions="BUILDING_NIFLIB_DLL;WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -297,6 +300,293 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="Debug - Static|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="$(ProjectDir)include"
+ PreprocessorDefinitions="NIFLIB_STATIC_LINK; WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="lib/niflib_static_debug_x64.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release - Static|x64"
+ OutputDirectory="$(ProjectDir)obj\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(ProjectDir)obj\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="4"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ WholeProgramOptimization="0"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ WholeProgramOptimization="false"
+ AdditionalIncludeDirectories="$(ProjectDir)include"
+ PreprocessorDefinitions="NIFLIB_STATIC_LINK;WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="lib/niflib_static_x64.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release - DLL|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ WholeProgramOptimization="0"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="3"
+ AdditionalIncludeDirectories="$(ProjectDir)include"
+ PreprocessorDefinitions="BUILDING_NIFLIB_DLL;WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="bin\niflib_x64.dll"
+ Version="0.7.2"
+ ImportLibrary="lib/niflib_dll.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Debug - DLL|x64"
+ OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="$(ProjectDir)include"
+ PreprocessorDefinitions="BUILDING_NIFLIB_DLL;WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ PrecompiledHeaderThrough=""
+ WarningLevel="3"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ OutputFile="bin\niflib_debug_x64.dll"
+ Version="0.7.2"
+ ImportLibrary="lib/niflib_dll_debug.lib"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
@@ -345,6 +635,22 @@
PrecompiledHeaderThrough=""
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug - Static|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PrecompiledHeaderThrough=""
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug - DLL|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PrecompiledHeaderThrough=""
+ />
+ </FileConfiguration>
</File>
<File
RelativePath=".\src\ObjectRegistry.cpp"
diff --git a/src/obj/NiTriBasedGeom.cpp b/src/obj/NiTriBasedGeom.cpp
index f860fba1..c357467e 100644
--- a/src/obj/NiTriBasedGeom.cpp
+++ b/src/obj/NiTriBasedGeom.cpp
@@ -236,7 +236,7 @@ void NiTriBasedGeom::UpdateTangentSpace() {
}
// generate the byte data
- unsigned vCount = verts.size();
+ size_t vCount = verts.size();
int fSize = sizeof(float[3]);
vector<byte> binData( 2 * vCount * fSize );
diff --git a/src/obj/bhkConvexVerticesShape.cpp b/src/obj/bhkConvexVerticesShape.cpp
index 4912d22a..d6454a38 100644
--- a/src/obj/bhkConvexVerticesShape.cpp
+++ b/src/obj/bhkConvexVerticesShape.cpp
@@ -153,4 +153,29 @@ std::list<NiObjectRef> bhkConvexVerticesShape::GetRefs() const {
}
//--BEGIN MISC CUSTOM CODE--//
+vector<Vector3> bhkConvexVerticesShape::GetNormals() const {
+ //Remove any bad triangles
+ vector<Vector3> good_normals;
+ for ( unsigned i = 0; i < normals.size(); ++i ) {
+ const Float4 & t = normals[i];
+ Vector3 v(t[0], t[1], t[2]);
+ good_normals.push_back(v);
+ }
+ return good_normals;
+}
+
+int bhkConvexVerticesShape::GetVertexCount() const {
+ return vertices.size();
+}
+
+vector<Vector3> bhkConvexVerticesShape::GetVertices() const {
+ //Remove any bad triangles
+ vector<Vector3> good_vertices;
+ for ( unsigned i = 0; i < vertices.size(); ++i ) {
+ const Float4 & t = vertices[i];
+ Vector3 v(t[0], t[1], t[2]);
+ good_vertices.push_back(v);
+ }
+ return good_vertices;
+}
//--END CUSTOM CODE--//
diff --git a/src/obj/bhkListShape.cpp b/src/obj/bhkListShape.cpp
index 4623e907..4ff45a32 100644
--- a/src/obj/bhkListShape.cpp
+++ b/src/obj/bhkListShape.cpp
@@ -174,4 +174,25 @@ std::list<NiObjectRef> bhkListShape::GetRefs() const {
}
//--BEGIN MISC CUSTOM CODE--//
+
+HavokMaterial bhkListShape::GetMaterial() const {
+ return material;
+}
+
+void bhkListShape::SetMaterial( HavokMaterial value ) {
+ material = value;
+}
+
+vector<Ref<bhkShape > > bhkListShape::GetSubShapes() const {
+ return subShapes;
+}
+
+/*!
+* Sets the child shape objects that this body is using.
+* \param[in] shapes The shape objects being used by this body.
+*/
+void bhkListShape::SetSubShapes(const vector<Ref<bhkShape > >& shapes) {
+ subShapes = shapes;
+}
+
//--END CUSTOM CODE--//
diff --git a/src/obj/bhkMoppBvTreeShape.cpp b/src/obj/bhkMoppBvTreeShape.cpp
index 0562d76a..97b63f73 100644
--- a/src/obj/bhkMoppBvTreeShape.cpp
+++ b/src/obj/bhkMoppBvTreeShape.cpp
@@ -162,4 +162,21 @@ std::list<NiObjectRef> bhkMoppBvTreeShape::GetRefs() const {
}
//--BEGIN MISC CUSTOM CODE--//
+
+Ref<bhkShape > bhkMoppBvTreeShape::GetShape() const {
+ return shape;
+}
+
+void bhkMoppBvTreeShape::SetShape( bhkShape * value ) {
+ shape = value;
+}
+
+HavokMaterial bhkMoppBvTreeShape::GetMaterial() const {
+ return material;
+}
+
+void bhkMoppBvTreeShape::SetMaterial( HavokMaterial value ) {
+ material = value;
+}
+
//--END CUSTOM CODE--//
diff --git a/src/obj/bhkNiTriStripsShape.cpp b/src/obj/bhkNiTriStripsShape.cpp
index 4bb722a7..b12d2f21 100644
--- a/src/obj/bhkNiTriStripsShape.cpp
+++ b/src/obj/bhkNiTriStripsShape.cpp
@@ -193,17 +193,20 @@ std::list<NiObjectRef> bhkNiTriStripsShape::GetRefs() const {
//--BEGIN MISC CUSTOM CODE--//
+int bhkNiTriStripsShape::GetNumStripsData( )
+{
+ return numStripsData;
+}
+
void bhkNiTriStripsShape::SetNumStripsData(int n)
{
numStripsData = n;
stripsData.resize(n);
+}
- // This is currently a kludge for compatibility with the max NifExporter as we dont know what this
- // does but its always same number of strips and usually 1 or 4
- //numUnknownInts2 = n;
- //unknownInts2.assign(n, 1);
-
- //TODO: Understand why these are gone and what to do about it
+Ref<NiTriStripsData> bhkNiTriStripsShape::GetStripsData( int index )
+{
+ return Ref<NiTriStripsData>(stripsData[index]);
}
void bhkNiTriStripsShape::SetStripsData( int index, NiTriStripsData * strips )
@@ -211,6 +214,8 @@ void bhkNiTriStripsShape::SetStripsData( int index, NiTriStripsData * strips )
stripsData[index] = strips;
}
+
+
Vector3 bhkNiTriStripsShape::GetScale() const {
return scale;
}
@@ -227,4 +232,29 @@ void bhkNiTriStripsShape::SetMaterial( HavokMaterial value ) {
material = value;
}
+unsigned int bhkNiTriStripsShape::GetNumDataLayers() const {
+ return numDataLayers;
+}
+
+void bhkNiTriStripsShape::SetNumDataLayers( unsigned int i ) {
+ numDataLayers = i;
+ dataLayers.resize(i);
+}
+
+OblivionLayer bhkNiTriStripsShape::GetOblivionLayer( unsigned int index ) const {
+ return dataLayers[index].layer;
+}
+
+void bhkNiTriStripsShape::SetOblivionLayer( unsigned int index, OblivionLayer layer ){
+ dataLayers[index].layer = layer;
+}
+
+unsigned char bhkNiTriStripsShape::GetOblivionFilter( unsigned int index ) const {
+ return dataLayers[index].colFilter;
+}
+
+void bhkNiTriStripsShape::SetOblivionFilter( unsigned int index, unsigned char filter ) {
+ dataLayers[index].colFilter = filter;
+}
+
//--END CUSTOM CODE--//
diff --git a/src/obj/bhkPackedNiTriStripsShape.cpp b/src/obj/bhkPackedNiTriStripsShape.cpp
index 547bed2c..4c9c2192 100644
--- a/src/obj/bhkPackedNiTriStripsShape.cpp
+++ b/src/obj/bhkPackedNiTriStripsShape.cpp
@@ -176,4 +176,12 @@ std::list<NiObjectRef> bhkPackedNiTriStripsShape::GetRefs() const {
}
//--BEGIN MISC CUSTOM CODE--//
+Ref<hkPackedNiTriStripsData> bhkPackedNiTriStripsShape::GetData() const {
+ return data;
+}
+
+void bhkPackedNiTriStripsShape::SetData( hkPackedNiTriStripsData * n ) {
+ data = n;
+}
+
//--END CUSTOM CODE--//
diff --git a/src/obj/hkPackedNiTriStripsData.cpp b/src/obj/hkPackedNiTriStripsData.cpp
index 07cd9066..ecf48621 100644
--- a/src/obj/hkPackedNiTriStripsData.cpp
+++ b/src/obj/hkPackedNiTriStripsData.cpp
@@ -138,4 +138,36 @@ std::list<NiObjectRef> hkPackedNiTriStripsData::GetRefs() const {
}
//--BEGIN MISC CUSTOM CODE--//
+
+vector<Triangle> hkPackedNiTriStripsData::GetTriangles() const {
+ //Remove any bad triangles
+ vector<Triangle> good_triangles;
+ for ( unsigned i = 0; i < triangles.size(); ++i ) {
+ const Triangle & t = triangles[i].triangle;
+ if ( t.v1 != t.v2 && t.v2 != t.v3 && t.v1 != t.v3 ) {
+ good_triangles.push_back(t);
+ }
+ }
+ return good_triangles;
+}
+
+vector<Vector3> hkPackedNiTriStripsData::GetNormals() const {
+ //Remove any bad triangles
+ vector<Vector3> good_normals;
+ for ( unsigned i = 0; i < triangles.size(); ++i ) {
+ const Vector3 & t = triangles[i].normal;
+ good_normals.push_back(t);
+ }
+ return good_normals;
+}
+
+int hkPackedNiTriStripsData::GetVertexCount() const {
+ return vertices.size();
+}
+
+vector<Vector3> hkPackedNiTriStripsData::GetVertices() const {
+ return vertices;
+}
+
+
//--END CUSTOM CODE--//
--
GitLab