* Move synth stuff into world/level/levelgen/synth

This commit is contained in:
iProgramInCpp
2023-08-18 22:29:03 +03:00
parent 737470f4ab
commit ac0555c3fb
10 changed files with 31 additions and 28 deletions

View File

@@ -9,8 +9,8 @@
#pragma once
#include <string>
#include "client/common/PerlinNoise.hpp"
#include "client/common/Utils.hpp"
#include "world/level/levelgen/synth/PerlinNoise.hpp"
#include "world/level/levelgen/feature/Feature.hpp"
class Biome

View File

@@ -14,8 +14,8 @@
#include <unordered_map>
#include "ChunkSource.hpp"
#include "client/common/PerlinNoise.hpp"
#include "client/common/Utils.hpp"
#include "world/level/levelgen/synth/PerlinNoise.hpp"
#include "world/level/levelgen/biome/BiomeSource.hpp"
#include "world/level/levelgen/feature/Feature.hpp"
#include "world/level/levelgen/feature/LargeCaveFeature.hpp"

View File

@@ -7,7 +7,7 @@
********************************************************************/
#include "ImprovedNoise.hpp"
#include "Mth.hpp"
#include "client/common/Mth.hpp"
ImprovedNoise::ImprovedNoise()
{

View File

@@ -8,7 +8,7 @@
#pragma once
#include "Random.hpp"
#include "client/common/Random.hpp"
#include "Synth.hpp"
// note: appears to maybe inherit from a class called Synth?

View File

@@ -37,14 +37,11 @@
<ClInclude Include="..\source\client\common\AABB.hpp" />
<ClInclude Include="..\source\client\common\CThread.hpp" />
<ClInclude Include="..\source\client\common\HitResult.hpp" />
<ClInclude Include="..\source\client\common\ImprovedNoise.hpp" />
<ClInclude Include="..\source\client\common\LongHack.hpp" />
<ClInclude Include="..\source\client\common\Matrix.hpp" />
<ClInclude Include="..\source\client\common\Mth.hpp" />
<ClInclude Include="..\source\client\common\Options.hpp" />
<ClInclude Include="..\source\client\common\PerlinNoise.hpp" />
<ClInclude Include="..\source\client\common\Random.hpp" />
<ClInclude Include="..\source\client\common\Synth.hpp" />
<ClInclude Include="..\source\client\common\Timer.hpp" />
<ClInclude Include="..\source\client\common\Util.hpp" />
<ClInclude Include="..\source\client\common\Utils.hpp" />
@@ -161,6 +158,9 @@
<ClInclude Include="..\source\world\level\levelgen\feature\Feature.hpp" />
<ClInclude Include="..\source\world\level\levelgen\feature\LargeCaveFeature.hpp" />
<ClInclude Include="..\source\world\level\levelgen\feature\LargeFeature.hpp" />
<ClInclude Include="..\source\world\level\levelgen\synth\ImprovedNoise.hpp" />
<ClInclude Include="..\source\world\level\levelgen\synth\PerlinNoise.hpp" />
<ClInclude Include="..\source\world\level\levelgen\synth\Synth.hpp" />
<ClInclude Include="..\source\world\level\LevelListener.hpp" />
<ClInclude Include="..\source\world\level\Material.hpp" />
<ClInclude Include="..\source\world\level\Region.hpp" />
@@ -393,13 +393,10 @@
<ClCompile Include="..\source\client\common\AABB.cpp" />
<ClCompile Include="..\source\client\common\CThread.cpp" />
<ClCompile Include="..\source\client\common\HitResult.cpp" />
<ClCompile Include="..\source\client\common\ImprovedNoise.cpp" />
<ClCompile Include="..\source\client\common\Matrix.cpp" />
<ClCompile Include="..\source\client\common\Mth.cpp" />
<ClCompile Include="..\source\client\common\Options.cpp" />
<ClCompile Include="..\source\client\common\PerlinNoise.cpp" />
<ClCompile Include="..\source\client\common\Random.cpp" />
<ClCompile Include="..\source\client\common\Synth.cpp" />
<ClCompile Include="..\source\client\common\Timer.cpp" />
<ClCompile Include="..\source\client\common\Util.cpp" />
<ClCompile Include="..\source\client\common\Utils.cpp" />
@@ -537,6 +534,9 @@
<ClCompile Include="..\source\world\level\levelgen\feature\SpringFeature.cpp" />
<ClCompile Include="..\source\world\level\levelgen\feature\SpruceFeature.cpp" />
<ClCompile Include="..\source\world\level\levelgen\feature\TreeFeature.cpp" />
<ClCompile Include="..\source\world\level\levelgen\synth\ImprovedNoise.cpp" />
<ClCompile Include="..\source\world\level\levelgen\synth\PerlinNoise.cpp" />
<ClCompile Include="..\source\world\level\levelgen\synth\Synth.cpp" />
<ClCompile Include="..\source\world\level\LevelListener.cpp" />
<ClCompile Include="..\source\world\level\Material.cpp" />
<ClCompile Include="..\source\world\level\Region.cpp" />

View File

@@ -97,6 +97,9 @@
<Filter Include="thirdparty\zlib">
<UniqueIdentifier>{b413cd08-238d-4e52-90c7-eccb86bc37ed}</UniqueIdentifier>
</Filter>
<Filter Include="source\world\level\levelgen\synth">
<UniqueIdentifier>{4bd8c4f7-8db0-4fa2-b674-5cab5bad2d0d}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\thirdparty\raknet\ThreadsafePacketLogger.h">
@@ -582,9 +585,6 @@
<ClInclude Include="..\source\client\common\HitResult.hpp">
<Filter>source\client\common</Filter>
</ClInclude>
<ClInclude Include="..\source\client\common\ImprovedNoise.hpp">
<Filter>source\client\common</Filter>
</ClInclude>
<ClInclude Include="..\source\client\common\LongHack.hpp">
<Filter>source\client\common</Filter>
</ClInclude>
@@ -597,15 +597,9 @@
<ClInclude Include="..\source\client\common\Options.hpp">
<Filter>source\client\common</Filter>
</ClInclude>
<ClInclude Include="..\source\client\common\PerlinNoise.hpp">
<Filter>source\client\common</Filter>
</ClInclude>
<ClInclude Include="..\source\client\common\Random.hpp">
<Filter>source\client\common</Filter>
</ClInclude>
<ClInclude Include="..\source\client\common\Synth.hpp">
<Filter>source\client\common</Filter>
</ClInclude>
<ClInclude Include="..\source\client\common\Timer.hpp">
<Filter>source\client\common</Filter>
</ClInclude>
@@ -1161,6 +1155,15 @@
<ClInclude Include="..\source\client\gui\screens\DeathScreen.hpp">
<Filter>source\client\gui\screens</Filter>
</ClInclude>
<ClInclude Include="..\source\world\level\levelgen\synth\ImprovedNoise.hpp">
<Filter>source\world\level\levelgen\synth</Filter>
</ClInclude>
<ClInclude Include="..\source\world\level\levelgen\synth\PerlinNoise.hpp">
<Filter>source\world\level\levelgen\synth</Filter>
</ClInclude>
<ClInclude Include="..\source\world\level\levelgen\synth\Synth.hpp">
<Filter>source\world\level\levelgen\synth</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\thirdparty\raknet\TwoWayAuthentication.cpp">
@@ -1514,9 +1517,6 @@
<ClCompile Include="..\source\client\common\HitResult.cpp">
<Filter>source\client\common</Filter>
</ClCompile>
<ClCompile Include="..\source\client\common\ImprovedNoise.cpp">
<Filter>source\client\common</Filter>
</ClCompile>
<ClCompile Include="..\source\client\common\Matrix.cpp">
<Filter>source\client\common</Filter>
</ClCompile>
@@ -1526,15 +1526,9 @@
<ClCompile Include="..\source\client\common\Options.cpp">
<Filter>source\client\common</Filter>
</ClCompile>
<ClCompile Include="..\source\client\common\PerlinNoise.cpp">
<Filter>source\client\common</Filter>
</ClCompile>
<ClCompile Include="..\source\client\common\Random.cpp">
<Filter>source\client\common</Filter>
</ClCompile>
<ClCompile Include="..\source\client\common\Synth.cpp">
<Filter>source\client\common</Filter>
</ClCompile>
<ClCompile Include="..\source\client\common\Timer.cpp">
<Filter>source\client\common</Filter>
</ClCompile>
@@ -2189,6 +2183,15 @@
<ClCompile Include="..\source\client\gui\screens\DeathScreen.cpp">
<Filter>source\client\gui\screens</Filter>
</ClCompile>
<ClCompile Include="..\source\world\level\levelgen\synth\PerlinNoise.cpp">
<Filter>source\world\level\levelgen\synth</Filter>
</ClCompile>
<ClCompile Include="..\source\world\level\levelgen\synth\Synth.cpp">
<Filter>source\world\level\levelgen\synth</Filter>
</ClCompile>
<ClCompile Include="..\source\world\level\levelgen\synth\ImprovedNoise.cpp">
<Filter>source\world\level\levelgen\synth</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Text Include="..\thirdparty\raknet\CMakeLists.txt">