MrSphay/WorldHandler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix outline rendering partially

Browse Source
This commit is contained in:
Marcel Konrad
2020-07-05 13:50:57 +02:00
parent 7832c0a902
commit c73e177dd2
2 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/exopandora/worldhandler/event/ClientEventHandler.java
View File

@@ -8,13 +8,14 @@ import com.mojang.brigadier.StringReader;
import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.CommandSyntaxException;
import exopandora.worldhandler.config.Config; import exopandora.worldhandler.config.Config;
import exopandora.worldhandler.render.CustomRenderType;
import exopandora.worldhandler.util.BlockHelper; import exopandora.worldhandler.util.BlockHelper;
import exopandora.worldhandler.util.CommandHelper; import exopandora.worldhandler.util.CommandHelper;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.WorldRenderer;
import net.minecraft.command.CommandSource; import net.minecraft.command.CommandSource;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3d;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
@@ -32,10 +33,6 @@ public class ClientEventHandler
{ {
Vector3d projected = Minecraft.getInstance().getRenderManager().info.getProjectedView(); Vector3d projected = Minecraft.getInstance().getRenderManager().info.getProjectedView();
MatrixStack matrix = event.getMatrixStack();
matrix.push();
matrix.translate(-projected.getX(), -projected.getY(), -projected.getZ());
double minX = Math.min(BlockHelper.getPos1().getX(), BlockHelper.getPos2().getX()); double minX = Math.min(BlockHelper.getPos1().getX(), BlockHelper.getPos2().getX());
double minY = Math.min(BlockHelper.getPos1().getY(), BlockHelper.getPos2().getY()); double minY = Math.min(BlockHelper.getPos1().getY(), BlockHelper.getPos2().getY());
double minZ = Math.min(BlockHelper.getPos1().getZ(), BlockHelper.getPos2().getZ()); double minZ = Math.min(BlockHelper.getPos1().getZ(), BlockHelper.getPos2().getZ());
@@ -44,13 +41,22 @@ public class ClientEventHandler
double maxY = Math.max(BlockHelper.getPos1().getY(), BlockHelper.getPos2().getY()) + 1; double maxY = Math.max(BlockHelper.getPos1().getY(), BlockHelper.getPos2().getY()) + 1;
double maxZ = Math.max(BlockHelper.getPos1().getZ(), BlockHelper.getPos2().getZ()) + 1; double maxZ = Math.max(BlockHelper.getPos1().getZ(), BlockHelper.getPos2().getZ()) + 1;
IRenderTypeBuffer.Impl buffer = Minecraft.getInstance().getRenderTypeBuffers().getBufferSource(); AxisAlignedBB aabb = new AxisAlignedBB(minX, minY, minZ, maxX, maxY, maxZ);
IVertexBuilder builder = buffer.getBuffer(RenderType.getLines());
WorldRenderer.drawBoundingBox(matrix, builder, minX, minY, minZ, maxX, maxY, maxZ, 0.9F, 0.9F, 0.9F, 1.0F, 0.5F, 0.5F, 0.5F); if(aabb.getCenter().distanceTo(projected) < 96)
buffer.finish(RenderType.LINES); {
MatrixStack matrix = event.getMatrixStack();
matrix.pop(); matrix.push();
matrix.translate(-projected.getX(), -projected.getY(), -projected.getZ());
IRenderTypeBuffer.Impl buffer = Minecraft.getInstance().getRenderTypeBuffers().getBufferSource();
IVertexBuilder builder = buffer.getBuffer(CustomRenderType.LINES2);
WorldRenderer.drawBoundingBox(matrix, builder, minX, minY, minZ, maxX, maxY, maxZ, 0.9F, 0.9F, 0.9F, 1.0F, 0.5F, 0.5F, 0.5F);
buffer.finish(CustomRenderType.LINES2);
matrix.pop();
}
} }
} }

32
src/main/java/exopandora/worldhandler/render/CustomRenderType.java Normal file
View File

@@ -0,0 +1,32 @@
package exopandora.worldhandler.render;
import java.util.OptionalDouble;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.renderer.RenderState;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
@OnlyIn(Dist.CLIENT)
public abstract class CustomRenderType extends RenderType
{
public static final RenderType LINES2 = RenderType.makeType("lines2",
DefaultVertexFormats.POSITION_COLOR,
GL11.GL_LINES,
256,
RenderType.State.getBuilder()
.line(new RenderState.LineState(OptionalDouble.empty()))
.layer(field_239235_M_)
.transparency(TRANSLUCENT_TRANSPARENCY)
.writeMask(COLOR_DEPTH_WRITE)
.build(false));
public CustomRenderType(String nameIn, VertexFormat formatIn, int drawModeIn, int bufferSizeIn, boolean useDelegateIn, boolean needsSortingIn, Runnable setupTaskIn, Runnable clearTaskIn)
{
super(nameIn, formatIn, drawModeIn, bufferSizeIn, useDelegateIn, needsSortingIn, setupTaskIn, clearTaskIn);
}
}