From 678fd193da54ec9e03177e7bb25df5dfd2930e01 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 2 Sep 2017 17:02:33 +0100 Subject: [PATCH] Pylon rendering --- .../client/render/tile/RenderTilePylon.java | 33 +++---------------- .../assets/botania/shader/pylon_glow.frag | 2 +- 2 files changed, 5 insertions(+), 30 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java index 7be7a9594..8c69dd622 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -18,7 +18,6 @@ import org.lwjgl.opengl.GL11; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -92,22 +91,15 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { worldTime += renderingItem ? 0 : new Random(pylon.getPos().hashCode()).nextInt(360); - /* - GlStateManager.translate(d0 + 0.2 + (type == PylonVariant.NATURA ? -0.1 : 0), d1 + 0.05, d2 + 0.8 + (type == PylonVariant.NATURA ? 0.1 : 0)); - float scale = type == PylonVariant.NATURA ? 0.8F : 0.6F; - GlStateManager.scale(scale, 0.6F, scale); - */ - - GlStateManager.translate(d0, d1 + 1.5, d2); + GlStateManager.translate(d0, d1 + (renderingItem ? 1.35 : 1.5), d2); GlStateManager.scale(1.0F, -1.0F, -1.0F); GlStateManager.pushMatrix(); GlStateManager.translate(0.5F, 0F, -0.5F); if(!renderingItem) GlStateManager.rotate((float) worldTime * 1.5F, 0F, 1F, 0F); - //GlStateManager.translate(-0.5F, 0F, 0.5F); - model.renderRing(); + model.renderRing(); if(!renderingItem) GlStateManager.translate(0D, Math.sin(worldTime / 20D) / 20 - 0.025, 0D); GlStateManager.popMatrix(); @@ -117,30 +109,13 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { GlStateManager.translate(0D, Math.sin(worldTime / 20D) / 17.5, 0D); GlStateManager.translate(0.5F, 0F, -0.5F); - if(!renderingItem) + if(!renderingItem) GlStateManager.rotate((float) -worldTime, 0F, 1F, 0F); - //GlStateManager.translate(-0.5F, 0F, 0.5F); - GlStateManager.disableCull(); - model.renderCrystal(); - - GlStateManager.color(1F, 1F, 1F, a); - if(!ShaderHelper.useShaders()) { - int light = 15728880; - int lightmapX = light % 65536; - int lightmapY = light / 65536; - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); - float alpha = (float) ((Math.sin(worldTime / 20D) / 2D + 0.5) / 2D); - GlStateManager.color(1F, 1F, 1F, a * (alpha + 0.183F)); - } - GlStateManager.disableAlpha(); - GlStateManager.scale(1.1F, 1.1F, 1.1F); - GlStateManager.translate(-0.05F, -0.1F, 0.05F); - ShaderHelper.useShader(ShaderHelper.pylonGlow); - //model.renderCrystal(); + model.renderCrystal(); ShaderHelper.releaseShader(); GlStateManager.enableAlpha(); diff --git a/src/main/resources/assets/botania/shader/pylon_glow.frag b/src/main/resources/assets/botania/shader/pylon_glow.frag index 45a161283..1c2ee115d 100644 --- a/src/main/resources/assets/botania/shader/pylon_glow.frag +++ b/src/main/resources/assets/botania/shader/pylon_glow.frag @@ -13,7 +13,7 @@ void main() { color += texture2D(bgl_RenderedTexture, texcoord + vec2(j, i)); float brightness = sin(time / 20.0) * 0.5 + 0.15; - float alpha = sin(time / 30.0) * 0.5 + 0.35; + float alpha = min(1, sin(time / 30.0) * 0.5 + 0.75); gl_FragColor = vec4((color * color * 0.0005 * brightness + texture2D(bgl_RenderedTexture, texcoord)).rgb, alpha * gl_Color.a); }