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

Fix jumping to marker position when time already matches

Browse Source
This commit is contained in:
Jonas Herzig
2020-09-27 14:13:40 +02:00
parent 85ea757253
commit 49b0cbe4f8
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/replaymod/replay/ReplayHandler.java
View File

@@ -519,10 +519,6 @@ public class ReplayHandler {
return spectating; return spectating;
} }
public void setTargetPosition(Location pos) {
targetCameraPosition = pos;
}
public void moveCameraToTargetPosition() { public void moveCameraToTargetPosition() {
CameraEntity cam = getCameraEntity(); CameraEntity cam = getCameraEntity();
if (cam != null && targetCameraPosition != null) { if (cam != null && targetCameraPosition != null) {

8
src/main/java/com/replaymod/replay/gui/overlay/GuiMarkerTimeline.java
View File

@@ -4,6 +4,7 @@ import com.replaymod.core.ReplayMod;
import com.replaymod.core.versions.MCVer.Keyboard; import com.replaymod.core.versions.MCVer.Keyboard;
import com.replaymod.replay.ReplayHandler; import com.replaymod.replay.ReplayHandler;
import com.replaymod.replay.ReplayModReplay; import com.replaymod.replay.ReplayModReplay;
import com.replaymod.replay.camera.CameraEntity;
import com.replaymod.replaystudio.data.Marker; import com.replaymod.replaystudio.data.Marker;
import com.replaymod.replaystudio.util.Location; import com.replaymod.replaystudio.util.Location;
import de.johni0702.minecraft.gui.GuiRenderer; import de.johni0702.minecraft.gui.GuiRenderer;
@@ -168,11 +169,14 @@ public class GuiMarkerTimeline extends AbstractGuiTimeline<GuiMarkerTimeline> im
} else if (button == 1) { // Right click } else if (button == 1) { // Right click
selectedMarker = null; selectedMarker = null;
if (replayHandler != null) { if (replayHandler != null) {
replayHandler.setTargetPosition(new Location( CameraEntity cameraEntity = replayHandler.getCameraEntity();
if (cameraEntity != null) {
cameraEntity.setCameraPosRot(new Location(
marker.getX(), marker.getY(), marker.getZ(), marker.getX(), marker.getY(), marker.getZ(),
marker.getPitch(), marker.getYaw() marker.getPitch(), marker.getYaw()
)); ));
replayHandler.doJump(marker.getTime(), false); }
replayHandler.doJump(marker.getTime(), true);
} else { } else {
setCursorPosition(marker.getTime()); setCursorPosition(marker.getTime());
} }