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

Implement CStateManager::Update

Browse Source
This commit is contained in:
Jack Andersen
2017-03-23 19:30:16 -10:00
parent 5a6e40c5aa
commit db12dd2ea2
68 changed files with 1165 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Collision/CCollisionActor.cpp
View File

@@ -71,11 +71,11 @@ void CCollisionActor::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, C
{
case EScriptObjectMessage::ToggleActive:
case EScriptObjectMessage::Deleted:
case EScriptObjectMessage::Constructed:
case EScriptObjectMessage::InitializedInArea:
break;
case EScriptObjectMessage::Alert:
case EScriptObjectMessage::InternalMessage10:
case EScriptObjectMessage::InternalMessage11:
case EScriptObjectMessage::Registered:
{
CEntity* ent = mgr.ObjectById(x25c_owner);
if (ent)

5
Runtime/Collision/CGameCollision.cpp
View File

@@ -45,6 +45,11 @@ void CGameCollision::InitCollision()
CCollisionPrimitive::InitEndColliders();
}
void CGameCollision::Move(CStateManager& mgr, CPlayer& player, float dt, const rstl::reserved_vector<TUniqueId, 1024>*)
{
}
bool CGameCollision::CanBlock(const CMaterialList& mat, const zeus::CVector3f& v)
{
if ((mat.HasMaterial(EMaterialTypes::Character) && !mat.HasMaterial(EMaterialTypes::Scannable)) ||

5
Runtime/Collision/CGameCollision.hpp
View File

@@ -1,6 +1,8 @@
#ifndef __URDE_CGAMECOLLISION_HPP__
#define __URDE_CGAMECOLLISION_HPP__
#include "zeus/CVector3f.hpp"
#include "rstl.hpp"
#include "RetroTypes.hpp"
namespace urde
{
@@ -14,6 +16,8 @@ class CCollisionInfo;
class CCollisionInfoList;
class CMaterialList;
class CStateManager;
class CPlayer;
class CGameCollision
{
public:
@@ -24,6 +28,7 @@ public:
static bool NullBooleanCollider(const CInternalCollisionStructure&) { return false; }
static bool NullCollisionCollider(const CInternalCollisionStructure&, CCollisionInfoList&) { return false; }
static void InitCollision();
static void Move(CStateManager& mgr, CPlayer& player, float dt, const rstl::reserved_vector<TUniqueId, 1024>*);
static bool CanBlock(const CMaterialList&, const zeus::CVector3f&);
static bool IsFloor(const CMaterialList&, const zeus::CVector3f&);