AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-11 07:07:42 +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

5
Runtime/World/CActor.cpp
View File

@@ -14,6 +14,7 @@
#include "CTimeProvider.hpp"
#include "Graphics/CSkinnedModel.hpp"
#include "hecl/CVarManager.hpp"
#include "zeus/CEulerAngles.hpp"
namespace urde {
static CMaterialList MakeActorMaterialList(const CMaterialList& materialList, const CActorParameters& params) {
@@ -303,7 +304,7 @@ const CDamageVulnerability* CActor::GetDamageVulnerability(const zeus::CVector3f
return GetDamageVulnerability();
}
rstl::optional<zeus::CAABox> CActor::GetTouchBounds() const { return {}; }
std::optional<zeus::CAABox> CActor::GetTouchBounds() const { return {}; }
void CActor::Touch(CActor&, CStateManager&) {}
@@ -493,6 +494,8 @@ void CActor::SetTransform(const zeus::CTransform& tr) {
xe4_27_notInSortedLists = true;
xe4_28_transformDirty = true;
xe4_29_actorLightsDirty = true;
//if (TCastToPtr<MP1::CActorContraption>(this))
// printf("ACC %f\n", zeus::radToDeg(zeus::CEulerAngles(tr).z()));
}
void CActor::SetAddedToken(u32 tok) { xcc_addedToken = tok; }