From f7952008cd9044fa1012956fe460fb845474f70c Mon Sep 17 00:00:00 2001 From: MagicBot Date: Mon, 9 Oct 2023 09:35:24 -0400 Subject: [PATCH] Blend cleanup --- src/engine/InterestManagement/Terrain.java | 4 ++-- src/engine/devcmd/cmds/GetHeightCmd.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/engine/InterestManagement/Terrain.java b/src/engine/InterestManagement/Terrain.java index c289ce8f..55aaa925 100644 --- a/src/engine/InterestManagement/Terrain.java +++ b/src/engine/InterestManagement/Terrain.java @@ -113,7 +113,7 @@ public class Terrain { // 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; } - public float heightBlend(Vector2f terrainLoc) { + public float terrainBlend(Vector2f terrainLoc) { // Normalize terrain loc diff --git a/src/engine/devcmd/cmds/GetHeightCmd.java b/src/engine/devcmd/cmds/GetHeightCmd.java index 3e7fde23..8849802a 100644 --- a/src/engine/devcmd/cmds/GetHeightCmd.java +++ b/src/engine/devcmd/cmds/GetHeightCmd.java @@ -47,7 +47,7 @@ public class GetHeightCmd extends AbstractDevCmd { this.throwbackInfo(playerCharacter, "Global Height: " + heightmapZone.worldAltitude); this.throwbackInfo(playerCharacter, "Sea Level: " + heightmapZone.seaLevel); 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, "------------");