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

Use the AdvancedPositionKeyframeList's interpolation instead of manually calculating the camera Path in the ReplayProcess

Browse Source
This commit is contained in:
CrushedPixel
2015-09-10 13:17:08 +02:00
parent b99d49ee72
commit 603cd4871e
1 changed files with 9 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,7 +125,7 @@ public class ReplayProcess {
//if rendering, disable all game sounds except for gui sounds //if rendering, disable all game sounds except for gui sounds
@SuppressWarnings("unchecked") //I, too, blame Forge for not re-adding generics to that Map. @SuppressWarnings("unchecked") //I, too, blame Forge for not re-adding generics to that Map.
Map<SoundCategory, Float> orgMap = (Map<SoundCategory, Float>)mc.gameSettings.mapSoundLevels; Map<SoundCategory, Float> orgMap = (Map<SoundCategory, Float>)mc.gameSettings.mapSoundLevels;
if(orgMap != null) { if(orgMap != null) {
mapSoundLevelsBefore = new HashMap<SoundCategory, Float>(orgMap); mapSoundLevelsBefore = new HashMap<SoundCategory, Float>(orgMap);
} else { } else {
@@ -232,24 +232,16 @@ public class ReplayProcess {
Keyframe<AdvancedPosition> lastPos = positionKeyframes.getPreviousKeyframe(curRealReplayTime, true); Keyframe<AdvancedPosition> lastPos = positionKeyframes.getPreviousKeyframe(curRealReplayTime, true);
Keyframe<AdvancedPosition> nextPos = positionKeyframes.getNextKeyframe(curRealReplayTime, true); Keyframe<AdvancedPosition> nextPos = positionKeyframes.getNextKeyframe(curRealReplayTime, true);
boolean spectating = false;
boolean spectateCamera = true; boolean spectateCamera = true;
SpectatorData.SpectatingMethod spectatingMethod = null;
SpectatorData previousSpectatorData = null; //check whether between two First Person Spectator Keyframes
SpectatorData nextSpectatorData = null;
//check whether between two Spectator Keyframes
if(lastPos != null && nextPos != null) { if(lastPos != null && nextPos != null) {
if(lastPos.getValue() instanceof SpectatorData && nextPos.getValue() instanceof SpectatorData) { if(lastPos.getValue() instanceof SpectatorData && nextPos.getValue() instanceof SpectatorData) {
previousSpectatorData = (SpectatorData)lastPos.getValue(); SpectatorData previousSpectatorData = (SpectatorData)lastPos.getValue();
nextSpectatorData = (SpectatorData)nextPos.getValue(); SpectatorData nextSpectatorData = (SpectatorData)nextPos.getValue();
if(previousSpectatorData.getSpectatedEntityID() == nextSpectatorData.getSpectatedEntityID()) { if(previousSpectatorData.getSpectatedEntityID() == nextSpectatorData.getSpectatedEntityID()) {
spectating = true; if(previousSpectatorData.getSpectatingMethod() == SpectatorData.SpectatingMethod.FIRST_PERSON
//the previous SpectatingMethod always applies && nextSpectatorData.getSpectatingMethod() == SpectatorData.SpectatingMethod.FIRST_PERSON) {
spectatingMethod = previousSpectatorData.getSpectatingMethod();
if(spectatingMethod == SpectatorData.SpectatingMethod.FIRST_PERSON) {
spectateCamera = false; spectateCamera = false;
} }
} }
@@ -290,29 +282,13 @@ public class ReplayProcess {
} }
} }
if(spectateCamera) {
ReplayHandler.spectateCamera();
}
AdvancedPosition cameraPosition = null; AdvancedPosition cameraPosition = null;
if(!spectating) { if(spectateCamera) {
cameraPosition = positionKeyframes.getInterpolatedValueForTimestamp(curRealReplayTime, linear); cameraPosition = positionKeyframes.getInterpolatedValueForTimestamp(curRealReplayTime, linear);
ReplayHandler.spectateCamera();
} else { } else {
Entity toSpectate = mc.theWorld.getEntityByID(((SpectatorData) lastPos.getValue()).getSpectatedEntityID()); Entity toSpectate = mc.theWorld.getEntityByID(((SpectatorData) lastPos.getValue()).getSpectatedEntityID());
//depending on the SpectatingMethod, position the camera relative to the spectated entity ReplayHandler.spectateEntity(toSpectate);
if(spectatingMethod == SpectatorData.SpectatingMethod.FIRST_PERSON) {
ReplayHandler.spectateEntity(toSpectate);
} else if(spectatingMethod == SpectatorData.SpectatingMethod.SHOULDER_CAM) {
//calculate the camera position using the shoulder cam settings
AdvancedPosition entityPosition = new AdvancedPosition(toSpectate);
//first, rotate the camera pitch and yaw according to the settings
entityPosition.setYaw(entityPosition.getYaw() + previousSpectatorData.getShoulderCamYawOffset());
entityPosition.setPitch(entityPosition.getPitch() + previousSpectatorData.getShoulderCamPitchOffset());
//next, move the camera point to fulfill the specified distance to the entity
cameraPosition = entityPosition.getDestination(-1 * previousSpectatorData.getShoulderCamDistance());
}
} }
if(cameraPosition != null) { if(cameraPosition != null) {