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

Added Spectator Keyframes and handles them properly in both normal and rendered Replay Paths

Browse Source
This commit is contained in:
CrushedPixel
2015-05-31 13:54:22 +02:00
parent 431a36c9d9
commit fe036d72d8
8 changed files with 143 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,8 +71,13 @@ public class ReplayHandler {
}
public static void spectateEntity(Entity e) {
currentEntity = e;
mc.setRenderViewEntity(currentEntity);
if(e == null) {
spectateCamera();
}
else {
currentEntity = e;
mc.setRenderViewEntity(currentEntity);
}
}
public static void spectateCamera() {

43
src/main/java/eu/crushedpixel/replaymod/replay/ReplayProcess.java
View File

@@ -221,6 +221,18 @@ public class ReplayProcess {
PositionKeyframe lastPos = ReplayHandler.getPreviousPositionKeyframe(curRealReplayTime);
PositionKeyframe nextPos = ReplayHandler.getNextPositionKeyframe(curRealReplayTime);
boolean spectating = false;
//if it's between two spectator keyframes sharing the same entity, spectate this entity
if(lastPos != null && nextPos != null) {
if(lastPos.getSpectatedEntityID() != null && nextPos.getSpectatedEntityID() != null) {
if(lastPos.getSpectatedEntityID().equals(nextPos.getSpectatedEntityID())) {
spectating = true;
}
}
}
ReplayHandler.setRealTimelineCursor(curRealReplayTime);
int lastPosStamp = 0;
@@ -292,17 +304,27 @@ public class ReplayProcess {
float splinePos = ((float) ReplayHandler.getKeyframeIndex(lastPos) + currentPosStepPerc) / (float) (posCount - 1);
float timePos = ((float) ReplayHandler.getKeyframeIndex(lastTime) + currentTimeStepPerc) / (float) (timeCount - 1);
Position pos = null;
if(posCount > 1) {
if(!linear) {
pos = motionSpline.getPoint(Math.max(0, Math.min(1, splinePos)));
if(!spectating) {
ReplayHandler.spectateCamera();
Position pos = null;
if(posCount > 1) {
if(!linear) {
pos = motionSpline.getPoint(Math.max(0, Math.min(1, splinePos)));
} else {
pos = motionLinear.getPoint(Math.max(0, Math.min(1, splinePos)));
}
} else {
pos = motionLinear.getPoint(Math.max(0, Math.min(1, splinePos)));
if(posCount == 1) {
pos = ReplayHandler.getFirstPositionKeyframe().getPosition();
}
}
if(pos != null) {
ReplayHandler.setCameraTilt(pos.getRoll());
ReplayHandler.getCameraEntity().movePath(pos);
}
} else {
if(posCount == 1) {
pos = ReplayHandler.getFirstPositionKeyframe().getPosition();
}
ReplayHandler.spectateEntity(mc.theWorld.getEntityByID(lastPos.getSpectatedEntityID()));
}
Integer curTimestamp = null;
@@ -310,11 +332,6 @@ public class ReplayProcess {
curTimestamp = timeLinear.getPoint(Math.max(0, Math.min(1, timePos)));
}
if(pos != null) {
ReplayHandler.setCameraTilt(pos.getRoll());
ReplayHandler.getCameraEntity().movePath(pos);
}
if(!isVideoRecording()) ReplayMod.replaySender.setReplaySpeed(curSpeed);
//if(curSpeed > 0)
lastSpeed = curSpeed;