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

Merge pull request #92 from lioncash/fwd

Browse Source 
ICollisionFilter: Use forward declarations where applicable
This commit is contained in:
Phillip Stephens 2019-10-01 06:44:08 -07:00 committed by GitHub
commit be2da2f363
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Collision/CAABoxFilter.cpp
View File

@ -1,5 +1,7 @@
#include "CAABoxFilter.hpp"
#include "CollisionUtil.hpp"
#include "Runtime/Collision/CAABoxFilter.hpp"
#include "Runtime/Collision/CCollisionInfoList.hpp"
#include "Runtime/Collision/CollisionUtil.hpp"
namespace urde {

1
Runtime/Collision/CAABoxFilter.hpp
View File

@ -3,6 +3,7 @@
#include "Runtime/Collision/ICollisionFilter.hpp"
namespace urde {
class CCollisionInfoList;
class CAABoxFilter : public ICollisionFilter {
public:

5
Runtime/Collision/CBallFilter.cpp
View File

@ -1,5 +1,6 @@
#include "CBallFilter.hpp"
#include "CollisionUtil.hpp"
#include "Runtime/Collision/CBallFilter.hpp"
#include "Runtime/Collision/CollisionUtil.hpp"
namespace urde {
void CBallFilter::Filter(const CCollisionInfoList& in, CCollisionInfoList& out) const {

1
Runtime/Collision/CBallFilter.hpp
View File

@ -3,6 +3,7 @@
#include "Runtime/Collision/ICollisionFilter.hpp"
namespace urde {
class CCollisionInfoList;
class CPhysicsActor;
class CBallFilter : public ICollisionFilter {

31
Runtime/Collision/CGameCollision.cpp
View File

@ -1,18 +1,21 @@
#include "CGameCollision.hpp"
#include "CCollidableOBBTreeGroup.hpp"
#include "CMaterialFilter.hpp"
#include "CMaterialList.hpp"
#include "World/CActor.hpp"
#include "CStateManager.hpp"
#include "Runtime/Collision/CGameCollision.hpp"
#include "Runtime/CStateManager.hpp"
#include "Runtime/Character/CGroundMovement.hpp"
#include "Runtime/Collision/CAABoxFilter.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 "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 {

8
Runtime/Collision/CGameCollision.hpp
View File

@ -16,11 +16,11 @@ namespace urde {
class CActor;
class CCollisionInfo;
class CCollisionInfoList;
class CMaterialList;
class CStateManager;
class CPhysicsActor;
class CMaterialFilter;
class CGameArea;
class CMaterialFilter;
class CMaterialList;
class CPhysicsActor;
class CStateManager;
class ICollisionFilter;
class CGameCollision {

3
Runtime/Collision/ICollisionFilter.hpp
View File

@ -1,9 +1,8 @@
#pragma once
#include "Runtime/Collision/CCollisionInfoList.hpp"
namespace urde {
class CActor;
class CCollisionInfoList;
class ICollisionFilter {
CActor& x4_actor;