Fix astrolabe shader usage and preview being offset in Z direction

This commit is contained in:
Vincent Lee committed 2020-01-21 10:42:15 -06:00
1 parent e78a1f21f3
commit de450cb633
2 files changed
+26 -15

No files matched your search

@@ -13,6 +13,7 @@ package vazkii.botania.client.core.handler;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GLX;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
@@ -34,6 +35,7 @@ import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import org.lwjgl.opengl.GL11;
import vazkii.botania.client.core.helper.RenderHelper;
import vazkii.botania.client.core.helper.ShaderHelper;
import vazkii.botania.common.item.ItemAstrolabe;
import vazkii.botania.common.lib.LibMisc;
@@ -47,6 +49,8 @@ public final class AstrolabePreviewHandler {
World world = Minecraft.getInstance().world;
MatrixStack ms = event.getMatrixStack();
IRenderTypeBuffer.Impl buffers = Minecraft.getInstance().getBufferBuilders().getEntityVertexConsumers();
IVertexBuilder buffer = buffers.getBuffer(RenderHelper.ASTROLABE_PREVIEW);
for (PlayerEntity player : world.getPlayers()) {
ItemStack currentStack = player.getHeldItemMainhand();
if(currentStack.isEmpty() || !(currentStack.getItem() instanceof ItemAstrolabe))
@@ -55,32 +59,24 @@ public final class AstrolabePreviewHandler {
if(!currentStack.isEmpty() && currentStack.getItem() instanceof ItemAstrolabe) {
Block block = ItemAstrolabe.getBlock(currentStack);
if(block != Blocks.AIR)
renderPlayerLook(ms, buffers, player, currentStack);
renderPlayerLook(ms, buffer, player, currentStack);
}
}
ShaderHelper.useShader(ShaderHelper.BotaniaShader.ALPHA, shader -> {
int alpha = GlStateManager.getUniformLocation(shader, "alpha");
ShaderHelper.FLOAT_BUF.position(0);
ShaderHelper.FLOAT_BUF.put(0, 0.4F);
GlStateManager.uniform1(alpha, ShaderHelper.FLOAT_BUF);
});
// todo 1.15 need to disable depth test
buffers.draw();
ShaderHelper.releaseShader();
buffers.draw(RenderHelper.ASTROLABE_PREVIEW);
}
private static void renderPlayerLook(MatrixStack ms, IRenderTypeBuffer buffers, PlayerEntity player, ItemStack stack) {
private static void renderPlayerLook(MatrixStack ms, IVertexBuilder buffer, PlayerEntity player, ItemStack stack) {
List<BlockPos> coords = ItemAstrolabe.getBlocksToPlace(stack, player);
if (ItemAstrolabe.hasBlocks(stack, player, coords)) {
BlockState state = ItemAstrolabe.getBlockState(stack);
for(BlockPos coord : coords)
renderBlockAt(ms, buffers, state, coord);
renderBlockAt(ms, buffer, state, coord);
}
}
private static void renderBlockAt(MatrixStack ms, IRenderTypeBuffer buffers, BlockState state, BlockPos pos) {
private static void renderBlockAt(MatrixStack ms, IVertexBuilder buffer, BlockState state, BlockPos pos) {
double renderPosX = Minecraft.getInstance().getRenderManager().info.getProjectedView().getX();
double renderPosY = Minecraft.getInstance().getRenderManager().info.getProjectedView().getY();
double renderPosZ = Minecraft.getInstance().getRenderManager().info.getProjectedView().getZ();
@@ -89,14 +85,14 @@ public final class AstrolabePreviewHandler {
ms.translate(-renderPosX, -renderPosY, -renderPosZ);
BlockRendererDispatcher brd = Minecraft.getInstance().getBlockRendererDispatcher();
ms.translate(pos.getX(), pos.getY(), pos.getZ() + 1);
ms.translate(pos.getX(), pos.getY(), pos.getZ());
IBakedModel model = brd.getModelForState(state);
int color = Minecraft.getInstance().getBlockColors().getColor(state, null, null, 0);
float r = (float)(color >> 16 & 255) / 255.0F;
float g = (float)(color >> 8 & 255) / 255.0F;
float b = (float)(color & 255) / 255.0F;
// always use entity translucent layer so blending is turned on
brd.getBlockModelRenderer().render(ms.peek(), buffers.getBuffer(Atlases.getEntityTranslucent()), state, model, r, g, b, 0xF000F0, OverlayTexture.DEFAULT_UV);
brd.getBlockModelRenderer().render(ms.peek(), buffer, state, model, r, g, b, 0xF000F0, OverlayTexture.DEFAULT_UV);
ms.pop();
}
@@ -11,6 +11,7 @@
package vazkii.botania.client.core.helper;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.block.BlockState;
@@ -27,6 +28,7 @@ import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.entity.LivingEntity;
@@ -35,6 +37,7 @@ import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.internal.ShaderCallback;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.client.render.tile.RenderTilePylon;
@@ -66,6 +69,7 @@ public final class RenderHelper {
public static final RenderType MANA_PYLON_GLOW;
public static final RenderType NATURA_PYLON_GLOW;
public static final RenderType GAIA_PYLON_GLOW;
public static final RenderType ASTROLABE_PREVIEW;
// todo 1.15 AT's for necessary fields
static {
@@ -80,6 +84,7 @@ public final class RenderHelper {
RenderState.OverlayState enableOverlay = new RenderState.OverlayState(true);
RenderState.DiffuseLightingState enableDiffuse = new RenderState.DiffuseLightingState(true);
RenderState.AlphaState zeroAlpha = new RenderState.AlphaState(0);
RenderState.AlphaState oneTenthAlpha = new RenderState.AlphaState(0.004F);
RenderType.State glState = RenderType.State.builder().shadeModel(smoothShade)
.writeMaskState(colorMask)
@@ -134,6 +139,16 @@ public final class RenderHelper {
glState = RenderType.State.builder().texture(new RenderState.TextureState(RenderTilePylon.GAIA_TEXTURE, false, false)).transparency(translucentTransparency).diffuseLighting(enableDiffuse).alpha(zeroAlpha).cull(disableCull).lightmap(enableLightmap).overlay(enableOverlay).build(true);
GAIA_PYLON_GLOW = new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.PYLON_GLOW, null, RenderType.of(LibResources.PREFIX_MOD + "gaia_pylon_glow", DefaultVertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL, GL11.GL_QUADS, 128, glState));
// Same as entity_translucent, with no depth test and a shader
glState = RenderType.State.builder().depthTest(new RenderState.DepthTestState(GL11.GL_ALWAYS)).texture(new RenderState.TextureState(AtlasTexture.LOCATION_BLOCKS_TEXTURE, false, false)).transparency(translucentTransparency).diffuseLighting(enableDiffuse).alpha(oneTenthAlpha).cull(disableCull).lightmap(enableLightmap).overlay(enableOverlay).build(true);
ShaderCallback cb = shader -> {
int alpha = GlStateManager.getUniformLocation(shader, "alpha");
ShaderHelper.FLOAT_BUF.position(0);
ShaderHelper.FLOAT_BUF.put(0, 0.4F);
GlStateManager.uniform1(alpha, ShaderHelper.FLOAT_BUF);
};
ASTROLABE_PREVIEW = new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.ALPHA, cb, RenderType.of(LibResources.PREFIX_MOD + "astrolabe_preview", DefaultVertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL, 7, 256, true, true, glState));
}
public static void drawTexturedModalRect(int par1, int par2, float z, int par3, int par4, int par5, int par6) {