Produces a 3d gridmap but fails to be correct

kthecoder · kthecoder · commit b061ae30c4e9 · 2025-05-22T19:06:35.000-04:00
diff --git a/Documentation/README_ARCHITECTURE.md b/Documentation/README_ARCHITECTURE.md
@@ -6,6 +6,45 @@ Godot Terrain Generator for 3D Tiled Maps
 
 Requires a C++ compiler such as MSVC or MSY2
 
-Building :
+### Building :
 
 1. `scons use_mingw=yes` or just `scons`
+
+## Debugging:
+
+1. https://youtu.be/8WSIMTJWCBk?t=3624
+1. `scons target=template_debug debug_symbols=yes`
+
+Launch.json
+
+```json
+{
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"type": "lldb",
+			"request": "launch",
+			"preLaunchTask": "build",
+			"name": "Debug",
+			"program": "<path to godot>/Godot 4.4.1.exe",
+			"args": ["--path", "<path to demo project>/GaiaGreen/demo"],
+			"cwd": "${workspaceFolder}"
+		}
+	]
+}
+```
+
+Tasks.json:
+
+```json
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"label": "build",
+			"type": "shell",
+			"command": "scons -j12 target=template_debug debug_symbols=yes"
+		}
+	]
+}
+```
diff --git a/demo/Test.tscn b/demo/Test.tscn
@@ -1,17 +1,29 @@
-[gd_scene load_steps=3 format=3 uid="uid://cs6xj3i70yh0f"]
+[gd_scene load_steps=5 format=3 uid="uid://cs6xj3i70yh0f"]
 
 [ext_resource type="Script" uid="uid://ba0phkf16vg6l" path="res://terrain_gen_script.gd" id="1_myinc"]
-[ext_resource type="MeshLibrary" uid="uid://cwusqwtpjkoaa" path="res://TerrainTiles/3D_Terrain_Tiles.tres" id="2_njov2"]
+[ext_resource type="MeshLibrary" uid="uid://bubhdqje2s6rn" path="res://TerrainTiles/3D_Terrain_Tiles.tres" id="2_njov2"]
+[ext_resource type="Script" uid="uid://txvq7hrqtxyd" path="res://camera_3d.gd" id="3_2au82"]
+
+[sub_resource type="Environment" id="Environment_njov2"]
 
 [node name="Test" type="Node3D"]
 
+[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
+
+[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
+environment = SubResource("Environment_njov2")
+
 [node name="TerrainGen" type="TerrainGen" parent="."]
 script = ExtResource("1_myinc")
 
 [node name="GridMap" type="GridMap" parent="."]
 mesh_library = ExtResource("2_njov2")
 cell_size = Vector3(1, 0.25, 1)
 data = {
-"cells": PackedInt32Array(65535, 2, 1, 65535, 3, 0, 0, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1, 2, 1, 1, 2, 0, 3, 1048577, 2, 0, 1441796, 3, 1, 1441794, 3, 0, 1441794, 1, 0, 1441794, 3, 2, 655362, 65540, 2, 1, 65540, 3, 1, 65540, 65535, 1, 65541, 65535, 2, 65541, 0, 2, 65541, 1, 2, 65541, 2, 2, 65541, 3, 2, 65540, 1, 5, 65540, 0, 5, 3, 3, 2, 2, 3, 2, 1, 3, 2, 3, 65535, 2, 3, 4, 2, 65540, 4, 0, 65541, 4, 1048577, 65542, 4, 1048577, 65543, 4, 1048577, 65544, 4, 1048577, 2, 4, 1048578, 2, 5, 1048578, 3, 5, 1048578, 4, 5, 1048578, 5, 5, 1048578, 6, 5, 1048578, 7, 5, 1048578, 8, 5, 1048578, 9, 5, 1048578, 65542, 65535, 1048578, 65542, 0, 1048578, 65542, 1, 1048578, 65542, 2, 1048578, 65542, 3, 1048578, 65543, 3, 1048578, 65544, 3, 1048578, 65544, 2, 1048578, 65544, 1, 1048578, 65544, 0, 1048578, 65544, 65535, 1048578, 65543, 65535, 1048578, 65543, 0, 1048578, 65543, 1, 1048578, 65543, 2, 1048578)
+"cells": PackedInt32Array(65546, 2, 1048588, 65547, 1, 655372)
 }
-metadata/_editor_floor_ = Vector3(0, 1, 0)
+metadata/_editor_floor_ = Vector3(0, 0, 0)
+
+[node name="Camera3D" type="Camera3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 22.3218, 36.7455)
+script = ExtResource("3_2au82")
diff --git a/demo/camera_3d.gd b/demo/camera_3d.gd
@@ -0,0 +1,7 @@
+extends Camera3D
+
+func _ready():
+	
+	size = 10
+	position = Vector3(0, 20, 0)  # Adjust position to view the GridMap
+	look_at(Vector3(50, 1, 50))
diff --git a/demo/camera_3d.gd.uid b/demo/camera_3d.gd.uid
@@ -0,0 +1 @@
+uid://txvq7hrqtxyd
diff --git a/demo/terrain_gen_script.gd b/demo/terrain_gen_script.gd
@@ -2,5 +2,7 @@ extends TerrainGen
 
 
 func _ready():
+	var grid_map = $"../GridMap"
 	var seed_value = int(Time.get_unix_time_from_system()) % 1000000;
-	generate(get_node("GridMap"), 5, 5, 3, seed_value, 2, 0.005);
+	grid_map.cell_size = Vector3(1, 0.25, 1);
+	generate(grid_map, 100, 100, 3, seed_value, false, 2, 0.03);
diff --git a/src/TerrainGen/Terrain_Gen.cpp b/src/TerrainGen/Terrain_Gen.cpp
@@ -9,33 +9,39 @@ TerrainGen::TerrainGen() {
 TerrainGen::~TerrainGen() {
 }
 
-void TerrainGen::generate(GridMap *myGridMap, int height, int width, int depth, int seed, int noiseOctaves, float noiseFreq) {
+void TerrainGen::generate(GridMap *myGridMap, int height, int width, int depth, int seed, bool useFractal, int noiseOctaves, float noiseFreq) {
 	UtilityFunctions::print("Begin Terrain Generation!");
 
-	/*
+	/*****************************************************
+
 		Setup the Noise Function
-	*/
+
+	*****************************************************/
 
 	noise->set_noise_type(FastNoiseLite::NoiseType::TYPE_SIMPLEX);
-	noise->set_fractal_type(FastNoiseLite::FractalType::FRACTAL_FBM);
+	noise->set_fractal_type(useFractal ? FastNoiseLite::FractalType::FRACTAL_FBM : FastNoiseLite::FractalType::FRACTAL_NONE);
 	noise->set_seed(seed);
 	noise->set_fractal_octaves(noiseOctaves);
 	noise->set_fractal_lacunarity(2.0);
 	noise->set_fractal_gain(0.5);
 	noise->set_frequency(noiseFreq);
 
-	/*
+	/*****************************************************
+
 		Function dependent Variables
-	*/
+
+	*****************************************************/
 
 	vector<vector<vector<int>>> gridMap(
 			depth, vector<vector<int>>(height, vector<int>(width, 0)));
 
 	vector<vector<float>> heightMap(height, vector<float>(width, 0.0f));
 
-	/*
+	/*****************************************************
+
 		Height Map Generation
-	*/
+
+	*****************************************************/
 
 	for (int y = 0; y < height; y++) {
 		for (int x = 0; x < width; x++) {
@@ -44,40 +50,158 @@ void TerrainGen::generate(GridMap *myGridMap, int height, int width, int depth,
 		}
 	}
 
-	/*
-		The key rotations (Orientation) in Godot's Grid Map around the Y-axis are:
-		- 0 → No rotation
-		- 1 → 90° clockwise around Y
-		- 2 → 180° around Y
-		- 3 → 90° counterclockwise around Y
-		- 10 → 180° around Y (alternative basis)
-		- 11 → 90° counterclockwise around Y (alternative basis)
-		- 9 → 90° clockwise around Y (alternative basis)
-
-		Which can be set with : `myGridMap->set_cell_item(Vector3i(x, y, z), meshID, orientation);`
-	*/
-
-	/*
-		Return the Grid Map to Godot in a GDScript consumable manner
-	*/
-
-	// Array terrainMap;
-	// for (size_t z = 0; z < depth; z++) { // Iterate over depth (Z-axis)
-	// 	Array grid_layer;
-	// 	for (size_t y = 0; y < height; y++) { // Iterate over height (Y-axis)
-	// 		TypedArray<int> grid_row;
-	// 		for (size_t x = 0; x < width; x++) { // Iterate over width (X-axis)
-	// 			grid_row.append(gridMap[z][y][x]); // Append voxel values
-	// 		}
-	// 		grid_layer.append(grid_row);
-	// 	}
-	// 	terrainMap.append(grid_layer);
-	// }
+	/*****************************************************
+
+		Tile Placement
+
+	*****************************************************/
+
+	for (int y = 0; y < height; ++y) {
+		for (int x = 0; x < width; ++x) {
+			float noiseValue = heightMap[x][y];
+			int elevation = round(((noiseValue + 1.0f) / 2.0f) * depth); // Normalize to depth
+
+			/*****************************************************
+
+				Edge & Water Setter
+				Encountering the edge of the Map, set the Tile to ground
+
+			*****************************************************/
+
+			bool isEdge = false;
+
+			if (x == 0 || x == width - 1 || y == 0 || y == height - 1) {
+				isEdge = true;
+			}
+			// Water assignment
+			if (elevation == 1 && !isEdge) {
+				myGridMap->set_cell_item(Vector3i(x, y, elevation), WATER, 0);
+				continue;
+			}
+
+			/*****************************************************
+
+				Elevation Change & Rotation Detection
+
+			*****************************************************/
+
+			int neighborElevations[4] = { elevation, elevation, elevation, elevation };
+			int dx[4] = { 1, -1, 0, 0 };
+			int dy[4] = { 0, 0, 1, -1 };
+
+			for (int d = 0; d < 4; ++d) {
+				int nx = x + dx[d];
+				int ny = y + dy[d];
+
+				if (nx >= 0 && ny >= 0 && nx < width && ny < height) {
+					neighborElevations[d] = heightMap[ny][nx];
+				}
+			}
+
+			// Elevation analysis
+			TileType tileType = GROUND;
+			int rotationOrientation = 0;
+			bool needsRamp = false, needsCliff = false, needsCorner = false;
+			int numDirectionChanges = 0;
+			int dominantDirection = -1;
+			int maxElevationChange = 0;
+
+			for (int d = 0; d < 4; ++d) {
+				int diff = neighborElevations[d] - elevation;
+				if (diff != 0)
+					numDirectionChanges++;
+				if (diff == 1 || diff == -1)
+					needsRamp = true;
+				if (abs(diff) > 1)
+					needsCliff = true;
+				if (abs(diff) > maxElevationChange) {
+					maxElevationChange = abs(diff);
+					dominantDirection = d;
+				}
+			}
+
+			// Assign terrain type
+			if (numDirectionChanges == 0) {
+				tileType = GROUND;
+			} else if (needsCliff) {
+				tileType = CLIFF;
+			} else if (needsRamp) {
+				tileType = RAMP;
+			}
+
+			// Corner detection: Two direction elevation change
+			if (numDirectionChanges >= 2) {
+				needsCorner = true;
+				if (tileType == RAMP)
+					tileType = RAMP_CORNER;
+				if (tileType == CLIFF)
+					tileType = CLIFF_CORNER;
+			}
+
+			// Water Edge & Corner detection
+			if (tileType == WATER) {
+				if (numDirectionChanges == 1) {
+					tileType = WATER_EDGE;
+				} else if (numDirectionChanges >= 2) {
+					tileType = WATER_CORNER;
+				}
+			}
+
+			/*
+				The key rotations (Orientation) in Godot's Grid Map around the Y-axis are:
+				- 0 → No rotation
+				- 1 → 90° clockwise around Y
+				- 2 → 180° around Y
+				- 3 → 90° counterclockwise around Y
+				- 10 → 180° around Y (alternative basis)
+				- 11 → 90° counterclockwise around Y (alternative basis)
+				- 9 → 90° clockwise around Y (alternative basis)
+
+				Which can be set with : `myGridMap->set_cell_item(Vector3i(x, y, z), meshID, orientation);`
+			*/
+
+			// Assign rotation using **0, 90, 180, 270** only
+			if (tileType == RAMP || tileType == CLIFF || tileType == RAMP_CORNER || tileType == CLIFF_CORNER) {
+				if (!needsCorner) {
+					switch (dominantDirection) {
+						case 0:
+							rotationOrientation = 0; // No Rotation
+							break; // North
+						case 1:
+							rotationOrientation = 1; // 90 Degrees Clockwise
+							break; // East
+						case 2:
+							rotationOrientation = 2; // 180 Degrees Clockwise
+							break; // South
+						case 3:
+							rotationOrientation = 3; // 270 Degrees Clockwise
+							break; // West
+					}
+				} else {
+					// Corner cases use the same **0, 90, 180, 270** logic.
+					if (neighborElevations[0] != elevation && neighborElevations[2] != elevation) {
+						rotationOrientation = 1; // Vertical corner (North-South elevation change)
+					} else if (neighborElevations[1] != elevation && neighborElevations[3] != elevation) {
+						rotationOrientation = 2; // Horizontal corner (East-West elevation change)
+					} else if (neighborElevations[0] != elevation && neighborElevations[1] != elevation) {
+						rotationOrientation = 0; // Corner facing North-East
+					} else if (neighborElevations[2] != elevation && neighborElevations[3] != elevation) {
+						rotationOrientation = 3; // Corner facing South-West
+					}
+				}
+			}
+
+			/*****************************************************
+
+				Grid Cell Setter
+
+			*****************************************************/
+
+			myGridMap->set_cell_item(Vector3i(x, elevation, y), tileType, rotationOrientation);
+		}
+	}
 }
 
 void TerrainGen::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("generate", "Grid Map"
-											  "height",
-								 "width", "depth", "seed", "noiseOctaves", "noiseFreq"),
-			&TerrainGen::generate);
+	ClassDB::bind_method(D_METHOD("generate", "GridMap", "height", "width", "depth", "seed", "useFBM", "noiseOctaves", "noiseFreq"), &TerrainGen::generate);
 }
diff --git a/src/TerrainGen/Terrain_Gen.h b/src/TerrainGen/Terrain_Gen.h
@@ -15,6 +15,17 @@ class TerrainGen : public Node {
 	GDCLASS(TerrainGen, Node);
 
 protected:
+	enum TileType {
+		WATER, // Pure water tile, Connects to bottom of Water Edge tiles and other Water tiles
+		WATER_CORNER, // Water corner with a section of ground at the top height, Connects to corners of water on one side and ground on the other
+		WATER_EDGE, // Water with a section of ground at the top height, Connects to water and ground on opposite sides
+		GROUND, // Pure ground tile, Simple tile that connects to ground, top of ramp, and top of cliffs
+		RAMP, // Ground to Ground tile of 45 degree angle, Connects ground tiles for elevation changes
+		RAMP_CORNER, // Connector of ramps and cliffs on its corners, Connects to Ground tiles and can be next to cliffs
+		CLIFF, // Cliffs separate elevation and on its sides can connect to cliffs & ramps, Connects to ground tiles & Water Edge for elevation changes
+		CLIFF_CORNER // Connector of ramps and cliffs on its corners, Connects to Ground & Water edge tiles, can also be next to Ramps
+	};
+
 	Ref<FastNoiseLite> noise;
 
 	static void _bind_methods();
@@ -25,7 +36,7 @@ class TerrainGen : public Node {
 
 	//Generate Terrain
 	//Takes in a height & width for size of map on the X & Z axis
-	void generate(GridMap *myGridMap, int height, int width, int depth, int seed, int noiseOctaves = 2, float noiseFreq = 0.005);
+	void generate(GridMap *myGridMap, int height, int width, int depth, int seed, bool useFractal = false, int noiseOctaves = 2, float noiseFreq = 0.005);
 };
 
 #endif
