From eeded7a7fda4e566fa3429ac4dab9b564182c6a6 Mon Sep 17 00:00:00 2001 From: CrushedPixel Date: Sun, 6 Sep 2015 16:47:38 +0200 Subject: [PATCH] Spectator Keyframe segments using Shoulder Camera are rendered in a different color on the timeline --- .../gui/elements/timelines/GuiKeyframeTimeline.java | 9 +++++++-- .../replaymod/holders/SpectatorData.java | 12 +++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiKeyframeTimeline.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiKeyframeTimeline.java index d4465685..543dee99 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiKeyframeTimeline.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/timelines/GuiKeyframeTimeline.java @@ -5,6 +5,7 @@ import eu.crushedpixel.replaymod.gui.GuiEditKeyframe; import eu.crushedpixel.replaymod.holders.*; import eu.crushedpixel.replaymod.replay.ReplayHandler; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import java.util.ListIterator; @@ -158,8 +159,12 @@ public class GuiKeyframeTimeline extends GuiTimeline { int keyframeX = getKeyframeX(kf.getRealTimestamp(), leftTime, bodyWidth, segmentLength); int nextX = getKeyframeX(nextSpectatorKeyframeRealTime, leftTime, bodyWidth, segmentLength); - drawGradientRect(Math.max(keyframeX + 2, positionX+BORDER_LEFT), positionY + BORDER_TOP + 1, Math.min(nextX - 2, positionX+width-BORDER_RIGHT+1), - positionY + BORDER_TOP + 4, 0xFF0080FF, 0xFF0080FF); + int color = ((SpectatorData)kf.getValue()).getSpectatingMethod().getColor(); + + drawRect(Math.max(keyframeX + 2, positionX+BORDER_LEFT), positionY + BORDER_TOP + 1, Math.min(nextX - 2, positionX+width-BORDER_RIGHT+1), + positionY + BORDER_TOP + 4, color); + + GlStateManager.color(1, 1, 1, 1); } } } diff --git a/src/main/java/eu/crushedpixel/replaymod/holders/SpectatorData.java b/src/main/java/eu/crushedpixel/replaymod/holders/SpectatorData.java index 06520b69..363dbb6e 100755 --- a/src/main/java/eu/crushedpixel/replaymod/holders/SpectatorData.java +++ b/src/main/java/eu/crushedpixel/replaymod/holders/SpectatorData.java @@ -84,6 +84,16 @@ public class SpectatorData extends AdvancedPosition { } public enum SpectatingMethod { - FIRST_PERSON, SHOULDER_CAM + FIRST_PERSON(0xFF0080FF), SHOULDER_CAM(0xFFFF8000); + + private int color; + + public int getColor() { + return color; + } + + SpectatingMethod(int color) { + this.color = color; + } } }