diff --git a/codechicken/lib/render/RenderUtils.java b/codechicken/lib/render/RenderUtils.java index 0ccc668..a73afb3 100644 --- a/codechicken/lib/render/RenderUtils.java +++ b/codechicken/lib/render/RenderUtils.java @@ -102,32 +102,38 @@ public class RenderUtils GL11.glTranslated(-interpPosX, -interpPosY, -interpPosZ); } - public static void drawOutlinedBoundingBox(AxisAlignedBB par1AxisAlignedBB) + @Deprecated + public static void drawOutlinedBoundingBox(AxisAlignedBB aabb) + { + drawCuboidOutline(new Cuboid6(aabb)); + } + + public static void drawCuboidOutline(Cuboid6 c) { Tessellator var2 = Tessellator.instance; var2.startDrawing(3); - var2.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - var2.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - var2.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.minY, par1AxisAlignedBB.maxZ); - var2.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.maxZ); - var2.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); + var2.addVertex(c.min.x, c.min.y, c.min.z); + var2.addVertex(c.max.x, c.min.y, c.min.z); + var2.addVertex(c.max.x, c.min.y, c.max.z); + var2.addVertex(c.min.x, c.min.y, c.max.z); + var2.addVertex(c.min.x, c.min.y, c.min.z); var2.draw(); var2.startDrawing(3); - var2.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.minZ); - var2.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.minZ); - var2.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.maxZ); - var2.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.maxZ); - var2.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.minZ); + var2.addVertex(c.min.x, c.max.y, c.min.z); + var2.addVertex(c.max.x, c.max.y, c.min.z); + var2.addVertex(c.max.x, c.max.y, c.max.z); + var2.addVertex(c.min.x, c.max.y, c.max.z); + var2.addVertex(c.min.x, c.max.y, c.min.z); var2.draw(); var2.startDrawing(1); - var2.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - var2.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.minZ); - var2.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.minY, par1AxisAlignedBB.minZ); - var2.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.minZ); - var2.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.minY, par1AxisAlignedBB.maxZ); - var2.addVertex(par1AxisAlignedBB.maxX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.maxZ); - var2.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.minY, par1AxisAlignedBB.maxZ); - var2.addVertex(par1AxisAlignedBB.minX, par1AxisAlignedBB.maxY, par1AxisAlignedBB.maxZ); + var2.addVertex(c.min.x, c.min.y, c.min.z); + var2.addVertex(c.min.x, c.max.y, c.min.z); + var2.addVertex(c.max.x, c.min.y, c.min.z); + var2.addVertex(c.max.x, c.max.y, c.min.z); + var2.addVertex(c.max.x, c.min.y, c.max.z); + var2.addVertex(c.max.x, c.max.y, c.max.z); + var2.addVertex(c.min.x, c.min.y, c.max.z); + var2.addVertex(c.min.x, c.max.y, c.max.z); var2.draw(); } diff --git a/codechicken/lib/vec/Cuboid6.java b/codechicken/lib/vec/Cuboid6.java index c31d83e..237504f 100644 --- a/codechicken/lib/vec/Cuboid6.java +++ b/codechicken/lib/vec/Cuboid6.java @@ -61,6 +61,18 @@ public class Cuboid6 max.subtract(vec); return this; } + + public Cuboid6 expand(double d) + { + return expand(new Vector3(d, d, d)); + } + + public Cuboid6 expand(Vector3 vec) + { + min.sub(vec); + max.add(vec); + return this; + } public void setBlockBounds(Block block) { @@ -123,7 +135,13 @@ public class Cuboid6 return this; } + @Deprecated public Cuboid6 transform(Transformation t) + { + return apply(t); + } + + public Cuboid6 apply(Transformation t) { t.apply(min); t.apply(max);