From 295872f27cd6e3a082f17b9d5e305fefa2b6bd49 Mon Sep 17 00:00:00 2001
From: Tazpn <tazpn@users.sourceforge.net>
Date: Sun, 13 Jul 2008 21:51:16 +0000
Subject: [PATCH] o All - Correct project so Max 2008 is properly supported.
- Update license to reflect that its a BSD license
o Importer
- Add support for importing Collision as Packed TriStrip as appropriate
- Remove code which was causing collision to be imported twice in some models
o Exporter
- Add support for exporting Collision as Packed TriStrips as appropriate
- Packed TriStrips will now also export bhkMoppBvTreeShape as well
bhkMoppBvTreeShape uses the Havok SDK to generate efficient collision models
which is supperior to bhkNiTriStripsShape.
This feature will not be available for max x64 builds.
---
Build/NifPlugins_VC80.vcproj | 2441 ++++++++++++++++++++++++-
Build/Sheets/Debug_Settings.vsprops | 3 +
Build/Sheets/Havok_Settings.vsprops | 22 +
Build/Sheets/Max_System_Win32.vsprops | 4 +-
Build/Sheets/Release_Settings.vsprops | 6 +-
CHANGELOG.TXT | 11 +
LICENSE.TXT | 53 +-
NifExport/Coll.cpp | 185 +-
NifImport/ImportCollision.cpp | 4 +-
NifImport/ImportSkeleton.cpp | 7 +-
NifPlugins/DllEntry.cpp | 73 +-
NifPlugins_VC80.sln | 41 +-
NifProps/NifProps.rc | 14 +-
NifProps/bhkRigidBodyModifer.cpp | 17 +-
NifProps/dds/dds.cpp | 5 +-
README.TXT | 21 +-
16 files changed, 2833 insertions(+), 74 deletions(-)
create mode 100644 Build/Sheets/Havok_Settings.vsprops
diff --git a/Build/NifPlugins_VC80.vcproj b/Build/NifPlugins_VC80.vcproj
index 53f5a95..2d0ee2f 100644
--- a/Build/NifPlugins_VC80.vcproj
+++ b/Build/NifPlugins_VC80.vcproj
@@ -5,6 +5,10 @@
Name="NifPlugins"
ProjectGUID="{466F2D3E-2663-4583-A05C-128683677617}"
RootNamespace="NifPlugins"
+ SccProjectName="Svn"
+ SccAuxPath="Svn"
+ SccLocalPath="Svn"
+ SccProvider="SubversionScc"
>
<Platforms>
<Platform
@@ -22,135 +26,2148 @@
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_6.vsprops;$(ProjectDir)Sheets\Release_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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="Release - Max 6|x64"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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 - Max 6|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_6.vsprops;$(ProjectDir)Sheets\Debug_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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 - Max 6|x64"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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="Release - Max 7|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_7.vsprops;$(ProjectDir)Sheets\Release_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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="Release - Max 7|x64"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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 - Max 7|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_7.vsprops;$(ProjectDir)Sheets\Debug_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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 - Max 7|x64"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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="Release - Max 8|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_8.vsprops;$(ProjectDir)Sheets\Release_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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="Release - Max 8|x64"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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 - Max 8|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_8.vsprops;$(ProjectDir)Sheets\Debug_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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 - Max 8|x64"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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 - Max 5|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_5.vsprops;$(ProjectDir)Sheets\Debug_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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 - Max 5|x64"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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="Release - Max 5|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_5.vsprops;$(ProjectDir)Sheets\Release_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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="Release - Max 5|x64"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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 - Max 9|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_9.vsprops;$(ProjectDir)Sheets\Debug_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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 - Max 9|x64"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_9.vsprops;$(ProjectDir)Sheets\Debug_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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="Release - Max 9|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_9.vsprops;$(ProjectDir)Sheets\Release_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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="Release - Max 9|x64"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_9.vsprops;$(ProjectDir)Sheets\Release_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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="Release - Max 4|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_4.vsprops;$(ProjectDir)Sheets\Release_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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="Release - Max 4|x64"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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 - Max 4|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_4.vsprops;$(ProjectDir)Sheets\Debug_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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 - Max 4|x64"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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 - gmax|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\gmax_Version_12.vsprops;$(ProjectDir)Sheets\Debug_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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 - gmax|x64"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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="Release - gmax|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\gmax_Version_12.vsprops;$(ProjectDir)Sheets\Release_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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="Release - gmax|x64"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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 - Max 4.2|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_42.vsprops;$(ProjectDir)Sheets\Debug_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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 - Max 4.2|x64"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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="Release - Max 4.2|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_42.vsprops;$(ProjectDir)Sheets\Release_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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="Release - Max 4.2|x64"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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 - Max 2008|Win32"
ConfigurationType="2"
- InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_2008.vsprops;$(ProjectDir)Sheets\Debug_Settings.vsprops"
+ InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_2008.vsprops;$(ProjectDir)Sheets\Debug_Settings.vsprops;$(SolutionDir)User_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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 - Max 2008|x64"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_2008.vsprops;$(ProjectDir)Sheets\Debug_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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="Release - Max 2008|Win32"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_2008.vsprops;$(ProjectDir)Sheets\Release_Settings.vsprops"
>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="if exist "%MaxInstallDir%\plugcfg" (
if not exist "%MaxInstallDir%\plugcfg\MaxNifTools.ini" (
copy "$(SolutionDir)MaxNifTools.ini" "%MaxInstallDir%\plugcfg\MaxNifTools.ini"
)
)
xcopy /D /Y /I "$(SolutionDir)Readme.txt" "$(OutDir)"
xcopy /D /Y /I "$(SolutionDir)MaxNifTools.ini" "$(OutDir)"
xcopy /D /Y /I "$(TargetPath)" "$(OutDir)"
"
+ />
</Configuration>
<Configuration
Name="Release - Max 2008|x64"
ConfigurationType="2"
InheritedPropertySheets="$(ProjectDir)Sheets\Max_System_$(PlatformName).vsprops;$(ProjectDir)Sheets\Max_Version_2008.vsprops;$(ProjectDir)Sheets\Release_Settings.vsprops"
>
- </Configuration>
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <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>
@@ -1779,6 +3796,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -1795,6 +3813,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -1811,6 +3830,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -1827,6 +3847,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -1843,6 +3864,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -1859,6 +3881,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -1875,6 +3898,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -1891,6 +3915,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -1907,6 +3932,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -1923,6 +3949,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -1939,6 +3966,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -1955,6 +3983,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -1971,6 +4000,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -1987,6 +4017,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2003,6 +4034,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2019,6 +4051,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2030,6 +4063,22 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\NifCommon\qhull\geom.h"
@@ -2043,6 +4092,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2059,6 +4109,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2075,6 +4126,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2091,6 +4143,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2107,6 +4160,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2123,6 +4177,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2139,6 +4194,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2155,6 +4211,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2171,6 +4228,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2187,6 +4245,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2203,6 +4262,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2219,6 +4279,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2235,6 +4296,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2251,6 +4313,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2267,6 +4330,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2283,6 +4347,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2294,6 +4359,22 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\NifCommon\qhull\global.c"
@@ -2303,6 +4384,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2319,6 +4401,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2335,6 +4418,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2351,6 +4435,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2367,6 +4452,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2383,6 +4469,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2399,6 +4486,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2415,6 +4503,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2431,6 +4520,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2447,6 +4537,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2463,6 +4554,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2479,6 +4571,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2495,6 +4588,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2511,6 +4605,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2527,6 +4622,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2543,6 +4639,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2554,6 +4651,22 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\NifCommon\qhull\io.c"
@@ -2563,6 +4676,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2579,6 +4693,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2595,6 +4710,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2611,6 +4727,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2627,6 +4744,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2643,6 +4761,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2659,6 +4778,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2675,6 +4795,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2691,6 +4812,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2707,6 +4829,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2723,6 +4846,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2739,6 +4863,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2755,6 +4880,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2771,6 +4897,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2787,6 +4914,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2803,6 +4931,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2814,6 +4943,22 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\NifCommon\qhull\io.h"
@@ -2827,6 +4972,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2843,6 +4989,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2859,6 +5006,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2875,6 +5023,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2891,6 +5040,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2907,6 +5057,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2923,6 +5074,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2939,6 +5091,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2955,6 +5108,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2971,6 +5125,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -2987,6 +5142,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3003,6 +5159,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3019,6 +5176,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3035,6 +5193,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3051,6 +5210,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3067,6 +5227,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3078,6 +5239,22 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\NifCommon\qhull\mem.h"
@@ -3091,6 +5268,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3107,6 +5285,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3123,6 +5302,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3139,6 +5319,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3155,6 +5336,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3171,6 +5353,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3187,6 +5370,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3203,6 +5387,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3219,6 +5404,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3235,6 +5421,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3251,6 +5438,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3267,6 +5455,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3283,6 +5472,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3299,6 +5489,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3315,6 +5506,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3331,6 +5523,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3342,6 +5535,22 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\NifCommon\qhull\merge.h"
@@ -3355,6 +5564,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3371,6 +5581,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3387,6 +5598,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3403,6 +5615,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3419,6 +5632,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3435,6 +5649,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3451,6 +5666,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3467,6 +5683,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3483,6 +5700,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3499,6 +5717,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3515,6 +5734,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3531,6 +5751,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3547,6 +5768,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3563,6 +5785,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3579,6 +5802,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3595,6 +5819,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3606,6 +5831,22 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\NifCommon\qhull\poly.h"
@@ -3619,6 +5860,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3635,6 +5877,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3651,6 +5894,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3667,6 +5911,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3683,6 +5928,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3699,6 +5945,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3715,6 +5962,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3731,6 +5979,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3747,6 +5996,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3763,6 +6013,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3779,6 +6030,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3795,6 +6047,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3811,6 +6064,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3827,6 +6081,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3843,6 +6098,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3859,6 +6115,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3870,6 +6127,22 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\NifCommon\qhull\qhull.c"
@@ -3879,6 +6152,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3895,6 +6169,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3911,6 +6186,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3927,6 +6203,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3943,6 +6220,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3959,6 +6237,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3975,6 +6254,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -3991,6 +6271,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4007,6 +6288,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4023,6 +6305,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4039,6 +6322,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4055,6 +6339,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4071,6 +6356,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4087,6 +6373,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4103,6 +6390,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4119,6 +6407,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4130,6 +6419,22 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\NifCommon\qhull\qhull.h"
@@ -4147,6 +6452,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4163,6 +6469,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4179,6 +6486,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4195,6 +6503,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4211,6 +6520,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4227,6 +6537,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4243,6 +6554,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4259,6 +6571,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4275,6 +6588,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4291,6 +6605,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4307,6 +6622,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4323,6 +6639,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4339,6 +6656,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4355,6 +6673,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4371,6 +6690,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4387,6 +6707,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4398,6 +6719,22 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\NifCommon\qhull\qset.h"
@@ -4411,6 +6748,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4427,6 +6765,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4443,6 +6782,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4459,6 +6799,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4475,6 +6816,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4491,6 +6833,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4507,6 +6850,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4523,6 +6867,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4539,6 +6884,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4555,6 +6901,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4571,6 +6918,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4587,6 +6935,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4603,6 +6952,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4619,6 +6969,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4635,6 +6986,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4651,6 +7003,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4662,6 +7015,22 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\NifCommon\qhull\stat.h"
@@ -4675,6 +7044,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4691,6 +7061,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4707,6 +7078,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4723,6 +7095,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4739,6 +7112,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4755,6 +7129,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4771,6 +7146,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4787,6 +7163,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4803,6 +7180,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4819,6 +7197,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4835,6 +7214,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4851,6 +7231,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4867,6 +7248,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4883,6 +7265,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4899,6 +7282,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4915,6 +7299,7 @@
>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
CompileAs="2"
/>
</FileConfiguration>
@@ -4926,6 +7311,22 @@
CompileAs="2"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalOptions="/TP"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\NifCommon\qhull\user.h"
@@ -5491,6 +7892,22 @@
UsePrecompiledHeader="1"
/>
</FileConfiguration>
+ <FileConfiguration
+ Name="Debug - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release - Max 2008|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ UsePrecompiledHeader="1"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\NifPlugins\pch.h"
@@ -5597,6 +8014,22 @@
</File>
</Filter>
</Filter>
+ <File
+ RelativePath="..\AUTHORS.TXT"
+ >
+ </File>
+ <File
+ RelativePath="..\CHANGELOG.TXT"
+ >
+ </File>
+ <File
+ RelativePath="..\LICENSE.TXT"
+ >
+ </File>
+ <File
+ RelativePath="..\README.TXT"
+ >
+ </File>
</Files>
<Globals>
</Globals>
diff --git a/Build/Sheets/Debug_Settings.vsprops b/Build/Sheets/Debug_Settings.vsprops
index 8f2aefd..a6b7d3c 100644
--- a/Build/Sheets/Debug_Settings.vsprops
+++ b/Build/Sheets/Debug_Settings.vsprops
@@ -28,4 +28,7 @@
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
/>
+
+ <UserMacro Name="NifBuildType" Value="Debug"/>
+
</VisualStudioPropertySheet>
diff --git a/Build/Sheets/Havok_Settings.vsprops b/Build/Sheets/Havok_Settings.vsprops
new file mode 100644
index 0000000..0a59f5a
--- /dev/null
+++ b/Build/Sheets/Havok_Settings.vsprops
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="Havok_Settings"
+ >
+ <!--
+ Uncomment the following to enable compiling with Havok
+ -->
+
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="USES_HAVOK"
+ AdditionalIncludeDirectories="$(HavokSDKDir)\Source\"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalLibraryDirectories="$(HavokSDKDir)\Lib\win32_net_8-0\$(NifBuildType)_multithreaded\"
+ />
+ <UserMacro Name="HavokSDKDir" Value="$(SolutionDir)..\..\Havok\hk550\"/>
+
+</VisualStudioPropertySheet>
diff --git a/Build/Sheets/Max_System_Win32.vsprops b/Build/Sheets/Max_System_Win32.vsprops
index d0fcdca..93b2dcb 100644
--- a/Build/Sheets/Max_System_Win32.vsprops
+++ b/Build/Sheets/Max_System_Win32.vsprops
@@ -3,11 +3,11 @@
ProjectType="Visual C++"
Version="8.00"
Name="Max_System_Win32"
- InheritedPropertySheets=".\Max_System_Default.vsprops;.\Niflib_Settings.vsprops"
+ InheritedPropertySheets=".\Max_System_Default.vsprops;.\Niflib_Settings.vsprops;.\Havok_Settings.vsprops"
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32"
+ PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x0500"
/>
<Tool
diff --git a/Build/Sheets/Release_Settings.vsprops b/Build/Sheets/Release_Settings.vsprops
index 8692565..276c608 100644
--- a/Build/Sheets/Release_Settings.vsprops
+++ b/Build/Sheets/Release_Settings.vsprops
@@ -2,7 +2,7 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="Debug_Settings"
+ Name="Release_Settings"
>
<Tool
Name="VCCLCompilerTool"
@@ -34,7 +34,9 @@
<Tool
Name="VCPostBuildEventTool"
- CommandLine="if exist "%MaxInstallDir%\plugcfg" (
if not exist "%MaxInstallDir%\plugcfg\MaxNifTools.ini" (
copy "$(ProjectDir)MaxNifTools.ini" "%MaxInstallDir%\plugcfg\MaxNifTools.ini"
)
)
xcopy /D /Y /I "$(ProjectDir)MaxNifPlugins_Readme.txt" "$(OutDir)"
xcopy /D /Y /I "$(ProjectDir)MaxNifTools.ini" "$(OutDir)"
xcopy /D /Y /I "$(TargetPath)" "$(OutDir)"
"
+ CommandLine="if exist "%MaxInstallDir%\plugcfg" (
if not exist "%MaxInstallDir%\plugcfg\MaxNifTools.ini" (
copy "$(SolutionDir)MaxNifTools.ini" "%MaxInstallDir%\plugcfg\MaxNifTools.ini"
)
)
xcopy /D /Y /I "$(SolutionDir)Readme.txt" "$(OutDir)"
xcopy /D /Y /I "$(SolutionDir)license.txt" "$(OutDir)"
xcopy /D /Y /I "$(SolutionDir)ChangeLog.txt" "$(OutDir)"
xcopy /D /Y /I "$(SolutionDir)Authors.txt" "$(OutDir)"
xcopy /D /Y /I "$(SolutionDir)MaxNifTools.ini" "$(OutDir)"
xcopy /D /Y /I "$(TargetPath)" "$(OutDir)"
"
/>
+ <UserMacro Name="NifBuildType" Value="Release"/>
+
</VisualStudioPropertySheet>
diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 410a2dd..3a464fd 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -5,11 +5,22 @@ NifTools MaxPlugin
----------
0.2.17
------
+ o All
+ - Correct project so Max 2008 is properly supported.
+ - Update license to reflect that its a BSD license
+
o Importer
- Add initial support for Freedom Force animation import
+ - Add support for importing Collision as Packed TriStrip as appropriate
+ - Remove code which was causing collision to be imported twice in some models
o Exporter
- Fix Binormal and Tangent export calculations
+ - Add support for exporting Collision as Packed TriStrips as appropriate
+ - Packed TriStrips will now also export bhkMoppBvTreeShape as well
+ bhkMoppBvTreeShape uses the Havok SDK to generate efficient collision models
+ which is supperior to bhkNiTriStripsShape.
+ This feature will not be available for max x64 builds.
0.2.16
-----
diff --git a/LICENSE.TXT b/LICENSE.TXT
index 0b0dc66..9090495 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -1,18 +1,37 @@
NifTools MaxPlugins
-Copyright (c) 2007, NIF File Format Library and Tools. All rights reserved.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+BSD License
+
+Copyright (c) 2006-2008, NIF File Format Library and Tools
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. The name of the NIF File Format Library and Tools projectmay not be
+ used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+NOTICE:
+ Parts of MaxPlugins (ie. included libraries) might be subject to
+ other licenses. This license only applies to original MaxPlugins
+ sources.
=======================================================================
@@ -57,3 +76,9 @@ and redistributed under the following conditions:
qhull_bug@qhull.org; the authors may or may not act on them as
they desire.
+
+=======================================================================
+
+MaxNifTools uses Havok®. ©Copyright 1999-2008 Havok.com Inc. (and its Licensors).
+ All Rights Reserved. See www.havok.com for details.
+
\ No newline at end of file
diff --git a/NifExport/Coll.cpp b/NifExport/Coll.cpp
index 2a99a67..6aad647 100755
--- a/NifExport/Coll.cpp
+++ b/NifExport/Coll.cpp
@@ -8,10 +8,43 @@
#include "obj/bhkCapsuleShape.h"
#include "obj/hkPackedNiTriStripsData.h"
#include "obj/bhkPackedNiTriStripsShape.h"
+#include "obj/bhkMoppBvTreeShape.h"
#include "..\NifProps\bhkHelperFuncs.h"
#include "..\NifProps\bhkHelperInterface.h"
+#ifdef USES_HAVOK
+//
+// Math and base include
+#include <Common/Base/hkBase.h>
+#include <Common/Base/System/hkBaseSystem.h>
+#include <Common/Base/Memory/hkThreadMemory.h>
+#include <Common/Base/Memory/Memory/Pool/hkPoolMemory.h>
+#include <Common/Base/System/Error/hkDefaultError.h>
+#include <Common/Base/Monitor/hkMonitorStream.h>
+
+#include <Common/Base/System/Io/FileSystem/hkFileSystem.h>
+#include <Common/Base/Container/LocalArray/hkLocalBuffer.h>
+//
+#include <Physics/Collide/Shape/Convex/Box/hkpBoxShape.h>
+#include <Physics/Collide/Shape/Convex/ConvexTranslate/hkpConvexTranslateShape.h>
+#include <Physics/Collide/Shape/Convex/ConvexTransform/hkpConvexTransformShape.h>
+#include <Physics/Collide/Shape/Compound/Collection/SimpleMesh/hkpSimpleMeshShape.h>
+#include <Physics/Collide/Shape/Compound/Collection/List/hkpListShape.h>
+#include <Physics/Collide/Shape/Convex/Capsule/hkpCapsuleShape.h>
+#include <Physics/Collide/Shape/Compound/Tree/Mopp/hkpMoppBvTreeShape.h>
+#include <Physics/Collide/Shape/Compound/Tree/Mopp/hkpMoppUtility.h>
+#include <Physics/Internal/Collide/Mopp/Code/hkpMoppCode.h>
+
+#pragma comment(lib, "hkBase.lib")
+#pragma comment(lib, "hkSerialize.lib")
+#pragma comment(lib, "hkpInternal.lib")
+#pragma comment(lib, "hkpUtilities.lib")
+#pragma comment(lib, "hkpCollide.lib")
+#pragma comment(lib, "hkpConstraintSolver.lib")
+#endif
+
+
#ifdef _DEBUG
#include <assert.h>
#include <crtdbg.h>
@@ -35,6 +68,48 @@ enum
};
+#ifdef USES_HAVOK
+
+static hkpSimpleMeshShape * ConstructHKMesh( vector<Vector3>& verts, vector<Niflib::Triangle>& tris)
+{
+ hkpSimpleMeshShape * storageMeshShape = new hkpSimpleMeshShape( 0.01f );
+ hkArray<hkVector4> &vertices = storageMeshShape->m_vertices;
+ hkArray<hkpSimpleMeshShape::Triangle> &triangles = storageMeshShape->m_triangles;
+
+ triangles.setSize( 0 );
+ for (unsigned int i=0;i<tris.size();++i) {
+ Niflib::Triangle &tri = tris[i];
+ hkpSimpleMeshShape::Triangle hktri;
+ hktri.m_a = tri[0];
+ hktri.m_b = tri[1];
+ hktri.m_c = tri[2];
+ triangles.pushBack( hktri );
+ }
+
+ vertices.setSize( 0 );
+ for (unsigned int i=0;i<verts.size();++i) {
+ Niflib::Vector3 &vert = verts[i];
+ vertices.pushBack( hkVector4(vert.x, vert.y, vert.z) );
+ }
+ //storageMeshShape->setRadius(1.0f);
+ return storageMeshShape;
+}
+
+static hkpSimpleMeshShape * ConstructHKMesh( NiTriBasedGeomRef shape )
+{
+ NiTriBasedGeomDataRef data = shape->GetData();
+ return ConstructHKMesh(data->GetVertices(), data->GetTriangles());
+}
+
+static hkpSimpleMeshShape * ConstructHKMesh( bhkPackedNiTriStripsShapeRef shape )
+{
+ hkPackedNiTriStripsDataRef data = shape->GetData();
+ return ConstructHKMesh(data->GetVertices(), data->GetTriangles());
+}
+
+#endif
+
+
/*
To mimic the "Reset Transform" and "Reset Scale" behavior, the following code snippet should help:
@@ -125,7 +200,7 @@ To mimic the "Align to world" behavior, the following code snippet should help:
int Exporter::addVertex(vector<Vector3> &verts, vector<Vector3> &vnorms, const Point3 &pt, const Point3 &norm)
{
- for (int i=0; i<verts.size(); i++)
+ for (unsigned int i=0; i<verts.size(); i++)
{
if (equal(verts[i], pt, mWeldThresh) &&
equal(vnorms[i], norm, 0))
@@ -362,6 +437,42 @@ bhkNiTriStripsShapeRef Exporter::makeTriStripsShape(Mesh& mesh, Matrix3& sm)
return shape;
}
+#ifdef USES_HAVOK
+static bhkMoppBvTreeShapeRef makeTreeShape(bhkPackedNiTriStripsShapeRef mesh)
+{
+ hkpShapeCollection * list = NULL;
+ bhkMoppBvTreeShapeRef mopp = new bhkMoppBvTreeShape();
+ mopp->SetMaterial( HAV_MAT_WOOD );
+ mopp->SetShape( mesh );
+ list = ConstructHKMesh(mesh);
+
+ hkpMoppCompilerInput mfr;
+ mfr.setAbsoluteFitToleranceOfAxisAlignedTriangles( hkVector4( 0.1f, 0.1f, 0.1f ) );
+
+ vector<Niflib::byte> moppcode;
+ try
+ {
+ hkpMoppCode* code = hkpMoppUtility::buildCode(list, mfr);
+
+ moppcode.resize( code->m_data.getSize() );
+ for (int i=0; i<code->m_data.getSize(); ++i )
+ moppcode[i] = code->m_data[i];
+ mopp->SetMoppCode( moppcode );
+ mopp->SetMoppOrigin( Vector3(code->m_info.m_offset(0), code->m_info.m_offset(1), code->m_info.m_offset(2) ));
+ mopp->SetMoppScale( code->m_info.getScale() );
+
+ code->removeReference();
+ }
+ catch(...)
+ {
+ }
+ list->removeReference();
+
+ return mopp;
+}
+
+#endif
+
bhkPackedNiTriStripsShapeRef Exporter::makePackedTriStripsShape(Mesh& mesh, Matrix3& sm)
{
// Need to separate the vertices based on material.
@@ -396,9 +507,9 @@ bhkPackedNiTriStripsShapeRef Exporter::makePackedTriStripsShape(Mesh& mesh, Matr
Triangle& tri = tris[i];
norms[i] = TOVECTOR3(mesh.getFaceNormal(i));
Face& face = mesh.faces[i];
- tri[0] = face.getVert(0);
- tri[1] = face.getVert(1);
- tri[2] = face.getVert(2);
+ tri[0] = (USHORT)face.getVert(0);
+ tri[1] = (USHORT)face.getVert(1);
+ tri[2] = (USHORT)face.getVert(2);
}
hkPackedNiTriStripsDataRef data = new hkPackedNiTriStripsData();
@@ -410,6 +521,15 @@ bhkPackedNiTriStripsShapeRef Exporter::makePackedTriStripsShape(Mesh& mesh, Matr
// setup shape
bhkPackedNiTriStripsShapeRef shape = new bhkPackedNiTriStripsShape();
shape->SetData(data);
+
+ OblivionSubShape subshape;
+ subshape.layer = OL_STATIC;
+ subshape.material = HAV_MAT_WOOD;
+ subshape.numVertices = verts.size();
+
+ vector<OblivionSubShape> subshapes;
+ subshapes.push_back(subshape);
+ shape->SetSubShapes( subshapes );
//shape->SetStripsData(0, data);
//shape->SetNumDataLayers(1);
//shape->SetOblivionLayer(0, OL_STATIC);
@@ -523,7 +643,7 @@ bhkShapeRef Exporter::makeBoxShape(INode *node, Object *obj, Matrix3& tm)
bhkShapeRef Exporter::makeSphereShape(INode *node, Object *obj, Matrix3& tm)
{
Point3 scale = GetScale(tm);
- float s = (scale[0] + scale[1] + scale[2]) / 3.0;
+ float s = (scale[0] + scale[1] + scale[2]) / 3.0f;
float radius = 0;
if (IParamBlock2* pblock2 = obj->GetParamBlockByID(0))
@@ -544,7 +664,7 @@ bhkShapeRef Exporter::makeSphereShape(INode *node, Object *obj, Matrix3& tm)
bhkShapeRef Exporter::makeCapsuleShape(INode *node, Object *obj, Matrix3& tm)
{
Point3 scale = GetScale(tm);
- float s = (scale[0] + scale[1] + scale[2]) / 3.0;
+ float s = (scale[0] + scale[1] + scale[2]) / 3.0f;
float radius = 0.1f;
float height = 0.1f;
@@ -576,7 +696,7 @@ bhkShapeRef Exporter::makebhkBoxShape(INode *node, Object *obj, Matrix3& tm)
if (IParamBlock2* pblock2 = obj->GetParamBlockByID(box_params))
{
Point3 scale = GetScale(tm);
- float s = (scale[0] + scale[1] + scale[2]) / 3.0;
+ float s = (scale[0] + scale[1] + scale[2]) / 3.0f;
int mtl = 0;
float length = 0, width = 0, height = 0;
@@ -823,7 +943,7 @@ bhkShapeRef Exporter::makeListShape(INode *node, Matrix3& tm, bhkRigidBodyRef bo
{
if (bhkRigidBodyInterface *irb = (bhkRigidBodyInterface *)node->GetObjectRef()->GetInterface(BHKRIGIDBODYINTERFACE_DESC))
{
- int mass = irb->GetMass(0);
+ float mass = irb->GetMass(0);
float frict = irb->GetFriction(0);
float resti = irb->GetRestitution(0);
int lyr = irb->GetLayer(0);
@@ -907,9 +1027,9 @@ bhkShapeRef Exporter::makeProxyShape(INode *node, Object *obj, Matrix3& tm)
case bv_type_shapes:
shape = makeProxyTriStripShape(node, obj, mesh, tm);
break;
+
case bv_type_packed:
- shape = makeProxyTriStripShape(node, obj, mesh, tm);
- //shape = makeProxyPackedTriStripShape(node, obj, mesh, tm);
+ shape = makeProxyPackedTriStripShape(node, obj, mesh, tm);
break;
case bv_type_convex:
@@ -1047,8 +1167,11 @@ bhkShapeRef Exporter::makeProxyPackedTriStripShape(INode *node, Object *obj, Mes
Matrix3 ident(true);
bhkPackedNiTriStripsShapeRef trishape = makePackedTriStripsShape(localmesh, ident);
-
+#ifdef USES_HAVOK
+ shape = StaticCast<bhkShape>( makeTreeShape(trishape) );
+#else
shape = StaticCast<bhkShape>(trishape);
+#endif
}
return shape;
}
@@ -1057,7 +1180,7 @@ bhkShapeRef Exporter::makeModifierShape(INode *node, Object* obj, Modifier* mod,
{
enum { havok_params };
enum { PB_BOUND_TYPE, PB_MATERIAL, };
- enum { bv_type_none, bv_type_box, bv_type_sphere, bv_type_capsule, bv_type_shapes, bv_type_convex, }; // pblock ID
+ enum { bv_type_none, bv_type_box, bv_type_sphere, bv_type_capsule, bv_type_shapes, bv_type_convex, bv_type_packed, }; // pblock ID
bhkShapeRef shape;
@@ -1107,6 +1230,10 @@ bhkShapeRef Exporter::makeModifierShape(INode *node, Object* obj, Modifier* mod,
case bv_type_convex:
shape = makeModConvexShape(node, mod, const_cast<Mesh&>(*mesh), tm);
break;
+
+ case bv_type_packed:
+ shape = makeModPackedTriStripShape(node, mod, const_cast<Mesh&>(*mesh), tm);
+ break;
}
return shape;
}
@@ -1115,7 +1242,7 @@ bhkShapeRef Exporter::makeModBoxShape(INode *node, Modifier* mod, Mesh& mesh, Ma
{
enum { havok_params };
enum { PB_BOUND_TYPE, PB_MATERIAL, };
- enum { bv_type_none, bv_type_box, bv_type_sphere, bv_type_capsule, bv_type_shapes, bv_type_convex, }; // pblock ID
+ enum { bv_type_none, bv_type_box, bv_type_sphere, bv_type_capsule, bv_type_shapes, bv_type_convex, bv_type_packed, }; // pblock ID
int material = NP_DEFAULT_HVK_MATERIAL;
if (IParamBlock2* pblock2 = mod->GetParamBlockByID(havok_params))
@@ -1157,7 +1284,7 @@ bhkShapeRef Exporter::makeModSphereShape(INode *node, Modifier* mod, Mesh& mesh,
{
enum { havok_params };
enum { PB_BOUND_TYPE, PB_MATERIAL, };
- enum { bv_type_none, bv_type_box, bv_type_sphere, bv_type_capsule, bv_type_shapes, bv_type_convex, }; // pblock ID
+ enum { bv_type_none, bv_type_box, bv_type_sphere, bv_type_capsule, bv_type_shapes, bv_type_convex, bv_type_packed, }; // pblock ID
int material = NP_DEFAULT_HVK_MATERIAL;
if (IParamBlock2* pblock2 = mod->GetParamBlockByID(havok_params))
@@ -1199,7 +1326,7 @@ bhkShapeRef Exporter::makeModCapsuleShape(INode *node, Modifier* mod, Mesh& mesh
{
enum { havok_params };
enum { PB_BOUND_TYPE, PB_MATERIAL, };
- enum { bv_type_none, bv_type_box, bv_type_sphere, bv_type_capsule, bv_type_shapes, bv_type_convex, }; // pblock ID
+ enum { bv_type_none, bv_type_box, bv_type_sphere, bv_type_capsule, bv_type_shapes, bv_type_convex, bv_type_packed, }; // pblock ID
int material = NP_DEFAULT_HVK_MATERIAL;
node->EvalWorldState(0);
@@ -1246,7 +1373,7 @@ bhkShapeRef Exporter::makeModConvexShape(INode *node, Modifier* mod, Mesh& mesh,
{
enum { havok_params };
enum { PB_BOUND_TYPE, PB_MATERIAL, };
- enum { bv_type_none, bv_type_box, bv_type_sphere, bv_type_capsule, bv_type_shapes, bv_type_convex, }; // pblock ID
+ enum { bv_type_none, bv_type_box, bv_type_sphere, bv_type_capsule, bv_type_shapes, bv_type_convex, bv_type_packed, }; // pblock ID
int material = NP_DEFAULT_HVK_MATERIAL;
Matrix3 ltm = node->GetObjTMAfterWSM(0) * tm;
@@ -1268,7 +1395,7 @@ bhkShapeRef Exporter::makeModTriStripShape(INode *node, Modifier* mod, Mesh& mes
{
enum { havok_params };
enum { PB_BOUND_TYPE, PB_MATERIAL, };
- enum { bv_type_none, bv_type_box, bv_type_sphere, bv_type_capsule, bv_type_shapes, bv_type_convex, }; // pblock ID
+ enum { bv_type_none, bv_type_box, bv_type_sphere, bv_type_capsule, bv_type_shapes, bv_type_convex, bv_type_packed, }; // pblock ID
int material = NP_DEFAULT_HVK_MATERIAL;
Matrix3 ltm = node->GetObjTMAfterWSM(0) * tm;
@@ -1288,5 +1415,27 @@ bhkShapeRef Exporter::makeModTriStripShape(INode *node, Modifier* mod, Mesh& mes
bhkShapeRef Exporter::makeModPackedTriStripShape(INode *node, Modifier* mod, Mesh& mesh, Matrix3& tm)
{
- return makeModTriStripShape(node, mod, mesh, tm);
+ enum { havok_params };
+ enum { PB_BOUND_TYPE, PB_MATERIAL, };
+ enum { bv_type_none, bv_type_box, bv_type_sphere, bv_type_capsule, bv_type_shapes, bv_type_convex, bv_type_packed, }; // pblock ID
+ int material = NP_DEFAULT_HVK_MATERIAL;
+
+ Matrix3 ltm = node->GetObjTMAfterWSM(0) * tm;
+
+ bhkShapeRef shape;
+ if (bhkPackedNiTriStripsShapeRef trishape = makePackedTriStripsShape(mesh, ltm))
+ {
+ //trishape->SetMaterial(HavokMaterial(material));
+ if (IParamBlock2* pblock2 = mod->GetParamBlockByID(havok_params))
+ {
+ pblock2->GetValue(PB_MATERIAL, 0, material, FOREVER, 0);
+ }
+
+#ifdef USES_HAVOK
+ shape = StaticCast<bhkShape>( makeTreeShape(trishape) );
+#else
+ shape = StaticCast<bhkShape>(trishape);
+#endif
+ }
+ return shape;
}
diff --git a/NifImport/ImportCollision.cpp b/NifImport/ImportCollision.cpp
index 555bcc4..48900c6 100644
--- a/NifImport/ImportCollision.cpp
+++ b/NifImport/ImportCollision.cpp
@@ -74,7 +74,7 @@ struct CollisionImport
INode *parent
);
- enum { bv_type_none, bv_type_box, bv_type_sphere, bv_type_capsule, bv_type_shapes, bv_type_convex, }; // pblock ID
+ enum { bv_type_none, bv_type_box, bv_type_sphere, bv_type_capsule, bv_type_shapes, bv_type_convex, bv_type_packed, }; // pblock ID
};
bool NifImporter::ImportCollision(NiNodeRef node)
@@ -567,7 +567,7 @@ bool CollisionImport::ImportPackedNiTriStripsShape(INode *rbody, bhkRigidBodyRef
vector<Vector3> norms = data->GetNormals();
INode *inode = ImportCollisionMesh(verts, tris, norms, tm, parent);
- CreatebhkCollisionModifier(inode, bv_type_shapes, HavokMaterial(NP_DEFAULT_HVK_MATERIAL));
+ CreatebhkCollisionModifier(inode, bv_type_packed, HavokMaterial(NP_DEFAULT_HVK_MATERIAL));
ImportBase(body, shape, parent, inode, ltm);
AddShape(rbody, inode);
return true;
diff --git a/NifImport/ImportSkeleton.cpp b/NifImport/ImportSkeleton.cpp
index c254f7c..7fcf1c1 100644
--- a/NifImport/ImportSkeleton.cpp
+++ b/NifImport/ImportSkeleton.cpp
@@ -683,8 +683,11 @@ void NifImporter::ImportBones(NiNodeRef node, bool recurse)
// Import UPB
if (bone) ImportUPB(bone, node);
- // Import Havok Collision Data surrounding node
- ImportCollision(node);
+ // Import Havok Collision Data surrounding node,
+ // unfortunately this causes double import of collision so I'm disabling it for now.
+ // if (ImportCollision) {
+ //ImportCollision(node);
+ // }
if (bone && recurse)
{
diff --git a/NifPlugins/DllEntry.cpp b/NifPlugins/DllEntry.cpp
index 2282fd4..014410d 100644
--- a/NifPlugins/DllEntry.cpp
+++ b/NifPlugins/DllEntry.cpp
@@ -12,6 +12,18 @@
**********************************************************************/
#include <notify.h>
+
+#ifdef USES_HAVOK
+//
+// Math and base include
+#include <Common/Base/hkBase.h>
+#include <Common/Base/System/hkBaseSystem.h>
+#include <Common/Base/Memory/hkThreadMemory.h>
+#include <Common/Base/Memory/Memory/Pool/hkPoolMemory.h>
+#include <Common/Base/System/Error/hkDefaultError.h>
+#endif
+
+
extern void DoNotifyNodeHide(void *param, NotifyInfo *info);
extern void DoNotifyNodeUnHide(void *param, NotifyInfo *info);
extern Class_ID BHKLISTOBJECT_CLASS_ID;
@@ -29,6 +41,8 @@ extern ClassDesc* GetDDSLibClassDesc();
extern ClassDesc2* GetbhkListObjDesc();
extern ClassDesc2* GetbhkProxyObjDesc();
+static void InitializeHavok();
+static void CloseHavok();
enum ClassDescType
{
@@ -50,8 +64,6 @@ static int nClasses = 0;
static ClassDesc2* classDescriptions[20];
static bool classDescEnabled[CD_Count];
-
-
// This function is called by Windows when the DLL is loaded. This
// function may also be called many times during time critical operations
// like rendering. Therefore developers need to be careful what they
@@ -68,10 +80,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,ULONG fdwReason,LPVOID lpvReserved)
InitCommonControls(); // Initialize Win95 controls
RegisterNotification(DoNotifyNodeHide, NULL, NOTIFY_NODE_HIDE);
RegisterNotification(DoNotifyNodeUnHide, NULL, NOTIFY_NODE_UNHIDE);
+ InitializeHavok();
}
- if (fdwReason == DLL_PROCESS_ATTACH)
- InitializeLibSettings();
-
+ if (fdwReason == DLL_PROCESS_ATTACH)
+ InitializeLibSettings();
+ if (fdwReason == DLL_PROCESS_DETACH)
+ CloseHavok();
return (TRUE);
}
@@ -267,3 +281,52 @@ static void DoNotifyNodeUnHide(void *param, NotifyInfo *info)
}
}
+#ifdef USES_HAVOK
+static hkThreadMemory* threadMemory = NULL;
+static char* stackBuffer = NULL;
+
+static void HK_CALL errorReport(const char* msg, void*)
+{
+ OutputDebugString(msg);
+}
+
+static void InitializeHavok()
+{
+ // Initialize the base system including our memory system
+ hkPoolMemory* memoryManager = new hkPoolMemory();
+ threadMemory = new hkThreadMemory(memoryManager, 16);
+ hkBaseSystem::init( memoryManager, threadMemory, errorReport );
+ memoryManager->removeReference();
+
+ // We now initialize the stack area to 100k (fast temporary memory to be used by the engine).
+ {
+ int stackSize = 0x100000;
+ stackBuffer = hkAllocate<char>( stackSize, HK_MEMORY_CLASS_BASE);
+ hkThreadMemory::getInstance().setStackArea( stackBuffer, stackSize);
+ }
+}
+
+static void CloseHavok()
+{
+ // Deallocate stack area
+ if (threadMemory)
+ {
+ threadMemory->setStackArea(0, 0);
+ hkDeallocate(stackBuffer);
+
+ threadMemory->removeReference();
+ threadMemory = NULL;
+ stackBuffer = NULL;
+ }
+
+ // Quit base system
+ hkBaseSystem::quit();
+}
+#else
+static void InitializeHavok()
+{
+}
+static void CloseHavok()
+{
+}
+#endif
diff --git a/NifPlugins_VC80.sln b/NifPlugins_VC80.sln
index b1c5654..5095538 100644
--- a/NifPlugins_VC80.sln
+++ b/NifPlugins_VC80.sln
@@ -4,7 +4,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Niflib", "..\niflib\niflib.
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{50B67748-0DFB-45B0-BF1F-E80135EE3823}"
ProjectSection(SolutionItems) = preProject
- MaxNifPlugins_Readme.txt = MaxNifPlugins_Readme.txt
MaxNifTools.ini = MaxNifTools.ini
MaxNifTools.iss = MaxNifTools.iss
NifPlugins_Development_Readme.txt = NifPlugins_Development_Readme.txt
@@ -17,9 +16,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NifPlugins", "Build\NifPlug
EndProjectSection
EndProject
Global
+ GlobalSection(SubversionScc) = preSolution
+ Svn-Managed = True
+ Manager = AnkhSVN - Subversion Support for Visual Studio
+ EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug - gmax|Win32 = Debug - gmax|Win32
Debug - gmax|x64 = Debug - gmax|x64
+ Debug - Max 2008|Win32 = Debug - Max 2008|Win32
+ Debug - Max 2008|x64 = Debug - Max 2008|x64
Debug - Max 4.2|Win32 = Debug - Max 4.2|Win32
Debug - Max 4.2|x64 = Debug - Max 4.2|x64
Debug - Max 4|Win32 = Debug - Max 4|Win32
@@ -34,8 +39,12 @@ Global
Debug - Max 8|x64 = Debug - Max 8|x64
Debug - Max 9|Win32 = Debug - Max 9|Win32
Debug - Max 9|x64 = Debug - Max 9|x64
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release - gmax|Win32 = Release - gmax|Win32
Release - gmax|x64 = Release - gmax|x64
+ Release - Max 2008|Win32 = Release - Max 2008|Win32
+ Release - Max 2008|x64 = Release - Max 2008|x64
Release - Max 4.2|Win32 = Release - Max 4.2|Win32
Release - Max 4.2|x64 = Release - Max 4.2|x64
Release - Max 4|Win32 = Release - Max 4|Win32
@@ -50,12 +59,18 @@ Global
Release - Max 8|x64 = Release - Max 8|x64
Release - Max 9|Win32 = Release - Max 9|Win32
Release - Max 9|x64 = Release - Max 9|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug - gmax|Win32.ActiveCfg = Debug - Static|Win32
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug - gmax|Win32.Build.0 = Debug - Static|Win32
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug - gmax|x64.ActiveCfg = Debug - DLL|x64
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug - gmax|x64.Build.0 = Debug - DLL|x64
+ {19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug - Max 2008|Win32.ActiveCfg = Debug - Static|Win32
+ {19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug - Max 2008|Win32.Build.0 = Debug - Static|Win32
+ {19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug - Max 2008|x64.ActiveCfg = Debug - Static|x64
+ {19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug - Max 2008|x64.Build.0 = Debug - Static|x64
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug - Max 4.2|Win32.ActiveCfg = Debug - Static|Win32
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug - Max 4.2|Win32.Build.0 = Debug - Static|Win32
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug - Max 4.2|x64.ActiveCfg = Debug - DLL|x64
@@ -84,10 +99,17 @@ Global
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug - Max 9|Win32.Build.0 = Debug - Static|Win32
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug - Max 9|x64.ActiveCfg = Debug - Static|x64
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug - Max 9|x64.Build.0 = Debug - Static|x64
+ {19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug|Win32.ActiveCfg = Debug - DLL|x64
+ {19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug|x64.ActiveCfg = Debug - DLL|x64
+ {19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Debug|x64.Build.0 = Debug - DLL|x64
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - gmax|Win32.ActiveCfg = Release - Static|Win32
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - gmax|Win32.Build.0 = Release - Static|Win32
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - gmax|x64.ActiveCfg = Release - DLL|x64
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - gmax|x64.Build.0 = Release - DLL|x64
+ {19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - Max 2008|Win32.ActiveCfg = Release - Static|Win32
+ {19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - Max 2008|Win32.Build.0 = Release - Static|Win32
+ {19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - Max 2008|x64.ActiveCfg = Release - Static|x64
+ {19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - Max 2008|x64.Build.0 = Release - Static|x64
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - Max 4.2|Win32.ActiveCfg = Release - Static|Win32
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - Max 4.2|Win32.Build.0 = Release - Static|Win32
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - Max 4.2|x64.ActiveCfg = Release - DLL|x64
@@ -116,10 +138,17 @@ Global
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - Max 9|Win32.Build.0 = Release - Static|Win32
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - Max 9|x64.ActiveCfg = Release - Static|x64
{19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release - Max 9|x64.Build.0 = Release - Static|x64
+ {19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release|Win32.ActiveCfg = Release - DLL|x64
+ {19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release|x64.ActiveCfg = Release - DLL|x64
+ {19FD8EE6-79CC-4BAC-9744-D9573BE47C7E}.Release|x64.Build.0 = Release - DLL|x64
{466F2D3E-2663-4583-A05C-128683677617}.Debug - gmax|Win32.ActiveCfg = Debug - gmax|Win32
{466F2D3E-2663-4583-A05C-128683677617}.Debug - gmax|Win32.Build.0 = Debug - gmax|Win32
{466F2D3E-2663-4583-A05C-128683677617}.Debug - gmax|x64.ActiveCfg = Debug - gmax|x64
{466F2D3E-2663-4583-A05C-128683677617}.Debug - gmax|x64.Build.0 = Debug - gmax|x64
+ {466F2D3E-2663-4583-A05C-128683677617}.Debug - Max 2008|Win32.ActiveCfg = Debug - Max 2008|Win32
+ {466F2D3E-2663-4583-A05C-128683677617}.Debug - Max 2008|Win32.Build.0 = Debug - Max 2008|Win32
+ {466F2D3E-2663-4583-A05C-128683677617}.Debug - Max 2008|x64.ActiveCfg = Debug - Max 9|x64
+ {466F2D3E-2663-4583-A05C-128683677617}.Debug - Max 2008|x64.Build.0 = Debug - Max 9|x64
{466F2D3E-2663-4583-A05C-128683677617}.Debug - Max 4.2|Win32.ActiveCfg = Debug - Max 4.2|Win32
{466F2D3E-2663-4583-A05C-128683677617}.Debug - Max 4.2|Win32.Build.0 = Debug - Max 4.2|Win32
{466F2D3E-2663-4583-A05C-128683677617}.Debug - Max 4.2|x64.ActiveCfg = Debug - Max 4.2|x64
@@ -148,10 +177,17 @@ Global
{466F2D3E-2663-4583-A05C-128683677617}.Debug - Max 9|Win32.Build.0 = Debug - Max 9|Win32
{466F2D3E-2663-4583-A05C-128683677617}.Debug - Max 9|x64.ActiveCfg = Debug - Max 9|x64
{466F2D3E-2663-4583-A05C-128683677617}.Debug - Max 9|x64.Build.0 = Debug - Max 9|x64
+ {466F2D3E-2663-4583-A05C-128683677617}.Debug|Win32.ActiveCfg = Debug - Max 2008|x64
+ {466F2D3E-2663-4583-A05C-128683677617}.Debug|x64.ActiveCfg = Debug - Max 2008|x64
+ {466F2D3E-2663-4583-A05C-128683677617}.Debug|x64.Build.0 = Debug - Max 2008|x64
{466F2D3E-2663-4583-A05C-128683677617}.Release - gmax|Win32.ActiveCfg = Release - gmax|Win32
{466F2D3E-2663-4583-A05C-128683677617}.Release - gmax|Win32.Build.0 = Release - gmax|Win32
{466F2D3E-2663-4583-A05C-128683677617}.Release - gmax|x64.ActiveCfg = Release - gmax|x64
{466F2D3E-2663-4583-A05C-128683677617}.Release - gmax|x64.Build.0 = Release - gmax|x64
+ {466F2D3E-2663-4583-A05C-128683677617}.Release - Max 2008|Win32.ActiveCfg = Release - Max 2008|Win32
+ {466F2D3E-2663-4583-A05C-128683677617}.Release - Max 2008|Win32.Build.0 = Release - Max 2008|Win32
+ {466F2D3E-2663-4583-A05C-128683677617}.Release - Max 2008|x64.ActiveCfg = Release - Max 9|x64
+ {466F2D3E-2663-4583-A05C-128683677617}.Release - Max 2008|x64.Build.0 = Release - Max 9|x64
{466F2D3E-2663-4583-A05C-128683677617}.Release - Max 4.2|Win32.ActiveCfg = Release - Max 4.2|Win32
{466F2D3E-2663-4583-A05C-128683677617}.Release - Max 4.2|Win32.Build.0 = Release - Max 4.2|Win32
{466F2D3E-2663-4583-A05C-128683677617}.Release - Max 4.2|x64.ActiveCfg = Release - Max 4.2|x64
@@ -180,6 +216,9 @@ Global
{466F2D3E-2663-4583-A05C-128683677617}.Release - Max 9|Win32.Build.0 = Release - Max 9|Win32
{466F2D3E-2663-4583-A05C-128683677617}.Release - Max 9|x64.ActiveCfg = Release - Max 9|x64
{466F2D3E-2663-4583-A05C-128683677617}.Release - Max 9|x64.Build.0 = Release - Max 9|x64
+ {466F2D3E-2663-4583-A05C-128683677617}.Release|Win32.ActiveCfg = Release - Max 2008|x64
+ {466F2D3E-2663-4583-A05C-128683677617}.Release|x64.ActiveCfg = Release - Max 2008|x64
+ {466F2D3E-2663-4583-A05C-128683677617}.Release|x64.Build.0 = Release - Max 2008|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/NifProps/NifProps.rc b/NifProps/NifProps.rc
index 748a2b7..3e6d8f5 100755
--- a/NifProps/NifProps.rc
+++ b/NifProps/NifProps.rc
@@ -13,7 +13,8 @@
#define DLLNAME "NifProps.dlu" // DLL Name
#define DLLDESCRIPTION "3ds Max Nif Reactor Properites Plugin"
#include "..\nifcommon\nifversion.rc"
-#endif
+#endif
+
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@@ -52,6 +53,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
+
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
@@ -207,19 +209,20 @@ BEGIN
CONTROL "Material",IDC_LBL_MATERIAL,"Static",SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | WS_GROUP,12,4,83,8
END
-IDD_RB_MOD_PANEL DIALOGEX 0, 0, 107, 117
+IDD_RB_MOD_PANEL DIALOGEX 0, 0, 107, 126
STYLE DS_SETFONT | DS_3DLOOK | WS_CHILD | WS_VISIBLE
FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
CONTROL "No Collision",IDC_RDO_NO_COLL,"Button",BS_AUTORADIOBUTTON | WS_GROUP,9,39,82,10
CONTROL "Axis Aligned Box",IDC_RDO_AXIS_ALIGNED_BOX,"Button",BS_AUTORADIOBUTTON,9,51,82,10
CONTROL "Sphere",IDC_RDO_SPHERE,"Button",BS_AUTORADIOBUTTON,9,63,80,10
- GROUPBOX "Bounding Volume",IDC_STATIC,5,29,97,84
+ GROUPBOX "Bounding Volume",IDC_STATIC,5,29,97,94
CONTROL "Capsule",IDC_RDO_CAPSULE,"Button",BS_AUTORADIOBUTTON,9,75,80,10
CONTROL "Strips Shape",IDC_RDO_PROXY_MESH,"Button",BS_AUTORADIOBUTTON,9,87,80,10
CONTROL "Convex Shape",IDC_RDO_CONVEX,"Button",BS_AUTORADIOBUTTON,9,99,80,10
CONTROL "Material",IDC_LBL_MATERIAL,"Static",SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | WS_GROUP,12,4,83,8
COMBOBOX IDC_CB_MATERIAL,12,13,83,157,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Packed Strips Shape",IDC_RDO_PACKED_STRIPS,"Button",BS_AUTORADIOBUTTON,9,111,80,10
END
IDD_BOXPARAM1 DIALOGEX 0, 0, 107, 69
@@ -305,7 +308,7 @@ BEGIN
CONTROL "No Collision",IDC_RDO_NO_COLL,"Button",BS_AUTORADIOBUTTON | WS_GROUP,8,41,82,10
CONTROL "Axis Aligned Box",IDC_RDO_AXIS_ALIGNED_BOX,"Button",BS_AUTORADIOBUTTON,8,52,82,10
CONTROL "Strips Shape",IDC_RDO_STRIPS_SHAPE,"Button",BS_AUTORADIOBUTTON,8,64,82,10
- CONTROL "Packed Strips Shape",IDC_RDO_PACKED_STRIPS,"Button",BS_AUTORADIOBUTTON | WS_DISABLED,8,76,80,10
+ CONTROL "Packed Strips Shape",IDC_RDO_PACKED_STRIPS,"Button",BS_AUTORADIOBUTTON,8,76,80,10
CONTROL "Convex Shape",IDC_RDO_CONVEX,"Button",BS_AUTORADIOBUTTON,8,88,80,10
LTEXT "Proxied Collision Meshes:",IDC_STATIC,8,116,92,8
LISTBOX IDC_LIST1,6,127,94,71,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
@@ -1207,7 +1210,8 @@ END
//
// Generated from the TEXTINCLUDE 3 resource.
//
-
+
+
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
diff --git a/NifProps/bhkRigidBodyModifer.cpp b/NifProps/bhkRigidBodyModifer.cpp
index 6640c33..e383701 100644
--- a/NifProps/bhkRigidBodyModifer.cpp
+++ b/NifProps/bhkRigidBodyModifer.cpp
@@ -176,7 +176,7 @@ enum { PB_BOUND_TYPE, PB_MATERIAL, PB_OPT_ENABLE, PB_MAXEDGE, PB_FACETHRESH, PB_
enum { havok_params_panel, };
-enum { bv_type_none, bv_type_box, bv_type_sphere, bv_type_capsule, bv_type_shapes, bv_type_convex, }; // pblock ID
+enum { bv_type_none, bv_type_box, bv_type_sphere, bv_type_capsule, bv_type_shapes, bv_type_convex, bv_type_packed, }; // pblock ID
static ParamBlockDesc2 havok_param_blk (
havok_params, _T("BoundingVolumes"), 0, NULL, P_AUTO_CONSTRUCT + P_AUTO_UI + P_MULTIMAP, PBLOCK_REF,
@@ -192,8 +192,8 @@ static ParamBlockDesc2 havok_param_blk (
PB_BOUND_TYPE, _T("boundType"), TYPE_INT, 0, IDS_BV_BOUNDING_TYPE,
p_default, bv_type_shapes,
- p_range, 0, 5,
- p_ui, havok_params, TYPE_RADIO, 6, IDC_RDO_NO_COLL, IDC_RDO_AXIS_ALIGNED_BOX, IDC_RDO_SPHERE, IDC_RDO_CAPSULE, IDC_RDO_PROXY_MESH, IDC_RDO_CONVEX,
+ p_range, 0, 6,
+ p_ui, havok_params, TYPE_RADIO, 7, IDC_RDO_NO_COLL, IDC_RDO_AXIS_ALIGNED_BOX, IDC_RDO_SPHERE, IDC_RDO_CAPSULE, IDC_RDO_PROXY_MESH, IDC_RDO_CONVEX, IDC_RDO_PACKED_STRIPS,
end,
PB_OPT_ENABLE, _T("enableOptimize"), TYPE_BOOL, 0, IDS_OPT_ENABLE,
@@ -436,16 +436,17 @@ void bhkRigidBodyModifier::ModifyObject (TimeValue t, ModContext &mc, ObjectStat
BuildColCapsule(proxyMesh);
break;
- //case bv_type_packed: // Packed
- // BuildColPackedStrips();
- // //BuildSphere();
- // break;
-
case bv_type_convex:
BuildColConvex(proxyMesh);
BuildOptimize(proxyMesh);
//BuildScubaMesh();
break;
+
+ case bv_type_packed: // Packed
+ BuildColPackedStrips(proxyMesh);
+ //BuildSphere();
+ break;
+
}
//
diff --git a/NifProps/dds/dds.cpp b/NifProps/dds/dds.cpp
index 85fbc37..b40a53f 100644
--- a/NifProps/dds/dds.cpp
+++ b/NifProps/dds/dds.cpp
@@ -1,3 +1,4 @@
+#ifdef GAME_VER
// File ....: dds.cpp
// ------------------
// Author...: Sean Palmer
@@ -771,4 +772,6 @@ BOOL WINAPI DllMain(HINSTANCE hDLLInst, DWORD fdwReason, LPVOID lpvReserved)
return TRUE;
}
-#endif
\ No newline at end of file
+#endif
+
+#endif //GAME_VER
\ No newline at end of file
diff --git a/README.TXT b/README.TXT
index d13e002..a3d351d 100644
--- a/README.TXT
+++ b/README.TXT
@@ -20,16 +20,6 @@
Enjoy!
-
- Additional Notes
- ----------------
-
- Set the layer value to "NonCollidable", if you want to be able to walk
- through your objects, while still being able to activate them.
-
- If your collision mesh comes out deformed, go to the utilities tab,
- choose "Reset XForm" and click "Reset Selected". This should fix it.
-
Requirements
------------
@@ -85,3 +75,14 @@
- TextureSearchPaths will be recursively scanned for file names that
match the extensions (this can be time consuming so keep it to only
relevant directories to you).
+
+
+ Additional Notes
+ ----------------
+
+ Set the layer value to "NonCollidable", if you want to be able to walk
+ through your objects, while still being able to activate them.
+
+ If your collision mesh comes out deformed, go to the utilities tab,
+ choose "Reset XForm" and click "Reset Selected". This should fix it.
+
\ No newline at end of file
--
GitLab