AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CPlayer: Organize includes

This commit is contained in:
Lioncash 2019-09-18 11:37:36 -04:00
parent b5d829379e
commit 33f10e2552
2 changed files with 51 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Runtime/World/CPlayer.cpp
View File

@ -1,29 +1,32 @@
#include "CPlayer.hpp" #include "Runtime/World/CPlayer.hpp"
#include "CActorParameters.hpp"
#include "CStateManager.hpp" #include "Runtime/CDependencyGroup.hpp"
#include "CSimplePool.hpp" #include "Runtime/CGameState.hpp"
#include "GameGlobalObjects.hpp" #include "Runtime/CSimplePool.hpp"
#include "Camera/CFirstPersonCamera.hpp" #include "Runtime/CStateManager.hpp"
#include "Camera/CBallCamera.hpp" #include "Runtime/TCastTo.hpp"
#include "Camera/CCinematicCamera.hpp" #include "Runtime/Audio/CStreamAudioManager.hpp"
#include "TCastTo.hpp" #include "Runtime/Camera/CBallCamera.hpp"
#include "CScriptGrapplePoint.hpp" #include "Runtime/Camera/CCinematicCamera.hpp"
#include "CPatterned.hpp" #include "Runtime/Camera/CFirstPersonCamera.hpp"
#include "CScriptWater.hpp" #include "Runtime/Character/CSteeringBehaviors.hpp"
#include "CDependencyGroup.hpp" #include "Runtime/Collision/CGameCollision.hpp"
#include "Character/CSteeringBehaviors.hpp" #include "Runtime/Collision/CMetroidAreaCollider.hpp"
#include "Weapon/CEnergyProjectile.hpp" #include "Runtime/GameGlobalObjects.hpp"
#include "MP1/World/CThardusRockProjectile.hpp" #include "Runtime/Input/ControlMapper.hpp"
#include "MP1/World/CMetroidBeta.hpp" #include "Runtime/MP1/CSamusHud.hpp"
#include "Collision/CMetroidAreaCollider.hpp" #include "Runtime/MP1/World/CMetroidBeta.hpp"
#include "Collision/CGameCollision.hpp" #include "Runtime/MP1/World/CThardusRockProjectile.hpp"
#include "Input/ControlMapper.hpp" #include "Runtime/Weapon/CEnergyProjectile.hpp"
#include "CGameState.hpp" #include "Runtime/World/CActorParameters.hpp"
#include "MP1/CSamusHud.hpp" #include "Runtime/World/CHUDBillboardEffect.hpp"
#include "CHUDBillboardEffect.hpp" #include "Runtime/World/CPatterned.hpp"
#include "Audio/CStreamAudioManager.hpp" #include "Runtime/World/CScriptAreaAttributes.hpp"
#include "CScriptPlayerHint.hpp" #include "Runtime/World/CScriptGrapplePoint.hpp"
#include "CScriptAreaAttributes.hpp" #include "Runtime/World/CScriptPlayerHint.hpp"
#include "Runtime/World/CScriptWater.hpp"
#include <logvisor/logvisor.hpp>
namespace urde { namespace urde {

37
Runtime/World/CPlayer.hpp
View File

@ -1,32 +1,39 @@
#pragma once #pragma once
#include "CPhysicsActor.hpp" #include <memory>
#include "zeus/CAABox.hpp" #include <optional>
#include "zeus/CTransform.hpp" #include <vector>
#include "Weapon/CWeaponMgr.hpp"
#include "CPlayerEnergyDrain.hpp" #include "Runtime/Weapon/CPlayerGun.hpp"
#include "Weapon/CPlayerGun.hpp" #include "Runtime/Weapon/CWeaponMgr.hpp"
#include "CMorphBall.hpp" #include "Runtime/World/CMorphBall.hpp"
#include "Runtime/World/CPhysicsActor.hpp"
#include "Runtime/World/CPlayerEnergyDrain.hpp"
#include <zeus/CAABox.hpp>
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde { namespace urde {
class CCollidableSphere;
class CDamageInfo;
class CFirstPersonCamera;
class CMaterialList; class CMaterialList;
class CMorphBall; class CMorphBall;
class CPlayerCameraBob;
class CPlayerGun; class CPlayerGun;
class CDamageInfo; class CScriptPlayerHint;
class CScriptWater; class CScriptWater;
class IVisitor; class IVisitor;
struct CFinalInput; struct CFinalInput;
class CPlayerCameraBob;
class CFirstPersonCamera;
class CCollidableSphere;
class CScriptPlayerHint;
class CPlayer : public CPhysicsActor { class CPlayer : public CPhysicsActor {
friend class CStateManager;
friend class CFirstPersonCamera; friend class CFirstPersonCamera;
friend class CPlayerCameraBob;
friend class CMorphBall;
friend class CGroundMovement; friend class CGroundMovement;
friend class CMorphBall;
friend class CPlayerCameraBob;
friend class CStateManager;
public: public:
enum class EPlayerScanState { NotScanning, Scanning, ScanComplete }; enum class EPlayerScanState { NotScanning, Scanning, ScanComplete };