ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2024-11-26 08:52:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cutscene viewer playback improvements

Browse Source
This commit is contained in:
dexy 2019-11-26 02:50:30 +11:00
parent 6467797c3d
commit f67731ddd4
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
World/CutsceneForm.cs
View File

@ -58,8 +58,10 @@ namespace CodeWalker.World
{ {
var cori = Quaternion.RotationAxis(Vector3.UnitX, -1.57079632679f) * Quaternion.RotationAxis(Vector3.UnitZ, 3.141592653f); var cori = Quaternion.RotationAxis(Vector3.UnitX, -1.57079632679f) * Quaternion.RotationAxis(Vector3.UnitZ, 3.141592653f);
var pos = Cutscene.Position + Cutscene.CameraObject.Position; var pos = Cutscene.Position;
var rot = Cutscene.Rotation * Cutscene.CameraObject.Rotation * cori; var rot = Cutscene.Rotation;
pos = pos + rot.Multiply(Cutscene.CameraObject.Position);
rot = rot * Cutscene.CameraObject.Rotation * cori;
WorldForm.SetCameraTransform(pos, rot); WorldForm.SetCameraTransform(pos, rot);
@ -304,10 +306,12 @@ namespace CodeWalker.World
public Dictionary<int, CutsceneObject> SceneObjects { get; set; } = null; public Dictionary<int, CutsceneObject> SceneObjects { get; set; } = null;
public CutEvent[] LoadEvents { get; set; } = null; public CutEvent[] LoadEvents { get; set; } = null;
public CutEvent[] PlayEvents { get; set; } = null; public CutEvent[] PlayEvents { get; set; } = null;
public CutConcatData[] ConcatDatas { get; set; } = null;
public int NextLoadEvent { get; set; } = 0; public int NextLoadEvent { get; set; } = 0;
public int NextPlayEvent { get; set; } = 0; public int NextPlayEvent { get; set; } = 0;
public int NextCameraCut { get; set; } = 0; public int NextCameraCut { get; set; } = 0;
public int NextConcatData { get; set; } = 0;
public Gxt2File Gxt2File { get; set; } = null; public Gxt2File Gxt2File { get; set; } = null;
@ -338,6 +342,7 @@ namespace CodeWalker.World
Objects = csf.ObjectsDict; Objects = csf.ObjectsDict;
LoadEvents = RecastArray<CutEvent>(csf.pCutsceneLoadEventList); LoadEvents = RecastArray<CutEvent>(csf.pCutsceneLoadEventList);
PlayEvents = RecastArray<CutEvent>(csf.pCutsceneEventList); PlayEvents = RecastArray<CutEvent>(csf.pCutsceneEventList);
ConcatDatas = csf.concatDataList;
LoadYcds(); LoadYcds();
@ -391,6 +396,7 @@ namespace CodeWalker.World
NextLoadEvent = 0; NextLoadEvent = 0;
NextPlayEvent = 0; NextPlayEvent = 0;
NextCameraCut = 0; NextCameraCut = 0;
NextConcatData = 0;
RaiseEvents(newTime); RaiseEvents(newTime);
} }
@ -473,7 +479,7 @@ namespace CodeWalker.World
updateObjectTransform(obj, cme, 0, 5, 6); updateObjectTransform(obj, cme, 0, 5, 6);
pos = pos + obj.Position; pos = pos + rot.Multiply(obj.Position);
rot = rot * obj.Rotation; rot = rot * obj.Rotation;
} }
obj.Ped.Position = pos; obj.Ped.Position = pos;
@ -545,6 +551,18 @@ namespace CodeWalker.World
} }
NextCameraCut = i; NextCameraCut = i;
for (i = NextConcatData; i < ConcatDatas?.Length; i++)
{
var c = ConcatDatas[i];
if (c.fStartTime > upToTime) break;
if (c.cSceneName == 0) break;
Position = c.vOffset;
Rotation = Quaternion.RotationAxis(Vector3.UnitZ, c.fRotation * 0.0174532925f); //is this right?
}
NextConcatData = i;
} }
private void RaiseEvent(CutEvent e) private void RaiseEvent(CutEvent e)
{ {