Inlined empty getters

This commit is contained in:
2023-09-20 15:43:01 -04:00
parent bf9fdae58b
commit 46b3db033b
58 changed files with 210 additions and 284 deletions
+12 -7
View File
@@ -154,8 +154,8 @@ public class HeightMap {
this.heightMapID = 999999;
this.maxHeight = 0;
int halfExtentsX = (int) zone.getBounds().getHalfExtents().x;
int halfExtentsY = (int) zone.getBounds().getHalfExtents().y;
int halfExtentsX = (int) zone.bounds.getHalfExtents().x;
int halfExtentsY = (int) zone.bounds.getHalfExtents().y;
this.zoneLoadID = 0;
this.seaLevel = 0;
@@ -191,7 +191,7 @@ public class HeightMap {
HeightMap heightMap = new HeightMap(zone);
HeightMap.heightmapByLoadNum.put(zone.getLoadNum(), heightMap);
HeightMap.heightmapByLoadNum.put(zone.loadNum, heightMap);
}
@@ -206,7 +206,7 @@ public class HeightMap {
return zone;
while (nextZone.getHeightMap() == null)
nextZone = nextZone.getParent();
nextZone = nextZone.parent;
return nextZone;
}
@@ -247,9 +247,14 @@ public class HeightMap {
}
private static float interpolatePLANAR(Vector3fImmutable worldLoc, Zone heightMapZone, Vector2f zoneLoc, float interpolatedTerrainHeight) {
// zones of type PLANAR
Zone parentZone;
float interpolatedParentTerrainHeight;
parentZone = HeightMap.getNextZoneWithTerrain(heightMapZone.getParent());
parentZone = HeightMap.getNextZoneWithTerrain(heightMapZone.parent);
interpolatedParentTerrainHeight = HeightMap.getWorldHeight(parentZone, worldLoc);
interpolatedParentTerrainHeight += parentZone.worldAltitude;
@@ -263,8 +268,8 @@ public class HeightMap {
(heightMapZone.maxBlend.getHalfExtents().y);
float currentArea = (blendBounds.getHalfExtents().x) *
(blendBounds.getHalfExtents().y);
float zoneArea = (heightMapZone.getBounds().getHalfExtents().x) *
(heightMapZone.getBounds().getHalfExtents().y);
float zoneArea = (heightMapZone.bounds.getHalfExtents().x) *
(heightMapZone.bounds.getHalfExtents().y);
blendBounds.release();