diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java index 4f8605cc3..c94a90932 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/IMultiblockRenderHook.java @@ -25,7 +25,7 @@ public interface IMultiblockRenderHook { public static Map renderHooks = new HashMap<>(); - public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp, float alpha); + public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp); public boolean needsTranslate(IBlockState state); diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index 60c9ef710..0dfbfe317 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -37,13 +37,16 @@ import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; +import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL11; +import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.block.ModBlocks; import java.util.List; @@ -62,7 +65,7 @@ public final class MultiblockRenderHandler { // todo 1.8.8 temporary shim, because cannot renderBlockBrightness directly, see MinecraftForge issue 2353 IMultiblockRenderHook.renderHooks.put(ModBlocks.pylon, new IMultiblockRenderHook() { @Override - public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp, float alpha) { + public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp) { // Steal itemstack model since it has the proper group visibilities configured ItemStack stack = new ItemStack(ModBlocks.pylon, 1, state.getBlock().getMetaFromState(state)); IBakedModel model = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(stack); @@ -80,7 +83,7 @@ public final class MultiblockRenderHandler { // TODO also a temporary shim for same reason as above IMultiblockRenderHook.renderHooks.put(ModBlocks.pool, new IMultiblockRenderHook() { @Override - public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp, float alpha) { + public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp) { GlStateManager.translate(-0.5F, -0.5F, 0.5F); IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(ModBlocks.pool.getDefaultState()); Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(model, ModBlocks.pool.getDefaultState(), 1.0F, false); @@ -135,9 +138,18 @@ public final class MultiblockRenderHandler { blockAccess.update(player.worldObj, mb, anchorPos); - for(MultiblockComponent comp : mb.getComponents()) + ShaderHelper.useShader(ShaderHelper.alpha, shader -> { + int alpha = ARBShaderObjects.glGetUniformLocationARB(shader, "alpha"); + ARBShaderObjects.glUniform1fARB(alpha, 0.4F); + }); + + for(MultiblockComponent comp : mb.getComponents()) { if(renderComponentInWorld(player.worldObj, mb, comp, anchorPos)) didAny = true; + } + + ShaderHelper.releaseShader(); + rendering = false; GL11.glPopAttrib(); GlStateManager.popMatrix(); @@ -168,7 +180,7 @@ public final class MultiblockRenderHandler { GlStateManager.pushMatrix(); GlStateManager.translate(-renderPosX, -renderPosY, -renderPosZ); GlStateManager.disableDepth(); - doRenderComponent(mb, comp, pos_, 0.4F); + doRenderComponent(mb, comp, pos_); GlStateManager.popMatrix(); return true; } @@ -178,11 +190,11 @@ public final class MultiblockRenderHandler { blockAccess.update(null, mb, mb.offPos); for(MultiblockComponent comp : mb.getComponents()) { BlockPos pos = comp.getRelativePosition(); - doRenderComponent(mb, comp, pos.add(mb.offPos), 1); + doRenderComponent(mb, comp, pos.add(mb.offPos)); } } - private static void doRenderComponent(Multiblock mb, MultiblockComponent comp, BlockPos pos, float alpha) { + private static void doRenderComponent(Multiblock mb, MultiblockComponent comp, BlockPos pos) { GlStateManager.pushMatrix(); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -191,81 +203,21 @@ public final class MultiblockRenderHandler { if(state == null) return; if(IMultiblockRenderHook.renderHooks.containsKey(state.getBlock())) { - GlStateManager.color(1F, 1F, 1F, alpha); + GlStateManager.color(1F, 1F, 1F, 1F); IMultiblockRenderHook renderHook = IMultiblockRenderHook.renderHooks.get(state.getBlock()); if(renderHook.needsTranslate(state)) { GlStateManager.translate(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); } - renderHook.renderBlockForMultiblock(blockAccess, mb, state, comp, alpha); + renderHook.renderBlockForMultiblock(blockAccess, mb, state, comp); } else { BlockRendererDispatcher brd = Minecraft.getMinecraft().getBlockRendererDispatcher(); GlStateManager.translate(pos.getX(), pos.getY(), pos.getZ() + 1); // todo 1.8 bandaid for things rendering one block off...why? - GlStateManager.color(1, 1, 1, alpha); - renderModelBrightness(brd.getModelForState(state), state, 1, true, alpha); // todo 1.9 make this a shader so we don't have to copypasta 3 methods? + GlStateManager.color(1, 1, 1, 1); + brd.renderBlockBrightness(state, 1.0F); } GlStateManager.color(1F, 1F, 1F, 1F); GlStateManager.enableDepth(); GlStateManager.popMatrix(); } - - // Copy of BlockModelRenderer.renderModelBrightness + alpha arg - private static void renderModelBrightness(IBakedModel model, IBlockState p_178266_2_, float brightness, boolean p_178266_4_, float alpha) - { - GlStateManager.rotate(90.0F, 0.0F, 1.0F, 0.0F); - int i = Minecraft.getMinecraft().getBlockColors().colorMultiplier(p_178266_2_, null, null, 0); - - if (EntityRenderer.anaglyphEnable) - { - i = TextureUtil.anaglyphColor(i); - } - - float f = (float)(i >> 16 & 255) / 255.0F; - float f1 = (float)(i >> 8 & 255) / 255.0F; - float f2 = (float)(i & 255) / 255.0F; - - if (!p_178266_4_) - { - GlStateManager.color(brightness, brightness, brightness, 1.0F); - } - - renderModelBrightnessColor(p_178266_2_, model, brightness, f, f1, f2, alpha); - } - - // Copy of BlockModelRenderer.renderModelBrightnessColor + alpha arg - private static void renderModelBrightnessColor(IBlockState p_187495_1_, IBakedModel p_187495_2_, float p_187495_3_, float p_187495_4_, float p_187495_5_, float p_187495_6_, float alpha) { - for (EnumFacing enumfacing : EnumFacing.values()) - { - renderModelBrightnessColorQuads(p_187495_3_, p_187495_4_, p_187495_5_, p_187495_6_, p_187495_2_.getQuads(p_187495_1_, enumfacing, 0L), alpha); - } - - renderModelBrightnessColorQuads(p_187495_3_, p_187495_4_, p_187495_5_, p_187495_6_, p_187495_2_.getQuads(p_187495_1_, (EnumFacing)null, 0L), alpha); - } - - // Copy of BlockModelRenderer.renderModelBrightnessColorQuads + alpha arg - private static void renderModelBrightnessColorQuads(float brightness, float red, float green, float blue, List listQuads, float alpha) - { - Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer vertexbuffer = tessellator.getBuffer(); - int i = 0; - - for (int j = listQuads.size(); i < j; ++i) - { - BakedQuad bakedquad = (BakedQuad)listQuads.get(i); - vertexbuffer.begin(7, DefaultVertexFormats.ITEM); - vertexbuffer.addVertexData(bakedquad.getVertexData()); - - // Botania - alpha - int a = ((int) (255 * alpha)); - int r = ((int) (255 * brightness * (bakedquad.hasTintIndex() ? red : 1))); - int g = ((int) (255 * brightness * (bakedquad.hasTintIndex() ? green : 1))); - int b = ((int) (255 * brightness * (bakedquad.hasTintIndex() ? blue : 1))); - int argb = a << 24 | r << 16 | g << 8 | b; - vertexbuffer.putColor4(argb); - - Vec3i vec3i = bakedquad.getFace().getDirectionVec(); - vertexbuffer.putNormal((float)vec3i.getX(), (float)vec3i.getY(), (float)vec3i.getZ()); - tessellator.draw(); - } - } } diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java index 86a48662d..ede7054e8 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -44,6 +44,7 @@ public final class ShaderHelper { public static int filmGrain = 0; public static int gold = 0; public static int categoryButton = 0; + public static int alpha = 0; public static void initShaders() { if(!useShaders()) @@ -59,6 +60,7 @@ public final class ShaderHelper { filmGrain = createProgram(null, LibResources.SHADER_FILM_GRAIN_FRAG); gold = createProgram(null, LibResources.SHADER_GOLD_FRAG); categoryButton = createProgram(null, LibResources.SHADER_CATEGORY_BUTTON_FRAG); + alpha = createProgram(LibResources.SHADER_ALPHA_VERT, LibResources.SHADER_ALPHA_FRAG); } public static void useShader(int shader, ShaderCallback callback) { diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java index f0993c978..d70e46644 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonCategory.java @@ -34,13 +34,13 @@ public class GuiButtonCategory extends GuiButtonLexicon { private static final ResourceLocation fallbackResource = new ResourceLocation(LibResources.CATEGORY_INDEX); private static final ResourceLocation stencilResource = new ResourceLocation(LibResources.GUI_STENCIL); - static boolean boundStencil = false; + private static boolean boundStencil = false; GuiLexicon gui; - LexiconCategory category; - ResourceLocation resource = null; - float ticksHovered = 0F; - float time = 12F; + private LexiconCategory category; + private ResourceLocation resource = null; + private float ticksHovered = 0F; + private float time = 12F; private ShaderCallback shaderCallback = shader -> { TextureManager r = Minecraft.getMinecraft().renderEngine; @@ -125,7 +125,7 @@ public class GuiButtonCategory extends GuiButtonLexicon { gui.categoryHighlight = I18n.translateToLocal(getTooltipText()); } - String getTooltipText() { + private String getTooltipText() { if(category == null) return "botaniamisc.lexiconIndex"; return category.getUnlocalizedName(); diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index 584d12181..4342933f4 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -166,5 +166,7 @@ public final class LibResources { public static final String SHADER_FILM_GRAIN_FRAG = PREFIX_SHADER + "film_grain.frag"; public static final String SHADER_GOLD_FRAG = PREFIX_SHADER + "gold.frag"; public static final String SHADER_CATEGORY_BUTTON_FRAG = PREFIX_SHADER + "category_button.frag"; + public static final String SHADER_ALPHA_FRAG = PREFIX_SHADER + "alpha.frag"; + public static final String SHADER_ALPHA_VERT = PREFIX_SHADER + "alpha.vert"; } diff --git a/src/main/resources/assets/botania/shader/alpha.frag b/src/main/resources/assets/botania/shader/alpha.frag new file mode 100644 index 000000000..ec9a86279 --- /dev/null +++ b/src/main/resources/assets/botania/shader/alpha.frag @@ -0,0 +1,9 @@ +#version 120 + +uniform float alpha; // Passed in by callback +uniform sampler2D tex; +uniform int time; // Passed in, see ShaderHelper.java + +void main() { + gl_FragColor = texture2D(tex, vec2(gl_TexCoord[0])) * gl_Color * vec4(1.0, 1.0, 1.0, alpha); +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/shader/alpha.vert b/src/main/resources/assets/botania/shader/alpha.vert new file mode 100644 index 000000000..f76947aa8 --- /dev/null +++ b/src/main/resources/assets/botania/shader/alpha.vert @@ -0,0 +1,9 @@ +#version 120 + +uniform int time; // Passed in, see ShaderHelper.java + +void main() { + gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; + gl_TexCoord[0] = gl_MultiTexCoord0; + gl_FrontColor = gl_Color; +} \ No newline at end of file