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

Blend cleanup

Browse Source
This commit is contained in:
MagicBot
2023-10-09 09:35:24 -04:00
parent a0c82d3f3f
commit f7952008cd
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/InterestManagement/Terrain.java
+2 -2
View File
@@ -113,7 +113,7 @@ public class Terrain {
// Blend between heights // Blend between heights
return interpolatedChildHeight + interpolatedParentTerrainHeight * (1 - terrainZone.terrain.heightBlend(terrainLoc)); return interpolatedChildHeight + interpolatedParentTerrainHeight * (1 - terrainZone.terrain.terrainBlend(terrainLoc));
} }
@@ -179,7 +179,7 @@ public class Terrain {
return interpolatedHeight; return interpolatedHeight;
} }
public float heightBlend(Vector2f terrainLoc) { public float terrainBlend(Vector2f terrainLoc) {
// Normalize terrain loc // Normalize terrain loc
src/engine/devcmd/cmds/GetHeightCmd.java
+1 -1
View File
@@ -47,7 +47,7 @@ public class GetHeightCmd extends AbstractDevCmd {
this.throwbackInfo(playerCharacter, "Global Height: " + heightmapZone.worldAltitude); this.throwbackInfo(playerCharacter, "Global Height: " + heightmapZone.worldAltitude);
this.throwbackInfo(playerCharacter, "Sea Level: " + heightmapZone.seaLevel); this.throwbackInfo(playerCharacter, "Sea Level: " + heightmapZone.seaLevel);
this.throwbackInfo(playerCharacter, "Grid : " + Math.floor(gridSquare.x) + "x" + Math.floor(gridSquare.y)); this.throwbackInfo(playerCharacter, "Grid : " + Math.floor(gridSquare.x) + "x" + Math.floor(gridSquare.y));
this.throwbackInfo(playerCharacter, "Blend: " + heightmapZone.terrain.heightBlend(zoneLoc)); this.throwbackInfo(playerCharacter, "Blend: " + heightmapZone.terrain.terrainBlend(zoneLoc));
this.throwbackInfo(playerCharacter, "Height returned: " + Math.ceil(currentHeight)); this.throwbackInfo(playerCharacter, "Height returned: " + Math.ceil(currentHeight));
this.throwbackInfo(playerCharacter, "------------"); this.throwbackInfo(playerCharacter, "------------");