From 5dcd4665ba3c5c12d67cb8df3463e0782772a4db Mon Sep 17 00:00:00 2001 From: miepzerino <o.skotnik@gmail.com> Date: Thu, 03 Apr 2025 22:37:09 +0000 Subject: [PATCH] #42 fixed ore generation height --- ProjectSettings/ProjectSettings.asset | 3 +-- Assets/Scenes/GameplayScene.unity | 3 ++- Assets/Scripts/GenerateTileMap.cs | 14 ++++++++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Assets/Scenes/GameplayScene.unity b/Assets/Scenes/GameplayScene.unity index 58cf609..5e8e3f1 100644 --- a/Assets/Scenes/GameplayScene.unity +++ b/Assets/Scenes/GameplayScene.unity @@ -4543,7 +4543,7 @@ m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1794216240 Transform: m_ObjectHideFlags: 0 @@ -5142,6 +5142,7 @@ m_EditorClassIdentifier: forestRuleTile: {fileID: 11400000, guid: 3999614e192b37546a6b710bf5ceb30c, type: 2} borderTile: {fileID: 11400000, guid: dcef846474e534b45ab3b175559c19a2, type: 2} + LOAD_DISTANCE: 3 --- !u!1 &1955008394 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GenerateTileMap.cs b/Assets/Scripts/GenerateTileMap.cs index fff1636..1c01f5d 100644 --- a/Assets/Scripts/GenerateTileMap.cs +++ b/Assets/Scripts/GenerateTileMap.cs @@ -45,7 +45,7 @@ //public List<TileBase> tiles; public const int CHUNK_SIZE = 16; // Size of each chunk - public const int LOAD_DISTANCE = 2; // Number of chunks to load around player + public int LOAD_DISTANCE = 2; // Number of chunks to load around player private Dictionary<Vector2Int, bool> loadedChunks = new Dictionary<Vector2Int, bool>(); private Transform playerTransform; // Reference to player/camera @@ -324,15 +324,22 @@ // Convert spawn heights to negative values if they aren't already int maxY = -Mathf.Abs(generateable.maxSpawnHeight); int minY = -Mathf.Abs(generateable.minSpawnHeight); + // Changed condition: Check if the chunk's Y range overlaps with ore spawn range + int chunkMaxY = startY; + int chunkMinY = startY - CHUNK_SIZE; // Only process this chunk if it's within the ore's spawn height range - if (startY < maxY && startY > minY) + if (chunkMinY <= maxY && chunkMaxY >= minY) { for (int x = startX; x < startX + CHUNK_SIZE; x++) { if (x >= maxWidth) continue; - for (int y = Mathf.Max(startY - CHUNK_SIZE, minY); y < Mathf.Min(startY, maxY); y++) + // Adjusted Y range calculation + int rangeStart = Mathf.Max(chunkMinY, minY); + int rangeEnd = Mathf.Min(chunkMaxY, maxY); + + for (int y = rangeStart; y <= rangeEnd; y++) { float xPerlin = ((float)x / maxWidth) * (float)generateable.clusterWeight + offsetX; float yPerlin = ((float)Mathf.Abs(y) / maxDepth) * (float)generateable.clusterWeight + offsetY; @@ -343,7 +350,6 @@ Vector3Int tileSpawnCoord = new Vector3Int(x, y); if (!destroyedTiles.Contains(tileSpawnCoord) && tilemap.HasTile(tileSpawnCoord)) { - // Check potential cluster size before placing int clusterSize = CountPotentialClusterSize(x, y, generateable.weight, generateable.clusterWeight); if (clusterSize >= generateable.minClusterSize) { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index de514e2..d4828cf 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -137,8 +137,7 @@ vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 bundleVersion: 0.0.1 - preloadedAssets: - - {fileID: 11400000, guid: 7e04de496fcdd9940a7686f07b3ded72, type: 2} + preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 -- Gitblit v1.9.3