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

Allow creating markers during replay

Browse Source
This commit is contained in:
johni0702
2015-11-08 09:54:16 +01:00
parent 3323f998e7
commit dfd133d84f
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,10 +29,7 @@ import org.lwjgl.opengl.Display;
import org.lwjgl.util.Point; import org.lwjgl.util.Point;
import java.io.IOException; import java.io.IOException;
import java.util.Collections; import java.util.*;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import static net.minecraft.client.renderer.GlStateManager.*; import static net.minecraft.client.renderer.GlStateManager.*;
import static org.lwjgl.opengl.GL11.GL_COLOR_BUFFER_BIT; import static org.lwjgl.opengl.GL11.GL_COLOR_BUFFER_BIT;
@@ -81,7 +78,7 @@ public class ReplayHandler {
FMLCommonHandler.instance().bus().post(new ReplayOpenEvent.Pre(this)); FMLCommonHandler.instance().bus().post(new ReplayOpenEvent.Pre(this));
markers = replayFile.getMarkers().or(Collections.<Marker>emptySet()); markers = new HashSet<>(replayFile.getMarkers().or(Collections.<Marker>emptySet()));
replaySender = new ReplaySender(this, replayFile, asyncMode); replaySender = new ReplaySender(this, replayFile, asyncMode);

17
src/main/java/com/replaymod/replay/ReplayModReplay.java
View File

@@ -7,6 +7,7 @@ import com.google.common.util.concurrent.ListenableFuture;
import com.replaymod.core.ReplayMod; import com.replaymod.core.ReplayMod;
import com.replaymod.replay.camera.*; import com.replaymod.replay.camera.*;
import com.replaymod.replay.handler.GuiHandler; import com.replaymod.replay.handler.GuiHandler;
import de.johni0702.replaystudio.data.Marker;
import de.johni0702.replaystudio.replay.ReplayFile; import de.johni0702.replaystudio.replay.ReplayFile;
import de.johni0702.replaystudio.replay.ZipReplayFile; import de.johni0702.replaystudio.replay.ZipReplayFile;
import de.johni0702.replaystudio.studio.ReplayStudio; import de.johni0702.replaystudio.studio.ReplayStudio;
@@ -52,7 +53,21 @@ public class ReplayModReplay {
core.getKeyBindingRegistry().registerKeyBinding("replaymod.input.marker", Keyboard.KEY_M, new Runnable() { core.getKeyBindingRegistry().registerKeyBinding("replaymod.input.marker", Keyboard.KEY_M, new Runnable() {
@Override @Override
public void run() { public void run() {
if (replayHandler != null ) {
CameraEntity camera = replayHandler.getCameraEntity();
if (camera != null) {
Marker marker = new Marker();
marker.setTime(replayHandler.getReplaySender().currentTimeStamp());
marker.setX(camera.posX);
marker.setY(camera.posY);
marker.setZ(camera.posZ);
marker.setYaw(camera.rotationYaw);
marker.setPitch(camera.rotationPitch);
marker.setRoll(camera.roll);
replayHandler.getMarkers().add(marker);
replayHandler.saveMarkers();
}
}
} }
}); });