AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 22:27:43 +00:00
Code Issues Projects Releases Wiki Activity

CActorContraption fixes, better CMake dependency handling

Browse Source
This commit is contained in:
Jack Andersen
2019-06-11 16:05:17 -10:00
parent 77d0ef942d
commit e218b8aeb5
295 changed files with 942 additions and 2219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/World/CPhysicsActor.cpp
View File

@@ -1,4 +1,7 @@
#include "CPhysicsActor.hpp"
#include "TCastTo.hpp"
#include "MP1/World/CActorContraption.hpp"
#include "zeus/CEulerAngles.hpp"
namespace urde {
@@ -90,6 +93,11 @@ void CPhysicsActor::AddMotionState(const CMotionState& mst) {
zeus::CNUQuaternion q{x34_transform.buildMatrix3f()};
q += mst.xc_orientation;
zeus::CQuaternion quat = zeus::CQuaternion::fromNUQuaternion(q);
//if (TCastToPtr<MP1::CActorContraption>(this)) {
// float a1 = zeus::radToDeg(zeus::CEulerAngles(zeus::CQuaternion(x34_transform.buildMatrix3f())).z());
// float a2 = zeus::radToDeg(zeus::CEulerAngles(quat).z());
// printf("ADD %f\n", a2 - a1);
//}
SetTransform(zeus::CTransform(quat, x34_transform.origin));
SetTranslation(x34_transform.origin + mst.x0_translation);