Changeset 25278 for ps/trunk/source/graphics/Terrain.cpp

Timestamp:

Apr 16, 2021, 6:01:30 PM (3 years ago)

Author:

wraitii

Message:

Rework rP25266

Following comments by @vladislavbelov.

Differential Revision: ​https://code.wildfiregames.com/D3860

File:

• ps/trunk/source/graphics/Terrain.cpp (modified) (9 diffs)

ps/trunk/source/graphics/Terrain.cpp

@@ -119 +119 @@
 void CTerrain::CalcPosition(ssize_t i, ssize_t j, CVector3D& pos) const
 {
-    ssize_t hi = Clamp(i, 0, m_MapSize - 1);
-    ssize_t hj = Clamp(j, 0, m_MapSize - 1);
+    ssize_t hi = Clamp(i, 0, m_MapSize - 1);
+    ssize_t hj = Clamp(j, 0, m_MapSize - 1);
     u16 height = m_Heightmap[hj*m_MapSize + hi];
     pos.X = float(i*TERRAIN_TILE_SIZE);
@@ -131 +131 @@
 void CTerrain::CalcPositionFixed(ssize_t i, ssize_t j, CFixedVector3D& pos) const
 {
-    ssize_t hi = Clamp(i, 0, m_MapSize - 1);
-    ssize_t hj = Clamp(j, 0, m_MapSize - 1);
+    ssize_t hi = Clamp(i, 0, m_MapSize - 1);
+    ssize_t hj = Clamp(j, 0, m_MapSize - 1);
     u16 height = m_Heightmap[hj*m_MapSize + hi];
     pos.X = fixed::FromInt(i) * (int)TERRAIN_TILE_SIZE;
@@ -309 +309 @@
 float CTerrain::GetVertexGroundLevel(ssize_t i, ssize_t j) const
 {
-    i = Clamp(i, 0, m_MapSize - 1);
-    j = Clamp(j, 0, m_MapSize - 1);
+    i = Clamp(i, 0, m_MapSize - 1);
+    j = Clamp(j, 0, m_MapSize - 1);
     return HEIGHT_SCALE * m_Heightmap[j*m_MapSize + i];
 }
@@ -316 +316 @@
 fixed CTerrain::GetVertexGroundLevelFixed(ssize_t i, ssize_t j) const
 {
-    i = Clamp(i, 0, m_MapSize - 1);
-    j = Clamp(j, 0, m_MapSize - 1);
+    i = Clamp(i, 0, m_MapSize - 1);
+    j = Clamp(j, 0, m_MapSize - 1);
     // Convert to fixed metres (being careful to avoid intermediate overflows)
     return fixed::FromInt(m_Heightmap[j*m_MapSize + i] / 2) / (int)(HEIGHT_UNITS_PER_METRE / 2);
@@ -325 +325 @@
 {
     // Clamp to size-2 so we can use the tiles (i,j)-(i+1,j+1)
-    i = Clamp(i, 0, m_MapSize - 2);
-    j = Clamp(j, 0, m_MapSize - 2);
+    i = Clamp(i, 0, m_MapSize - 2);
+    j = Clamp(j, 0, m_MapSize - 2);
 
     u16 h00 = m_Heightmap[j*m_MapSize + i];
@@ -481 +481 @@
 {
     // Clamp to size-2 so we can use the tiles (i,j)-(i+1,j+1)
-    i = Clamp(i, 0, m_MapSize - 2);
-    j = Clamp(j, 0, m_MapSize - 2);
+    i = Clamp(i, 0, m_MapSize - 2);
+    j = Clamp(j, 0, m_MapSize - 2);
 
     int h00 = m_Heightmap[j*m_MapSize + i];
@@ -775 +775 @@
 {
     // Finds the inclusive limits of the patches that include the specified range of tiles
-    ssize_t pi0 = Clamp( i0   /PATCH_SIZE, 0, m_MapSizePatches-1);
-    ssize_t pi1 = Clamp((i1-1)/PATCH_SIZE, 0, m_MapSizePatches-1);
-    ssize_t pj0 = Clamp( j0   /PATCH_SIZE, 0, m_MapSizePatches-1);
-    ssize_t pj1 = Clamp((j1-1)/PATCH_SIZE, 0, m_MapSizePatches-1);
+    ssize_t pi0 = Clamp( i0   /PATCH_SIZE, 0, m_MapSizePatches-1);
+    ssize_t pi1 = Clamp((i1-1)/PATCH_SIZE, 0, m_MapSizePatches-1);
+    ssize_t pj0 = Clamp( j0   /PATCH_SIZE, 0, m_MapSizePatches-1);
+    ssize_t pj1 = Clamp((j1-1)/PATCH_SIZE, 0, m_MapSizePatches-1);
 
     for (ssize_t j = pj0; j <= pj1; j++)
@@ -794 +794 @@
     {
         m_HeightMipmap.Update(m_Heightmap,
-            Clamp(i0, 0, m_MapSize - 1),
-            Clamp(j0, 0, m_MapSize - 1),
-            Clamp(i1, 1, m_MapSize),
-            Clamp(j1, 1, m_MapSize)
+            Clamp(i0, 0, m_MapSize - 1),
+            Clamp(j0, 0, m_MapSize - 1),
+            Clamp(i1, 1, m_MapSize),
+            Clamp(j1, 1, m_MapSize)
         );
     }
@@ -821 +821 @@
 CBoundingBoxAligned CTerrain::GetVertexesBound(ssize_t i0, ssize_t j0, ssize_t i1, ssize_t j1)
 {
-    i0 = Clamp(i0, 0, m_MapSize - 1);
-    j0 = Clamp(j0, 0, m_MapSize - 1);
-    i1 = Clamp(i1, 0, m_MapSize - 1);
-    j1 = Clamp(j1, 0, m_MapSize - 1);
+    i0 = Clamp(i0, 0, m_MapSize - 1);
+    j0 = Clamp(j0, 0, m_MapSize - 1);
+    i1 = Clamp(i1, 0, m_MapSize - 1);
+    j1 = Clamp(j1, 0, m_MapSize - 1);
 
     u16 minH = 65535;