Fix small issues

heyx3 · Jun 25, 2022 · 211a81c · 211a81c
1 parent 85468b5
commit 211a81c
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 77 deletions.
diff --git a/WFC++.vcxproj b/WFC++.vcxproj
@@ -262,7 +262,6 @@ del /q "%UNREAL_WFC_DIR%\Tiled"</Command>
     <ClInclude Include="WFC++\List.hpp" />
     <ClInclude Include="WFC++\Tiled3D\StandardRunner.h" />
     <ClInclude Include="WFC++\WFCppStreamPrinting.hpp" />
-    <ClInclude Include="WFC++\Tiled3D\InputData.h" />
     <ClInclude Include="WFC++\Tiled3D\Grid.h" />
     <ClInclude Include="WFC++\Tiled3D\Tile.hpp" />
     <ClInclude Include="WFC++\Tiled3D\TilePermutator.h" />
@@ -286,7 +285,6 @@ del /q "%UNREAL_WFC_DIR%\Tiled"</Command>
     <ClCompile Include="WFC++\Simple\InputData.cpp" />
     <ClCompile Include="WFC++\Simple\Pattern.cpp" />
     <ClCompile Include="WFC++\Simple\State.cpp" />
-    <ClCompile Include="WFC++\Tiled3D\InputData.cpp" />
     <ClCompile Include="WFC++\Tiled3D\Grid.cpp" />
     <ClCompile Include="WFC++\Tiled3D\StandardRunner.cpp" />
     <ClCompile Include="WFC++\Tiled3D\TilePermutator.cpp" />

diff --git a/WFC++.vcxproj.filters b/WFC++.vcxproj.filters
@@ -57,9 +57,6 @@
     <ClInclude Include="WFC++\Tiled3D\Transform3D.h">
       <Filter>Generator Classes\Tiled3D</Filter>
     </ClInclude>
-    <ClInclude Include="WFC++\Tiled3D\InputData.h">
-      <Filter>Generator Classes\Tiled3D</Filter>
-    </ClInclude>
     <ClInclude Include="WFC++\Tiled3D\Tile.hpp">
       <Filter>Generator Classes\Tiled3D</Filter>
     </ClInclude>
@@ -122,9 +119,6 @@
     <ClCompile Include="WFC++\Tiled3D\Transform3D.cpp">
       <Filter>Generator Classes\Tiled3D</Filter>
     </ClCompile>
-    <ClCompile Include="WFC++\Tiled3D\InputData.cpp">
-      <Filter>Generator Classes\Tiled3D</Filter>
-    </ClCompile>
     <ClCompile Include="WFC++\Tiled3D\Grid.cpp">
       <Filter>Generator Classes\Tiled3D</Filter>
     </ClCompile>

diff --git a/WFC++/HelperClasses.h b/WFC++/HelperClasses.h
@@ -3,6 +3,7 @@
 #include "Nullable.hpp"
 #include "Array2D.hpp"
 #include "Array3D.hpp"
+#include "Array4D.hpp"
 #include "List.hpp"
 #include "Set.hpp"
 #include "Dictionary.hpp"

diff --git a/WFC++/Tiled3D/Grid.h b/WFC++/Tiled3D/Grid.h
@@ -4,8 +4,7 @@
 #include <tuple>
 #include <algorithm>
 
-#include "InputData.h"
-#include "../Array4D.hpp"
+#include "Tile.hpp"
 
 namespace WFC
 {

diff --git a/WFC++/Tiled3D/InputData.cpp b/WFC++/Tiled3D/InputData.cpp
diff --git a/WFC++/Tiled3D/InputData.h b/WFC++/Tiled3D/InputData.h