From ee67c5ea501d9b05db71faaecb4ddcb12bd3298b Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 16 Aug 2020 14:05:10 +0200 Subject: [PATCH] Use different naming for fullbright, and always reset it back after setting it. --- .../block/paint/PaintSplotchesBakedModel.java | 4 +-- .../appeng/block/qnb/QnbFormedBakedModel.java | 5 ++-- .../client/render/cablebus/CableBuilder.java | 30 +++++++++++++------ .../client/render/cablebus/CubeBuilder.java | 8 ++--- .../P2PTunnelFrequencyBakedModel.java | 6 +++- .../render/crafting/LightBakedModel.java | 4 ++- .../render/crafting/MonitorBakedModel.java | 4 ++- .../spatial/SpatialPylonBakedModel.java | 5 +++- 8 files changed, 45 insertions(+), 21 deletions(-) diff --git a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java index 0e1cd2721..fd0a489ee 100644 --- a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java @@ -79,10 +79,10 @@ class PaintSplotchesBakedModel implements IDynamicBakedModel { if (s.isLumen()) { builder.setColorRGB(s.getColor().whiteVariant); - builder.setRenderFullBright(true); + builder.setEmissiveMaterial(true); } else { builder.setColorRGB(s.getColor().mediumVariant); - builder.setRenderFullBright(false); + builder.setEmissiveMaterial(false); } float offset = offsetConstant; diff --git a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java index fed98f876..5f9023fb9 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java +++ b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java @@ -117,7 +117,7 @@ class QnbFormedBakedModel implements IDynamicBakedModel { if (formedState.isPowered()) { builder.setTexture(this.lightCornerTexture); - builder.setRenderFullBright(true); + builder.setEmissiveMaterial(true); for (Direction facing : Direction.values()) { // Offset the face by a slight amount so that it is drawn over the already drawn // ring texture @@ -131,6 +131,7 @@ class QnbFormedBakedModel implements IDynamicBakedModel { DEFAULT_RENDER_MIN - zOffset, DEFAULT_RENDER_MAX + xOffset, DEFAULT_RENDER_MAX + yOffset, DEFAULT_RENDER_MAX + zOffset); } + builder.setEmissiveMaterial(false); } } else { builder.setTexture(this.ringTexture); @@ -143,7 +144,7 @@ class QnbFormedBakedModel implements IDynamicBakedModel { if (formedState.isPowered()) { builder.setTexture(this.lightTexture); - builder.setRenderFullBright(true); + builder.setEmissiveMaterial(true); for (Direction facing : Direction.values()) { // Offset the face by a slight amount so that it is drawn over the already drawn // ring texture diff --git a/src/main/java/appeng/client/render/cablebus/CableBuilder.java b/src/main/java/appeng/client/render/cablebus/CableBuilder.java index bc00ef972..e4936fb00 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/CableBuilder.java @@ -342,7 +342,7 @@ class CableBuilder { this.addBigCoveredCableSizedCube(facing, cubeBuilder); // Render the channel indicators brightly lit at night - cubeBuilder.setRenderFullBright(true); + cubeBuilder.setEmissiveMaterial(true); cubeBuilder.setTexture(oddChannel); cubeBuilder.setColorRGB(cableColor.blackVariant); @@ -353,14 +353,14 @@ class CableBuilder { this.addBigCoveredCableSizedCube(facing, cubeBuilder); // Reset back to normal rendering for the rest - cubeBuilder.setRenderFullBright(false); + cubeBuilder.setEmissiveMaterial(false); cubeBuilder.setTexture(texture); } addCoveredCableSizedCube(facing, cubeBuilder); // Render the channel indicators brightly lit at night - cubeBuilder.setRenderFullBright(true); + cubeBuilder.setEmissiveMaterial(true); cubeBuilder.setTexture(oddChannel); cubeBuilder.setColorRGB(cableColor.blackVariant); @@ -369,6 +369,9 @@ class CableBuilder { cubeBuilder.setTexture(evenChannel); cubeBuilder.setColorRGB(cableColor.whiteVariant); addCoveredCableSizedCube(facing, cubeBuilder); + + // Reset back to default + cubeBuilder.setEmissiveMaterial(false); } public void addStraightSmartConnection(Direction facing, AEColor cableColor, int channels, @@ -386,7 +389,7 @@ class CableBuilder { TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels); // Render the channel indicators brightly lit at night - cubeBuilder.setRenderFullBright(true); + cubeBuilder.setEmissiveMaterial(true); cubeBuilder.setTexture(oddChannel); cubeBuilder.setColorRGB(cableColor.blackVariant); @@ -395,6 +398,9 @@ class CableBuilder { cubeBuilder.setTexture(evenChannel); cubeBuilder.setColorRGB(cableColor.whiteVariant); addStraightCoveredCableSizedCube(facing, cubeBuilder); + + // Reset back to default + cubeBuilder.setEmissiveMaterial(false); } public void addConstrainedSmartConnection(Direction facing, AEColor cableColor, int distanceFromEdge, int channels, @@ -417,7 +423,7 @@ class CableBuilder { TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels); // Render the channel indicators brightly lit at night - cubeBuilder.setRenderFullBright(true); + cubeBuilder.setEmissiveMaterial(true); cubeBuilder.setTexture(oddChannel); cubeBuilder.setColorRGB(cableColor.blackVariant); @@ -426,6 +432,9 @@ class CableBuilder { cubeBuilder.setTexture(evenChannel); cubeBuilder.setColorRGB(cableColor.whiteVariant); addCoveredCableSizedCube(facing, distanceFromEdge, cubeBuilder); + + // Reset back to default + cubeBuilder.setEmissiveMaterial(false); } public void addDenseCoveredConnection(Direction facing, AEColor cableColor, AECableType connectionType, @@ -449,7 +458,7 @@ class CableBuilder { addDenseCableSizedCube(facing, cubeBuilder); // Reset back to normal rendering for the rest - cubeBuilder.setRenderFullBright(false); + cubeBuilder.setEmissiveMaterial(false); cubeBuilder.setTexture(texture); } @@ -485,7 +494,7 @@ class CableBuilder { TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels); // Render the channel indicators brightly lit at night - cubeBuilder.setRenderFullBright(true); + cubeBuilder.setEmissiveMaterial(true); cubeBuilder.setTexture(oddChannel); cubeBuilder.setColorRGB(cableColor.blackVariant); @@ -496,7 +505,7 @@ class CableBuilder { addDenseCableSizedCube(facing, cubeBuilder); // Reset back to normal rendering for the rest - cubeBuilder.setRenderFullBright(false); + cubeBuilder.setEmissiveMaterial(false); cubeBuilder.setTexture(texture); } @@ -529,7 +538,7 @@ class CableBuilder { TextureAtlasSprite evenChannel = this.smartCableTextures.getEvenTextureForChannels(channels); // Render the channel indicators brightly lit at night - cubeBuilder.setRenderFullBright(true); + cubeBuilder.setEmissiveMaterial(true); cubeBuilder.setTexture(oddChannel); cubeBuilder.setColorRGB(cableColor.blackVariant); @@ -538,6 +547,9 @@ class CableBuilder { cubeBuilder.setTexture(evenChannel); cubeBuilder.setColorRGB(cableColor.whiteVariant); addStraightDenseCableSizedCube(facing, cubeBuilder); + + // Reset back to default + cubeBuilder.setEmissiveMaterial(false); } private static void addDenseCableSizedCube(Direction facing, CubeBuilder cubeBuilder) { diff --git a/src/main/java/appeng/client/render/cablebus/CubeBuilder.java b/src/main/java/appeng/client/render/cablebus/CubeBuilder.java index 47d15a35e..b2dfb678b 100644 --- a/src/main/java/appeng/client/render/cablebus/CubeBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/CubeBuilder.java @@ -52,7 +52,7 @@ public class CubeBuilder { private boolean useStandardUV = false; - private boolean renderFullBright; + private boolean emissiveMaterial; public CubeBuilder(List output) { this.output = output; @@ -379,7 +379,7 @@ public class CubeBuilder { if (e.getIndex() == 0) { builder.put(i, u, v); break; - } else if (e.getIndex() == 2 && renderFullBright) { + } else if (e.getIndex() == 2 && emissiveMaterial) { // Force Brightness to 15, this is for full bright mode // this vertex element will only be present in that case final float lightMapU = (float) (15 * 0x20) / 0xFFFF; @@ -434,8 +434,8 @@ public class CubeBuilder { this.setColorRGB((int) (r * 255) << 16 | (int) (g * 255) << 8 | (int) (b * 255)); } - public void setRenderFullBright(boolean renderFullBright) { - this.renderFullBright = renderFullBright; + public void setEmissiveMaterial(boolean renderFullBright) { + this.emissiveMaterial = renderFullBright; } public void setCustomUv(Direction facing, float u1, float v1, float u2, float v2) { diff --git a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java index 30aa73ab1..898870817 100644 --- a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java +++ b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java @@ -49,7 +49,7 @@ public class P2PTunnelFrequencyBakedModel implements IDynamicBakedModel { cb.setTexture(this.texture); cb.useStandardUV(); - cb.setRenderFullBright(active); + cb.setEmissiveMaterial(active); for (int i = 0; i < 4; ++i) { final int[] offs = QUAD_OFFSETS[i]; @@ -70,6 +70,10 @@ public class P2PTunnelFrequencyBakedModel implements IDynamicBakedModel { } } + + // Reset back to default + cb.setEmissiveMaterial(false); + return cb.getOutput(); } diff --git a/src/main/java/appeng/client/render/crafting/LightBakedModel.java b/src/main/java/appeng/client/render/crafting/LightBakedModel.java index b279b98d3..7904b444e 100644 --- a/src/main/java/appeng/client/render/crafting/LightBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/LightBakedModel.java @@ -51,8 +51,10 @@ class LightBakedModel extends CraftingCubeBakedModel { builder.addCube(x1, y1, z1, x2, y2, z2); boolean powered = state.get(AbstractCraftingUnitBlock.POWERED); - builder.setRenderFullBright(powered); + builder.setEmissiveMaterial(powered); builder.setTexture(this.lightTexture); builder.addCube(x1, y1, z1, x2, y2, z2); + // Reset back to default + builder.setEmissiveMaterial(false); } } diff --git a/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java b/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java index 37bce9f5d..f08c1c93b 100644 --- a/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/MonitorBakedModel.java @@ -78,7 +78,7 @@ public class MonitorBakedModel extends CraftingCubeBakedModel { AEColor color = getColor(modelData); boolean powered = state.get(CraftingMonitorBlock.POWERED); - builder.setRenderFullBright(powered); + builder.setEmissiveMaterial(powered); builder.setColorRGB(color.whiteVariant); builder.setTexture(this.lightBrightTexture); @@ -92,6 +92,8 @@ public class MonitorBakedModel extends CraftingCubeBakedModel { builder.setTexture(this.lightDarkTexture); builder.addCube(x1, y1, z1, x2, y2, z2); + // Reset back to default + builder.setEmissiveMaterial(false); } private static AEColor getColor(IModelData modelData) { diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java b/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java index f666fae6c..8fdd695f2 100644 --- a/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java +++ b/src/main/java/appeng/client/render/spatial/SpatialPylonBakedModel.java @@ -117,7 +117,7 @@ class SpatialPylonBakedModel implements IDynamicBakedModel { if ((flags & SpatialPylonTileEntity.DISPLAY_POWERED_ENABLED) == SpatialPylonTileEntity.DISPLAY_POWERED_ENABLED) { - builder.setRenderFullBright(true); + builder.setEmissiveMaterial(true); } builder.setTextures(this.textures.get(getTextureTypeFromSideInside(flags, ori, Direction.UP)), @@ -135,6 +135,9 @@ class SpatialPylonBakedModel implements IDynamicBakedModel { builder.addCube(0, 0, 0, 16, 16, 16); } + // Reset back to default + builder.setEmissiveMaterial(false); + return builder.getOutput(); }