From 780188c17ea30f7edfa7dbaff978f2a90df38844 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Fri, 31 Oct 2014 18:19:53 +0000 Subject: [PATCH] Some minor graphical work. --- .../botania/client/model/ModelSpinningCubes.java | 10 ++++++---- resources/assets/botania/shader/doppleganger_bar.frag | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/MODSRC/vazkii/botania/client/model/ModelSpinningCubes.java b/MODSRC/vazkii/botania/client/model/ModelSpinningCubes.java index 4e573d3a3..3f643e8a0 100644 --- a/MODSRC/vazkii/botania/client/model/ModelSpinningCubes.java +++ b/MODSRC/vazkii/botania/client/model/ModelSpinningCubes.java @@ -60,9 +60,10 @@ public class ModelSpinningCubes extends ModelBase { GL11.glRotatef(deg, xRotate, yRotate, zRotate); if(repeat < origRepeat) { - GL11.glColor4f(1F, 1F, 1F, 0.2F); + GL11.glColor4f(1F, 1F, 1F, ((float) repeat / (float) origRepeat) * 0.4F); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GL11.glDisable(GL11.GL_ALPHA_TEST); } else GL11.glColor4f(1F, 1F, 1F, 1F); int light = 15728880; @@ -72,15 +73,16 @@ public class ModelSpinningCubes extends ModelBase { OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); spinningCube.render(1F / 16F); - if(repeat < origRepeat) + if(repeat < origRepeat) { GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_ALPHA_TEST); + } GL11.glPopMatrix(); } GL11.glPopMatrix(); - GL11.glEnable(GL11.GL_TEXTURE_2D); - + if(repeat != 0) renderSpinningCubes(cubes, repeat - 1, origRepeat); } diff --git a/resources/assets/botania/shader/doppleganger_bar.frag b/resources/assets/botania/shader/doppleganger_bar.frag index 0c7ce5dbd..80b1dea67 100644 --- a/resources/assets/botania/shader/doppleganger_bar.frag +++ b/resources/assets/botania/shader/doppleganger_bar.frag @@ -31,7 +31,7 @@ void main() { g = min(1, g + s); b = min(1, b + s); - if(hpFract <= 0.5) { + if(hpFract <= 0.2) { float flash = (sin(time * 2.0) - 0.8) * 5; if(flash > 0) { g = max(0, g - flash);