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

7
Runtime/World/CScriptActor.cpp
View File

@@ -8,6 +8,8 @@
#include "Character/IAnimReader.hpp"
#include "TCastTo.hpp"
#include "CActorParameters.hpp"
#include "MP1/World/CActorContraption.hpp"
#include "zeus/CEulerAngles.hpp"
namespace urde {
@@ -103,6 +105,9 @@ void CScriptActor::Think(float dt, CStateManager& mgr) {
else
MoveToOR(deltas.x0_posDelta, dt);
//if (TCastToPtr<MP1::CActorContraption>(this))
//printf("DEL %f\n", zeus::radToDeg(zeus::CEulerAngles(deltas.xc_rotDelta).z()));
//printf("DEL %f %f %f %f\n", float(deltas.xc_rotDelta[0]), float(deltas.xc_rotDelta[1]), float(deltas.xc_rotDelta[2]), float(deltas.xc_rotDelta[3]));
RotateToOR(deltas.xc_rotDelta, dt);
}
@@ -176,7 +181,7 @@ EWeaponCollisionResponseTypes CScriptActor::GetCollisionResponseType(const zeus:
return CActor::GetCollisionResponseType(v1, v2, wMode, w);
}
rstl::optional<zeus::CAABox> CScriptActor::GetTouchBounds() const {
std::optional<zeus::CAABox> CScriptActor::GetTouchBounds() const {
if (GetActive() && x68_material.HasMaterial(EMaterialTypes::Solid))
return {CPhysicsActor::GetBoundingBox()};
return {};