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

CPuddleToadGamma and animation system fixes

Browse Source
This commit is contained in:
Jack Andersen
2019-06-20 20:02:56 -10:00
parent 9ccc4227cb
commit 77af3f0ebd
35 changed files with 309 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/World/CPhysicsActor.cpp
View File

@@ -1,7 +1,5 @@
#include "CPhysicsActor.hpp"
#include "TCastTo.hpp"
#include "MP1/World/CActorContraption.hpp"
#include "zeus/CEulerAngles.hpp"
namespace urde {
@@ -93,10 +91,8 @@ 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);
//if (TCastToPtr<CPlayer>(this)) {
// printf("ADD %f %f %f\n", float(mst.x0_translation.x()), float(mst.x0_translation.y()), float(mst.x0_translation.z()));
//}
SetTransform(zeus::CTransform(quat, x34_transform.origin));