From 084830a966c81d3c29e6ced8834d09b7e6d32a69 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Fri, 22 Jul 2016 15:22:36 -0700 Subject: [PATCH] CMorphBall stubs --- Runtime/World/CActor.hpp | 4 ++ Runtime/World/CMorphBall.hpp | 119 +++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) diff --git a/Runtime/World/CActor.hpp b/Runtime/World/CActor.hpp index 0ead184c1..645651f3b 100644 --- a/Runtime/World/CActor.hpp +++ b/Runtime/World/CActor.hpp @@ -78,6 +78,10 @@ protected: u8 _dummy4 = 0; }; public: + enum class EFluidState + { + }; + CActor(TUniqueId, bool, const std::string&, const CEntityInfo&, const zeus::CTransform&, CModelData&&, const CMaterialList&, const CActorParameters&, TUniqueId); diff --git a/Runtime/World/CMorphBall.hpp b/Runtime/World/CMorphBall.hpp index 7e08812f9..0592084af 100644 --- a/Runtime/World/CMorphBall.hpp +++ b/Runtime/World/CMorphBall.hpp @@ -1,15 +1,134 @@ #ifndef __URDE_CMORPHBALL_HPP__ #define __URDE_CMORPHBALL_HPP__ +#include "World/CActor.hpp" +#include "World/ScriptObjectSupport.hpp" +#include "zeus/CVector3f.hpp" +#include "Collision/CCollidableSphere.hpp" +#include "RetroTypes.hpp" + namespace urde { +class CActorLights; class CPlayer; +class CDamageInfo; +class CFinalInput; +class CFrustumPlanes; +class CScriptWater; +class CStateManager; class CMorphBall { +public: + enum class EBallBoostState + { + Zero + }; + + enum class ESpiderBallState + { + Zero + }; +private: CPlayer& x0_player; + public: CMorphBall(CPlayer& player, float); + ESpiderBallState GetSpiderBallState() const { return ESpiderBallState::Zero; } + bool InSpiderBallMode() const { return false; } + zeus::CVector3f GetBallContactSurfaceNormal() const { return {}; } + void GetModel() const {} + CCollidableSphere GetCollidableSphere() const { return {}; } + bool IsProjectile() const { return false; } + void GetBallContactMeterials() const {} + void GetWallBumpCounter() const {} + void GetBoostChargeTimer() const {} + bool IsBoosting() const { return false; } + float GetBallRadius() const { return 0.f; } + float GetBallTouchRadius() const { return 0.f; } + void ForwardInput(const CFinalInput&) const {} + void ComputBallMovement(const CFinalInput&, CStateManager&, float) {} + bool IsMovementAllowed() const { return false; } + void UpdateSpiderBall(const CFinalInput&, CStateManager&, float) {} + void ApplySpiderBallSwingingForces(const CFinalInput&, CStateManager&, float) {} + void ApplySpiderBallRollForces(const CFinalInput&, CStateManager&, float) {} + void CalculateSpiderBallAttractionSurfaceForces(const CFinalInput&, CStateManager&, + const zeus::CTransform&) {} + void CheckForSwitchToSpiderBallSwinging(CStateManager&) {} + void FindClosestSpiderBallWaypoint(CStateManager&, const zeus::CVector3f&, zeus::CVector3f&, + zeus::CVector3f&, zeus::CVector3f&, float&, zeus::CVector3f&, bool&, + zeus::CTransform&) const {} + void SetSpiderBallSwingingState(bool) {} + void GetSpiderBallControllerMovement(const CFinalInput&, bool, bool) {} + void ResetSpiderBallSwingControllerMovementTimer() {} + void UpdateSpiderBallSwingControllerMovementTimer(float, float) {} + float GetSpiderBallSwingControllerMovementScalar() const { return 0.f; } + void CreateSpiderBallParticles(const zeus::CVector3f&, const zeus::CVector3f&) {} + void ComputeMarioMovement(const CFinalInput&, CStateManager&, float) {} + void SetSpiderBallState(ESpiderBallState) {} + void GetSwooshToWorld() const {} + void GetBallToWorld() const {} + void CalculateSurfaceToWorld(const zeus::CVector3f&, const zeus::CVector3f&, const zeus::CVector3f&) const {} + void CalculateBallContactInfo(zeus::CVector3f&, zeus::CVector3f&) const {} + void BallTurnInput(const CFinalInput&) const {} + void UpdateBallDynamics(CStateManager&, float) {} + void SwitchToMarble() {} + void SwitchToTire() {} + void Update(float, CStateManager&) {} + void UpdateScriptMessage(EScriptObjectMessage, TUniqueId, CStateManager&) {} + void DeleteLight(CStateManager&) {} + void SetBallLightActive(CStateManager&, bool) {} + void EnterMorphBallState(CStateManager&) {} + void LeaveMorphBallState(CStateManager&) {} + void UpdateEffects(float, CStateManager&) {} + void ComputeBoostBallMovement(const CFinalInput&, const CStateManager&, float) {} + void EnterBoosting() {} + void LeaveBoosting() {} + void CancelBoosting() {} + void UpdateMarbleDynamics(CStateManager&, float, const zeus::CVector3f&) {} + void ApplyFriction(float) {} + void DampLinearAndAngularVelocities(float, float) {} + zeus::CTransform GetPrimitiveTransform() const { return {}; } + void DrawCollisionPrimitive() const {} + void GetMinimumAlignmentSpeed() const {} + void PreRender(CStateManager&, const CFrustumPlanes&); + void Render(const CStateManager&, const CActorLights*) const {} + void ResetMorphBallTransitionFlash() {} + void UpdateMorphBallTransitionFlash(float) {} + void RenderMorphBallTransitionFlash(const CStateManager&) const {} + void IsMorphBallTransitionFlashValid() const {} + void RenderDamageEffects(const CStateManager&, const zeus::CTransform&) const {} + void UpdateHalfPipeStatus(CStateManager&, float) {} + void GetIsInHalfPipeMode() const {} + void SetIsInHalfPipeMode(bool) {} + void GetIsInHalfPipeModeInAir() const {} + void SetIsInHalfPipeModeInAir(bool) {} + void GetTouchedHalfPipeRecently() const {} + void SetTouchedHalfPipeRecently(bool) {} + void DisableHalfPipeStatus() {} + void BallCloseToCollision(const CStateManager&, float) const {} + void CollidedWith(const TUniqueId&, const CCollisionInfoList&, CStateManager&) {} + void IsInFrustum(const CFrustumPlanes&) const {} + void ComputeLiftForces(const zeus::CVector3f&, const zeus::CVector3f&, const CStateManager&) {} + void CalculateSurfaceFriction() const {} + void ApplyGravity(CStateManager&) {} + void SpinToSpeed(float, zeus::CVector3f, float) {} + void ComputeMaxSpeed() const {} + void Touch(CActor&, CStateManager&) {} + bool IsClimable(const CCollisionInfo&) const { return false; } + void FluidFXThink(CActor::EFluidState, CScriptWater&, CStateManager&) {} + void GetMorphBallModel(const std::string&, float) {} + void AddSpiderBallElectricalEffect() {} + void UpdateSpiderBallElectricalEffect() {} + void RenderSpiderBallElectricalEffect() const {} + void RenderEnergyDrainEffects(const CStateManager&) const {} + void TouchModel(const CStateManager&) const {} + void SetAsProjectile(const CDamageInfo&, const CDamageInfo&) {} + EBallBoostState GetBallBoostState() const { return EBallBoostState::Zero; } + void SetBallBoostState(EBallBoostState) {} + void GetBombJumpState() const {} + void LoadAnimationTokens(const std::string&) {} + void TakeDamage(float) {} }; }