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

Keyframes are now live edited (to allow for better fine tweaking of camera paths)

Browse Source
This commit is contained in:
CrushedPixel
2015-07-24 18:00:01 +02:00
parent 7b67fb4242
commit f91791ff9e
1 changed files with 60 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/main/java/eu/crushedpixel/replaymod/gui/GuiEditKeyframe.java
View File

@@ -2,7 +2,7 @@ package eu.crushedpixel.replaymod.gui;
import eu.crushedpixel.replaymod.ReplayMod; import eu.crushedpixel.replaymod.ReplayMod;
import eu.crushedpixel.replaymod.gui.elements.*; import eu.crushedpixel.replaymod.gui.elements.*;
import eu.crushedpixel.replaymod.gui.overlay.GuiReplayOverlay; import eu.crushedpixel.replaymod.gui.elements.listeners.NumberValueChangeListener;
import eu.crushedpixel.replaymod.holders.AdvancedPosition; import eu.crushedpixel.replaymod.holders.AdvancedPosition;
import eu.crushedpixel.replaymod.holders.Keyframe; import eu.crushedpixel.replaymod.holders.Keyframe;
import eu.crushedpixel.replaymod.holders.Marker; import eu.crushedpixel.replaymod.holders.Marker;
@@ -24,7 +24,7 @@ import java.awt.*;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
public abstract class GuiEditKeyframe<T extends KeyframeValue> extends GuiScreen implements GuiReplayOverlay.NoOverlay { public abstract class GuiEditKeyframe<T extends KeyframeValue> extends GuiScreen {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static GuiEditKeyframe create(Keyframe kf) { public static GuiEditKeyframe create(Keyframe kf) {
@@ -158,9 +158,9 @@ public abstract class GuiEditKeyframe<T extends KeyframeValue> extends GuiScreen
@Override @Override
public void onGuiClosed() { public void onGuiClosed() {
if(!save) { if(!save) {
ReplayHandler.removeKeyframe(keyframe);
ReplayHandler.addKeyframe(keyframeBackup);
ReplayHandler.selectKeyframe(keyframeBackup); ReplayHandler.selectKeyframe(keyframeBackup);
} else {
keyframe.setRealTimestamp(TimestampUtils.calculateTimestamp(min.getIntValue(), sec.getIntValue(), ms.getIntValue()));
} }
ReplayHandler.fireKeyframesModifyEvent(); ReplayHandler.fireKeyframesModifyEvent();
Keyboard.enableRepeatEvents(false); Keyboard.enableRepeatEvents(false);
@@ -238,6 +238,8 @@ public abstract class GuiEditKeyframe<T extends KeyframeValue> extends GuiScreen
markerNameInput.setText(name); markerNameInput.setText(name);
inputs.addPart(markerNameInput); inputs.addPart(markerNameInput);
new KeyframeValueChangeListener(this);
} }
markerNameInput.xPosition = width/2 - 100; markerNameInput.xPosition = width/2 - 100;
@@ -248,15 +250,9 @@ public abstract class GuiEditKeyframe<T extends KeyframeValue> extends GuiScreen
@Override @Override
public void onGuiClosed() { public void onGuiClosed() {
if (!save) {
ReplayHandler.getMarkerKeyframes().remove(keyframe);
ReplayHandler.getMarkerKeyframes().add(keyframeBackup);
} else {
keyframe.getValue().setName(markerNameInput.getText().trim()); keyframe.getValue().setName(markerNameInput.getText().trim());
}
super.onGuiClosed(); super.onGuiClosed();
} }
} }
private static class GuiEditKeyframeTime extends GuiEditKeyframe<TimestampValue> { private static class GuiEditKeyframeTime extends GuiEditKeyframe<TimestampValue> {
@@ -281,6 +277,20 @@ public abstract class GuiEditKeyframe<T extends KeyframeValue> extends GuiScreen
inputs.addPart(kfMin); inputs.addPart(kfMin);
inputs.addPart(kfSec); inputs.addPart(kfSec);
inputs.addPart(kfMs); inputs.addPart(kfMs);
KeyframeValueChangeListener listener = new KeyframeValueChangeListener(this) {
@Override
public void onValueChange(double value) {
keyframe.setValue(new TimestampValue(TimestampUtils.calculateTimestamp(
kfMin.getIntValue(), kfSec.getIntValue(), kfMs.getIntValue())));
super.onValueChange(value);
}
};
kfMin.addValueChangeListener(listener);
kfSec.addValueChangeListener(listener);
kfMs.addValueChangeListener(listener);
} }
kfMin.xPosition = min.xPosition; kfMin.xPosition = min.xPosition;
@@ -300,18 +310,6 @@ public abstract class GuiEditKeyframe<T extends KeyframeValue> extends GuiScreen
drawString(fontRendererObj, I18n.format("replaymod.gui.milliseconds"), kfMs.xPosition + kfMs.width + 5, kfMs.yPosition + 7, Color.WHITE.getRGB()); drawString(fontRendererObj, I18n.format("replaymod.gui.milliseconds"), kfMs.xPosition + kfMs.width + 5, kfMs.yPosition + 7, Color.WHITE.getRGB());
} }
@Override
public void onGuiClosed() {
if (!save) {
ReplayHandler.removeKeyframe(keyframe);
ReplayHandler.addKeyframe(keyframeBackup);
} else {
keyframe.setValue(new TimestampValue(TimestampUtils.calculateTimestamp(
kfMin.getIntValue(), kfSec.getIntValue(), kfMs.getIntValue())));
}
super.onGuiClosed();
}
} }
private static class GuiEditKeyframePosition extends GuiEditKeyframe<AdvancedPosition> { private static class GuiEditKeyframePosition extends GuiEditKeyframe<AdvancedPosition> {
@@ -343,6 +341,24 @@ public abstract class GuiEditKeyframe<T extends KeyframeValue> extends GuiScreen
posInputs = new ComposedElement(xCoord, yCoord, zCoord, yaw, pitch, roll); posInputs = new ComposedElement(xCoord, yCoord, zCoord, yaw, pitch, roll);
inputs.addPart(posInputs); inputs.addPart(posInputs);
KeyframeValueChangeListener listener = new KeyframeValueChangeListener(this) {
@Override
public void onValueChange(double value) {
keyframe.setValue(new AdvancedPosition(xCoord.getPreciseValue(), yCoord.getPreciseValue(),
zCoord.getPreciseValue(), new Float(pitch.getPreciseValue()), (float) yaw.getPreciseValue(),
(float) roll.getPreciseValue(), null));
super.onValueChange(value);
}
};
xCoord.addValueChangeListener(listener);
yCoord.addValueChangeListener(listener);
zCoord.addValueChangeListener(listener);
pitch.addValueChangeListener(listener);
yaw.addValueChangeListener(listener);
roll.addValueChangeListener(listener);
} }
int w = Math.max(fontRendererObj.getStringWidth(I18n.format("replaymod.gui.editkeyframe.xpos")), int w = Math.max(fontRendererObj.getStringWidth(I18n.format("replaymod.gui.editkeyframe.xpos")),
@@ -369,19 +385,6 @@ public abstract class GuiEditKeyframe<T extends KeyframeValue> extends GuiScreen
initialized = true; initialized = true;
} }
@Override
public void onGuiClosed() {
if (!save) {
ReplayHandler.removeKeyframe(keyframe);
ReplayHandler.addKeyframe(keyframeBackup);
} else {
keyframe.setValue(new AdvancedPosition(xCoord.getPreciseValue(), yCoord.getPreciseValue(),
zCoord.getPreciseValue(), new Float(pitch.getPreciseValue()), (float) yaw.getPreciseValue(),
(float) roll.getPreciseValue(), null));
}
super.onGuiClosed();
}
@Override @Override
protected void drawScreen0() { protected void drawScreen0() {
if (keyframe.getValue().getSpectatedEntityID() != null) return; if (keyframe.getValue().getSpectatedEntityID() != null) return;
@@ -394,4 +397,25 @@ public abstract class GuiEditKeyframe<T extends KeyframeValue> extends GuiScreen
} }
} }
private static class KeyframeValueChangeListener implements NumberValueChangeListener {
private GuiEditKeyframe parent;
public KeyframeValueChangeListener(GuiEditKeyframe parent) {
this.parent = parent;
parent.min.addValueChangeListener(this);
parent.sec.addValueChangeListener(this);
parent.ms.addValueChangeListener(this);
}
@Override
public void onValueChange(double value) {
int realTimestamp = TimestampUtils.calculateTimestamp(parent.min.getIntValue(), parent.sec.getIntValue(), parent.ms.getIntValue());
parent.keyframe.setRealTimestamp(realTimestamp);
ReplayHandler.fireKeyframesModifyEvent();
}
}
} }