X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld.hpp;h=4823c47b0c8c0ec804f62f10c5d83f4e5c2dbd04;hb=f01ebd81ff047eb3209e25e183564f72f587915f;hp=461da5623f5874c7fae25e9923359eaa29e4ead5;hpb=eca1fdcc8e34a4918418b2de122c6200aeb7ceaf;p=blank.git diff --git a/src/world.hpp b/src/world.hpp index 461da56..4823c47 100644 --- a/src/world.hpp +++ b/src/world.hpp @@ -4,7 +4,7 @@ #include "block.hpp" #include "chunk.hpp" #include "entity.hpp" -#include "noise.hpp" +#include "generator.hpp" #include "shader.hpp" #include "shape.hpp" @@ -44,17 +44,13 @@ public: void Render(DirectionalLighting &); -private: - void Generate(Chunk &); - private: BlockTypeRegistry blockType; CuboidShape blockShape; StairShape stairShape; CuboidShape slabShape; - SimplexNoise blockNoise; - SimplexNoise colorNoise; + Generator generate; Entity player; Chunk::Pos player_chunk;