Small changes

Author: kthecoder

demo/TerrainTiles/3D_Terrain_Tiles.tres

@@ -9,7 +9,7 @@
 [ext_resource type="PackedScene" uid="uid://r3attbe54kel" path="res://TerrainTiles/cliffs.tscn" id="7_1ubri"]
 [ext_resource type="PackedScene" uid="uid://ci3xp1iywxf2o" path="res://TerrainTiles/cliffs_corner.tscn" id="8_2ix0w"]
 [ext_resource type="PackedScene" uid="uid://bnup07coye8fx" path="res://TerrainTiles/Cliff_Corner_Inner.glb" id="9_vsn3x"]
-[ext_resource type="PackedScene" uid="uid://q7oiyh40co85" path="res://TerrainTiles/Water_Corner_Inner.glb" id="10_4p2ei"]
+[ext_resource type="PackedScene" uid="uid://dy7je7lfyqw1y" path="res://TerrainTiles/Water_Corner_Inner.glb" id="10_4p2ei"]
 
 [node name="GridMeshesLoader" type="Node3D"]
 
@@ -29,6 +29,7 @@ visible = false
 visible = false
 
 [node name="Ramp_Corner" parent="." instance=ExtResource("6_21lxm")]
+visible = false
 
 [node name="Cliffs" parent="." instance=ExtResource("7_1ubri")]
 visible = false

demo/TerrainTiles/Grid_Meshes_Loader.tscn

@@ -3,7 +3,7 @@
 importer="scene"
 importer_version=1
 type="PackedScene"
-uid="uid://bj1kj2vg4g1w6"
+uid="uid://ckwxcl3a0k4qv"
 path="res://.godot/imported/Water_Corner_Inner.blend-35e66b59c1fefbf752fbc64d0dbfe211.scn"
 
 [deps]

demo/TerrainTiles/Water_Corner_Inner.blend

@@ -3,7 +3,7 @@
 importer="scene"
 importer_version=1
 type="PackedScene"
-uid="uid://q7oiyh40co85"
+uid="uid://dy7je7lfyqw1y"
 path="res://.godot/imported/Water_Corner_Inner.glb-822af3d9b979e2b662823f1f4607f037.scn"
 
 [deps]

demo/TerrainTiles/Water_Corner_Inner.blend.import

@@ -23,7 +23,7 @@ cell_size = Vector3(1, 0.25, 1)
 data = {
 "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)

demo/TerrainTiles/Water_Corner_Inner.blend1

@@ -19,7 +19,7 @@ func _ready():
 	#generate(grid_map, 128, 128, 4, seed_value, 12, NoiseType.VALUE, 0.79, 0.1);
 
 	# Simplex Noise Based
-	var result: Dictionary = generate(grid_map, 128, 128, 4, seed_value, 12, NoiseType.SIMPLEX, 0.6, 0.005, 0.015);
+	var result: Dictionary = generate(grid_map, 128, 128, 4, seed_value, 12, NoiseType.SIMPLEX, 0.5, 0.005, 0.015);
 
 	#
 	#

demo/TerrainTiles/Water_Corner_Inner.glb

@@ -309,9 +309,8 @@ Dictionary TerrainGen::generate(
 				(Cardinal Neighbors Only)
 
 	*****************************************************/
-	int neighborRadius = 1; // 3x3 neighborhood (cardinal only)
 	int threshold = 2; // Minimum matching neighbors to preserve center
-	int iterations = 1; // Number of CA generations to apply
+	int iterations = 2; // Number of CA generations to apply
 
 	vector<vector<int>> curr = heightMap;
 	vector<vector<int>> next = heightMap;
@@ -321,6 +320,24 @@ Dictionary TerrainGen::generate(
 		{ 0, -1 }, { 0, 1 }, { -1, 0 }, { 1, 0 }
 	};
 
+	// Height Map is a double grid
+	// +----+----+----+----+
+	// | z1 | z2 | y1 | y2 |
+	// +----+----+----+----+
+	// | z3 | z4 | y3 | y5 |
+	// +----+----+----+----+
+	// | x1 | x2 | w1 | w2 |
+	// +----+----+----+----+
+	// | x3 | x4 | w3 | w4 |
+	// +----+----+----+----+
+	//
+	// Eventually the map will be reduced to :
+	// +----+----+
+	// | z  | y  |
+	// +----+----+
+	// | x  | w  |
+	// +----+----+
+
 	for (int it = 0; it < iterations; ++it) {
 		bool anyChanged = false;
 
@@ -395,80 +412,84 @@ Dictionary TerrainGen::generate(
 
 	*****************************************************/
 
+	int caCcount = 2;
+
 	if (waterRemoval >= 10.0f) {
 		// Clamp percentage
 		if (waterRemoval > 100.0f)
 			waterRemoval = 100.0f;
 		if (waterRemoval < 0.0f)
 			waterRemoval = 0.0f;
 
-		vector<vector<bool>> visited(heightx2, vector<bool>(widthx2, false));
+		for (int iter = 0; iter < caCcount; iter++) {
+			vector<vector<bool>> visited(heightx2, vector<bool>(widthx2, false));
 
-		for (int y = 0; y < heightx2; y++) {
-			for (int x = 0; x < widthx2; x++) {
-				if (heightMap[y][x] != 0 || visited[y][x])
-					continue;
+			for (int y = 0; y < heightx2; y++) {
+				for (int x = 0; x < widthx2; x++) {
+					if (heightMap[y][x] != 0 || visited[y][x])
+						continue;
 
-				// Manual stack flood fill
-				vector<pair<int, int>> stack;
-				vector<pair<int, int>> region;
-				stack.push_back(make_pair(x, y));
-				visited[y][x] = true;
-
-				while (!stack.empty()) {
-					pair<int, int> current = stack.back();
-					stack.pop_back();
-					int cx = current.first;
-					int cy = current.second;
-					region.push_back(current);
-
-					for (int d = 0; d < 4; d++) {
-						int nx = cx + dx[d];
-						int ny = cy + dy[d];
-						if (nx < 0 || ny < 0 || nx >= widthx2 || ny >= heightx2)
-							continue;
-						if (visited[ny][nx])
-							continue;
-						if (heightMap[ny][nx] != 0)
-							continue;
-						visited[ny][nx] = true;
-						stack.push_back(make_pair(nx, ny));
+					// Manual stack flood fill
+					vector<pair<int, int>> stack;
+					vector<pair<int, int>> region;
+					stack.push_back(make_pair(x, y));
+					visited[y][x] = true;
+
+					while (!stack.empty()) {
+						pair<int, int> current = stack.back();
+						stack.pop_back();
+						int cx = current.first;
+						int cy = current.second;
+						region.push_back(current);
+
+						for (int d = 0; d < 4; d++) {
+							int nx = cx + dx[d];
+							int ny = cy + dy[d];
+							if (nx < 0 || ny < 0 || nx >= widthx2 || ny >= heightx2)
+								continue;
+							if (visited[ny][nx])
+								continue;
+							if (heightMap[ny][nx] != 0)
+								continue;
+							visited[ny][nx] = true;
+							stack.push_back(make_pair(nx, ny));
+						}
 					}
-				}
 
-				// Determine how many cells to flip
-				int regionSize = region.size();
-				int toFlip = (int)(regionSize * (waterRemoval / 100.0f));
-				if (toFlip <= 0)
-					continue;
+					// Determine how many cells to flip
+					int regionSize = region.size();
+					int toFlip = (int)(regionSize * (waterRemoval / 100.0f));
+					if (toFlip <= 0)
+						continue;
 
-				// Rank by proximity to edge
-				vector<pair<int, pair<int, int>>> candidates;
-				for (int i = 0; i < regionSize; i++) {
-					int rx = region[i].first;
-					int ry = region[i].second;
-					int distX = min(rx, widthx2 - 1 - rx);
-					int distY = min(ry, heightx2 - 1 - ry);
-					int edgeDist = min(distX, distY);
-					candidates.push_back(make_pair(edgeDist, region[i]));
-				}
+					// Rank by proximity to edge
+					vector<pair<int, pair<int, int>>> candidates;
+					for (int i = 0; i < regionSize; i++) {
+						int rx = region[i].first;
+						int ry = region[i].second;
+						int distX = min(rx, widthx2 - 1 - rx);
+						int distY = min(ry, heightx2 - 1 - ry);
+						int edgeDist = min(distX, distY);
+						candidates.push_back(make_pair(edgeDist, region[i]));
+					}
 
-				// Bubble sort
-				for (int i = 0; i < (int)candidates.size(); i++) {
-					for (int j = i + 1; j < (int)candidates.size(); j++) {
-						if (candidates[j].first < candidates[i].first) {
-							pair<int, pair<int, int>> temp = candidates[i];
-							candidates[i] = candidates[j];
-							candidates[j] = temp;
+					// Bubble sort
+					for (int i = 0; i < (int)candidates.size(); i++) {
+						for (int j = i + 1; j < (int)candidates.size(); j++) {
+							if (candidates[j].first < candidates[i].first) {
+								pair<int, pair<int, int>> temp = candidates[i];
+								candidates[i] = candidates[j];
+								candidates[j] = temp;
+							}
 						}
 					}
-				}
 
-				// Flip top N water cells to land
-				for (int i = 0; i < toFlip && i < (int)candidates.size(); i++) {
-					int fx = candidates[i].second.first;
-					int fy = candidates[i].second.second;
-					heightMap[fy][fx] = 1;
+					// Flip top N water cells to land
+					for (int i = 0; i < toFlip && i < (int)candidates.size(); i++) {
+						int fx = candidates[i].second.first;
+						int fy = candidates[i].second.second;
+						heightMap[fy][fx] = 1;
+					}
 				}
 			}
 		}
@@ -798,7 +819,7 @@ Dictionary TerrainGen::generate(
 			// | n3 | n4 |  | 1 | 1 |  | 2 | 2 |
 			// +----+----+  +---+---+  +---+---+
 			//
-			if (n1 == n2 && n2 == n3 && n3 == n4 && n1 > 0 && n2 > 0 && n3 > 0 && n4 > 0) {
+			if (n1 == n2 && n2 == n3 && n3 == n4 && n1 == n4 && n1 > 0 && n2 > 0 && n3 > 0 && n4 > 0) {
 				tileMap[x][y] = GROUND;
 			}
 
@@ -1072,7 +1093,9 @@ Dictionary TerrainGen::generate(
 	//
 	//
 	//
-	// Phase 2 : Determine the Tile's Rotation
+	// Phase 2 : Corrections & Rotations
+	//
+	//  Description: Determine the Tile's Rotation and correct tiles
 	//
 	// 	Models: Ramp Corner's/ Cliff Corner's / Water Corner's start with HIGH at (−Z, +X)
 	//				i.e., NE corner.
@@ -1087,11 +1110,12 @@ Dictionary TerrainGen::generate(
 	// | m6 | m7 | m8 |
 	// +----+----+----+
 	//
+
 	for (int x = 0; x < width; x++) {
 		for (int y = 0; y < height; y++) {
 			int c_height = elevationMap[x][y];
 			int tile_id = myGridMap->get_cell_item(Vector3i(x, c_height, y));
-			if (tile_id == -1 || tile_id == WATER || tile_id == GROUND)
+			if (tile_id == -1 || tile_id == GROUND)
 				continue;
 
 			auto in_bounds = [&](int gx, int gy) {
@@ -1107,6 +1131,10 @@ Dictionary TerrainGen::generate(
 				return myGridMap->get_cell_item(Vector3i(gx, h, gy));
 			};
 
+			auto isWaterLike = [&](TileType t) {
+				return t == WATER || t == WATER_EDGE || t == WATER_CORNER || t == WATER_CORNER_INNER;
+			};
+
 			int rotation_val = NORTH; // default face −Z
 
 			//
@@ -1151,6 +1179,31 @@ Dictionary TerrainGen::generate(
 			int nwHeight = safe_height(x - 1, y + 1, c_height);
 			int nwTile = safe_tile_at(x - 1, y + 1); // m1
 
+			//
+			// Water Tiles
+			//
+
+			bool nWater = isWaterLike(static_cast<TileType>(nTile));
+			bool sWater = isWaterLike(static_cast<TileType>(sTile));
+			bool eWater = isWaterLike(static_cast<TileType>(eTile));
+			bool wWater = isWaterLike(static_cast<TileType>(wTile));
+			bool neWater = isWaterLike(static_cast<TileType>(neTile));
+			bool nwWater = isWaterLike(static_cast<TileType>(nwTile));
+			bool seWater = isWaterLike(static_cast<TileType>(seTile));
+			bool swWater = isWaterLike(static_cast<TileType>(swTile));
+
+			if (isWaterLike(static_cast<TileType>(tile_id))) {
+				int waterNeighbors =
+						nWater + sWater + eWater + wWater +
+						neWater + nwWater + seWater + swWater;
+
+				// Fully surrounded by water
+				if (waterNeighbors == 8) {
+					tile_id = WATER;
+					rotation_val = 0;
+				}
+			}
+
 			if (tile_id == RAMP || tile_id == CLIFF || tile_id == WATER_EDGE) {
 				// +----+----+----+
 				// | m1 | m2 | m3 |