Lambdaify shadercallback

This commit is contained in:
Vincent Lee committed 2016-02-14 19:13:25 -06:00
1 parent d1ff5e89ca
commit 333102a08f
6 files changed
+55 -73

No files matched your search

@@ -13,8 +13,9 @@ package vazkii.botania.api.internal;
/**
* A Callback for when a shader is called. Used to define shader uniforms.
*/
public abstract class ShaderCallback {
@FunctionalInterface
public interface ShaderCallback {
public abstract void call(int shader);
void call(int shader);
}
@@ -90,7 +90,7 @@ public final class BossBarHandler {
ShaderHelper.releaseShader();
}
static class BarCallback extends ShaderCallback {
static class BarCallback implements ShaderCallback {
int x, y;
ShaderCallback callback;
@@ -34,31 +34,6 @@ 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);
private ShaderCallback shaderCallback = new ShaderCallback() {
@Override
public void call(int shader) {
TextureManager r = Minecraft.getMinecraft().renderEngine;
int heightMatchUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "heightMatch");
int imageUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "image");
int maskUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "mask");
float heightMatch = ticksHovered / time;
OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB);
GL11.glBindTexture(GL11.GL_TEXTURE_2D, r.getTexture(resource).getGlTextureId());
ARBShaderObjects.glUniform1iARB(imageUniform, 0);
OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + ConfigHandler.glSecondaryTextureUnit);
GlStateManager.enableTexture2D();
GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
GL11.glBindTexture(GL11.GL_TEXTURE_2D, r.getTexture(stencilResource).getGlTextureId());
ARBShaderObjects.glUniform1iARB(maskUniform, ConfigHandler.glSecondaryTextureUnit);
ARBShaderObjects.glUniform1fARB(heightMatchUniform, heightMatch);
}
};
static boolean boundStencil = false;
GuiLexicon gui;
@@ -66,6 +41,29 @@ public class GuiButtonCategory extends GuiButtonLexicon {
ResourceLocation resource = null;
float ticksHovered = 0F;
float time = 12F;
private ShaderCallback shaderCallback = shader -> {
TextureManager r = Minecraft.getMinecraft().renderEngine;
int heightMatchUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "heightMatch");
int imageUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "image");
int maskUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "mask");
float heightMatch = ticksHovered / time;
OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB);
GL11.glBindTexture(GL11.GL_TEXTURE_2D, r.getTexture(resource).getGlTextureId());
ARBShaderObjects.glUniform1iARB(imageUniform, 0);
OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + ConfigHandler.glSecondaryTextureUnit);
GlStateManager.enableTexture2D();
GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
GL11.glBindTexture(GL11.GL_TEXTURE_2D, r.getTexture(stencilResource).getGlTextureId());
ARBShaderObjects.glUniform1iARB(maskUniform, ConfigHandler.glSecondaryTextureUnit);
ARBShaderObjects.glUniform1fARB(heightMatchUniform, heightMatch);
};
int activeTex = 0;
public GuiButtonCategory(int id, int x, int y, GuiLexicon gui, LexiconCategory category) {
@@ -31,33 +31,25 @@ public class RenderDoppleganger extends RenderBiped<EntityDoppleganger> {
public static float grainIntensity = DEFAULT_GRAIN_INTENSITY;
public static float disfiguration = DEFAULT_DISFIGURATION;
public static ShaderCallback callback = new ShaderCallback() {
public static ShaderCallback callback = shader -> {
// Frag Uniforms
int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration");
ARBShaderObjects.glUniform1fARB(disfigurationUniform, disfiguration);
@Override
public void call(int shader) {
// Frag Uniforms
int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration");
ARBShaderObjects.glUniform1fARB(disfigurationUniform, disfiguration);
// Vert Uniforms
int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity");
ARBShaderObjects.glUniform1fARB(grainIntensityUniform, grainIntensity);
};
// Vert Uniforms
int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity");
ARBShaderObjects.glUniform1fARB(grainIntensityUniform, grainIntensity);
}
};
public static ShaderCallback defaultCallback = shader -> {
// Frag Uniforms
int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration");
ARBShaderObjects.glUniform1fARB(disfigurationUniform, DEFAULT_DISFIGURATION);
public static ShaderCallback defaultCallback = new ShaderCallback() {
@Override
public void call(int shader) {
// Frag Uniforms
int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration");
ARBShaderObjects.glUniform1fARB(disfigurationUniform, DEFAULT_DISFIGURATION);
// Vert Uniforms
int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity");
ARBShaderObjects.glUniform1fARB(grainIntensityUniform, DEFAULT_GRAIN_INTENSITY);
}
};
// Vert Uniforms
int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity");
ARBShaderObjects.glUniform1fARB(grainIntensityUniform, DEFAULT_GRAIN_INTENSITY);
};
public RenderDoppleganger(RenderManager renderManager) {
super(renderManager, new ModelPlayer(0.0F, false), 0F);
@@ -27,19 +27,15 @@ import vazkii.botania.common.entity.EntityPixie;
public class RenderPixie extends RenderLiving<EntityPixie> {
ShaderCallback callback = new ShaderCallback() {
ShaderCallback callback = shader -> {
// Frag Uniforms
int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration");
ARBShaderObjects.glUniform1fARB(disfigurationUniform, 0.025F);
@Override
public void call(int shader) {
// Frag Uniforms
int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration");
ARBShaderObjects.glUniform1fARB(disfigurationUniform, 0.025F);
// Vert Uniforms
int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity");
ARBShaderObjects.glUniform1fARB(grainIntensityUniform, 0.05F);
}
};
// Vert Uniforms
int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity");
ARBShaderObjects.glUniform1fARB(grainIntensityUniform, 0.05F);
};
public RenderPixie(RenderManager renderManager) {
super(renderManager, new ModelPixie(), 0.25F);
@@ -904,21 +904,16 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
@SideOnly(Side.CLIENT)
public ShaderCallback getBossBarShaderCallback(boolean background, int shader) {
if(shaderCallback == null)
shaderCallback = new ShaderCallback() {
@Override
public void call(int shader) {
int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity");
int hpFractUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "hpFract");
shaderCallback = shader1 -> {
int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader1, "grainIntensity");
int hpFractUniform = ARBShaderObjects.glGetUniformLocationARB(shader1, "hpFract");
float time = getInvulTime();
float grainIntensity = time > 20 ? 1F : Math.max(isHardMode() ? 0.5F : 0F, time / 20F);
ARBShaderObjects.glUniform1fARB(grainIntensityUniform, grainIntensity);
ARBShaderObjects.glUniform1fARB(hpFractUniform, getHealth() / getMaxHealth());
}
};
};
return background ? null : shaderCallback;
}