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

Blender

Browse Source
This commit is contained in:
MagicBot
2023-09-18 00:05:53 -04:00
parent da238b9986
commit cbc8216fe0
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/InterestManagement/HeightMap.java
+20 -8
View File
@@ -118,8 +118,8 @@ public class HeightMap {
int halfExtentsY = (int) Enum.CityBoundsType.ZONE.halfExtents; int halfExtentsY = (int) Enum.CityBoundsType.ZONE.halfExtents;
this.zoneLoadID = 0; this.zoneLoadID = 0;
this.seaLevel = 0; this.seaLevel = 0;
this.zone_minBlend = 256; this.zone_minBlend = 0;
this.zone_maxBlend = 256; this.zone_maxBlend = 0;
// Cache the full extents to avoid the calculation // Cache the full extents to avoid the calculation
@@ -246,14 +246,26 @@ public class HeightMap {
blendBounds.setBounds(new Vector2f(heightMapZone.absX, heightMapZone.absZ), zoneLoc, 0.0f); blendBounds.setBounds(new Vector2f(heightMapZone.absX, heightMapZone.absZ), zoneLoc, 0.0f);
float currentArea = (blendBounds.getHalfExtents().x * 2) * float maxBlendArea = (heightMapZone.maxBlend.getHalfExtents().x) *
(blendBounds.getHalfExtents().y * 2); (heightMapZone.maxBlend.getHalfExtents().y);
float zoneArea = (heightMapZone.getBounds().getHalfExtents().x * 2) * float currentArea = (blendBounds.getHalfExtents().x) *
(heightMapZone.getBounds().getHalfExtents().y * 2); (blendBounds.getHalfExtents().y);
float zoneArea = (heightMapZone.getBounds().getHalfExtents().x) *
(heightMapZone.getBounds().getHalfExtents().y);
float areaDelta = currentArea / zoneArea; float blendDelta = zoneArea - maxBlendArea;
float currentDelta = zoneArea - currentArea;
interpolatedTerrainHeight = FastMath.LERP(areaDelta, interpolatedTerrainHeight, interpolatedParentTerrainHeight); float percentage;
if (currentDelta != 0 && blendDelta != 0)
percentage = currentDelta / blendDelta;
else
percentage = 0.0f;
interpolatedTerrainHeight = FastMath.LERP(percentage, interpolatedTerrainHeight, interpolatedParentTerrainHeight);
interpolatedTerrainHeight = FastMath.LERP(percentage, interpolatedTerrainHeight, interpolatedParentTerrainHeight);
return interpolatedTerrainHeight + heightMapZone.worldAltitude; return interpolatedTerrainHeight + heightMapZone.worldAltitude;
} }