diff --git a/NifExport/Coll.cpp b/NifExport/Coll.cpp
index 25ddf2cb47f2254a8951d9782b2807558cbdc903..01baf3822e6c45dfb191325901afc84588bc6bd0 100755
--- a/NifExport/Coll.cpp
+++ b/NifExport/Coll.cpp
@@ -63,10 +63,10 @@ bool Exporter::makeCollisionHierarchy(NiNodeRef &parent, INode *node, TimeValue
mesh->buildNormals();
int lyr, mtl;
- if (!getHvkLayer(node, lyr))
+ if (!npGetProp(node, NP_HVK_LAYER, lyr))
lyr = NP_DEFAULT_HVK_LAYER;
- if (!getHvkMaterial(node, mtl))
+ if (!npGetProp(node, NP_HVK_MATERIAL, mtl))
mtl = NP_DEFAULT_HVK_LAYER;
// setup shape data
diff --git a/NifExport/Exporter.cpp b/NifExport/Exporter.cpp
index 52c33346446aca5daa14cd9e777cce25a0e648f5..2731a4ed7bde26feebb3db1f956de79331787d28 100755
--- a/NifExport/Exporter.cpp
+++ b/NifExport/Exporter.cpp
@@ -1,6 +1,6 @@
#include "pch.h"
-int Exporter::mVersion=001;
+int Exporter::mVersion=013;
bool Exporter::mSelectedOnly=false;
bool Exporter::mTriStrips=true;
bool Exporter::mExportHidden=false;
@@ -37,7 +37,7 @@ Exporter::Result Exporter::export(NiNodeRef &root, INode *node)
Exporter::Result Exporter::exportTree(NiNodeRef &parent, INode *node)
{
- bool coll = isCollision(node);
+ bool coll = npIsCollision(node);
if ((coll && !mExportCollision) ||
(node->IsHidden() && !mExportHidden && !coll) ||
(mSelectedOnly && !node->Selected()))
diff --git a/NifExport/Mesh.cpp b/NifExport/Mesh.cpp
index 47177d2de6876eb7ff83e5d91ca1f75e086d3270..8705f1b82133705cf3267ed8cdf9c972b71c8b68 100755
--- a/NifExport/Mesh.cpp
+++ b/NifExport/Mesh.cpp
@@ -212,6 +212,11 @@ bool Exporter::splitMesh(INode *node, Mesh *mesh, FaceGroups &grps, TimeValue t)
Matrix3 texm;
getTextureMatrix(texm, getMaterial(node, mtlID));
+ Matrix3 flip;
+ flip.IdentityMatrix();
+ flip.Scale(Point3(1, -1, 1));
+ texm *= flip;
+
addFace(grps[mtlID], i, vi, mesh, texm);
}
diff --git a/NifExport/NifExport.cpp b/NifExport/NifExport.cpp
index b356d5880b87bb162c4e71577073847700dcfec8..b8f96a64d3211660b894f6a696a80c2263575070 100755
--- a/NifExport/NifExport.cpp
+++ b/NifExport/NifExport.cpp
@@ -168,7 +168,7 @@ const TCHAR *NifExport::ShortDesc()
const TCHAR *NifExport::AuthorName()
{
- return _T("Alexander Stillich aka Gundalf / The Niftools Team");
+ return _T("Alexander \"Gundalf\" Stillich / The Niftools Team");
}
const TCHAR *NifExport::CopyrightMessage()
diff --git a/NifExport/NifExport.rc b/NifExport/NifExport.rc
index 251a824b4bf3097e1f710b5376bf884ef9ab8f59..6cff55c91f5277f9d7b26a8309d7ce9bd10a5df8 100755
--- a/NifExport/NifExport.rc
+++ b/NifExport/NifExport.rc
@@ -73,7 +73,7 @@ END
// Dialog
//
-IDD_PANEL DIALOGEX 0, 0, 200, 108
+IDD_PANEL DIALOGEX 0, 0, 200, 137
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION |
WS_SYSMENU
EXSTYLE WS_EX_TOOLWINDOW
@@ -83,30 +83,38 @@ BEGIN
CONTROL "",IDC_EDIT,"CustEdit",NOT WS_VISIBLE | WS_TABSTOP,148,8,
35,10
CONTROL "",IDC_SPIN,"SpinnerControl",NOT WS_VISIBLE,186,7,7,10
- PUSHBUTTON "&Export",IDOK,7,87,34,14
- PUSHBUTTON "&Cancel",IDCANCEL,44,87,33,14
+ PUSHBUTTON "&Export",IDOK,5,115,34,14
+ PUSHBUTTON "&Cancel",IDCANCEL,45,115,33,14
CONTROL "Include &Hidden",IDC_CHK_HIDDEN,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,85,7,64,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,80,5,64,10
CONTROL "Generate &Strips",IDC_CHK_STRIPS,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,7,7,65,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,5,5,65,10
CONTROL "Furniture &Markers",IDC_CHK_FURN,"Button",
- BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,19,71,10
- EDITTEXT IDC_ED_TEXPREFIX,7,70,186,12,ES_AUTOHSCROLL
- LTEXT "Texture &Prefix",IDC_STATIC,7,60,44,8
+ BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,5,15,71,10
+ EDITTEXT IDC_ED_TEXPREFIX,5,60,190,12,ES_AUTOHSCROLL
+ LTEXT "Texture &Prefix",IDC_STATIC,5,50,44,8
CONTROL "&Lights",IDC_CHK_LIGHTS,"Button",BS_AUTOCHECKBOX |
- WS_DISABLED | WS_TABSTOP,7,31,35,10
- EDITTEXT IDC_ED_WELDTHRESH,16,44,35,12,ES_AUTOHSCROLL | NOT
+ WS_DISABLED | WS_TABSTOP,5,25,35,10
+ EDITTEXT IDC_ED_WELDTHRESH,163,22,35,12,ES_AUTOHSCROLL | NOT
+ WS_VISIBLE | WS_DISABLED
+ LTEXT "Auto-&Weld",IDC_LBL_WELDTHRESH,160,30,34,8,NOT
WS_VISIBLE | WS_DISABLED
- LTEXT "Auto-&Weld",IDC_LBL_WELDTHRESH,7,45,34,8,NOT WS_VISIBLE |
- WS_DISABLED
CONTROL "Export Co&llision",IDC_CHK_COLL,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,85,18,68,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,80,15,68,10
CONTROL "&Vertex Colors",IDC_CHK_VCOLORS,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,85,31,68,10
- LTEXT "http://niftools.sourceforge.net",IDC_LBL_LINK,98,87,95,
+ BS_AUTOCHECKBOX | WS_TABSTOP,80,25,68,10
+ LTEXT "http://niftools.sourceforge.net",IDC_LBL_LINK,98,114,95,
14,SS_NOTIFY | SS_CENTERIMAGE
CONTROL "&Remap Indices",IDC_CHK_REMAP,"Button",BS_AUTOCHECKBOX |
- WS_TABSTOP,85,46,68,10
+ WS_TABSTOP,80,35,68,10
+ COMBOBOX IDC_CB_GAMES,5,90,105,70,CBS_DROPDOWN | CBS_SORT |
+ WS_DISABLED | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Game",IDC_STATIC,5,79,66,8,WS_DISABLED
+ EDITTEXT IDC_CB_VERSION,115,90,45,12,ES_AUTOHSCROLL | WS_DISABLED
+ LTEXT "Version",IDC_STATIC,115,79,39,8,WS_DISABLED
+ EDITTEXT IDC_CB_VERSION2,165,90,30,12,ES_AUTOHSCROLL |
+ WS_DISABLED
+ LTEXT "User",IDC_STATIC,165,79,25,8,WS_DISABLED
END
@@ -123,7 +131,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 193
TOPMARGIN, 7
- BOTTOMMARGIN, 101
+ BOTTOMMARGIN, 130
END
END
#endif // APSTUDIO_INVOKED
diff --git a/NifExport/resource.h b/NifExport/resource.h
index 9802b637ba55a4d2e525c8f02b6957026e1d1beb..9db120a8922724d24ac9a2d1f9e4e04969d2640d 100755
--- a/NifExport/resource.h
+++ b/NifExport/resource.h
@@ -20,8 +20,10 @@
#define IDC_CHK_COLL 1010
#define IDC_LBL_LINK 1011
#define IDC_CHK_VCOLORS 1012
-#define IDC_CHK_VCOLORS2 1013
#define IDC_CHK_REMAP 1013
+#define IDC_CB_GAMES 1014
+#define IDC_CB_VERSION 1015
+#define IDC_CB_VERSION2 1016
#define IDC_COLOR 1456
#define IDC_EDIT 1490
#define IDC_SPIN 1496
@@ -32,7 +34,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 102
#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1012
+#define _APS_NEXT_CONTROL_VALUE 1016
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif