From 662eaec7a73eb0b2aa8cab8606b6bf33466c9c75 Mon Sep 17 00:00:00 2001
From: turanszkij <turanszkij@gmail.com>
Date: Thu, 24 Dec 2015 00:55:36 +0100
Subject: [PATCH] New version manager

---
 WickedEngine/MainComponent.cpp            |  7 +++--
 WickedEngine/WickedEngine.h               |  7 +++--
 WickedEngine/WickedEngine.vcxproj         |  2 ++
 WickedEngine/WickedEngine.vcxproj.filters |  6 ++++
 WickedEngine/wiVersion.cpp                | 36 +++++++++++++++++++++++
 WickedEngine/wiVersion.h                  | 18 ++++++++++++
 6 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 WickedEngine/wiVersion.cpp
 create mode 100644 WickedEngine/wiVersion.h

diff --git a/WickedEngine/MainComponent.cpp b/WickedEngine/MainComponent.cpp
index 5d3c88bcc..1bd20bec3 100644
--- a/WickedEngine/MainComponent.cpp
+++ b/WickedEngine/MainComponent.cpp
@@ -7,7 +7,10 @@
 #include "wiInputManager.h"
 #include "wiBackLog.h"
 #include "MainComponent_BindLua.h"
-#include "WickedEngine.h"
+#include "wiVersion.h"
+#include "wiImageEffects.h"
+#include "wiTextureHelper.h"
+#include "wiFrameRate.h"
 
 MainComponent::MainComponent()
 {
@@ -156,7 +159,7 @@ void MainComponent::Compose()
 		stringstream ss("");
 		if (infoDisplay.watermark)
 		{
-			ss << string("Wicked Engine ") + string(WICKED_ENGINE_VERSION) << endl;
+			ss << string("Wicked Engine ") + wiVersion::GetVersionString() << endl;
 		}
 		if (infoDisplay.fpsinfo)
 		{
diff --git a/WickedEngine/WickedEngine.h b/WickedEngine/WickedEngine.h
index bd99fe143..cb21ec192 100644
--- a/WickedEngine/WickedEngine.h
+++ b/WickedEngine/WickedEngine.h
@@ -1,8 +1,9 @@
-#ifndef WICKED_ENGINE_VERSION
-#define WICKED_ENGINE_VERSION "0.9"
+#ifndef WICKED_ENGINE
+#define WICKED_ENGINE
 
 #include "CommonInclude.h"
 
+#include "wiVersion.h"
 #include "wiRenderTarget.h"
 #include "wiDepthTarget.h"
 #include "wiBackLog.h"
@@ -67,4 +68,4 @@
 #pragma comment(lib,"pdh.lib")
 
 
-#endif
+#endif // WICKED_ENGINE
diff --git a/WickedEngine/WickedEngine.vcxproj b/WickedEngine/WickedEngine.vcxproj
index 7503fe813..1cc9d4314 100644
--- a/WickedEngine/WickedEngine.vcxproj
+++ b/WickedEngine/WickedEngine.vcxproj
@@ -293,6 +293,7 @@
     <ClCompile Include="SpriteAnim_BindLua.cpp" />
     <ClCompile Include="Texture_BindLua.cpp" />
     <ClCompile Include="Vector_BindLua.cpp" />
+    <ClCompile Include="wiVersion.cpp" />
     <ClCompile Include="wiBackLog.cpp" />
     <ClCompile Include="wiBackLog_BindLua.cpp" />
     <ClCompile Include="wiBULLET.cpp" />
@@ -508,6 +509,7 @@
     <ClInclude Include="SpriteAnim_BindLua.h" />
     <ClInclude Include="Texture_BindLua.h" />
     <ClInclude Include="Vector_BindLua.h" />
+    <ClInclude Include="wiVersion.h" />
     <ClInclude Include="wiBackLog_BindLua.h" />
     <ClInclude Include="wiFadeManager.h" />
     <ClInclude Include="wiFont_BindLua.h" />
diff --git a/WickedEngine/WickedEngine.vcxproj.filters b/WickedEngine/WickedEngine.vcxproj.filters
index 48061dcd5..db35faab3 100644
--- a/WickedEngine/WickedEngine.vcxproj.filters
+++ b/WickedEngine/WickedEngine.vcxproj.filters
@@ -800,6 +800,9 @@
     <ClCompile Include="wiFadeManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="wiVersion.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="typelib.h">
@@ -1777,6 +1780,9 @@
     <ClInclude Include="wiFadeManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="wiVersion.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\io_export_wicked_wi_bin.py" />
diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp
new file mode 100644
index 000000000..8fcf80e6a
--- /dev/null
+++ b/WickedEngine/wiVersion.cpp
@@ -0,0 +1,36 @@
+#include "wiVersion.h"
+
+namespace wiVersion
+{
+	// major features
+	const int major = 0;
+	// minor features, major bug fixes
+	const int minor = 1;
+	// minor bug fixes
+	const int revision = 0;
+
+
+	long GetVersion()
+	{
+		return major * 10000 + minor * 1000 + revision;
+	}
+	int GetMajor()
+	{
+		return major;
+	}
+	int GetMinor()
+	{
+		return minor;
+	}
+	int GetRevision()
+	{
+		return revision;
+	}
+	string GetVersionString()
+	{
+		stringstream ss("");
+		ss << GetMajor() << "." << GetMinor() << "." << GetRevision();
+		return ss.str();
+	}
+
+}
diff --git a/WickedEngine/wiVersion.h b/WickedEngine/wiVersion.h
new file mode 100644
index 000000000..d582b2687
--- /dev/null
+++ b/WickedEngine/wiVersion.h
@@ -0,0 +1,18 @@
+#ifndef WICKEDENGINE_VERSION_DEFINED
+#define WICKEDENGINE_VERSION_DEFINED
+
+#include "CommonInclude.h"
+
+namespace wiVersion
+{
+	long GetVersion();
+	// major features
+	int GetMajor();
+	// minor features, major bug fixes
+	int GetMinor();
+	// minor bug fixes
+	int GetRevision();
+	string GetVersionString();
+}
+
+#endif // WICKEDENGINE_VERSION_DEFINED