DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Timelines now only jump when left-clicked, and jumping to a Marker is done via right-click

Browse Source
This commit is contained in:
CrushedPixel
2015-06-18 15:52:34 +02:00
parent cb6f3426f4
commit ceb40d2468
1 changed files with 61 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiKeyframeTimeline.java
View File

@@ -9,6 +9,7 @@ import eu.crushedpixel.replaymod.holders.TimeKeyframe;
import eu.crushedpixel.replaymod.replay.ReplayHandler; import eu.crushedpixel.replaymod.replay.ReplayHandler;
import eu.crushedpixel.replaymod.utils.MouseUtils; import eu.crushedpixel.replaymod.utils.MouseUtils;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.I18n;
import org.lwjgl.util.Point; import org.lwjgl.util.Point;
import java.awt.*; import java.awt.*;
@@ -42,41 +43,65 @@ public class GuiKeyframeTimeline extends GuiTimeline {
@Override @Override
public void mouseClick(Minecraft mc, int mouseX, int mouseY, int button) { public void mouseClick(Minecraft mc, int mouseX, int mouseY, int button) {
long time = getTimeAt(mouseX, mouseY); //left mouse button
if (time == -1) { if(button == 0) {
return; long time = getTimeAt(mouseX, mouseY);
} if(time == -1) {
return;
int tolerance = (int)(2 * Math.round(zoom * timelineLength / width)); }
Keyframe closest; int tolerance = (int) (2 * Math.round(zoom * timelineLength / width));
if (mouseY >= positionY + BORDER_TOP + 5 && timeKeyframes) {
closest = ReplayHandler.getClosestTimeKeyframeForRealTime((int) time, tolerance); Keyframe closest;
} else if (mouseY >= positionY + BORDER_TOP && placeKeyframes) { if(mouseY >= positionY + BORDER_TOP + 5 && timeKeyframes) {
closest = ReplayHandler.getClosestPlaceKeyframeForRealTime((int) time, tolerance); closest = ReplayHandler.getClosestTimeKeyframeForRealTime((int) time, tolerance);
} else if (mouseY >= positionY + BORDER_TOP + 10 && markerKeyframes) { } else if(mouseY >= positionY + BORDER_TOP && placeKeyframes) {
closest = ReplayHandler.getClosestMarkerForRealTime((int) time, tolerance); closest = ReplayHandler.getClosestPlaceKeyframeForRealTime((int) time, tolerance);
} else { } else if(mouseY >= positionY + BORDER_TOP + 10 && markerKeyframes) {
closest = null; closest = ReplayHandler.getClosestMarkerForRealTime((int) time, tolerance);
} } else {
closest = null;
ReplayHandler.selectKeyframe(closest); //can be null, deselects keyframe }
// If we clicked on a key frame, then continue monitoring the mouse for movements ReplayHandler.selectKeyframe(closest); //can be null, deselects keyframe
long currentTime = System.currentTimeMillis();
if (closest != null) { // If we clicked on a key frame, then continue monitoring the mouse for movements
if (currentTime - clickTime < 500) { // if double clicked then open GUI instead long currentTime = System.currentTimeMillis();
mc.displayGuiScreen(new GuiEditKeyframe(closest)); if(closest != null) {
this.clickedKeyFrame = null; if(currentTime - clickTime < 500) { // if double clicked then open GUI instead
} else { mc.displayGuiScreen(new GuiEditKeyframe(closest));
this.clickedKeyFrame = closest; this.clickedKeyFrame = null;
this.dragging = false; } else {
this.clickedKeyFrame = closest;
this.dragging = false;
}
} else { // If we didn't then just update the cursor
ReplayHandler.setRealTimelineCursor((int) time);
this.dragging = true;
}
this.clickTime = currentTime;
} else if(button == 1) {
if(markerKeyframes) {
long time = getTimeAt(mouseX, mouseY);
if(time == -1) {
return;
}
int tolerance = (int) (2 * Math.round(zoom * timelineLength / width));
MarkerKeyframe closest = null;
if(mouseY >= positionY + BORDER_TOP + 10 && markerKeyframes) {
closest = ReplayHandler.getClosestMarkerForRealTime((int) time, tolerance);
}
if(closest != null) {
//Jump to clicked Marker Keyframe
ReplayHandler.setLastPosition(closest.getPosition());
ReplayMod.replaySender.jumpToTime(closest.getRealTimestamp());
}
} }
} else { // If we didn't then just update the cursor
ReplayHandler.setRealTimelineCursor((int) time);
this.dragging = true;
} }
this.clickTime = currentTime;
} }
@Override @Override
@@ -194,7 +219,9 @@ public class GuiKeyframeTimeline extends GuiTimeline {
if(MouseUtils.isMouseWithinBounds(keyframeX - 2, this.positionY + BORDER_TOP + 10 + 1, 5, 5)) { if(MouseUtils.isMouseWithinBounds(keyframeX - 2, this.positionY + BORDER_TOP + 10 + 1, 5, 5)) {
Point mouse = MouseUtils.getMousePos(); Point mouse = MouseUtils.getMousePos();
ReplayMod.tooltipRenderer.drawTooltip(mouse.getX(), mouse.getY(), marker.getName(), null, Color.WHITE); String markerName = marker.getName();
if(markerName == null) markerName = I18n.format("replaymod.gui.ingame.unnamedmarker");
ReplayMod.tooltipRenderer.drawTooltip(mouse.getX(), mouse.getY(), markerName, null, Color.WHITE);
drawn = true; drawn = true;
} }