diff --git a/api/src/main/java/com/seibel/distanthorizons/api/objects/render/DhApiRenderableBox.java b/api/src/main/java/com/seibel/distanthorizons/api/objects/render/DhApiRenderableBox.java index d3411dc15..35858b511 100644 --- a/api/src/main/java/com/seibel/distanthorizons/api/objects/render/DhApiRenderableBox.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/objects/render/DhApiRenderableBox.java @@ -23,6 +23,7 @@ public class DhApiRenderableBox public DhApiVec3d maxPos; public Color color; + /** @see EDhApiBlockMaterial */ public byte material; diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/BufferQuad.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/BufferQuad.java index 5a9f962f4..e090e1fb8 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/BufferQuad.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/BufferQuad.java @@ -47,7 +47,7 @@ public final class BufferQuad public short widthEastWest; /** This is both North/South and Up/Down since the merging logic is the same either way */ - public short widthNorthSouthOrUpDown; + public short widthNorthSouthOrHeight; public final int color; /** used by the Iris shader mod to determine how each LOD should be rendered */ @@ -62,15 +62,15 @@ public final class BufferQuad BufferQuad( - short x, short y, short z, short widthEastWest, short widthNorthSouthOrUpDown, + short x, short y, short z, short widthEastWest, short widthNorthSouthOrHeight, int color, byte irisBlockMaterialId, byte skylight, byte blockLight, EDhDirection direction) { - if (widthEastWest == 0 || widthNorthSouthOrUpDown == 0) + if (widthEastWest == 0 || widthNorthSouthOrHeight == 0) { throw new IllegalArgumentException("Size 0 quad!"); } - if (widthEastWest < 0 || widthNorthSouthOrUpDown < 0) + if (widthEastWest < 0 || widthNorthSouthOrHeight < 0) { throw new IllegalArgumentException("Negative sized quad!"); } @@ -79,7 +79,7 @@ public final class BufferQuad this.y = y; this.z = z; this.widthEastWest = widthEastWest; - this.widthNorthSouthOrUpDown = widthNorthSouthOrUpDown; + this.widthNorthSouthOrHeight = widthNorthSouthOrHeight; this.color = color; this.irisBlockMaterialId = irisBlockMaterialId; this.skyLight = skylight; @@ -242,17 +242,17 @@ public final class BufferQuad if (mergeDirection == BufferMergeDirectionEnum.EastWest) { thisPerpendicularCompareWidth = this.widthEastWest; - thisParallelCompareWidth = this.widthNorthSouthOrUpDown; + thisParallelCompareWidth = this.widthNorthSouthOrHeight; otherPerpendicularCompareWidth = quad.widthEastWest; - otherParallelCompareWidth = quad.widthNorthSouthOrUpDown; + otherParallelCompareWidth = quad.widthNorthSouthOrHeight; } else { - thisPerpendicularCompareWidth = this.widthNorthSouthOrUpDown; + thisPerpendicularCompareWidth = this.widthNorthSouthOrHeight; thisParallelCompareWidth = this.widthEastWest; - otherPerpendicularCompareWidth = quad.widthNorthSouthOrUpDown; + otherPerpendicularCompareWidth = quad.widthNorthSouthOrHeight; otherParallelCompareWidth = quad.widthEastWest; } @@ -322,7 +322,7 @@ public final class BufferQuad // merge the two quads if (mergeDirection == BufferMergeDirectionEnum.NorthSouthOrUpDown) { - this.widthNorthSouthOrUpDown += quad.widthNorthSouthOrUpDown; + this.widthNorthSouthOrHeight += quad.widthNorthSouthOrHeight; } else // if (mergeDirection == MergeDirection.EastWest) { diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnBox.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnBox.java index 7f774732a..646105857 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnBox.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnBox.java @@ -134,7 +134,7 @@ public class ColumnBox && !isBottomTransparent; if (!skipBottom) { - builder.addQuadDown(minX, minY, minZ, width, width, ColorUtil.applyShade(color, MC_RENDER.getShade(EDhDirection.DOWN)), irisBlockMaterialId, skyLightBot, blockLight); + builder.addQuadDown(minX, minY, minZ, width, ColorUtil.applyShade(color, MC_RENDER.getShade(EDhDirection.DOWN)), irisBlockMaterialId, skyLightBot, blockLight); } } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/LodQuadBuilder.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/LodQuadBuilder.java index a574b78e1..3bba59013 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/LodQuadBuilder.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/LodQuadBuilder.java @@ -31,7 +31,6 @@ import com.seibel.distanthorizons.core.enums.EDhDirection; import com.seibel.distanthorizons.core.logging.DhLogger; import com.seibel.distanthorizons.core.logging.DhLoggerBuilder; import com.seibel.distanthorizons.core.util.ColorUtil; -import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper; import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper; import com.seibel.distanthorizons.coreapi.util.MathUtil; @@ -145,7 +144,7 @@ public class LodQuadBuilder public void addQuadAdj( EDhDirection dir, short x, short y, short z, - short widthEastWest, short widthNorthSouthOrUpDown, + short width, short height, int color, byte irisBlockMaterialId, byte skyLight, byte blockLight) { if (dir == EDhDirection.DOWN) @@ -164,7 +163,7 @@ public class LodQuadBuilder quadList = this.opaqueQuads[dir.ordinal()]; } - BufferQuad quad = new BufferQuad(x, y, z, widthEastWest, widthNorthSouthOrUpDown, color, irisBlockMaterialId, skyLight, blockLight, dir); + BufferQuad quad = new BufferQuad(x, y, z, width, height, color, irisBlockMaterialId, skyLight, blockLight, dir); if (!quadList.isEmpty() && ( quadList.get(quadList.size() - 1).tryMerge(quad, BufferMergeDirectionEnum.EastWest) @@ -179,24 +178,24 @@ public class LodQuadBuilder } // XZ - public void addQuadUp(short minX, short maxY, short minZ, short widthEastWest, short widthNorthSouthOrUpDown, int color, byte irisBlockMaterialId, byte skylight, byte blocklight) // TODO argument names are wrong + public void addQuadUp(short minX, short maxY, short minZ, short width, int color, byte irisBlockMaterialId, byte skylight, byte blocklight) { boolean isTransparent = (this.doTransparency && ColorUtil.getAlpha(color) < 255); ArrayList quadList = isTransparent ? this.transparentQuads[EDhDirection.UP.ordinal()] : this.opaqueQuads[EDhDirection.UP.ordinal()]; - BufferQuad quad = new BufferQuad(minX, maxY, minZ, widthEastWest, widthNorthSouthOrUpDown, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.UP); + BufferQuad quad = new BufferQuad(minX, maxY, minZ, width, width, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.UP); quadList.add(quad); } - public void addQuadDown(short x, short y, short z, short width, short wz, int color, byte irisBlockMaterialId, byte skylight, byte blocklight) + public void addQuadDown(short x, short y, short z, short width, int color, byte irisBlockMaterialId, byte skylight, byte blocklight) { ArrayList quadArray = (this.doTransparency && ColorUtil.getAlpha(color) < 255) ? this.transparentQuads[EDhDirection.DOWN.ordinal()] : this.opaqueQuads[EDhDirection.DOWN.ordinal()]; - BufferQuad quad = new BufferQuad(x, y, z, width, wz, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.DOWN); + BufferQuad quad = new BufferQuad(x, y, z, width, width, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.DOWN); quadArray.add(quad); } @@ -329,7 +328,7 @@ public class LodQuadBuilder { int[][] quadBase = DIRECTION_VERTEX_IBO_QUAD[quad.direction.ordinal()]; short widthEastWest = quad.widthEastWest; - short widthNorthSouth = quad.widthNorthSouthOrUpDown; + short widthNorthSouth = quad.widthNorthSouthOrHeight; byte normalIndex = (byte) quad.direction.ordinal(); EDhDirection.Axis axis = quad.direction.axis; for (int i = 0; i < quadBase.length; i++)