Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

Interpolating from adjusted altitudes.

Browse Source
This commit is contained in:
MagicBot
2023-09-18 03:19:00 -04:00
parent e359b1dfdf
commit 5ba06796b1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/InterestManagement/HeightMap.java
+5 -3
View File
@@ -229,16 +229,18 @@ public class HeightMap {
// Interpolate height for this position using pixel array. // Interpolate height for this position using pixel array.
float interpolatedTerrainHeight = heightMapZone.getHeightMap().getInterpolatedTerrainHeight(zoneLoc); float interpolatedTerrainHeight = heightMapZone.getHeightMap().getInterpolatedTerrainHeight(zoneLoc);
interpolatedTerrainHeight += heightMapZone.worldAltitude;
// Heightmap blending is based on distance to edge of zone. // Heightmap blending is based on distance to edge of zone.
if (Bounds.collide(worldLoc, heightMapZone.maxBlend) == true) if (Bounds.collide(worldLoc, heightMapZone.maxBlend) == true)
return interpolatedTerrainHeight + heightMapZone.worldAltitude; return interpolatedTerrainHeight;
// We will need the parent height if we got this far into the method // We will need the parent height if we got this far into the method
parentZone = HeightMap.getNextZoneWithTerrain(heightMapZone.getParent()); parentZone = HeightMap.getNextZoneWithTerrain(heightMapZone.getParent());
interpolatedParentTerrainHeight = HeightMap.getWorldHeight(parentZone, worldLoc); interpolatedParentTerrainHeight = HeightMap.getWorldHeight(parentZone, worldLoc);
interpolatedParentTerrainHeight += parentZone.worldAltitude;
Bounds blendBounds = Bounds.borrow(); Bounds blendBounds = Bounds.borrow();
zoneLoc.x = abs(zoneLoc.x); zoneLoc.x = abs(zoneLoc.x);
@@ -262,9 +264,9 @@ public class HeightMap {
percentage = currentDelta / blendDelta; percentage = currentDelta / blendDelta;
else else
percentage = 0.0f; percentage = 0.0f;
float interpolatedWorldAltitude = FastMath.LERP(percentage, heightMapZone.worldAltitude, parentZone.worldAltitude);
interpolatedTerrainHeight = FastMath.LERP(percentage, interpolatedTerrainHeight, interpolatedParentTerrainHeight); interpolatedTerrainHeight = FastMath.LERP(percentage, interpolatedTerrainHeight, interpolatedParentTerrainHeight);
return interpolatedTerrainHeight + interpolatedWorldAltitude; return interpolatedTerrainHeight;
} }