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

Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde

Browse Source
This commit is contained in:
Jack Andersen
2018-12-07 18:36:12 -10:00
parent 7c7da6671a dd705a3db9
commit 41ae32be31
27 changed files with 1424 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/Character/CActorLights.hpp
View File

@@ -93,6 +93,8 @@ public:
s32 GetShadowLightIndex() const { return x2a0_shadowLightIdx; }
u32 GetAreaUpdateFramePeriod() const { return x2a8_areaUpdateFramePeriod; }
void SetAreaUpdateFramePeriod(u32 p) { x2a8_areaUpdateFramePeriod = p; }
zeus::CVector3f GetActorPositionBias() const { return x2ac_actorPosBias; }
void SetActorPositionBias(const zeus::CVector3f& bias) { x2ac_actorPosBias = bias; }
};
}

4
Runtime/Character/CBodyStateCmdMgr.hpp
View File

@@ -91,9 +91,9 @@ public:
CBCGenerateCmd(pas::EGenerateType type, s32 animId = -1)
: CBodyStateCmd(EBodyStateCmd::Generate), x8_type(type), x18_animId(animId)
{ x1c_24_targetTransform = false; x1c_25_overrideAnim = false; }
CBCGenerateCmd(pas::EGenerateType type, const zeus::CVector3f& vec)
CBCGenerateCmd(pas::EGenerateType type, const zeus::CVector3f& vec, bool targetTransform = false, bool overrideAnim = false)
: CBodyStateCmd(EBodyStateCmd::Generate), x8_type(type), xc_targetPos(vec)
{ x1c_24_targetTransform = false; x1c_25_overrideAnim = false; }
{ x1c_24_targetTransform = targetTransform; x1c_25_overrideAnim = overrideAnim; }
pas::EGenerateType GetGenerateType() const { return x8_type; }
const zeus::CVector3f& GetExitTargetPos() const { return xc_targetPos; }
bool HasExitTargetPos() const { return x1c_24_targetTransform; }

30
Runtime/Character/CharacterCommon.hpp
View File

@@ -7,21 +7,21 @@ namespace pas
enum class ELocomotionType
{
Invalid = -1,
Crouch,
Relaxed,
Lurk,
Combat,
Internal4,
Internal5,
Internal6,
Internal7,
Internal8,
Internal9,
Internal10,
Internal11,
Internal12,
Internal13,
Internal14
Crouch = 0,
Relaxed = 1,
Lurk = 2,
Combat = 3,
Internal4 = 4,
Internal5 = 5,
Internal6 = 6,
Internal7 = 7,
Internal8 = 8,
Internal9 = 9,
Internal10 = 10,
Internal11 = 11,
Internal12 = 12,
Internal13 = 13,
Internal14 = 14
};
enum class ELocomotionAnim