From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Wed, 3 Mar 2021 15:41:25 +0000 (+0100)
Subject: Add snow + mountain generation
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=99c54d04cb68113d319c971fda44960ca00ee7da;p=dragonblocks3d.git

Add snow + mountain generation
---

diff --git a/src/game.cpp b/src/game.cpp
index 651f223..a29681a 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1,7 +1,7 @@
-#include "block_def.hpp" 
-#include "game.hpp" 
-#include "mapgen.hpp" 
-#include "tile_def.hpp" 
+#include "block_def.hpp"
+#include "game.hpp"
+#include "mapgen.hpp"
+#include "tile_def.hpp"
 
 using namespace dragonblocks;
 
@@ -11,14 +11,17 @@ Game::Game(Mapgen *m) : mapgen(m)
 	grass_side_texture.load("textures/grass_side.png");
 	dirt_texture.load("textures/dirt.png");
 	stone_texture.load("textures/stone.png");
-	
+	snow_texture.load("textures/snow.png");
+
 	air = new BlockDef("dragonblocks:air");
 	grass = new BlockDef("dragonblocks:grass", TileDef({grass_side_texture, grass_side_texture, grass_side_texture, grass_side_texture, dirt_texture, grass_texture}));
 	dirt = new BlockDef("dragonblocks:dirt", dirt_texture);
 	stone = new BlockDef("dragonblocks:stone", stone_texture);
-	
+	snow = new BlockDef("dragonblocks:snow", snow_texture);
+
 	mapgen->air_def = air;
 	mapgen->grass_def = grass;
 	mapgen->dirt_def = dirt;
 	mapgen->stone_def = stone;
+	mapgen->snow_def = snow;
 }
diff --git a/src/game.hpp b/src/game.hpp
index 1168482..04eeddb 100644
--- a/src/game.hpp
+++ b/src/game.hpp
@@ -6,14 +6,14 @@ namespace dragonblocks
 {
 	class BlockDef;
 	class Mapgen;
-	
+
 	class Game
 	{
 		public:
-		BlockDef *air, *grass, *dirt, *stone;
+		BlockDef *air, *grass, *dirt, *stone, *snow;
 		Mapgen *mapgen;
-		Texture grass_texture, grass_side_texture, dirt_texture, stone_texture;
-		
+		Texture grass_texture, grass_side_texture, dirt_texture, stone_texture, snow_texture;
+
 		Game(Mapgen *);
 	};
-} 
+}
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 5cad82c..a2792eb 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -1,33 +1,59 @@
 #include <iostream>
 #include <glm/gtc/noise.hpp>
-#include "mapgen.hpp" 
+#include "map.hpp"
+#include "mapgen.hpp"
 
 using namespace glm;
 using namespace dragonblocks;
 
 Chunk::Data Mapgen::generate(const ivec3 &chunkp) const
 {
+	int map_size = DRAGONBLOCKS_CHUNK_SIZE * DRAGONBLOCKS_MAP_SIZE;
+
 	Chunk::Data data;
 	vec3 minp = chunkp * ivec3(DRAGONBLOCKS_CHUNK_SIZE);
 	vec3 maxp = minp + vec3(DRAGONBLOCKS_CHUNK_SIZE);
 	int minx = minp.x, miny = minp.y, minz = minp.z, maxx = maxp.x, maxy = maxp.y, maxz = maxp.z;
 	for (int x = minx; x < maxx; x++) {
 		int rx = x - minx;
+		int ux = x + map_size;
+
 		for (int z = minz; z < maxz; z++) {
 			int rz = z - minz;
-			int grass_layer = grass_layer_middle + grass_layer_range * perlin(vec2((float)x / 64, (float)z / 64));
-			for (int y = miny; y < maxy; y++) {
+			int uz = z + map_size;
+			int height = perlin(vec2((float)ux / 200, (float)uz / 200)) * 25 + 100;
+
+			bool is_mountain = false;
+			float mountain_factor = pow((perlin(vec2((float)ux / 1000.0f, (float)uz / 1000.0f)) - 0.3f) * 5.0f, 1.0f);
+			if (mountain_factor > 0) {
+				height = pow(height * pow(((perlin(vec2((float)ux / 50.0f, (float)uz / 50.0f)) + 1.0f) * 200.0f + 100.0f), mountain_factor), 1.0f / (mountain_factor + 1.0f));
+				is_mountain = true;
+			}
+
+			BlockDef *blockdef = nullptr;
+
+			for (int y = maxy - 1; y >= miny; y--) {
 				int ry = y - miny;
-				BlockDef *blockdef;
-				if (y < grass_layer - 4)
-					blockdef = stone_def;
-				else if (y < grass_layer - 1)
-					blockdef = dirt_def;
-				else if (y < grass_layer)
-					blockdef = grass_def;
-				else
-					blockdef = air_def;
-				data.blocks[rx][ry][rz] = blockdef;
+
+				int by = y + 100;
+
+				BlockDef *new_blockdef = air_def;
+
+				int diff = by - height;
+
+				if (diff < -5)
+					new_blockdef = stone_def;
+				else if (diff < -1)
+					new_blockdef = is_mountain ? stone_def : dirt_def;
+				else if (diff < 0)
+					new_blockdef = is_mountain ? stone_def : grass_def;
+				else if (diff < 1)
+					new_blockdef = is_mountain && by > 150 ? snow_def : air_def;
+
+				if (new_blockdef == dirt_def && (! blockdef || blockdef == air_def))
+					new_blockdef = grass_def;
+
+				data.blocks[rx][ry][rz] = new_blockdef;
 			}
 		}
 	}
diff --git a/src/mapgen.hpp b/src/mapgen.hpp
index 8c44d63..0a40634 100644
--- a/src/mapgen.hpp
+++ b/src/mapgen.hpp
@@ -1,18 +1,17 @@
 #pragma once
 
 #include "chunk.hpp"
-#include "gl.hpp" 
+#include "gl.hpp"
 
 namespace dragonblocks
 {
 	class BlockDef;
-	
+
 	class Mapgen
 	{
 		public:
-		float grass_layer_middle = 0, grass_layer_range = 32;
-		BlockDef *air_def, *stone_def, *dirt_def, *grass_def;
-		
+		BlockDef *air_def, *stone_def, *dirt_def, *grass_def, *snow_def;
+
 		Chunk::Data generate(const glm::ivec3 &) const;
 	};
 };
diff --git a/textures/snow.png b/textures/snow.png
new file mode 100644
index 0000000..1748103
Binary files /dev/null and b/textures/snow.png differ