# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1377484240 -10800
# Node ID 1f94a2107c64430e76604be0771d9b9620bf2308
# Parent  04bb114fcf0518694dbbdffbaa2dad66c0276987
merged with win32 stuff

diff -r 04bb114fcf05 -r 1f94a2107c64 .hgignore
--- a/.hgignore	Fri Aug 23 06:36:47 2013 +0300
+++ b/.hgignore	Mon Aug 26 05:30:40 2013 +0300
@@ -7,3 +7,5 @@
 \.opensdf$
 \.sdf$
 \.suo$
+x64/
+\.tlog$
diff -r 04bb114fcf05 -r 1f94a2107c64 exporters/maxgoat/maxgoat.vcxproj
--- a/exporters/maxgoat/maxgoat.vcxproj	Fri Aug 23 06:36:47 2013 +0300
+++ b/exporters/maxgoat/maxgoat.vcxproj	Mon Aug 26 05:30:40 2013 +0300
@@ -89,6 +89,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>$(TargetPath)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -103,6 +104,8 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>goat3d-x64.lib;libvmath-x64.lib;libanim-x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
       <Command>copy /Y "$(TargetPath)" "$(ADSK_3DSMAX_x64_2014)plugins\$(ProjectName).dle"</Command>
@@ -123,6 +126,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>$(TargetPath)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -141,6 +145,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>goat3d-x64.lib;libvmath-x64.lib;libanim-x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(TargetDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
       <Command>copy /Y "$(TargetPath)" "$(ADSK_3DSMAX_x64_2014)plugins\$(ProjectName).dle"</Command>
@@ -149,6 +155,9 @@
   <ItemGroup>
     <ClCompile Include="src\maxgoat.cc" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\config.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff -r 04bb114fcf05 -r 1f94a2107c64 exporters/maxgoat/maxgoat.vcxproj.filters
--- a/exporters/maxgoat/maxgoat.vcxproj.filters	Fri Aug 23 06:36:47 2013 +0300
+++ b/exporters/maxgoat/maxgoat.vcxproj.filters	Mon Aug 26 05:30:40 2013 +0300
@@ -11,4 +11,9 @@
       <Filter>src</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\config.h">
+      <Filter>src</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff -r 04bb114fcf05 -r 1f94a2107c64 exporters/maxgoat/src/config.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/exporters/maxgoat/src/config.h	Mon Aug 26 05:30:40 2013 +0300
@@ -0,0 +1,7 @@
+#ifndef CONFIG_H_
+#define CONFIG_H_
+
+#define VER_MAJOR	0
+#define VER_MINOR	1
+
+#endif	/* CONFIG_H_ */
\ No newline at end of file
diff -r 04bb114fcf05 -r 1f94a2107c64 exporters/maxgoat/src/maxgoat.cc
--- a/exporters/maxgoat/src/maxgoat.cc	Fri Aug 23 06:36:47 2013 +0300
+++ b/exporters/maxgoat/src/maxgoat.cc	Mon Aug 26 05:30:40 2013 +0300
@@ -10,6 +10,7 @@
 #include "IGame.h"
 #include "IGameExport.h"
 #include "IConversionmanager.h"
+#include "config.h"
 
 
 #pragma comment (lib, "core.lib")
@@ -24,6 +25,9 @@
 #pragma comment (lib, "comctl32.lib")
 
 
+#define VERSION(major, minor) \
+	((major) * 100 + ((minor) < 10 ? (minor) * 10 : (minor)))
+
 static FILE *logfile;
 static HINSTANCE hinst;
 
@@ -90,7 +94,7 @@
 
 unsigned int GoatExporter::Version()
 {
-	return 10;
+	return VERSION(VER_MAJOR, VER_MINOR);
 }
 
 void GoatExporter::ShowAbout(HWND win)
diff -r 04bb114fcf05 -r 1f94a2107c64 src/goat3d.cc
--- a/src/goat3d.cc	Fri Aug 23 06:36:47 2013 +0300
+++ b/src/goat3d.cc	Mon Aug 26 05:30:40 2013 +0300
@@ -34,10 +34,10 @@
 	}
 	cameras.clear();
 
-	for(size_t i=0; i<nodes.size(); i++) {
-		delete_node_tree(nodes[i]);
+	for(size_t i=0; i<objects.size(); i++) {
+		delete_node_tree(objects[i]);
 	}
-	nodes.clear();
+	objects.clear();
 
 	name = "unnamed";
 }
diff -r 04bb114fcf05 -r 1f94a2107c64 src/goat3d_impl.h
--- a/src/goat3d_impl.h	Fri Aug 23 06:36:47 2013 +0300
+++ b/src/goat3d_impl.h	Mon Aug 26 05:30:40 2013 +0300
@@ -8,7 +8,7 @@
 #include "light.h"
 #include "camera.h"
 #include "material.h"
-#include "node.h"
+#include "object.h"
 
 class Scene {
 private:
@@ -19,7 +19,7 @@
 	std::vector<Mesh*> meshes;
 	std::vector<Light*> lights;
 	std::vector<Camera*> cameras;
-	std::vector<Node*> nodes;
+	std::vector<Object*> objects;
 
 public:
 	Scene();