Add CPlayerGun::CPlayerGun

Former-commit-id: 835ea5361f
This commit is contained in:
Henrique Gemignani Passos Lima
2022-10-06 11:53:35 +03:00
parent 4f798b9cc4
commit b85a66c2ee
5 changed files with 129 additions and 2 deletions

View File

@@ -17,6 +17,8 @@ class CAABox;
class CActorLights {
public:
CActorLights(uint areaUpdateFramePeriod, const CVector3f& actorPosBias, int maxDynamicLights, int maxAreaLights,
bool ambientChannelOverflow, bool layer2, bool disableWorldLights, float positionUpdateThreshold);
~CActorLights();
void BuildConstantAmbientLighting();

View File

@@ -15,7 +15,14 @@ private:
CVector3f x8_scale;
bool x14_canLoop;
int x18_defaultAnim;
public:
// CAnimRes()
// : x4_charIdx(-1), x14_canLoop(false), x8_scale(????), x18_defaultAnim(-1) {}
CAnimRes(CAssetId ancs, int charIdx, const CVector3f& scale, const int defaultAnim, bool loop)
: x0_ancsId(ancs), x4_charIdx(charIdx), x8_scale(scale), x14_canLoop(loop), x18_defaultAnim(defaultAnim) {}
};
CHECK_SIZEOF(CAnimRes, 0x1c)
#endif
#endif

View File

@@ -17,6 +17,7 @@
class CAABox;
class CActorLights;
class CAnimData;
class CAnimRes;
class CFrustumPlanes;
class CModel;
class CModelFlags;
@@ -47,7 +48,7 @@ public:
bool HasNormalModel() const { return x1c_normalModel; }
CModelData();
// __ct__10CModelDataFRC8CAnimRes
CModelData(const CAnimRes&);
// __ct__10CModelDataFRC10CStaticRes
CModelData(const CModelData& other);
~CModelData();

View File

@@ -4,8 +4,10 @@
#include "types.h"
#include "MetroidPrime/CActorLights.hpp"
#include "MetroidPrime/CModelData.hpp"
#include "MetroidPrime/Player/CFidget.hpp"
#include "MetroidPrime/Player/CPlayerCameraBob.hpp"
#include "MetroidPrime/Player/CPlayerState.hpp"
#include "Kyoto/Audio/CSfxHandle.hpp"
#include "Kyoto/Math/CAABox.hpp"
@@ -16,6 +18,8 @@
#include "rstl/single_ptr.hpp"
#include "rstl/vector.hpp"
#include "math.h"
enum EChargeState {
kCS_Normal,
kCS_Charged,
@@ -33,6 +37,7 @@ class CPlasmaBeam;
class CPhazonBeam;
class CElementGen;
class CWorldShadow;
class CGenDescription;
class CPlayerGun {
static float skTractorBeamFactor;
@@ -85,6 +90,8 @@ public:
kIS_Four,
};
CPlayerGun(TUniqueId);
bool IsCharging() const { return x834_24_charging; }
float GetChargeBeamFactor() const { return x834_24_charging ? x340_chargeBeamFactor : 0.f; }