X-Git-Url: http://git.localhorst.tv/?p=blobs.git;a=blobdiff_plain;f=src%2Fworld%2Fworld.cpp;h=4f98d9a63bdef3b241123e8cf2bbdf30b76ce3de;hp=0b1260f8673d8a0eb1b054bec81847b61602d711;hb=8f6530c75730f901efd6708e4fde7e68a178adf1;hpb=c51b3bbef5c9b8ab52f55d46f08c5992fe574f70 diff --git a/src/world/world.cpp b/src/world/world.cpp index 0b1260f..4f98d9a 100644 --- a/src/world/world.cpp +++ b/src/world/world.cpp @@ -8,12 +8,12 @@ #include "Tile.hpp" #include "TileType.hpp" -#include "../const.hpp" #include "../app/Assets.hpp" #include "../creature/Creature.hpp" #include "../graphics/Viewport.hpp" -#include "../rand/OctaveNoise.hpp" -#include "../rand/SimplexNoise.hpp" +#include "../math/const.hpp" +#include "../math/OctaveNoise.hpp" +#include "../math/SimplexNoise.hpp" #include #include @@ -421,8 +421,8 @@ void Planet::Draw(app::Assets &assets, graphics::Viewport &viewport) { void GenerateEarthlike(const Set &tiles, Planet &p) noexcept { - rand::SimplexNoise elevation_gen(0); - rand::SimplexNoise variation_gen(45623752346); + math::SimplexNoise elevation_gen(0); + math::SimplexNoise variation_gen(45623752346); const int ice = tiles["ice"].id; const int ocean = tiles["ocean"].id; @@ -460,7 +460,7 @@ void GenerateEarthlike(const Set &tiles, Planet &p) noexcept { p.TileAt(surface, x, y).type = ice; continue; } - float elevation = rand::OctaveNoise( + float elevation = math::OctaveNoise( elevation_gen, to_tile / p.Radius(), 3, // octaves @@ -469,7 +469,7 @@ void GenerateEarthlike(const Set &tiles, Planet &p) noexcept { 2, // amplitude 2 // growth ); - float variation = rand::OctaveNoise( + float variation = math::OctaveNoise( variation_gen, to_tile / p.Radius(), 3, // octaves