diff --git a/Escape-the-Dawn.sln b/Escape-the-Dawn.sln
index a932c57..db93554 100644
--- a/Escape-the-Dawn.sln
+++ b/Escape-the-Dawn.sln
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Escape-the-Dawn", "Escape-the-Dawn\Escape-the-Dawn.vcxproj", "{FE405CFA-8FCE-4867-92CF-797E73B36482}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tests", "Tests\Tests.vcxproj", "{B9A8F4AA-BE85-45EA-84DD-652D13DD22BE}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -13,6 +15,10 @@ Global
{FE405CFA-8FCE-4867-92CF-797E73B36482}.Debug|Win32.Build.0 = Debug|Win32
{FE405CFA-8FCE-4867-92CF-797E73B36482}.Release|Win32.ActiveCfg = Release|Win32
{FE405CFA-8FCE-4867-92CF-797E73B36482}.Release|Win32.Build.0 = Release|Win32
+ {B9A8F4AA-BE85-45EA-84DD-652D13DD22BE}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B9A8F4AA-BE85-45EA-84DD-652D13DD22BE}.Debug|Win32.Build.0 = Debug|Win32
+ {B9A8F4AA-BE85-45EA-84DD-652D13DD22BE}.Release|Win32.ActiveCfg = Release|Win32
+ {B9A8F4AA-BE85-45EA-84DD-652D13DD22BE}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Escape-the-Dawn/Escape-the-Dawn.vcxproj b/Escape-the-Dawn/Escape-the-Dawn.vcxproj
index 00425cb..d4b1d30 100644
--- a/Escape-the-Dawn/Escape-the-Dawn.vcxproj
+++ b/Escape-the-Dawn/Escape-the-Dawn.vcxproj
@@ -38,14 +38,13 @@
-
- $(ProjectDir);$(SolutionDir)\Libraries;$(SolutionDir)\Libraries\glew-1.10.0\include;$(SolutionDir)\Libraries\glfw-3.0.4\include;$(SolutionDir)\Libraries\glm-0.9.5.2;$(IncludePath)
-
+
$(SolutionDir)\Libraries\glew-1.10.0\lib\Debug\Win32;$(SolutionDir)\Libraries\glfw-3.0.4\lib\Debug;$(LibraryPath)
$(SolutionDir)bin\
$(SolutionDir)build\$(Configuration)\
$(ProjectName)-$(Configuration)
+ $(ProjectDir);$(SolutionDir)\Libraries;$(SolutionDir)\Libraries\glew-1.10.0\include;$(SolutionDir)\Libraries\glfw-3.0.4\include;$(SolutionDir)\Libraries\glm-0.9.5.2;$(IncludePath)
$(ProjectDir);$(SolutionDir)\Libraries;$(SolutionDir)\Libraries\glew-1.10.0\include;$(SolutionDir)\Libraries\glfw-3.0.4\include;$(SolutionDir)\Libraries\glm-0.9.5.2;$(IncludePath)
@@ -68,6 +67,8 @@
Console
opengl32.lib;glu32.lib;glew32sd.lib;glfw3.lib;%(AdditionalDependencies)
+
+
@@ -98,6 +99,16 @@
+
+
+ {b9a8f4aa-be85-45ea-84dd-652d13dd22be}
+ false
+ false
+ false
+ false
+ false
+
+
diff --git a/Tests/Debug/boost_unit_test_framework-vc110-gd-1_55.dll b/Tests/Debug/boost_unit_test_framework-vc110-gd-1_55.dll
new file mode 100644
index 0000000..548d50c
Binary files /dev/null and b/Tests/Debug/boost_unit_test_framework-vc110-gd-1_55.dll differ
diff --git a/Tests/Release/boost_unit_test_framework-vc110-1_55.dll b/Tests/Release/boost_unit_test_framework-vc110-1_55.dll
new file mode 100644
index 0000000..492bd71
Binary files /dev/null and b/Tests/Release/boost_unit_test_framework-vc110-1_55.dll differ
diff --git a/Tests/Tests.vcxproj b/Tests/Tests.vcxproj
new file mode 100644
index 0000000..e1002f0
--- /dev/null
+++ b/Tests/Tests.vcxproj
@@ -0,0 +1,86 @@
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+
+ {B9A8F4AA-BE85-45EA-84DD-652D13DD22BE}
+ Tests
+
+
+
+ Application
+ true
+ v110
+ MultiByte
+
+
+ Application
+ false
+ v110
+ true
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+ $(SolutionDir)\Escape-the-Dawn\;$(BOOST_ROOT);$(IncludePath)
+ $(BOOST_ROOT)\lib32-msvc-11.0;$(LibraryPath)
+ $(ProjectDir)$(Configuration)\
+
+
+ $(SolutionDir)\Escape-the-Dawn\;$(BOOST_ROOT);$(IncludePath)
+ $(BOOST_ROOT)\lib32-msvc-11.0;$(LibraryPath)
+ $(ProjectDir)$(Configuration)\
+
+
+
+ Level3
+ Disabled
+ true
+
+
+ true
+ Console
+ boost_unit_test_framework-vc110-gd-1_55.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ boost_unit_test_framework-vc110-1_55.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Tests/Tests.vcxproj.filters b/Tests/Tests.vcxproj.filters
new file mode 100644
index 0000000..8755a3a
--- /dev/null
+++ b/Tests/Tests.vcxproj.filters
@@ -0,0 +1,22 @@
+
+
+
+
+ {4FC737F1-C7A5-4376-A066-2A32D752A2FF}
+ cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx
+
+
+ {93995380-89BD-4b04-88EB-625FBE52EBFB}
+ h;hpp;hxx;hm;inl;inc;xsd
+
+
+ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01}
+ rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms
+
+
+
+
+ Source Files
+
+
+
\ No newline at end of file
diff --git a/Tests/main.cpp b/Tests/main.cpp
new file mode 100644
index 0000000..cf24dd8
--- /dev/null
+++ b/Tests/main.cpp
@@ -0,0 +1,26 @@
+#include "World.h"
+#include "Components/Transform.h"
+
+#define BOOST_TEST_MODULE MyTest
+#define BOOST_TEST_DYN_LINK
+#include
+
+BOOST_AUTO_TEST_CASE(my_test)
+{
+ World world;
+
+ // Parenting
+ EntityID ent1 = world.CreateEntity();
+ BOOST_CHECK(ent1 != 0); // 0 is reserved for world
+ BOOST_CHECK(ent1 == 1);
+ BOOST_CHECK(world.GetEntityParent(ent1) == 0);
+ EntityID ent2 = world.CreateEntity(ent1);
+ BOOST_CHECK(ent2 != 0);
+ BOOST_CHECK(ent2 == ent1 + 1);
+ BOOST_CHECK(world.GetEntityParent(ent2) == ent1);
+
+ // EntityID recycling
+ world.RemoveEntity(ent2);
+ EntityID ent3 = world.CreateEntity();
+ BOOST_CHECK(ent2 == ent3);
+}
\ No newline at end of file