From cf2a8adb4c250850680371f81d875ef0be1ec534 Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Tue, 7 Jul 2015 17:04:01 +0200 Subject: [PATCH] Removed backVisible field from CustomImageObject Updated new instance creations of GuiEntryListEntry whose constructor changed in last commit --- .../replaymod/gui/GuiKeyframeRepository.java | 2 +- .../gui/replayeditor/GuiConnectPart.java | 2 +- .../replaymod/holders/CustomImageObject.java | 4 +--- .../replaymod/renderer/CustomObjectRenderer.java | 16 +++++++++------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiKeyframeRepository.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiKeyframeRepository.java index f44f3ed2..12c14cf4 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiKeyframeRepository.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiKeyframeRepository.java @@ -54,7 +54,7 @@ public class GuiKeyframeRepository extends GuiScreen implements GuiReplayOverlay if(!initialized) { screenTitle = I18n.format("replaymod.gui.keyframerepository.title"); - keyframeSetList = new GuiEntryList(GuiConstants.KEYFRAME_REPOSITORY_LIST, mc.fontRendererObj, + keyframeSetList = new GuiEntryList(mc.fontRendererObj, 0, 45, 0, h); for(KeyframeSet set : keyframeRepository) diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/replayeditor/GuiConnectPart.java b/src/main/java/eu/crushedpixel/replaymod/gui/replayeditor/GuiConnectPart.java index 1cbdd726..ce98b7ef 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/replayeditor/GuiConnectPart.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/replayeditor/GuiConnectPart.java @@ -95,7 +95,7 @@ public class GuiConnectPart extends GuiStudioPart { @Override public void initGui() { if(!initialized) { - concatList = new GuiEntryList(1, fontRendererObj, 30, yPos, 150, 0); + concatList = new GuiEntryList(fontRendererObj, 30, yPos, 150, 0); filesToConcat = new ArrayList(); String selectedName = FilenameUtils.getBaseName(GuiReplayEditor.instance.getSelectedFile().getAbsolutePath()); filesToConcat.add(new GuiEntryListStringEntry(selectedName)); diff --git a/src/main/java/eu/crushedpixel/replaymod/holders/CustomImageObject.java b/src/main/java/eu/crushedpixel/replaymod/holders/CustomImageObject.java index 8c4b4da8..d5c8c269 100644 --- a/src/main/java/eu/crushedpixel/replaymod/holders/CustomImageObject.java +++ b/src/main/java/eu/crushedpixel/replaymod/holders/CustomImageObject.java @@ -15,19 +15,17 @@ import java.io.IOException; public class CustomImageObject implements GuiEntryListEntry { - public CustomImageObject(Position position, String name, final File imageSource, boolean backVisible) throws IOException { + public CustomImageObject(Position position, String name, final File imageSource) throws IOException { this.position = new ExtendedPosition(RoundUtils.round(position.getX()), RoundUtils.round(position.getY()), RoundUtils.round(position.getZ()), 0, 0); this.name = name; - this.backVisible = backVisible; setImageFile(imageSource); } @Getter @Setter private ExtendedPosition position; @Getter @Setter private String name; - @Getter @Setter private boolean backVisible; @Getter private File imageFile; public void setImageFile(final File imageSource) throws IOException { diff --git a/src/main/java/eu/crushedpixel/replaymod/renderer/CustomObjectRenderer.java b/src/main/java/eu/crushedpixel/replaymod/renderer/CustomObjectRenderer.java index cd15cc7b..e00177cc 100644 --- a/src/main/java/eu/crushedpixel/replaymod/renderer/CustomObjectRenderer.java +++ b/src/main/java/eu/crushedpixel/replaymod/renderer/CustomObjectRenderer.java @@ -78,7 +78,11 @@ public class CustomObjectRenderer { GlStateManager.rotate(objectPosition.getRoll(), 0, 0, 1); GlStateManager.rotate(objectPosition.getPitch(), 1, 0, 0); - renderer.setColorRGBA_F(1, 1, 1, 0.5f); + GlStateManager.enableBlend(); + GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + + float opacity = objectPosition.getOpacity(); + GlStateManager.color(1, 1, 1, opacity); float width = objectPosition.getWidth() * objectPosition.getScale(); float height = objectPosition.getHeight() * objectPosition.getScale(); @@ -95,12 +99,10 @@ public class CustomObjectRenderer { renderer.addVertexWithUV(maxX, maxY, 0, 0, 0); renderer.addVertexWithUV(maxX, minY, 0, 0, 1); - if(customImageObject.isBackVisible()) { - renderer.addVertexWithUV(maxX, maxY, 0, 0, 0); - renderer.addVertexWithUV(minX, maxY, 0, 1, 0); - renderer.addVertexWithUV(minX, minY, 0, 1, 1); - renderer.addVertexWithUV(maxX, minY, 0, 0, 1); - } + renderer.addVertexWithUV(maxX, maxY, 0, 0, 0); + renderer.addVertexWithUV(minX, maxY, 0, 1, 0); + renderer.addVertexWithUV(minX, minY, 0, 1, 1); + renderer.addVertexWithUV(maxX, minY, 0, 0, 1); tessellator.draw(); renderer.setTranslation(0, 0, 0);