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

Keyframe Presets now ignore Marker Keyframes and those are not overwritten when loading a preset

Browse Source
This commit is contained in:
CrushedPixel
2015-06-09 23:05:18 +02:00
parent b2ad52d5b6
commit 0a1680e891
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/eu/crushedpixel/replaymod/replay/ReplayHandler.java
View File

@@ -95,7 +95,15 @@ public class ReplayHandler {
}
public static void useKeyframePresetFromRepository(int index) {
MarkerKeyframe[] markers = getMarkers();
keyframes = new ArrayList<Keyframe>(Arrays.asList(keyframeRepository[index].getKeyframes()));
for(MarkerKeyframe mk : markers) {
keyframes.add(mk);
}
if(!(selectedKeyframe instanceof MarkerKeyframe)) selectedKeyframe = null;
}
public static void spectateEntity(Entity e) {
@@ -374,9 +382,15 @@ public class ReplayHandler {
}
public static void resetKeyframes() {
MarkerKeyframe[] markers = getMarkers();
keyframes = new ArrayList<Keyframe>();
selectKeyframe(null);
for(MarkerKeyframe mk : markers) {
keyframes.add(mk);
}
if(!(selectedKeyframe instanceof MarkerKeyframe))
selectKeyframe(null);
}
public static boolean isSelected(Keyframe kf) {