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

Comment and name cleanup

Browse Source
This commit is contained in:
MagicBot
2023-09-17 12:49:30 -04:00
parent 6de8249fb0
commit 83be09d643
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/InterestManagement/HeightMap.java
+6 -6
View File
@@ -212,7 +212,7 @@ public class HeightMap {
Zone heightMapZone; Zone heightMapZone;
Zone parentZone; Zone parentZone;
float worldHeight; float worldHeight;
float parentHeight; float interpolatedParentTerrainHeight;
// Seafloor is rather flat. // Seafloor is rather flat.
@@ -242,12 +242,12 @@ public class HeightMap {
// 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());
parentHeight = HeightMap.getWorldHeight(parentZone, worldLoc); interpolatedParentTerrainHeight = HeightMap.getWorldHeight(parentZone, worldLoc);
// Between maxBlend and minBlend distance from edge of zone we LERP between the two heights
if (Bounds.collide(worldLoc, heightMapZone.minBlend) == true) { if (Bounds.collide(worldLoc, heightMapZone.minBlend) == true) {
// How far into blend zone are we?
Bounds blendBounds = Bounds.borrow(); Bounds blendBounds = Bounds.borrow();
zoneLoc.x = abs(zoneLoc.x); zoneLoc.x = abs(zoneLoc.x);
zoneLoc.y = abs(zoneLoc.x); zoneLoc.y = abs(zoneLoc.x);
@@ -260,14 +260,14 @@ public class HeightMap {
float areaDelta = childArea / parentArea; float areaDelta = childArea / parentArea;
interpolatedTerrainHeight = FastMath.LERP(areaDelta, interpolatedTerrainHeight, parentHeight); interpolatedTerrainHeight = FastMath.LERP(areaDelta, interpolatedTerrainHeight, interpolatedParentTerrainHeight);
return interpolatedTerrainHeight + heightMapZone.worldAltitude; return interpolatedTerrainHeight + heightMapZone.worldAltitude;
} }
// Past min blend we just return the parent height. // Past min blend we just return the parent height.
return parentHeight + heightMapZone.worldAltitude; return interpolatedParentTerrainHeight + heightMapZone.worldAltitude;
} }