From 3181c465cbedf2250cf24ff913be102e9be1c2dd Mon Sep 17 00:00:00 2001 From: MagicBot Date: Thu, 2 Nov 2023 09:08:28 -0400 Subject: [PATCH] Dev cmd updated --- src/engine/devcmd/cmds/GetHeightCmd.java | 26 +++++++++--------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/engine/devcmd/cmds/GetHeightCmd.java b/src/engine/devcmd/cmds/GetHeightCmd.java index 83c0fb99..873ae29d 100644 --- a/src/engine/devcmd/cmds/GetHeightCmd.java +++ b/src/engine/devcmd/cmds/GetHeightCmd.java @@ -49,32 +49,26 @@ public class GetHeightCmd extends AbstractDevCmd { float blendedHeight = Terrain.getWorldHeight(currentZone, playerCharacter.getLoc()); - Vector2f terrainCell = heightmapZone.terrain.getTerrainCell(childZoneLoc); - Vector2f cell_offset = new Vector2f(terrainCell.x % 1, terrainCell.y % 1); + Vector2f gridSquare = heightmapZone.terrain.getTerrainCell(childZoneLoc); + gridSquare.x = (float) Math.floor(gridSquare.x); + gridSquare.y = (float) Math.floor(gridSquare.y); - terrainCell.x = (float) Math.floor(terrainCell.x); - terrainCell.y = (float) Math.floor(terrainCell.y); - - - 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]; + 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]; this.throwbackInfo(playerCharacter, "Current Zone : " + currentZone.zoneName); this.throwbackInfo(playerCharacter, "Heightmap Zone : " + heightmapZone.zoneName); this.throwbackInfo(playerCharacter, "Parent Zone: " + parentZone.zoneName); - this.throwbackInfo(playerCharacter, "Player loc: " + "[" + playerCharacter.loc.x + "]" + "[" + playerCharacter.loc.y + "]" + "[" + playerCharacter.loc.z + "]"); - - this.throwbackInfo(playerCharacter, "Terrain Cell : " + "[" + terrainCell.x + "]" + "[" + terrainCell.y + "]"); - this.throwbackInfo(playerCharacter, "Cell Offset : " + "[" + cell_offset.x + "]" + "[" + cell_offset.y + "]"); + this.throwbackInfo(playerCharacter, "Grid : " + "[" + gridSquare.x + "]" + "[" + gridSquare.y + "]"); this.throwbackInfo(playerCharacter, "Pixels : " + "[" + top_left_pixel + "]" + "[" + top_right_pixel + "]"); this.throwbackInfo(playerCharacter, "Pixels : " + "[" + bottom_left_pixel + "]" + "[" + bottom_right_pixel + "]"); - this.throwbackInfo(playerCharacter, "Child Zone Offset: " + "[" + childZoneOffset.x + "]" + "[" + childZoneOffset.y + "]"); + this.throwbackInfo(playerCharacter, "offset: " + "[" + childZoneOffset.x + "]" + "[" + childZoneOffset.y + "]"); this.throwbackInfo(playerCharacter, "Normalized offset: " + "[" + normalizedOffset.x + "]" + "[" + normalizedOffset.y + "]"); - this.throwbackInfo(playerCharacter, "template blend Values: (max/min): " + heightmapZone.template.max_blend + " /" + heightmapZone.template.min_blend); + this.throwbackInfo(playerCharacter, "template blend Values: (max/min): " + heightmapZone.template.min_blend + " /" + heightmapZone.template.max_blend); this.throwbackInfo(playerCharacter, "terrain values (max/min): " + heightmapZone.terrain.blend_values.x + " /" + heightmapZone.terrain.blend_values.y); this.throwbackInfo(playerCharacter, "Blend coefficient: " + heightmapZone.terrain.getTerrainBlendCoefficient(childZoneOffset));