From 17ddd7d1ff9a32d33c215fe7142bd570ef95fbb9 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Tue, 7 Nov 2023 12:32:25 -0500 Subject: [PATCH] Dev cmd updated --- src/engine/devcmd/cmds/GetHeightCmd.java | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/engine/devcmd/cmds/GetHeightCmd.java b/src/engine/devcmd/cmds/GetHeightCmd.java index 873ae29d..647ee661 100644 --- a/src/engine/devcmd/cmds/GetHeightCmd.java +++ b/src/engine/devcmd/cmds/GetHeightCmd.java @@ -49,20 +49,24 @@ public class GetHeightCmd extends AbstractDevCmd { float blendedHeight = Terrain.getWorldHeight(currentZone, playerCharacter.getLoc()); - Vector2f gridSquare = heightmapZone.terrain.getTerrainCell(childZoneLoc); - gridSquare.x = (float) Math.floor(gridSquare.x); - gridSquare.y = (float) Math.floor(gridSquare.y); + Vector2f terrainCell = heightmapZone.terrain.getTerrainCell(childZoneLoc); - short top_left_pixel = heightmapZone.terrain.terrain_pixel_data[(int) gridSquare.x][(int) gridSquare.y]; - short top_right_pixel = heightmapZone.terrain.terrain_pixel_data[(int) gridSquare.x + 1][(int) gridSquare.y]; - short bottom_left_pixel = heightmapZone.terrain.terrain_pixel_data[(int) gridSquare.x][(int) gridSquare.y + 1]; - short bottom_right_pixel = heightmapZone.terrain.terrain_pixel_data[(int) gridSquare.x + 1][(int) gridSquare.y + 1]; + terrainCell.x = (float) Math.floor(terrainCell.x); + terrainCell.y = (float) Math.floor(terrainCell.y); + + Vector2f cell_offset = new Vector2f(terrainCell.x % 1, terrainCell.y % 1); + + short top_left_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x][(int) terrainCell.y]; + short top_right_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x + 1][(int) terrainCell.y]; + short bottom_left_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x][(int) terrainCell.y + 1]; + short bottom_right_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x + 1][(int) terrainCell.y + 1]; this.throwbackInfo(playerCharacter, "Current Zone : " + currentZone.zoneName); this.throwbackInfo(playerCharacter, "Heightmap Zone : " + heightmapZone.zoneName); this.throwbackInfo(playerCharacter, "Parent Zone: " + parentZone.zoneName); - this.throwbackInfo(playerCharacter, "Grid : " + "[" + gridSquare.x + "]" + "[" + gridSquare.y + "]"); + this.throwbackInfo(playerCharacter, "Terrain Cell : " + "[" + terrainCell.x + "]" + "[" + terrainCell.y + "]"); + this.throwbackInfo(playerCharacter, "Cell Offset : " + "[" + cell_offset.x + "]" + "[" + cell_offset.y + "]"); this.throwbackInfo(playerCharacter, "Pixels : " + "[" + top_left_pixel + "]" + "[" + top_right_pixel + "]"); this.throwbackInfo(playerCharacter, "Pixels : " + "[" + bottom_left_pixel + "]" + "[" + bottom_right_pixel + "]");