mirror of
https://github.com/zeldaret/ss
synced 2026-07-05 04:59:41 -04:00
intial progress
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
#include "common.h"
|
||||
#include "m/m3d/m_bmdl.h"
|
||||
#include "m/m3d/m_fanm.h"
|
||||
#include "nw4r/g3d/g3d_anmchr.h"
|
||||
#include "nw4r/g3d/res/g3d_resanmchr.h"
|
||||
|
||||
namespace m3d {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#ifndef M3D_M_MDL_H
|
||||
#define M3D_M_MDL_H
|
||||
|
||||
#include "common.h"
|
||||
#include "m/m3d/m_banm.h"
|
||||
#include "m/m3d/m_calc_ratio.h"
|
||||
#include "m/m3d/m_smdl.h"
|
||||
@@ -59,6 +60,9 @@ public:
|
||||
virtual ~mdl_c();
|
||||
|
||||
bool create(nw4r::g3d::ResMdl, mAllocator_c *, u32, int, u32 *);
|
||||
bool create(nw4r::g3d::ResMdl mdl, mAllocator_c *alloc, u32 flag, int num) {
|
||||
return create(mdl, alloc, flag, num, nullptr);
|
||||
}
|
||||
bool create(nw4r::g3d::ResMdl, mdlCallback_c *cb, mAllocator_c *, u32, int, u32 *);
|
||||
|
||||
virtual void remove() override;
|
||||
|
||||
@@ -28,9 +28,16 @@ public:
|
||||
mpFader->setStatus(status);
|
||||
}
|
||||
|
||||
void fadeIn() {
|
||||
mpFader->fadeIn();
|
||||
}
|
||||
bool calc() {
|
||||
return mpFader->calc();
|
||||
}
|
||||
void setFrame(u16 frame) {
|
||||
mpFader->setFrame(frame);
|
||||
}
|
||||
|
||||
protected:
|
||||
mFaderBase_c *mpFader;
|
||||
};
|
||||
|
||||
+1
-1
@@ -216,7 +216,7 @@ public:
|
||||
return x != v.x || y != v.y || z != v.z;
|
||||
}
|
||||
|
||||
void normalize();
|
||||
f32 normalize();
|
||||
bool normalizeRS();
|
||||
|
||||
static mVec3_c createProjectionXZ(const mAng3_c &ang, f32 scalar);
|
||||
|
||||
Reference in New Issue
Block a user