Merge pull request #1464 from OutpostUniverse/Refactor/Move_MapOffset_To_libOPHD

DanRStevens · web-flow · commit 253d69bcb438 · 2024-08-01T04:17:14.000-06:00
Refactor/move map offset to libOPHD
diff --git a/OPHD/DirectionOffset.h b/OPHD/DirectionOffset.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Map/MapOffset.h"
+#include <libOPHD/Map/MapOffset.h>
 
 #include <NAS2D/Math/Vector.h>
 
diff --git a/OPHD/Map/MapCoordinate.h b/OPHD/Map/MapCoordinate.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "MapOffset.h"
+#include <libOPHD/Map/MapOffset.h>
 
 #include <NAS2D/Math/Point.h>
 
diff --git a/OPHD/Map/MapView.h b/OPHD/Map/MapView.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include "../Map/MapCoordinate.h"
-#include "../Map/MapOffset.h"
+
+#include <libOPHD/Map/MapOffset.h>
 
 #include <NAS2D/Math/Rectangle.h>
 
diff --git a/OPHD/ophd.vcxproj b/OPHD/ophd.vcxproj
@@ -269,7 +269,6 @@
     <ClInclude Include="GraphWalker.h" />
     <ClInclude Include="IOHelper.h" />
     <ClInclude Include="Map\MapCoordinate.h" />
-    <ClInclude Include="Map\MapOffset.h" />
     <ClInclude Include="Map\MapView.h" />
     <ClInclude Include="Map\Tile.h" />
     <ClInclude Include="Map\TileMap.h" />
diff --git a/OPHD/ophd.vcxproj.filters b/OPHD/ophd.vcxproj.filters
@@ -332,9 +332,6 @@
     <ClInclude Include="Map\MapCoordinate.h">
       <Filter>Header Files\Map</Filter>
     </ClInclude>
-    <ClInclude Include="Map\MapOffset.h">
-      <Filter>Header Files\Map</Filter>
-    </ClInclude>
     <ClInclude Include="Map\MapView.h">
       <Filter>Header Files\Map</Filter>
     </ClInclude>
diff --git a/libOPHD/Map/MapOffset.h b/libOPHD/Map/MapOffset.h
diff --git a/libOPHD/libOPHD.vcxproj b/libOPHD/libOPHD.vcxproj
@@ -171,6 +171,7 @@
     <ClCompile Include="XmlSerializer.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="Map\MapOffset.h" />
     <ClInclude Include="RandomNumberGenerator.h" />
     <ClInclude Include="Population\Population.h" />
     <ClInclude Include="Population\PopulationTable.h" />
diff --git a/libOPHD/libOPHD.vcxproj.filters b/libOPHD/libOPHD.vcxproj.filters
@@ -25,6 +25,9 @@
     <Filter Include="Source Files\Technology">
       <UniqueIdentifier>{f03fdd93-09f6-4050-a5df-18305b27811d}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\Map">
+      <UniqueIdentifier>{402a7397-db9d-4c85-9cde-d12b218e5932}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="libOPHD.cpp">
@@ -77,6 +80,9 @@
     <ClInclude Include="XmlSerializer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Map\MapOffset.h">
+      <Filter>Header Files\Map</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\.clang-format" />
diff --git a/testLibOPHD/MapOffset.cpp b/testLibOPHD/MapOffset.cpp
@@ -0,0 +1,36 @@
+#include <libOPHD/Map/MapOffset.h>
+
+#include <gtest/gtest.h>
+
+
+TEST(MapOffset, EqualOperator)
+{
+	EXPECT_TRUE((MapOffset{1, 2, 3}) == (MapOffset{1, 2, 3}));
+	EXPECT_FALSE((MapOffset{1, 2, 3}) == (MapOffset{2, 1, 3}));
+	EXPECT_FALSE((MapOffset{1, 2, 0}) == (MapOffset{1, 2, 3}));
+}
+
+
+TEST(MapOffset, NotEqualOperator)
+{
+	EXPECT_TRUE((MapOffset{1, 2, 3}) != (MapOffset{2, 1, 3}));
+	EXPECT_TRUE((MapOffset{1, 2, 0}) != (MapOffset{1, 2, 3}));
+	EXPECT_FALSE((MapOffset{1, 2, 3}) != (MapOffset{1, 2, 3}));
+}
+
+
+TEST(MapOffset, ScalarMultiplication)
+{
+	EXPECT_EQ((MapOffset{-1, 2, 3}) * 2, (MapOffset{-2, 4, 6}));
+	EXPECT_EQ(2 * (MapOffset{-1, 2, 3}), (MapOffset{-2, 4, 6}));
+	EXPECT_EQ((MapOffset{-1, 2, 3}) * -2, (MapOffset{2, -4, -6}));
+	EXPECT_EQ((MapOffset{-1, 2, 3}) * 0, (MapOffset{0, 0, 0}));
+}
+
+TEST(MapOffset, ScalarMultiplicationWithAssignment)
+{
+	MapOffset offset = MapOffset{-1, 2, 3};
+	EXPECT_EQ(offset *= 2, (MapOffset{-2, 4, 6}));
+	EXPECT_EQ(offset *= -2, (MapOffset{4, -8, -12}));
+	EXPECT_EQ(offset *= 0, (MapOffset{0, 0, 0}));
+}
diff --git a/testLibOPHD/main.cpp b/testLibOPHD/main.cpp
diff --git a/testLibOPHD/testLibOPHD.vcxproj b/testLibOPHD/testLibOPHD.vcxproj
@@ -162,7 +162,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp" />
+    <ClCompile Include="MapOffset.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\libOPHD\libOPHD.vcxproj">
diff --git a/testLibOPHD/testLibOPHD.vcxproj.filters b/testLibOPHD/testLibOPHD.vcxproj.filters
@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="MapOffset.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
