Make icon overlay layers render offscreen, fix spark icons not spinning properly

This commit is contained in:
Vincent Lee committed 2020-07-04 17:11:49 -05:00
1 parent dc74b617e7
commit dbc2bd609f
2 files changed
+15 -6

No files matched your search

@@ -92,9 +92,9 @@ public final class RenderHelper {
RenderState.LightmapState enableLightmap = new RenderState.LightmapState(true);
RenderState.OverlayState enableOverlay = new RenderState.OverlayState(true);
RenderState.DiffuseLightingState enableDiffuse = new RenderState.DiffuseLightingState(true);
RenderState.AlphaState zeroAlpha = new RenderState.AlphaState(0);
RenderState.AlphaState oneTenthAlpha = new RenderState.AlphaState(0.004F);
RenderState.DepthTestState noDepth = new RenderState.DepthTestState("always", GL11.GL_ALWAYS);
RenderState.TargetState itemTarget = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_241712_U_");
boolean useShaders = ShaderHelper.useShaders();
RenderType.State glState = RenderType.State.getBuilder().shadeModel(smoothShade)
@@ -118,7 +118,12 @@ public final class RenderHelper {
glState = RenderType.State.getBuilder().line(new RenderState.LineState(OptionalDouble.of(8))).layer(viewOffsetZLayering).transparency(TRANSLUCENT_TRANSPARENCY).writeMask(colorMask).depthTest(noDepth).build(false);
LINE_8_NO_DEPTH = RenderType.makeType(LibResources.PREFIX_MOD + "line_8_no_depth", DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, 64, glState);
glState = RenderType.State.getBuilder().texture(mipmapBlockAtlasTexture).transparency(TRANSLUCENT_TRANSPARENCY).alpha(new RenderState.AlphaState(0.05F)).lightmap(enableLightmap).build(true);
glState = RenderType.State.getBuilder()
.texture(mipmapBlockAtlasTexture)
.transparency(TRANSLUCENT_TRANSPARENCY)
.target(itemTarget)
.alpha(new RenderState.AlphaState(0.05F))
.lightmap(enableLightmap).build(true);
// todo 1.15: need normals?
SPARK = RenderType.makeType(LibResources.PREFIX_MOD + "spark", DefaultVertexFormats.POSITION_COLOR_TEX_LIGHTMAP, GL11.GL_QUADS, 256, glState);
RenderType lightRelay = RenderType.makeType(LibResources.PREFIX_MOD + "light_relay", DefaultVertexFormats.POSITION_COLOR_TEX_LIGHTMAP, GL11.GL_QUADS, 64, glState);
@@ -132,13 +137,18 @@ public final class RenderHelper {
glState = RenderType.State.getBuilder().texture(mipmapBlockAtlasTexture)
.transparency(TRANSLUCENT_TRANSPARENCY)
.target(itemTarget)
.diffuseLighting(new RenderState.DiffuseLightingState(true))
.alpha(oneTenthAlpha)
.lightmap(enableLightmap).build(true);
ICON_OVERLAY = RenderType.makeType(LibResources.PREFIX_MOD + "icon_overlay", DefaultVertexFormats.POSITION_COLOR_TEX_LIGHTMAP, GL11.GL_QUADS, 128, glState);
RenderState.TextureState babylonTexture = new RenderState.TextureState(new ResourceLocation(LibResources.MISC_BABYLON), false, true);
glState = RenderType.State.getBuilder().texture(babylonTexture).transparency(TRANSLUCENT_TRANSPARENCY).cull(disableCull).shadeModel(smoothShade).build(true);
glState = RenderType.State.getBuilder().texture(babylonTexture)
.transparency(TRANSLUCENT_TRANSPARENCY)
.target(itemTarget)
.cull(disableCull)
.shadeModel(smoothShade).build(true);
RenderType babylonIcon = RenderType.makeType(LibResources.PREFIX_MOD + "babylon", DefaultVertexFormats.POSITION_COLOR_TEX, GL11.GL_QUADS, 64, glState);
BABYLON_ICON = useShaders ? new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.HALO, null, babylonIcon) : babylonIcon;
@@ -191,8 +201,7 @@ public final class RenderHelper {
.diffuseLighting(new RenderState.DiffuseLightingState(true))
.alpha(new RenderState.AlphaState(0))
.cull(new RenderState.CullState(false))
.lightmap(new RenderState.LightmapState(true))
.overlay(new RenderState.OverlayState(true));
.lightmap(new RenderState.LightmapState(true));
if (!direct) {
RenderState.TargetState itemTarget = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_241712_U_");
glState = glState.target(itemTarget);
@@ -42,7 +42,7 @@ public abstract class RenderSparkBase<T extends EntitySparkBase> extends EntityR
ms.push();
double time = ClientTickHandler.ticksInGame + partialTicks + new Random(tEntity.getEntityId()).nextInt();
double time = tEntity.world.getDayTime() + partialTicks + new Random(tEntity.getEntityId()).nextInt(200);
float a = 0.1F + (tEntity.isInvisible() ? 0 : 1) * 0.8F;
int alpha = (int) ((0.7F + 0.3F * (float) (Math.sin(time / 5.0) + 0.5) * 2) * a * 255.0F);