mirror of https://github.com/AxioDL/metaforce.git
ICollisionFilter: Use forward declarations where applicable
With the headers all normalized, we can safely convert the only ICollisionFilter include into a forward declaration.
This commit is contained in:
parent
81a019b1e0
commit
4442421586
|
@ -1,5 +1,7 @@
|
||||||
#include "CAABoxFilter.hpp"
|
#include "Runtime/Collision/CAABoxFilter.hpp"
|
||||||
#include "CollisionUtil.hpp"
|
|
||||||
|
#include "Runtime/Collision/CCollisionInfoList.hpp"
|
||||||
|
#include "Runtime/Collision/CollisionUtil.hpp"
|
||||||
|
|
||||||
namespace urde {
|
namespace urde {
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#include "Runtime/Collision/ICollisionFilter.hpp"
|
#include "Runtime/Collision/ICollisionFilter.hpp"
|
||||||
|
|
||||||
namespace urde {
|
namespace urde {
|
||||||
|
class CCollisionInfoList;
|
||||||
|
|
||||||
class CAABoxFilter : public ICollisionFilter {
|
class CAABoxFilter : public ICollisionFilter {
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#include "CBallFilter.hpp"
|
#include "Runtime/Collision/CBallFilter.hpp"
|
||||||
#include "CollisionUtil.hpp"
|
#include "Runtime/Collision/CollisionUtil.hpp"
|
||||||
|
|
||||||
namespace urde {
|
namespace urde {
|
||||||
|
|
||||||
void CBallFilter::Filter(const CCollisionInfoList& in, CCollisionInfoList& out) const {
|
void CBallFilter::Filter(const CCollisionInfoList& in, CCollisionInfoList& out) const {
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#include "Runtime/Collision/ICollisionFilter.hpp"
|
#include "Runtime/Collision/ICollisionFilter.hpp"
|
||||||
|
|
||||||
namespace urde {
|
namespace urde {
|
||||||
|
class CCollisionInfoList;
|
||||||
class CPhysicsActor;
|
class CPhysicsActor;
|
||||||
|
|
||||||
class CBallFilter : public ICollisionFilter {
|
class CBallFilter : public ICollisionFilter {
|
||||||
|
|
|
@ -1,18 +1,21 @@
|
||||||
#include "CGameCollision.hpp"
|
#include "Runtime/Collision/CGameCollision.hpp"
|
||||||
#include "CCollidableOBBTreeGroup.hpp"
|
|
||||||
#include "CMaterialFilter.hpp"
|
#include "Runtime/CStateManager.hpp"
|
||||||
#include "CMaterialList.hpp"
|
#include "Runtime/Character/CGroundMovement.hpp"
|
||||||
#include "World/CActor.hpp"
|
#include "Runtime/Collision/CAABoxFilter.hpp"
|
||||||
#include "CStateManager.hpp"
|
#include "Runtime/Collision/CBallFilter.hpp"
|
||||||
|
#include "Runtime/Collision/CCollidableOBBTreeGroup.hpp"
|
||||||
|
#include "Runtime/Collision/CCollidableSphere.hpp"
|
||||||
|
#include "Runtime/Collision/CCollisionInfoList.hpp"
|
||||||
|
#include "Runtime/Collision/CMaterialFilter.hpp"
|
||||||
|
#include "Runtime/Collision/CMaterialList.hpp"
|
||||||
|
#include "Runtime/Collision/CMetroidAreaCollider.hpp"
|
||||||
|
#include "Runtime/Collision/CollisionUtil.hpp"
|
||||||
|
#include "Runtime/World/CActor.hpp"
|
||||||
|
#include "Runtime/World/CScriptPlatform.hpp"
|
||||||
|
#include "Runtime/World/CWorld.hpp"
|
||||||
|
|
||||||
#include "TCastTo.hpp" // Generated file, do not modify include path
|
#include "TCastTo.hpp" // Generated file, do not modify include path
|
||||||
#include "World/CWorld.hpp"
|
|
||||||
#include "CAABoxFilter.hpp"
|
|
||||||
#include "CBallFilter.hpp"
|
|
||||||
#include "CMetroidAreaCollider.hpp"
|
|
||||||
#include "CollisionUtil.hpp"
|
|
||||||
#include "World/CScriptPlatform.hpp"
|
|
||||||
#include "CCollidableSphere.hpp"
|
|
||||||
#include "Character/CGroundMovement.hpp"
|
|
||||||
|
|
||||||
namespace urde {
|
namespace urde {
|
||||||
|
|
||||||
|
|
|
@ -16,11 +16,11 @@ namespace urde {
|
||||||
class CActor;
|
class CActor;
|
||||||
class CCollisionInfo;
|
class CCollisionInfo;
|
||||||
class CCollisionInfoList;
|
class CCollisionInfoList;
|
||||||
class CMaterialList;
|
|
||||||
class CStateManager;
|
|
||||||
class CPhysicsActor;
|
|
||||||
class CMaterialFilter;
|
|
||||||
class CGameArea;
|
class CGameArea;
|
||||||
|
class CMaterialFilter;
|
||||||
|
class CMaterialList;
|
||||||
|
class CPhysicsActor;
|
||||||
|
class CStateManager;
|
||||||
class ICollisionFilter;
|
class ICollisionFilter;
|
||||||
|
|
||||||
class CGameCollision {
|
class CGameCollision {
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "Runtime/Collision/CCollisionInfoList.hpp"
|
|
||||||
|
|
||||||
namespace urde {
|
namespace urde {
|
||||||
class CActor;
|
class CActor;
|
||||||
|
class CCollisionInfoList;
|
||||||
|
|
||||||
class ICollisionFilter {
|
class ICollisionFilter {
|
||||||
CActor& x4_actor;
|
CActor& x4_actor;
|
||||||
|
|
Loading…
Reference in New Issue