2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 03:47:42 +00:00

Various windows compile fixes

This commit is contained in:
2016-05-20 20:02:09 -07:00
parent 27bee1cc35
commit a3b47df10d
32 changed files with 215 additions and 43 deletions

View File

@@ -39,19 +39,19 @@ CAnimData::CAnimData(ResId id,
const std::shared_ptr<CAnimationManager>& animMgr,
const std::shared_ptr<CTransitionManager>& transMgr,
const TLockedToken<CCharacterFactory>& charFactory)
: x0_charFactory(charFactory),
xc_charInfo(character),
xcc_layoutData(layout),
xd8_modelData(model),
xfc_animCtx(ctx.lock()),
x100_animMgr(animMgr),
x1d8_selfId(id),
x1fc_transMgr(transMgr),
x204_charIdx(charIdx),
x208_defaultAnim(defaultAnim),
x21c_25_loop(loop),
x220_pose(layout->GetSegIdList().GetList().size()),
x2f8_poseBuilder(layout)
: x0_charFactory(charFactory),
xc_charInfo(character),
xcc_layoutData(layout),
xd8_modelData(model),
xfc_animCtx(ctx.lock()),
x100_animMgr(animMgr),
x1d8_selfId(id),
x1fc_transMgr(transMgr),
x204_charIdx(charIdx),
x208_defaultAnim(defaultAnim),
x21c_25_loop(loop),
x220_pose(layout->GetSegIdList().GetList().size()),
x2f8_poseBuilder(layout)
{
if (iceModel)
xe4_iceModelData = *iceModel;
@@ -106,14 +106,17 @@ void CAnimData::UpdateAdditiveAnims(float)
bool CAnimData::IsAdditiveAnimation(u32) const
{
return false;
}
std::shared_ptr<CAnimTreeNode> CAnimData::GetAdditiveAnimationTree(u32) const
{
return {};
}
bool CAnimData::IsAdditiveAnimationActive(u32) const
{
return false;
}
void CAnimData::DelAdditiveAnimation(u32)
@@ -126,6 +129,7 @@ void CAnimData::AddAdditiveAnimation(u32, float, bool, bool)
std::shared_ptr<CAnimationManager> CAnimData::GetAnimationManager()
{
return {};
}
void CAnimData::SetPhase(float)
@@ -139,10 +143,12 @@ void CAnimData::Touch(const CSkinnedModel& model, int) const
SAdvancementDeltas CAnimData::GetAdvancementDeltas(const CCharAnimTime& a,
const CCharAnimTime& b) const
{
return {};
}
CCharAnimTime CAnimData::GetTimeOfUserEvent(EUserEventType, const CCharAnimTime& time) const
{
return {};
}
void CAnimData::MultiplyPlaybackRate(float)
@@ -158,36 +164,43 @@ void CAnimData::SetRandomPlaybackRate(CRandom16&)
}
void CAnimData::CalcPlaybackAlignmentParms(const CAnimPlaybackParms& parms,
const std::weak_ptr<CAnimTreeNode>& node)
const std::weak_ptr<CAnimTreeNode>& node)
{
}
zeus::CTransform CAnimData::GetLocatorTransform(CSegId id, const CCharAnimTime* time) const
{
return {};
}
zeus::CTransform CAnimData::GetLocatorTransform(const std::string& name, const CCharAnimTime* time) const
{
return {};
}
bool CAnimData::IsAnimTimeRemaining(float, const std::string& name) const
{
return false;
}
float CAnimData::GetAnimTimeRemaining(const std::string& name) const
{
return 0.f;
}
float CAnimData::GetAnimationDuration(int) const
{
return 0.f;
}
std::shared_ptr<CAnimSysContext> CAnimData::GetAnimSysContext() const
{
return {};
}
std::shared_ptr<CAnimationManager> CAnimData::GetAnimationManager() const
{
return {};
}
void CAnimData::RecalcPoseBuilder(const CCharAnimTime*) const
@@ -236,10 +249,12 @@ void CAnimData::DoAdvance(float, bool&, CRandom16&, bool)
SAdvancementDeltas CAnimData::Advance(float, const zeus::CVector3f&, CStateManager& stateMgr, bool)
{
return {};
}
SAdvancementDeltas CAnimData::AdvanceIgnoreParticles(float, CRandom16&, bool)
{
return {};
}
void CAnimData::AdvanceAnim(CCharAnimTime& time, zeus::CVector3f&, zeus::CQuaternion&)
@@ -275,14 +290,17 @@ void CAnimData::ResetPOILists()
CSegId CAnimData::GetLocatorSegId(const std::string& name) const
{
return {};
}
zeus::CAABox CAnimData::GetBoundingBox(const zeus::CTransform& xf) const
{
return {};
}
zeus::CAABox CAnimData::GetBoundingBox() const
{
return {};
}
}

View File

@@ -19,7 +19,7 @@ namespace urde
class CCharLayoutInfo;
class CSkinnedModel;
class CMorphableSkinnedModel;
class CAnimSysContext;
struct CAnimSysContext;
class CAnimationManager;
class CTransitionManager;
class CCharacterFactory;

View File

@@ -11,58 +11,70 @@ CAnimTreeSingleChild::CAnimTreeSingleChild(const std::weak_ptr<CAnimTreeNode>& n
SAdvancementResults CAnimTreeSingleChild::VAdvanceView(const CCharAnimTime& a)
{
return {};
}
CCharAnimTime CAnimTreeSingleChild::VGetTimeRemaining() const
{
return {};
}
bool CAnimTreeSingleChild::VHasOffset(const CSegId& seg) const
{
return false;
}
zeus::CVector3f CAnimTreeSingleChild::VGetOffset(const CSegId& seg) const
{
return {};
}
zeus::CQuaternion CAnimTreeSingleChild::VGetRotation(const CSegId& seg) const
{
return {};
}
u32 CAnimTreeSingleChild::VGetBoolPOIList(const CCharAnimTime& time,
CBoolPOINode* listOut,
u32 capacity, u32 iterator, u32) const
{
return 0;
}
u32 CAnimTreeSingleChild::VGetInt32POIList(const CCharAnimTime& time,
CInt32POINode* listOut,
u32 capacity, u32 iterator, u32) const
{
return 0;
}
u32 CAnimTreeSingleChild::VGetParticlePOIList(const CCharAnimTime& time,
CParticlePOINode* listOut,
u32 capacity, u32 iterator, u32) const
{
return 0;
}
u32 CAnimTreeSingleChild::VGetSoundPOIList(const CCharAnimTime& time,
CSoundPOINode* listOut,
u32 capacity, u32 iterator, u32) const
{
return 0;
}
bool CAnimTreeSingleChild::VGetBoolPOIState(const char* name) const
{
return false;
}
s32 CAnimTreeSingleChild::VGetInt32POIState(const char* name) const
{
return -1;
}
CParticleData::EParentedMode CAnimTreeSingleChild::VGetParticlePOIState(const char* name) const
{
return CParticleData::EParentedMode::Initial;
}
void CAnimTreeSingleChild::VGetSegStatementSet(const CSegIdList& list,
@@ -84,6 +96,7 @@ SAdvancementResults
CAnimTreeSingleChild::VGetAdvancementResults(const CCharAnimTime& a,
const CCharAnimTime& b) const
{
return {};
}
void CAnimTreeSingleChild::Depth() const
@@ -92,6 +105,7 @@ void CAnimTreeSingleChild::Depth() const
u32 CAnimTreeSingleChild::VGetNumChildren() const
{
return 0;
}
}

View File

@@ -0,0 +1,13 @@
#include "CAnimationManager.hpp"
#include "CAnimationDatabaseGame.hpp"
#include "CTransitionDatabaseGame.hpp"
namespace urde
{
const CAnimationDatabaseGame* CAnimationManager::GetAnimationDatabase() const
{
return x0_animDB.GetObj();
}
}

View File

@@ -19,7 +19,7 @@ public:
const CAnimSysContext& sysCtx)
: x0_animDB(animDB), x8_sysCtx(sysCtx) {}
const CAnimationDatabaseGame* GetAnimationDatabase() const {return x0_animDB.GetObj();}
const CAnimationDatabaseGame* GetAnimationDatabase() const;
};
}

View File

@@ -16,6 +16,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimBlend::GetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
void CMetaAnimBlend::GetUniquePrimitives(std::set<CPrimitive>& primsOut) const
@@ -26,6 +27,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimBlend::VGetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
}

View File

@@ -16,6 +16,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimPhaseBlend::GetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
void CMetaAnimPhaseBlend::GetUniquePrimitives(std::set<CPrimitive>& primsOut) const
@@ -26,6 +27,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimPhaseBlend::VGetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
}

View File

@@ -10,6 +10,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimPlay::GetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
void CMetaAnimPlay::GetUniquePrimitives(std::set<CPrimitive>& primsOut) const
@@ -20,6 +21,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimPlay::VGetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
}

View File

@@ -26,6 +26,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimRandom::GetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
void CMetaAnimRandom::GetUniquePrimitives(std::set<CPrimitive>& primsOut) const
@@ -36,6 +37,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimRandom::VGetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
}

View File

@@ -23,6 +23,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimSequence::GetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
void CMetaAnimSequence::GetUniquePrimitives(std::set<CPrimitive>& primsOut) const
@@ -33,6 +34,7 @@ std::shared_ptr<CAnimTreeNode>
CMetaAnimSequence::VGetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
}

View File

@@ -12,6 +12,7 @@ CMetaTransMetaAnim::VGetTransitionTree(const std::weak_ptr<CAnimTreeNode>& a,
const std::weak_ptr<CAnimTreeNode>& b,
const CAnimSysContext& animSys) const
{
return {};
}
}

View File

@@ -17,6 +17,7 @@ CMetaTransPhaseTrans::VGetTransitionTree(const std::weak_ptr<CAnimTreeNode>& a,
const std::weak_ptr<CAnimTreeNode>& b,
const CAnimSysContext& animSys) const
{
return {};
}
}

View File

@@ -18,7 +18,7 @@ CMetaTransTrans::VGetTransitionTree(const std::weak_ptr<CAnimTreeNode>& a,
const std::weak_ptr<CAnimTreeNode>& b,
const CAnimSysContext& animSys) const
{
return {};
}
}

View File

@@ -10,6 +10,9 @@ class CPASAnimParmData
s32 x0_stateId;
rstl::reserved_vector<CPASAnimParm,8> x4_parms;
public:
CPASAnimParmData()
{};
CPASAnimParmData(s32 stateId, const CPASAnimParm& parm1, const CPASAnimParm& parm2, const CPASAnimParm& parm3,
const CPASAnimParm& parm4, const CPASAnimParm& parm5, const CPASAnimParm& parm6, const CPASAnimParm& parm7,
const CPASAnimParm& parm8);

View File

@@ -1,5 +1,5 @@
#include "CPASAnimState.hpp"
#include "CPASAnimParmData.hpp"
namespace urde
{
@@ -51,12 +51,14 @@ CPASAnimState::CPASAnimState(CInputStream& in)
}
}
const CPASAnimParmData&CPASAnimState::GetAnimParmData(s32, u32) const
const CPASAnimParmData& CPASAnimState::GetAnimParmData(s32, u32) const
{
static const CPASAnimParmData badData;
return badData;
}
std::pair<float, s32> CPASAnimState::FindBestAnimation(const rstl::reserved_vector<CPASAnimParm, 8>&, CRandom16&, s32) const
{
return {};
}
}

View File

@@ -74,14 +74,17 @@ void CParticleGenInfoGeneric::SetParticleEmission(bool, CStateManager& stateMgr)
bool CParticleGenInfoGeneric::IsSystemDeletable() const
{
return false;
}
zeus::CAABox CParticleGenInfoGeneric::GetBounds() const
{
return {};
}
bool CParticleGenInfoGeneric::HasActiveParticles() const
{
return false;
}
void CParticleGenInfoGeneric::DestroyParticles()
@@ -90,10 +93,12 @@ void CParticleGenInfoGeneric::DestroyParticles()
bool CParticleGenInfoGeneric::HasLight() const
{
return false;
}
TUniqueId CParticleGenInfoGeneric::GetLightId() const
{
return 0;
}
void CParticleGenInfoGeneric::SetModulationColor(const zeus::CColor& color)

View File

@@ -19,12 +19,13 @@ void CConstantAnimationTimeScale::VFindUpperLimit(const float&, const float&) co
std::shared_ptr<IVaryingAnimationTimeScale> CConstantAnimationTimeScale::VClone() const
{
return {};
}
std::shared_ptr<IVaryingAnimationTimeScale>
CConstantAnimationTimeScale::VGetFunctionMirrored(const float&) const
{
return {};
}
void CLinearAnimationTimeScale::VTimeScaleIntegral(const float&, const float&) const

View File

@@ -10,7 +10,7 @@ std::shared_ptr<CAnimTreeNode>
IMetaAnim::GetAnimationTree(const CAnimSysContext& animSys,
const CMetaAnimTreeBuildOrders& orders) const
{
return {};
}
void IMetaAnim::AdvanceAnim(IAnimReader& anim, const CCharAnimTime& dt)

View File

@@ -8,7 +8,7 @@
namespace urde
{
class CAnimTreeNode;
class CAnimSysContext;
struct CAnimSysContext;
class CMetaAnimTreeBuildOrders;
class CPrimitive;
class IAnimReader;

View File

@@ -6,7 +6,7 @@
namespace urde
{
class CAnimTreeNode;
class CAnimSysContext;
struct CAnimSysContext;
enum class EMetaTransType
{