AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 02:27:43 +00:00
Code Issues Projects Releases Wiki Activity

More ScriptLoader imps

Browse Source
This commit is contained in:
Jack Andersen
2016-04-18 14:17:49 -10:00
parent c614d2d2d1
commit 76afccbdbe
31 changed files with 485 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Runtime/Character/CModelData.hpp
View File

@@ -6,6 +6,7 @@
#include "zeus/CColor.hpp"
#include "RetroTypes.hpp"
#include "CToken.hpp"
#include "CAnimData.hpp"
namespace urde
{
@@ -23,16 +24,16 @@ struct SAdvancementDeltas;
struct CStaticRes
{
ResId x0_cmdlId;
zeus::CVector3f x4_particleScale;
zeus::CVector3f x4_scale;
};
struct CAnimRes
{
ResId x0_ancsId;
u32 x4_charIdx;
zeus::CVector3f x8_particleScale;
s32 x4_charIdx;
zeus::CVector3f x8_scale;
bool x14_;
int x1c_;
s32 x1c_defaultAnim;
};
class CModelData
@@ -53,8 +54,6 @@ class CModelData
TLockedToken<CModel> x2c_xrayModel;
TLockedToken<CModel> x3c_infraModel;
CModelData();
public:
enum class EWhichModel
{
@@ -67,6 +66,8 @@ public:
CModelData(const CStaticRes& res);
CModelData(const CAnimRes& res);
CModelData(CModelData&&) = default;
CModelData& operator=(CModelData&&) = default;
CModelData();
CModelData CModelDataNull();
SAdvancementDeltas GetAdvancementDeltas(const CCharAnimTime& a, const CCharAnimTime& b) const;