diff --git a/NifImport/MaxNifImport.cpp b/NifImport/MaxNifImport.cpp
index d895f433e7f7011729868b2c96983fabb34e49c9..d862c802121665c7e8d5218c5692216621020831 100644
--- a/NifImport/MaxNifImport.cpp
+++ b/NifImport/MaxNifImport.cpp
@@ -138,7 +138,7 @@ public:
// Apply post processing checks after reading blocks
if (isValid()){
if (goToSkeletonBindPosition && !nodes.empty())
- nodes[0]->GoToSkeletonBindPosition();
+ GoToSkeletonBindPosition(nodes);
hasSkeleton = HasSkeleton();
isBiped = IsBiped();
diff --git a/NifImport/MaxNifImport.rc b/NifImport/MaxNifImport.rc
index 9641d48eeef1e3731abf573db57e4bce18241233..1161745f77540028eaf0692ad78e3ba706cb2624 100644
--- a/NifImport/MaxNifImport.rc
+++ b/NifImport/MaxNifImport.rc
@@ -88,8 +88,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION 0,1,3,0
+ PRODUCTVERSION 0,1,3,0
FILEFLAGSMASK 0x37L
#ifdef _DEBUG
FILEFLAGS 0x21L
@@ -105,12 +105,12 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "3ds Max Nif Importer"
- VALUE "FileVersion", "0, 1, 0, 1"
+ VALUE "FileVersion", "0, 1, 3, 0"
VALUE "InternalName", "MaxNifImport.dli"
VALUE "LegalCopyright", "Copyright (c) 2006, NIF File Format Library and Tools\r\nAll rights reserved."
VALUE "OriginalFilename", "MaxNifImport.dli"
VALUE "ProductName", "3ds Max Nif Importer"
- VALUE "ProductVersion", "0, 1, 0, 1"
+ VALUE "ProductVersion", "0, 1, 3, 0"
VALUE "SpecialBuild", "Alpha"
END
END
diff --git a/NifImport/MaxNifImport.vcproj b/NifImport/MaxNifImport.vcproj
index c942c2910854273c1f37cfc9cc90e503b456f6bd..28757c46f1b069443ae2635566e4e622eace420b 100644
--- a/NifImport/MaxNifImport.vcproj
+++ b/NifImport/MaxNifImport.vcproj
@@ -86,6 +86,8 @@
ModuleDefinitionFile=".\MaxNifImport.def"
ProgramDatabaseFile=".\Release\MaxNifImport.pdb"
SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
SetChecksum="true"
BaseAddress="0x16860000"
ImportLibrary=".\Release\MaxNifImport.lib"
@@ -113,7 +115,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="if exist "C:\3dsmax8\plugcfg" (
 if not exist "C:\3dsmax8\plugcfg\MaxNifTools.ini" (
 copy "$(ProjectDir)MaxNifTools.ini" "C:\3dsmax8\plugcfg\MaxNifTools.ini"
 )
)
if exist "C:\3dsmax8" (
 xcopy /D /Y /I "$(ProjectDir)MaxNifImport_Readme.txt" "C:\3dsmax8\"
)
"
+ CommandLine="if exist "C:\3dsmax8\plugcfg" (
if not exist "C:\3dsmax8\plugcfg\MaxNifTools.ini" (
copy "$(ProjectDir)MaxNifTools.ini" "C:\3dsmax8\plugcfg\MaxNifTools.ini"
)
)
if exist "C:\3dsmax8" (
xcopy /D /Y /I "$(ProjectDir)..\MaxNifPlugins_Readme.txt" "$(ProjectDir)Staging\"
)
xcopy /D /Y /I "$(TargetPath)" "$(ProjectDir)Staging\plugins\"
xcopy /D /Y /I "$(ProjectDir)MaxNifTools.ini" "$(ProjectDir)Staging\plugcfg""
/>
</Configuration>
<Configuration
@@ -215,7 +217,7 @@
/>
<Tool
Name="VCPostBuildEventTool"
- CommandLine="if exist "C:\3dsmax8\plugcfg" (
 if not exist "C:\3dsmax8\plugcfg\MaxNifTools.ini" (
 copy "$(ProjectDir)MaxNifTools.ini" "C:\3dsmax8\plugcfg\MaxNifTools.ini"
 )
)
if exist "C:\3dsmax8" (
 xcopy /D /Y /I "$(ProjectDir)MaxNifImport_Readme.txt" "C:\3dsmax8\"
)
"
+ CommandLine="if exist "C:\3dsmax8\plugcfg" (
if not exist "C:\3dsmax8\plugcfg\MaxNifTools.ini" (
copy "$(ProjectDir)MaxNifTools.ini" "C:\3dsmax8\plugcfg\MaxNifTools.ini"
)
)
"
/>
</Configuration>
</Configurations>
@@ -317,10 +319,6 @@
>
</File>
</Filter>
- <File
- RelativePath=".\MaxNifImport_Readme.txt"
- >
- </File>
<File
RelativePath=".\MaxNifTools.ini"
>
diff --git a/NifImport/MaxNifImport_Readme.txt b/NifImport/MaxNifImport_Readme.txt
deleted file mode 100644
index 329f250c4370367032c4b49df7bb5f8f4a318261..0000000000000000000000000000000000000000
--- a/NifImport/MaxNifImport_Readme.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-3ds Max Nif Importer v0.1
-
-=========================
-ABOUT
-=========================
-This is an importer for the NIF file format for 3ds Max 8.
-
-It uses the NIF File Format Library and Tools library.
-
-See the plugin INI file for advanced configuration.
-
-=========================
-REQUIREMENTS
-=========================
-3ds Max 8
-
-=========================
-INSTALL
-=========================
-Extract file to 3dsmax8 installation directory.
-
-Its highly recommended that you edit the MaxNifTools.ini file to adjust paths
-and other settings to you machine.
-
-Most importantly:
-1. Remove irrelevant applications from the KnownApplications list
-
-2. Fix the RootPaths, TexturePaths and TextureSearchPaths in the Applications for your machine.
-
- - The ini file has a substitution mechanism to make it easier to just change one location
- and refer to that path in other areas.
-
- - RootPaths is used to determine if the imported nif is in one of those directories
- if so it assumes the nif is from that app and uses those settings for import.
-
- - TexturePaths is used to test if the relative path in the nif is relative to that directory.
-
- - 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).
-
-=========================
-UNINSTALL
-=========================
-Delete the installed files from 3dsmax directory. See the list below in the
-Installed Files section.
-
-=========================
-CHANGE LIST
-=========================
-v 0.1
- o Initial Revision
-
-=========================
-KNOWN ISSUES
-=========================
-o Bipeds do not import correctly. Bones are doing better at the moment.
-
-=========================
-INSTALLED FILES
-=========================
-MaxNifImport_Readme.txt
-plugins\MaxNifImport.dli
-plugcfg\MaxNifTools.ini
-
-
-=========================
-WEBSITES
-=========================
-http://niftools.sourceforge.net/forum/index.php
-http://niftools.sourceforge.net/forum/viewforum.php?f=6&sid=a7b7b59ba39233760ac22590ea8382e1
-
-
-=========================
-COPYRIGHT
-=========================
-Copyright (c) 2006, NIF File Format Library and Tools. All rights reserved.
-
-=========================
-LEGAL
-=========================
-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.
diff --git a/NifImport/Staging/plugcfg/MaxNifTools.ini b/NifImport/Staging/plugcfg/MaxNifTools.ini
new file mode 100644
index 0000000000000000000000000000000000000000..2667f20bc5223edd7afd3412a3394f6dd839fc1a
--- /dev/null
+++ b/NifImport/Staging/plugcfg/MaxNifTools.ini
@@ -0,0 +1,102 @@
+;
+; Niftools Max tools configuration file
+;
+[System]
+; ShortDescription used in the
+ShortDescription=Netimmerse/Gamebryo
+; KnownApplications - Used to indicate which sections in the ini file point
+; to "Applications" which have their own settings in a section below.
+KnownApplications=Oblivion;Morrowind;Civ4
+; Reparse the Applications (and therefore Texture directory cache) on every import/export
+Reparse=0
+
+[MaxNifImport]
+; Current Application to get setting/directory information from. Should match KnownApps above or Auto.
+; Auto will check the import file against the known root paths use that app if a directory match is found.
+CurrentApp=Auto
+; Wildcard to use on all NiNodes to test whether a biped may be used. Default: Bip*
+SkeletonCheck=Bip*
+; Use Bones or Biped. Biped is broken right now so use bones or nothing. Default: 0
+UseBiped=0
+; Flip the V coordinate. Default: 1
+FlipUVTextures=1
+; Show Textures in the Viewport. Default: 1
+ShowTextures=1
+; Enable AutoSmooth on meshes. Default: 1
+EnableAutoSmooth=1
+; AutoSmooth angle. Default: 30
+AutoSmoothAngle=30.0
+; Remove Double/Illegal faces on meshes on import
+RemoveDoubleFaces=1
+RemoveIllegalFaces=1
+; EnableSkinSupport attempt to skin the mesh if bones are available
+EnableSkinSupport=1
+
+[BipedImport]
+; Biped Height. Default: 131.90
+BipedHeight=131.90
+; Biped initial rotation. Default: 90.0
+BipedAngle=90.0
+; Biped Ankle Attach. Default: 0.2
+BipedAnkleAttach=0.2
+; Use Triangle Pelvis. Default: 0
+BipedTrianglePelvis=0
+; Remove unused bones from the biped on import of a mesh. Default: 1
+RemoveUnusedImportedBones=1
+; Minimum Bone Width / Maximum Bone Width / Ratio of Width to Length
+MinBoneWidth=0.5
+MaxBoneWidth=3
+BoneWidthToLengthRatio=0.25
+; Force nub to point back to parent at expense of loss of rotation data. Default: 1
+ForceRotation=1
+; Browse for skeleton on import. Default: 1
+BrowseForSkeleton=1
+; DefaultName for Skeletons (use if in same directory as imported nif)
+DefaultSkeletonName=skeleton.nif
+
+; [Applications]
+; RootPaths - Semicolon separated list of base directories to use when determining which app the imported file is from
+;
+; TextureRootPaths - Semicolon separated list of base directories to look for texturefiles
+; TextureExtensions - Extensions to scan for when using TextureSearchPaths
+; TextureSeachPaths - Semicolon separated list of directories to look recursively for files in
+;
+; UseSkeleton - Whether to use skeleton. Default: 0
+; Skeleton - Default Skeleton to use when importing oblivion meshes
+; GoToSkeletonBindPosition - Morrowind trishape data is not in the correct bind position for import. Default: 1
+
+[Oblivion]
+; Installation Folder
+InstallPath=[HKLM\SOFTWARE\Bethesda Softworks\Oblivion]=@"Installed Path"
+ExtractFolder=E:\Nifs\Oblivion
+
+RootPath=${InstallPath}\Data
+MeshRootPath=${ExtractFolder}\Oblivion - Meshes
+TextureRootPath=${ExtractFolder}\Oblivion - Textures - Compressed
+UseSkeleton=1
+Skeleton=${MeshRootPath}\meshes\characters\_male\skeleton.nif
+RootPaths=${RootPath};${MeshRootPath};${TextureRootPath}
+TextureRootPaths=${RootPath};${TextureRootPath}
+TextureExtensions=.dds;
+TextureSearchPaths=${RootPath}\Textures;${TextureRootPath}\Textures\Characters;${TextureRootPath}\Textures\Armor
+GoToSkeletonBindPosition=1
+
+[Morrowind]
+InstallPath=[HKLM\SOFTWARE\Bethesda Softworks\Morrowind]=@"Installed Path"
+RootPath=${InstallPath}\Data Files
+ExtractFolder=E:\Nifs\Morrowind\Data Files
+RootPaths=${RootPath};${ExtractFolder}
+TextureRootPaths=${RootPath}\Textures;${ExtractFolder}\Textures
+TextureExtensions=.tga;
+TextureSearchPaths=${RootPath}\Textures
+GoToSkeletonBindPosition=1
+
+[Civ4]
+InstallPath=[HKEY_LOCAL_MACHINE\SOFTWARE\Firaxis Games\Sid Meier's Civilization 4]=@"INSTALLDIR"
+RootPath=
+ExtractFolder=C:\Projects\Main\Civilization4\assets
+RootPaths=${ExtractFolder};${InstallPath}\Assets;${InstallPath}\Mods;%USERPROFILE%\My Documents\My Games\Civilization 4\CustomAssets;%USERPROFILE%\My Documents\My Games\Civilization 4\Mods
+TextureRootPaths=$(ExtractFolder)\art\shared\
+TextureExtensions=.dds;.bmp
+TextureSearchPaths=
+GoToSkeletonBindPosition=1
\ No newline at end of file
diff --git a/NifImport/Staging/plugins/MaxNifImport.dli b/NifImport/Staging/plugins/MaxNifImport.dli
new file mode 100644
index 0000000000000000000000000000000000000000..443d6d01b59fb740a6b2eabaed571a697786bc1a
Binary files /dev/null and b/NifImport/Staging/plugins/MaxNifImport.dli differ
diff --git a/NifImport/niutils.cpp b/NifImport/niutils.cpp
index 3240427e4cb924a858dd3a8bcf2a2dbebfcc75cd..52353b86788966fb6ce912f9235861623cbce087 100644
--- a/NifImport/niutils.cpp
+++ b/NifImport/niutils.cpp
@@ -514,3 +514,15 @@ void FindImages(NameValueCollection& images, const string& rootPath, const strin
}
}
}
+
+
+void GoToSkeletonBindPosition(vector<NiNodeRef>& blocks)
+{
+ //Send all skeleton roots to bind position
+ for (uint i = 0; i < blocks.size(); ++i) {
+ NiNodeRef node = blocks[i];
+ if ( node != NULL && node->IsSkeletonRoot() ) {
+ node->GoToSkeletonBindPosition();
+ }
+ }
+}
\ No newline at end of file
diff --git a/NifImport/niutils.h b/NifImport/niutils.h
index 6e2f12bda5c59f560fdf1ee0b82e0caaf6532626..2458ee3c5f5d1ae3992d9a650b4c254d03f6c752 100644
--- a/NifImport/niutils.h
+++ b/NifImport/niutils.h
@@ -208,6 +208,7 @@ extern Niflib::NiNodeRef FindNodeByName( const vector<Niflib::NiNodeRef>& blocks
extern std::vector<Niflib::NiNodeRef> SelectNodesByName( const vector<Niflib::NiNodeRef>& blocks, LPCTSTR match);
extern int CountNodesByName( const vector<Niflib::NiNodeRef>& blocks, LPCTSTR match );
extern std::vector<std::string> GetNamesOfNodes( const vector<Niflib::NiNodeRef>& blocks );
+extern void GoToSkeletonBindPosition(std::vector<Niflib::NiNodeRef>& blocks);
// Simple conversion helpers
static inline float TODEG(float x) { return x * 180.0f / PI; }