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

Cutscene viewer now puts camera in correct place when not playing

Browse Source
This commit is contained in:
dexy 2019-11-28 16:02:13 +11:00
parent 2f12402a03
commit 9ba2e288ed
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
World/CutsceneForm.cs
View File

@ -56,12 +56,8 @@ namespace CodeWalker.World
if (AnimateCamera && (Cutscene.CameraObject != null)) if (AnimateCamera && (Cutscene.CameraObject != null))
{ {
var cori = Quaternion.RotationAxis(Vector3.UnitX, -1.57079632679f) * Quaternion.RotationAxis(Vector3.UnitZ, 3.141592653f); var pos = Cutscene.CameraObject.Position;
var rot = Cutscene.CameraObject.Rotation;
var pos = Cutscene.Position;
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);
@ -321,6 +317,8 @@ namespace CodeWalker.World
public CutsceneObject CameraObject = null; public CutsceneObject CameraObject = null;
public Quaternion CameraRotationOffset = Quaternion.RotationAxis(Vector3.UnitX, -1.57079632679f) * Quaternion.RotationAxis(Vector3.UnitZ, 3.141592653f);
@ -461,6 +459,18 @@ namespace CodeWalker.World
ycd.CutsceneMap.TryGetValue(CameraObject.Name, out cme); ycd.CutsceneMap.TryGetValue(CameraObject.Name, out cme);
updateObjectTransform(CameraObject, cme, 0, 7, 8); updateObjectTransform(CameraObject, cme, 0, 7, 8);
if (cme != null)
{
var pos = Position;
var rot = Rotation;
pos = pos + rot.Multiply(CameraObject.Position);
rot = rot * CameraObject.Rotation * CameraRotationOffset;
CameraObject.Position = pos;
CameraObject.Rotation = rot;
}
} }
if (SceneObjects != null) if (SceneObjects != null)
@ -947,8 +957,10 @@ namespace CodeWalker.World
{ return; } { return; }
obj.Position = args.vPosition; var pos = Position;
obj.Rotation = args.vRotationQuaternion; var rot = Rotation * Quaternion.RotationAxis(Vector3.UnitX, 1.57079632679f);
obj.Position = pos + rot.Multiply(args.vPosition);
obj.Rotation = rot * args.vRotationQuaternion;
CameraObject = obj; CameraObject = obj;
} }