Fixed shaders compiling and servers crashing. Yo.

This commit is contained in:
Lizbeth Rika committed 2014-10-31 21:48:48 +00:00
1 parent 3c5844254b
commit 4c7baabd09
2 files changed
+25 -18

No files matched your search

@@ -399,19 +399,23 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
}
@SideOnly(Side.CLIENT)
private static final Rectangle barRect = new Rectangle(0, 0, 185, 15);
private static Rectangle barRect;
@SideOnly(Side.CLIENT)
private static final Rectangle hpBarRect = new Rectangle(0, barRect.y + barRect.height, 181, 7);
private static Rectangle hpBarRect;
@Override
@SideOnly(Side.CLIENT)
public Rectangle getBossBarTextureRect() {
if(barRect == null)
barRect = new Rectangle(0, 0, 185, 15);
return barRect;
}
@Override
@SideOnly(Side.CLIENT)
public Rectangle getBossBarHPTextureRect() {
if(hpBarRect == null)
hpBarRect = new Rectangle(0, barRect.y + barRect.height, 181, 7);
return hpBarRect;
}
@@ -428,25 +432,28 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
}
@SideOnly(Side.CLIENT)
private final ShaderCallback shaderCallback = new ShaderCallback() {
@Override
public void call(int shader) {
int grainIntensityUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "grainIntensity");
int hpFractUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "hpFract");
float time = getInvulTime();
float grainIntensity = time > 20 ? 1F : time / 20F;
ARBShaderObjects.glUniform1fARB(grainIntensityUniform, grainIntensity);
ARBShaderObjects.glUniform1fARB(hpFractUniform, (float) getHealth() / (float) getMaxHealth());
}
};
private static ShaderCallback shaderCallback;
@Override
@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");
float time = getInvulTime();
float grainIntensity = time > 20 ? 1F : time / 20F;
ARBShaderObjects.glUniform1fARB(grainIntensityUniform, grainIntensity);
ARBShaderObjects.glUniform1fARB(hpFractUniform, (float) getHealth() / (float) getMaxHealth());
}
};
return background ? null : shaderCallback;
}
}
@@ -22,7 +22,7 @@ void main() {
float b = color.b;
float s = sin((texcoord.y + 0.0375) * 100.0 + sin(texcoord.x * 90.0 - time / 2.0) * hpFract) * 0.5 + 0.5;
s = 1F - s;
s = 1.0 - s;
if(s <= 0.98)
s = 0;
s *= 0.4;