Fix includes to support Unreal projects; remove old unreal plugin work

heyx3 · Jan 9, 2025 · c174ad0 · c174ad0
1 parent 5f7a79c
commit c174ad0
Show file tree

Hide file tree

Showing 93 changed files with 30 additions and 2,531 deletions.
diff --git a/WFC++.vcxproj b/WFC++.vcxproj
@@ -48,6 +48,7 @@
     <ClInclude Include="WFC++\include\Tiled\TilePermutator.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="WFC++\src\Helpers\Vector2i.cpp" />
     <ClCompile Include="WFC++\src\Simple\InputData.cpp" />
     <ClCompile Include="WFC++\src\Simple\Pattern.cpp" />
     <ClCompile Include="WFC++\src\Simple\State.cpp" />
@@ -58,7 +59,6 @@
     <ClCompile Include="WFC++\src\Tiled\InputData.cpp" />
     <ClCompile Include="WFC++\src\Tiled\State.cpp" />
     <ClCompile Include="WFC++\src\Tiled\TilePermutator.cpp" />
-    <ClCompile Include="WFC++\src\Vector2i.cpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{38A88B72-ACE0-400E-AC82-677C89622B69}</ProjectGuid>

diff --git a/WFC++.vcxproj.filters b/WFC++.vcxproj.filters
@@ -97,9 +97,6 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="WFC++\src\Vector2i.cpp">
-      <Filter>Code\Helpers</Filter>
-    </ClCompile>
     <ClCompile Include="WFC++\src\Simple\Pattern.cpp">
       <Filter>Code\Simple</Filter>
     </ClCompile>
@@ -130,5 +127,8 @@
     <ClCompile Include="WFC++\src\Tiled3D\StandardRunner.cpp">
       <Filter>Code\Tiled3D</Filter>
     </ClCompile>
+    <ClCompile Include="WFC++\src\Helpers\Vector2i.cpp">
+      <Filter>Code\Helpers</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/WFC++/include/Helpers/Vector2i.h b/WFC++/include/Helpers/Vector2i.h
@@ -4,7 +4,7 @@
 #include <iterator>
 #include <math.h>
 
-#include "Platform.h"
+#include "../Platform.h"
 #include "EnumFlags.h"
 #include "WFCMath.h"
 

diff --git a/WFC++/include/Helpers/Vector3i.h b/WFC++/include/Helpers/Vector3i.h
@@ -4,7 +4,7 @@
 #include <iterator>
 #include <math.h>
 
-#include "Platform.h"
+#include "../Platform.h"
 #include "EnumFlags.h"
 #include "Vector2i.h"
 

diff --git a/WFC++/include/Helpers/Vector4i.h b/WFC++/include/Helpers/Vector4i.h
@@ -4,7 +4,7 @@
 #include <iterator>
 #include <math.h>
 
-#include "Platform.h"
+#include "../Platform.h"
 #include "EnumFlags.h"
 #include "Vector3i.h"
 

diff --git a/WFC++/include/Helpers/WFCppStreamPrinting.hpp b/WFC++/include/Helpers/WFCppStreamPrinting.hpp
@@ -4,9 +4,9 @@
 //But if you want to be able to print Tile3D structures to somewhere like cout,
 //    include this file.
 
-#include "Simple/State.h"
-#include "Tiled/State.h"
-#include "Tiled3D/Grid.h"
+#include "../Simple/State.h"
+#include "../Tiled/State.h"
+#include "../Tiled3D/Grid.h"
 
 #include <iomanip>
 #include <format>

diff --git a/WFC++/include/Simple/InputData.h b/WFC++/include/Simple/InputData.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "HelperClasses.h"
+#include "../HelperClasses.h"
 #include "Pattern.h"
 
 

diff --git a/WFC++/include/Tiled3D/Transform3D.h b/WFC++/include/Tiled3D/Transform3D.h
@@ -4,12 +4,12 @@
 #include <utility>
 #include <array>
 
-#include "Platform.h"
+#include "../Platform.h"
 
-#include "Helpers/Vector2i.h"
-#include "Helpers/Vector3i.h"
-#include "Helpers/Vector4i.h"
-#include "Helpers/WFCMath.h"
+#include "../Helpers/Vector2i.h"
+#include "../Helpers/Vector3i.h"
+#include "../Helpers/Vector4i.h"
+#include "../Helpers/WFCMath.h"
 
 namespace WFC
 {

diff --git a/WFC++/src/Vector2i.cpp → WFC++/src/Helpers/Vector2i.cpp b/WFC++/src/Vector2i.cpp → WFC++/src/Helpers/Vector2i.cpp
@@ -1,4 +1,4 @@
-#include "Helpers/Vector2i.h"
+#include "../../include/Helpers/Vector2i.h"
 
 using namespace WFC;
 

diff --git a/WFC++/src/Simple/InputData.cpp b/WFC++/src/Simple/InputData.cpp
@@ -1,4 +1,4 @@
-#include "Simple/InputData.h"
+#include "../../include/Simple/InputData.h"
 
 using namespace WFC;
 using namespace WFC::Simple;

diff --git a/WFC++/src/Simple/Pattern.cpp b/WFC++/src/Simple/Pattern.cpp
@@ -1,6 +1,6 @@
-#include "Simple/Pattern.h"
-#include "Simple/InputData.h"
-#include "Simple/State.h"
+#include "../../include/Simple/Pattern.h"
+#include "../../include/Simple/InputData.h"
+#include "../../include/Simple/State.h"
 
 using namespace WFC;
 using namespace WFC::Simple;

diff --git a/WFC++/src/Simple/State.cpp b/WFC++/src/Simple/State.cpp
@@ -1,4 +1,4 @@
-#include "Simple/State.h"
+#include "../../include/Simple/State.h"
 
 #include <unordered_set>
 

diff --git a/WFC++/src/Tiled/InputData.cpp b/WFC++/src/Tiled/InputData.cpp
@@ -1,4 +1,4 @@
-#include "Tiled/InputData.h"
+#include "../../include/Tiled/InputData.h"
 
 #include <algorithm>
 

diff --git a/WFC++/src/Tiled/State.cpp b/WFC++/src/Tiled/State.cpp
@@ -1,4 +1,4 @@
-#include "Tiled/State.h"
+#include "../../include/Tiled/State.h"
 
 #include <algorithm>
 

diff --git a/WFC++/src/Tiled/TilePermutator.cpp b/WFC++/src/Tiled/TilePermutator.cpp
@@ -1,4 +1,4 @@
-#include "Tiled/TilePermutator.h"
+#include "../../include/Tiled/TilePermutator.h"
 
 using namespace WFC;
 using namespace WFC::Tiled;

diff --git a/WFC++/src/Tiled3D/Grid.cpp b/WFC++/src/Tiled3D/Grid.cpp
@@ -1,4 +1,4 @@
-#include "Tiled3D/Grid.h"
+#include "../../include/Tiled3D/Grid.h"
 
 #include <algorithm>
 

diff --git a/WFC++/src/Tiled3D/StandardRunner.cpp b/WFC++/src/Tiled3D/StandardRunner.cpp
@@ -1,4 +1,4 @@
-#include "Tiled3D/StandardRunner.h"
+#include "../../include/Tiled3D/StandardRunner.h"
 
 using namespace WFC;
 using namespace WFC::Math;

diff --git a/WFC++/src/Tiled3D/TilePermutator.cpp b/WFC++/src/Tiled3D/TilePermutator.cpp
@@ -1,4 +1,4 @@
-#include "Tiled3D/TilePermutator.h"
+#include "../../include/Tiled3D/TilePermutator.h"
 #include <algorithm>
 
 using namespace WFC;

diff --git a/WFC++/src/Tiled3D/Transform3D.cpp b/WFC++/src/Tiled3D/Transform3D.cpp
@@ -1,8 +1,8 @@
-#include "Tiled3D/Transform3D.h"
+#include "../../include/Tiled3D/Transform3D.h"
 
 #include <algorithm>
 
-#include "Helpers/Vector2i.h"
+#include "../../include/Helpers/Vector2i.h"
 
 
 using namespace WFC;

diff --git a/WFCunreal/Config/DefaultEditor.ini b/WFCunreal/Config/DefaultEditor.ini
diff --git a/WFCunreal/Config/DefaultEngine.ini b/WFCunreal/Config/DefaultEngine.ini
diff --git a/WFCunreal/Config/DefaultGame.ini b/WFCunreal/Config/DefaultGame.ini
diff --git a/WFCunreal/Content/Assets/Concrete/Concrete.uasset b/WFCunreal/Content/Assets/Concrete/Concrete.uasset
diff --git a/WFCunreal/Content/Assets/Concrete/ConcreteALBED.png b/WFCunreal/Content/Assets/Concrete/ConcreteALBED.png
diff --git a/WFCunreal/Content/Assets/Concrete/ConcreteALBED.uasset b/WFCunreal/Content/Assets/Concrete/ConcreteALBED.uasset
diff --git a/WFCunreal/Content/Assets/Concrete/ConcreteBUMP.png b/WFCunreal/Content/Assets/Concrete/ConcreteBUMP.png
diff --git a/WFCunreal/Content/Assets/Concrete/ConcreteBUMP.uasset b/WFCunreal/Content/Assets/Concrete/ConcreteBUMP.uasset
diff --git a/WFCunreal/Content/Assets/Concrete/ConcreteNORM.png b/WFCunreal/Content/Assets/Concrete/ConcreteNORM.png
diff --git a/WFCunreal/Content/Assets/Concrete/ConcreteNORM.uasset b/WFCunreal/Content/Assets/Concrete/ConcreteNORM.uasset
diff --git a/WFCunreal/Content/Assets/Fence/Fence.uasset b/WFCunreal/Content/Assets/Fence/Fence.uasset
diff --git a/WFCunreal/Content/Assets/Fence/FenceALBED.png b/WFCunreal/Content/Assets/Fence/FenceALBED.png
diff --git a/WFCunreal/Content/Assets/Fence/FenceALBED.uasset b/WFCunreal/Content/Assets/Fence/FenceALBED.uasset
diff --git a/WFCunreal/Content/Assets/Fence/FenceNORM.png b/WFCunreal/Content/Assets/Fence/FenceNORM.png
diff --git a/WFCunreal/Content/Assets/Fence/FenceNORM.uasset b/WFCunreal/Content/Assets/Fence/FenceNORM.uasset
diff --git a/WFCunreal/Content/Assets/General/AxisAlignedWorldMesh.uasset b/WFCunreal/Content/Assets/General/AxisAlignedWorldMesh.uasset
diff --git a/WFCunreal/Content/Set_Wires/Materials/Wire.uasset b/WFCunreal/Content/Set_Wires/Materials/Wire.uasset
diff --git a/WFCunreal/Content/Set_Wires/Materials/WireBase.uasset b/WFCunreal/Content/Set_Wires/Materials/WireBase.uasset
diff --git a/WFCunreal/Content/Set_Wires/Meshes/WireContinueCorner.uasset b/WFCunreal/Content/Set_Wires/Meshes/WireContinueCorner.uasset
diff --git a/WFCunreal/Content/Set_Wires/Meshes/WireContinueStraight.uasset b/WFCunreal/Content/Set_Wires/Meshes/WireContinueStraight.uasset
diff --git a/WFCunreal/Content/Set_Wires/Meshes/WireEnd.uasset b/WFCunreal/Content/Set_Wires/Meshes/WireEnd.uasset
diff --git a/WFCunreal/Content/Set_Wires/Meshes/WireStartCorner.uasset b/WFCunreal/Content/Set_Wires/Meshes/WireStartCorner.uasset
diff --git a/WFCunreal/Content/Set_Wires/Meshes/WireStartStraight.uasset b/WFCunreal/Content/Set_Wires/Meshes/WireStartStraight.uasset
diff --git a/WFCunreal/Content/Set_Wires/Wires.uasset b/WFCunreal/Content/Set_Wires/Wires.uasset
diff --git a/WFCunreal/Content/Set_Wires/WiresGenerator.umap b/WFCunreal/Content/Set_Wires/WiresGenerator.umap
diff --git a/WFCunreal/Content/Set_Wires/WiresGenerator_BuiltData.uasset b/WFCunreal/Content/Set_Wires/WiresGenerator_BuiltData.uasset
diff --git a/WFCunreal/Content/SimpleGenerator.uasset b/WFCunreal/Content/SimpleGenerator.uasset
diff --git a/WFCunreal/Content/WFC_HelperMacros.uasset b/WFCunreal/Content/WFC_HelperMacros.uasset
diff --git a/WFCunreal/Source/WfcppDemo.Target.cs b/WFCunreal/Source/WfcppDemo.Target.cs
diff --git a/WFCunreal/Source/WfcppDemo/WfcppDemo.Build.cs b/WFCunreal/Source/WfcppDemo/WfcppDemo.Build.cs
diff --git a/WFCunreal/Source/WfcppDemo/WfcppDemo.cpp b/WFCunreal/Source/WfcppDemo/WfcppDemo.cpp
diff --git a/WFCunreal/Source/WfcppDemo/WfcppDemo.h b/WFCunreal/Source/WfcppDemo/WfcppDemo.h
diff --git a/WFCunreal/Source/WfcppDemo/WfcppDemoGameModeBase.cpp b/WFCunreal/Source/WfcppDemo/WfcppDemoGameModeBase.cpp
diff --git a/WFCunreal/Source/WfcppDemo/WfcppDemoGameModeBase.h b/WFCunreal/Source/WfcppDemo/WfcppDemoGameModeBase.h
diff --git a/WFCunreal/Source/WfcppDemoEditor.Target.cs b/WFCunreal/Source/WfcppDemoEditor.Target.cs
diff --git a/WFCunreal/Source/WfcppEditor/Private/AssetTypeActions_WfcTileset.cpp b/WFCunreal/Source/WfcppEditor/Private/AssetTypeActions_WfcTileset.cpp