ihateninjas/OdysseyDecomp
1
0
Fork 0
mirror of https://github.com/MonsterDruide1/OdysseyDecomp synced 2026-04-23 09:04:21 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

all: Fixes across various headers (#760)

Browse source
This commit is contained in:
Narr the Reg 2025-10-25 03:01:43 -06:00 committed by GitHub
parent 832b3abb54
commit 57083bb31a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 77 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
lib/al/Library/Anim/AnimPlayerSkl.h
View file

@ -22,53 +22,53 @@ public:
AnimPlayerSkl(const AnimPlayerInitInfo*, s32);
bool calcNeedUpdateAnimNext() override;
void updateLast() override;
bool startSklAnim(const char*, const char*, const char*, const char*, const char*, const char*,
const char*);
void startPartialAnim(const char*, s32, s32, const SklAnimRetargettingInfo*);
void updateLast() override;
void clearSklAnimBlend();
void setSklAnim(const char*, s32);
bool calcSklAnim();
void initInterp(const char*);
void setSklAnimBlendWeight(s32, f32);
f32 getSklAnimBlendWeight(s32) const;
s32 getSklAnimBlendNum() const;
f32 getSklAnimFrame(s32) const;
nn::g3d::SkeletalAnimObj* getAnimObj(s32) const;
void setSklAnimFrame(s32, f32);
nn::g3d::SkeletalAnimObj* getAnimObj(s32);
f32 getSklAnimFrameMax(s32) const;
f32 getSklAnimFrameMax(const char*) const;
f32 getSklAnimFrameRate(s32) const;
void setSklAnimFrameRate(s32, f32);
bool isSklAnimExist(const char*) const;
bool isSklAnimEnd(s32) const;
bool isSklAnimOneTime(s32) const;
bool isSklAnimOneTime(const char*) const;
bool isSklAnimPlaying(s32) const;
const char* getPlayingSklAnimName(s32) const;
void update();
void reset();
void clearSklAnimBlend();
bool calcSklAnim();
bool initInterp(const char*);
void initPartialAnim(s32, s32, s32);
void prepareAnimInterpDirect(s32);
void clearPartialAnim(s32);
void setSklAnim(const char*, s32);
void setSklAnimBlendWeight(s32, f32);
void setSklAnimFrame(s32, f32);
void setSklAnimFrameRate(s32, f32);
void setPartialAnimFrame(s32, f32);
void setPartialAnimFrameRate(s32, f32);
void initPartialAnim(s32, s32, s32);
s32 getPartialAnimSlotNum() const;
s32 getJoitsAmountFromJoint(const char*) const;
void addPartialAnimJoint(s32, const char*, const char*);
void addPartialAnimJointRecursive(s32, const char*);
const char* getPlayingSklAnimName(s32);
const char* getPlayingPartialSklAnimName(s32);
f32 getSklAnimBlendWeight(s32);
s32 getSklAnimBlendNum();
f32 getSklAnimFrame(s32);
f32 getSklAnimFrameMax(s32);
f32 getSklAnimFrameMax(const char*);
f32 getSklAnimFrameRate(s32);
f32 getSklAnimFrameRate(s32, f32);
s32 getPartialAnimSlotNum();
s32 getJoitsAmountFromJos32(const char*);
f32 getPartialAnimFrame(s32);
f32 getPartialAnimFrameRate(s32);
bool isSklAnimExist(const char*);
bool isSklAnimEnd(s32);
bool isSklAnimOneTime(s32);
bool isSklAnimOneTime(const char*);
bool isSklAnimPlaying(s32);
bool isPartialAnimEnd(s32);
bool isPartialAnimOneTime(s32);
bool isPartialAnimAttached(s32);
void startPartialAnim(const char*, s32, s32, const SklAnimRetargettingInfo*);
void clearPartialAnim(s32);
void getPartialAnimInfo(s32); // TODO: unknown return type
bool isPartialAnimEnd(s32) const;
nn::g3d::SkeletalAnimObj* getPartialAnimObj(s32) const;
bool isPartialAnimOneTime(s32) const;
bool isPartialAnimAttached(s32) const;
void getPartialAnimInfo(s32) const; // TODO: unknown return type
const char* getPlayingPartialSklAnimName(s32) const;
f32 getPartialAnimFrame(s32) const;
void setPartialAnimFrame(s32, f32);
nn::g3d::SkeletalAnimObj* getPartialAnimObj(s32);
f32 getPartialAnimFrameRate(s32) const;
void setPartialAnimFrameRate(s32, f32);
void setRetargettingInfo(SklAnimRetargettingInfo* info) { mRetargettingInfo = info; }
@ -90,4 +90,7 @@ private:
bool _88;
bool _89;
};
static_assert(sizeof(AnimPlayerSkl) == 0x90);
} // namespace al

6
lib/al/Library/Camera/CameraDirector.h
View file

@ -52,7 +52,7 @@ public:
void update();
void endInit(const PlayerHolder*);
CameraPoseUpdater* getPoseUpdater(s32 index);
CameraPoseUpdater* getPoseUpdater(s32 index) const;
CameraTicket* createCameraFromFactory(const char*, const PlacementId*, const char*, s32,
const sead::Matrix34f&);
CameraTicket* createCamera(CameraPoser*, const PlacementId*, const char*, s32,
@ -64,12 +64,12 @@ public:
CameraTicket* createMirrorObjectCamera(const PlacementId*, const char*, s32,
const sead::Matrix34f&);
ICameraInput* getCameraInput();
ICameraInput* getCameraInput(s32) const;
void setCameraInput(const ICameraInput* input);
void setViewCameraInput(const ICameraInput* input, s32);
void registerCameraRailHolder(CameraRailHolder* railHolder);
void setCameraParamTransferFuncTable(const NameToCameraParamTransferFunc*, s32);
f32 getSceneFovyDegree();
f32 getSceneFovyDegree() const;
void validateCameraArea2D();
void invalidateCameraArea2D();
void stopByDeathPlayer();

2
lib/al/Library/Draw/GraphicsSystemInfo.h
View file

@ -146,7 +146,7 @@ public:
void cancelLerp();
void updateGraphics();
void updatePartsGraphics(const GraphicsUpdateInfo&);
void preDrawGraphics(SceneCameraInfo*);
void preDrawGraphics(const SceneCameraInfo*);
void calcGpuPartsGraphics(const GraphicsCalcGpuInfo&);
void updateViewGpu(s32, const sead::Camera*, const Projection*);
void updateViewVolume(const sead::Matrix34f&, const sead::Matrix44f&);

2
lib/al/Library/Joint/JointControllerKeeper.h
View file

@ -15,7 +15,7 @@ class JointTranslateShaker;
class LiveActor;
void initJointControllerKeeper(const LiveActor*, s32);
void isExistJointControllerKeeper(const LiveActor*);
bool isExistJointControllerKeeper(const LiveActor*);
void registerJointController(const LiveActor*, JointControllerBase*);
void registerJointController(const LiveActor*, JointControllerBase*, const char*);
void initJointLocalRotator(const LiveActor*, sead::Vector3f*, const char*);

2
lib/al/Library/Layout/LayoutActionKeeper.h
View file

@ -15,7 +15,7 @@ public:
void findPaneGroupInfo(const char* groupName);
void update();
void setMainGroupName(const char* groupName);
LayoutPaneGroup* getLayoutPaneGroup(const char* groupName);
LayoutPaneGroup* getLayoutPaneGroup(const char* groupName) const;
private:
bool mHasStartedAction;

2
lib/al/Library/LiveActor/ActorCollisionFunction.h
View file

@ -17,7 +17,7 @@ void validateCollisionParts(LiveActor*);
void invalidateCollisionParts(LiveActor*);
void validateCollisionPartsBySystem(LiveActor*);
void invalidateCollisionPartsBySystem(LiveActor*);
void isValidCollisionParts(const LiveActor*);
bool isValidCollisionParts(const LiveActor*);
void setCollisionPartsSpecialPurposeName(LiveActor*, const char*);
void resetAllCollisionMtx(LiveActor*);
void syncCollisionMtx(LiveActor*, const sead::Matrix34f*);

2
lib/al/Library/Se/SeKeeper.h
View file

@ -34,7 +34,7 @@ public:
void stopAll(s32, const char*);
void separatePlayingSePosFromEmitter();
void tryGetCurrentStreamSamplePos(const char*, const char*) const;
void isPlaying(const char*);
bool isPlaying(const char*);
void checkIsPlayingSe(const char*, const char*);
void validate();
void invalidate();

2
lib/al/Library/Shadow/ShadowDirector.h
View file

@ -41,7 +41,7 @@ public:
void* getCurrentClipParam(); // unknown return type
bool isUsingShadowCamera() const;
void preDrawGraphics();
void isEnableShadowPrePass() const;
bool isEnableShadowPrePass() const;
void updateViewGpu(s32, const sead::Camera*, const Projection*);
void* getDepthShadow(); // unknown return type
void drawShadowPrePass(agl::DrawContext*, s32, const agl::RenderTargetDepth*,

10
lib/al/Project/Action/ActionAnimCtrl.h
View file

@ -16,12 +16,12 @@ public:
void init(const ActorResource*, const char*, const char*);
bool start(const char*);
bool trySetFrame(f32);
bool isExistAction(const char*);
bool isActionOneTime(const char*);
bool isActionEnd();
bool isExistAction(const char*) const;
bool isActionOneTime(const char*) const;
bool isActionEnd() const;
void sortCtrlInfo();
const char* findAnimInfo(const char*) const;
const char* getPlayingActionName();
ActionAnimCtrlInfo* findAnimInfo(const char*) const;
const char* getPlayingActionName() const;
f32 getActionFrameMax(const char*) const;
f32 getFrame() const;
f32 getFrameRate() const;

3
lib/al/Project/Anim/AnimPlayerBase.h
View file

@ -20,4 +20,7 @@ private:
bool _10 = false;
bool _11 = false;
};
static_assert(sizeof(AnimPlayerBase) == 0x18);
} // namespace al

29
lib/al/Project/Anim/AnimPlayerSimple.h
View file

@ -21,23 +21,24 @@ public:
void startAnim(const char*);
void update();
void clearAnim();
const char* getPlayingAnimName();
f32 getAnimFrame();
f32 getAnimFrameMax();
f32 getAnimFrameMax(const char*);
f32 getAnimFrameRate();
f32 getAnimFrame() const;
void setAnimFrame(f32);
void setAnimFrameMax(const char*);
f32 getAnimFrameMax() const;
f32 getAnimFrameMax(const char*) const;
f32 getAnimFrameRate() const;
void setAnimFrameRate(f32);
bool isAnimExist(const char*);
bool isAnimEnd();
bool isAnimOneTime();
bool isAnimOneTime(const char*);
bool isAnimPlaying();
bool isAnimExist(const char*) const;
bool isAnimEnd() const;
bool isAnimOneTime() const;
bool isAnimOneTime(const char*) const;
bool isAnimPlaying() const;
const char* getPlayingAnimName() const;
private:
void* _18;
const char* mPlayingAnimName;
};
static_assert(sizeof(AnimPlayerSimple) == 0x28);
} // namespace al

6
src/Scene/StageSceneStateWorldMap.h
View file

@ -51,9 +51,9 @@ public:
void exeEnd();
void tryOpenWorldMap();
void isCloseEndWipe();
void isOpenEndWipe();
void isOpenCollectionList();
bool isCloseEndWipe() const;
bool isOpenEndWipe() const;
bool isOpenCollectionList() const;
static StageSceneStateWorldMap* tryCreate(al::Scene*, const al::SceneInitInfo&,
const al::ActorInitInfo&, const al::LayoutInitInfo&,