dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Draw union of all boxes instead

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-08-06 20:13:39 +02:00
parent 0531ace39e
commit 0e1370115e
1 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/java/refinedstorage/proxy/ClientProxy.java
View File

@@ -77,10 +77,14 @@ public class ClientProxy extends CommonProxy {
double d1 = player.lastTickPosY + (player.posY - player.lastTickPosY) * (double) partialTicks; double d1 = player.lastTickPosY + (player.posY - player.lastTickPosY) * (double) partialTicks;
double d2 = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * (double) partialTicks; double d2 = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * (double) partialTicks;
for (AxisAlignedBB aabb : boxes) { AxisAlignedBB aabb = boxes.get(0);
drawSelectionBoundingBox(aabb.expand(0.0020000000949949026D, 0.0020000000949949026D, 0.0020000000949949026D).offset(-d0, -d1, -d2).offset(pos.getX(), pos.getY(), pos.getZ()));
for (int i = 1; i < boxes.size(); ++i) {
aabb = aabb.union(boxes.get(i));
} }
drawSelectionBoundingBox(aabb.expand(0.0020000000949949026D, 0.0020000000949949026D, 0.0020000000949949026D).offset(-d0, -d1, -d2).offset(pos.getX(), pos.getY(), pos.getZ()));
GlStateManager.depthMask(true); GlStateManager.depthMask(true);
GlStateManager.enableTexture2D(); GlStateManager.enableTexture2D();
GlStateManager.disableBlend(); GlStateManager.disableBlend();
@@ -89,33 +93,36 @@ public class ClientProxy extends CommonProxy {
private void drawSelectionBoundingBox(AxisAlignedBB aabb) { private void drawSelectionBoundingBox(AxisAlignedBB aabb) {
Tessellator tessellator = Tessellator.getInstance(); Tessellator tessellator = Tessellator.getInstance();
VertexBuffer vertexbuffer = tessellator.getBuffer(); VertexBuffer buffer = tessellator.getBuffer();
buffer.begin(3, DefaultVertexFormats.POSITION);
buffer.pos(aabb.minX, aabb.minY, aabb.minZ).endVertex();
buffer.pos(aabb.maxX, aabb.minY, aabb.minZ).endVertex();
buffer.pos(aabb.maxX, aabb.minY, aabb.maxZ).endVertex();
buffer.pos(aabb.minX, aabb.minY, aabb.maxZ).endVertex();
buffer.pos(aabb.minX, aabb.minY, aabb.minZ).endVertex();
vertexbuffer.begin(3, DefaultVertexFormats.POSITION);
vertexbuffer.pos(aabb.minX, aabb.minY, aabb.minZ).endVertex();
vertexbuffer.pos(aabb.maxX, aabb.minY, aabb.minZ).endVertex();
vertexbuffer.pos(aabb.maxX, aabb.minY, aabb.maxZ).endVertex();
vertexbuffer.pos(aabb.minX, aabb.minY, aabb.maxZ).endVertex();
vertexbuffer.pos(aabb.minX, aabb.minY, aabb.minZ).endVertex();
tessellator.draw(); tessellator.draw();
vertexbuffer.begin(3, DefaultVertexFormats.POSITION); buffer.begin(3, DefaultVertexFormats.POSITION);
vertexbuffer.pos(aabb.minX, aabb.maxY, aabb.minZ).endVertex(); buffer.pos(aabb.minX, aabb.maxY, aabb.minZ).endVertex();
vertexbuffer.pos(aabb.maxX, aabb.maxY, aabb.minZ).endVertex(); buffer.pos(aabb.maxX, aabb.maxY, aabb.minZ).endVertex();
vertexbuffer.pos(aabb.maxX, aabb.maxY, aabb.maxZ).endVertex(); buffer.pos(aabb.maxX, aabb.maxY, aabb.maxZ).endVertex();
vertexbuffer.pos(aabb.minX, aabb.maxY, aabb.maxZ).endVertex(); buffer.pos(aabb.minX, aabb.maxY, aabb.maxZ).endVertex();
vertexbuffer.pos(aabb.minX, aabb.maxY, aabb.minZ).endVertex(); buffer.pos(aabb.minX, aabb.maxY, aabb.minZ).endVertex();
tessellator.draw(); tessellator.draw();
vertexbuffer.begin(1, DefaultVertexFormats.POSITION); buffer.begin(1, DefaultVertexFormats.POSITION);
vertexbuffer.pos(aabb.minX, aabb.minY, aabb.minZ).endVertex(); buffer.pos(aabb.minX, aabb.minY, aabb.minZ).endVertex();
vertexbuffer.pos(aabb.minX, aabb.maxY, aabb.minZ).endVertex(); buffer.pos(aabb.minX, aabb.maxY, aabb.minZ).endVertex();
vertexbuffer.pos(aabb.maxX, aabb.minY, aabb.minZ).endVertex(); buffer.pos(aabb.maxX, aabb.minY, aabb.minZ).endVertex();
vertexbuffer.pos(aabb.maxX, aabb.maxY, aabb.minZ).endVertex(); buffer.pos(aabb.maxX, aabb.maxY, aabb.minZ).endVertex();
vertexbuffer.pos(aabb.maxX, aabb.minY, aabb.maxZ).endVertex(); buffer.pos(aabb.maxX, aabb.minY, aabb.maxZ).endVertex();
vertexbuffer.pos(aabb.maxX, aabb.maxY, aabb.maxZ).endVertex(); buffer.pos(aabb.maxX, aabb.maxY, aabb.maxZ).endVertex();
vertexbuffer.pos(aabb.minX, aabb.minY, aabb.maxZ).endVertex(); buffer.pos(aabb.minX, aabb.minY, aabb.maxZ).endVertex();
vertexbuffer.pos(aabb.minX, aabb.maxY, aabb.maxZ).endVertex(); buffer.pos(aabb.minX, aabb.maxY, aabb.maxZ).endVertex();
tessellator.draw(); tessellator.draw();
} }