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

Right clicking on timeline applies clicked path at clicked time

Browse Source
This commit is contained in:
johni0702
2016-08-22 16:15:19 +02:00
parent ff50f11abf
commit a6efbe6a83
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/replaymod/simplepathing/gui/GuiKeyframeTimeline.java
View File

@@ -168,19 +168,17 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline<GuiKeyframeTimeline
.filter(k -> Math.abs(k.getTime() - time) <= tolerance) .filter(k -> Math.abs(k.getTime() - time) <= tolerance)
.sorted(Comparator.comparing(k -> Math.abs(k.getTime() - time))) .sorted(Comparator.comparing(k -> Math.abs(k.getTime() - time)))
.findFirst(); .findFirst();
if (keyframe.isPresent()) { return Pair.of(path, keyframe.orElse(null));
return Pair.of(path, keyframe.get());
}
} }
} }
return null; return Pair.of(null, null);
} }
@Override @Override
public boolean mouseClick(ReadablePoint position, int button) { public boolean mouseClick(ReadablePoint position, int button) {
int time = getTimeAt(position.getX(), position.getY()); int time = getTimeAt(position.getX(), position.getY());
Pair<Integer, Keyframe> pathKeyframePair = getKeyframe(position); Pair<Integer, Keyframe> pathKeyframePair = getKeyframe(position);
if (pathKeyframePair != null) { if (pathKeyframePair.getRight() != null) {
// Clicked on keyframe // Clicked on keyframe
Keyframe keyframe = pathKeyframePair.getRight(); Keyframe keyframe = pathKeyframePair.getRight();
if (button == 0) { // Left click if (button == 0) { // Left click
@@ -210,13 +208,31 @@ public class GuiKeyframeTimeline extends AbstractGuiTimeline<GuiKeyframeTimeline
return true; return true;
} else if (time != -1) { } else if (time != -1) {
// Clicked on timeline but not on any keyframe // Clicked on timeline but not on any keyframe
setCursorPosition(time); if (button == 0) { // Left click
setCursorPosition(time);
} else if (button == 1) { // Right click
if (pathKeyframePair.getLeft() != null) {
// Apply the value of the clicked path at the clicked position
Timeline timeline = gui.getMod().getCurrentTimeline();
Path path = timeline.getPaths().get(pathKeyframePair.getLeft());
path.getKeyframes().stream().flatMap(k -> k.getProperties().stream()).distinct().forEach(
p -> applyPropertyToGame(p, path, time));
}
}
return true; return true;
} }
// Missed timeline // Missed timeline
return false; return false;
} }
// Helper method because generics cannot be defined on blocks
private <T> void applyPropertyToGame(Property<T> property, Path path, long time) {
Optional<T> value = path.getValue(property, time);
if (value.isPresent()) {
property.applyToGame(value.get(), ReplayModReplay.instance.getReplayHandler());
}
}
// Helper method because generics cannot be defined on blocks // Helper method because generics cannot be defined on blocks
private <T> void applyPropertyToGame(Property<T> property, Keyframe keyframe) { private <T> void applyPropertyToGame(Property<T> property, Keyframe keyframe) {
Optional<T> value = keyframe.getValue(property); Optional<T> value = keyframe.getValue(property);