mirror of
https://github.com/AxioDL/metaforce.git
synced 2025-12-09 17:47:43 +00:00
Fix MP3 SAVW support, code cleanup, and more stubs
This commit is contained in:
@@ -4,7 +4,8 @@
|
||||
namespace urde
|
||||
{
|
||||
|
||||
CActorLights::CActorLights(u32 unk, const zeus::CVector3f& vec, int a, int b, int c, int d, int e, float f1)
|
||||
s32 CActorLights::sFrameSchedulerCount = 0;
|
||||
CActorLights::CActorLights(u32 unk, const zeus::CVector3f& vec, int a, int b, bool c, int d, int e, float f1)
|
||||
: x2a8_(unk), x2ac_(vec), x2b8_b(b), x2bc_a(a), x2cc_(f1 * f1)
|
||||
{
|
||||
x298_24_ = true;
|
||||
@@ -15,6 +16,9 @@ CActorLights::CActorLights(u32 unk, const zeus::CVector3f& vec, int a, int b, in
|
||||
x298_30_ = d;
|
||||
x298_31_ = e;
|
||||
x299_24_ = true;
|
||||
|
||||
sFrameSchedulerCount++;
|
||||
sFrameSchedulerCount &= 7;
|
||||
}
|
||||
|
||||
void CActorLights::BuildConstantAmbientLighting()
|
||||
|
||||
@@ -15,6 +15,7 @@ class CGameArea;
|
||||
|
||||
class CActorLights
|
||||
{
|
||||
static s32 sFrameSchedulerCount;
|
||||
std::vector<CLight> x0_areaLights;
|
||||
std::vector<CLight> x144_dynamicLights;
|
||||
zeus::CColor x288_ambientColor;
|
||||
@@ -54,7 +55,7 @@ class CActorLights
|
||||
u32 x2dc_overrideDist = 0;
|
||||
|
||||
public:
|
||||
CActorLights(u32, const zeus::CVector3f& vec, int, int, int, int, int, float);
|
||||
CActorLights(u32, const zeus::CVector3f& vec, int, int, bool, int, int, float);
|
||||
|
||||
void BuildConstantAmbientLighting();
|
||||
void BuildConstantAmbientLighting(const zeus::CColor& color);
|
||||
|
||||
@@ -45,6 +45,7 @@ void CAnimTreeSequence::VGetWeightedReaders
|
||||
|
||||
SAdvancementResults CAnimTreeSequence::VAdvanceView(const CCharAnimTime& a)
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
||||
CCharAnimTime CAnimTreeSequence::VGetTimeRemaining() const
|
||||
|
||||
@@ -35,6 +35,7 @@ CSequenceHelper::CSequenceHelper(const std::vector<std::shared_ptr<IMetaAnim>>&
|
||||
|
||||
CSequenceFundamentals CSequenceHelper::ComputeSequenceFundamentals()
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -21,6 +21,9 @@ class CSequenceFundamentals
|
||||
std::vector<CParticlePOINode> x38_particleNodes;
|
||||
std::vector<CSoundPOINode> x48_soundNodes;
|
||||
public:
|
||||
/* HACK: Remove this default constructor */
|
||||
CSequenceFundamentals() = default;
|
||||
|
||||
CSequenceFundamentals(const CSteadyStateAnimInfo& ssInfo,
|
||||
const std::vector<CBoolPOINode>& boolNodes,
|
||||
const std::vector<CInt32POINode>& int32Nodes,
|
||||
@@ -40,6 +43,8 @@ class CSequenceHelper
|
||||
std::vector<std::shared_ptr<CAnimTreeNode>> x10_treeNodes;
|
||||
std::vector<bool> x20_;
|
||||
public:
|
||||
/* HACK: Remove this default constructor */
|
||||
CSequenceHelper() = default;
|
||||
CSequenceHelper(const std::shared_ptr<CAnimTreeNode>& a,
|
||||
const std::shared_ptr<CAnimTreeNode>& b,
|
||||
const CAnimSysContext& animCtx);
|
||||
|
||||
@@ -37,6 +37,8 @@ class CSteadyStateAnimInfo
|
||||
bool x14_looping = false;
|
||||
|
||||
public:
|
||||
/* HACK: Remove this default constructor */
|
||||
CSteadyStateAnimInfo() = default;
|
||||
CSteadyStateAnimInfo(bool looping, const CCharAnimTime& duration, const zeus::CVector3f& offset)
|
||||
: x0_duration(duration), x8_offset(offset), x14_looping(looping) {}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user