From 0bc595f16fb3a3dc7076aa0b4af217895ac7e57e Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Fri, 4 Jul 2025 12:04:36 +0200
Subject: [PATCH] Disable terarin normals smoothening

---
 .../Editor/SceneGraph/Actors/TerrainNode.cs   |  4 ++++
 Source/Engine/Terrain/TerrainPatch.cpp        | 20 ++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Source/Editor/SceneGraph/Actors/TerrainNode.cs b/Source/Editor/SceneGraph/Actors/TerrainNode.cs
index f5cef604d..4e2cd3346 100644
--- a/Source/Editor/SceneGraph/Actors/TerrainNode.cs
+++ b/Source/Editor/SceneGraph/Actors/TerrainNode.cs
@@ -76,9 +76,13 @@ namespace FlaxEditor.SceneGraph.Actors
                     // Skip removing this terrain file sif it's still referenced
                     var sceneReferences = Editor.GetAssetReferences(e.SceneId);
                     if (sceneReferences != null && sceneReferences.Contains(e.TerrainId))
+                    {
+                        Debug.Log($"Skip removing files used by terrain {e.TerrainId} on scene {e.SceneId} as it's still in use");
                         continue;
+                    }
 
                     // Delete files
+                    Debug.Log($"Removing files used by removed terrain {e.TerrainId} on scene {e.SceneId}");
                     foreach (var file in e.Files)
                     {
                         if (file != null && File.Exists(file))
diff --git a/Source/Engine/Terrain/TerrainPatch.cpp b/Source/Engine/Terrain/TerrainPatch.cpp
index 1c754d843..a9388224d 100644
--- a/Source/Engine/Terrain/TerrainPatch.cpp
+++ b/Source/Engine/Terrain/TerrainPatch.cpp
@@ -431,8 +431,6 @@ void UpdateNormalsAndHoles(const TerrainDataUpdateInfo& info, const float* heigh
             GET_VERTEX(1, 1);
 #undef GET_VERTEX
 
-            // TODO: use SIMD for those calculations
-
             // Calculate normals for quad two vertices
             Float3 n0 = Float3::Normalize((v00 - v01) ^ (v01 - v10));
             Float3 n1 = Float3::Normalize((v11 - v10) ^ (v10 - v01));
@@ -446,6 +444,7 @@ void UpdateNormalsAndHoles(const TerrainDataUpdateInfo& info, const float* heigh
         }
     }
 
+#if 0
     // Smooth normals
     for (int32 z = 1; z < normalsSize.Y - 1; z++)
     {
@@ -466,8 +465,6 @@ void UpdateNormalsAndHoles(const TerrainDataUpdateInfo& info, const float* heigh
             GET_NORMAL(2, 2);
 #undef GET_VERTEX
 
-            // TODO: use SIMD for those calculations
-
             /*
              * The current vertex is (11). Calculate average for the nearby vertices.
              * 00   01   02
@@ -481,6 +478,7 @@ void UpdateNormalsAndHoles(const TerrainDataUpdateInfo& info, const float* heigh
             normalsPerVertex[i11] = Float3::Lerp(n11, avg, 0.6f);
         }
     }
+#endif
 
     // Write back to the data container
     const auto ptr = (Color32*)data;
@@ -525,10 +523,9 @@ void UpdateNormalsAndHoles(const TerrainDataUpdateInfo& info, const float* heigh
                 const int32 textureIndex = tz + tx;
                 const int32 heightmapIndex = hz + hx;
                 const int32 normalIndex = sz + sx;
-#if BUILD_DEBUG
-                ASSERT(normalIndex >= 0 && normalIndex < normalsLength);
-#endif
-                Float3 normal = Float3::NormalizeFast(normalsPerVertex[normalIndex]) * 0.5f + 0.5f;
+                ASSERT_LOW_LAYER(normalIndex >= 0 && normalIndex < normalsLength);
+                Float3 normal = Float3::NormalizeFast(normalsPerVertex[normalIndex]);
+                normal = normal * 0.5f + 0.5f;
 
                 if (holesMask && !holesMask[heightmapIndex])
                     normal = Float3::One;
@@ -1247,6 +1244,11 @@ void TerrainPatch::ClearCache()
 
 void TerrainPatch::CacheHeightData()
 {
+    if (Heightmap == nullptr)
+    {
+        LOG(Error, "Missing heightmap.");
+        return;
+    }
     PROFILE_CPU_NAMED("Terrain.CacheHeightData");
     const TerrainDataUpdateInfo info(this);
 
@@ -1745,7 +1747,7 @@ bool TerrainPatch::UpdateHeightData(TerrainDataUpdateInfo& info, const Int2& mod
     // Prepare data for the uploading to GPU
     ASSERT(Heightmap);
     auto texture = Heightmap->GetTexture();
-    ASSERT(texture->ResidentMipLevels() > 0);
+    ASSERT(texture->IsAllocated());
     const int32 textureSize = texture->Width();
     const PixelFormat pixelFormat = texture->Format();
     const int32 pixelStride = PixelFormatExtensions::SizeInBytes(pixelFormat);