diff --git a/lib/al/Library/Camera/CameraPoserFunction.h b/lib/al/Library/Camera/CameraPoserFunction.h index 25c5b6bd..8309d8e9 100644 --- a/lib/al/Library/Camera/CameraPoserFunction.h +++ b/lib/al/Library/Camera/CameraPoserFunction.h @@ -143,8 +143,8 @@ void initGyroCameraCtrl(al::CameraPoser*); void resetGyro(al::CameraPoser*); void calcCameraGyroPose(const al::CameraPoser*, sead::Vector3f*, sead::Vector3f*, sead::Vector3f*); void getGyroFront(al::CameraPoser*); -void getGyroAngleV(al::CameraPoser*); -void getGyroAngleH(al::CameraPoser*); +f32 getGyroAngleV(al::CameraPoser*); +f32 getGyroAngleH(al::CameraPoser*); void setGyroLimitAngleV(al::CameraPoser*, f32, f32); void setGyroSensitivity(al::CameraPoser*, f32, f32); void reduceGyroSencitivity(al::CameraPoser*); diff --git a/lib/al/Library/Layout/LayoutActorGroup.h b/lib/al/Library/Layout/LayoutActorGroup.h index 31053b42..315785f4 100644 --- a/lib/al/Library/Layout/LayoutActorGroup.h +++ b/lib/al/Library/Layout/LayoutActorGroup.h @@ -1,7 +1,29 @@ #pragma once +#include + namespace al { class LayoutActor; -class LayoutActorGroup {}; +class LayoutActorGroup { +public: + LayoutActorGroup(const char*, s32); + void registerActor(LayoutActor*); + LayoutActor* findDeadActor() const; + LayoutActor* tryFindDeadActor() const; + + const char* getGroupName() const { return mGroupName; } + + s32 getMaxActorCount() const { return mMaxActorCount; } + + s32 getActorCount() const { return mActorCount; } + + LayoutActor* getActor(s32 idx) const { return mActors[idx]; } + +private: + const char* mGroupName; + s32 mMaxActorCount; + s32 mActorCount; + LayoutActor** mActors; +}; } // namespace al diff --git a/lib/al/Library/Layout/LayoutActorUtil.h b/lib/al/Library/Layout/LayoutActorUtil.h index 20b402e0..ca7e4ffa 100644 --- a/lib/al/Library/Layout/LayoutActorUtil.h +++ b/lib/al/Library/Layout/LayoutActorUtil.h @@ -56,9 +56,9 @@ void setPaneLocalSize(IUseLayout*, const char*, const sead::Vector2f&); void setPaneLocalAlpha(IUseLayout*, const char*, f32); sead::Vector3f getPaneLocalTrans(const IUseLayout*, const char*); void getPaneLocalSize(sead::Vector2f*, const IUseLayout*, const char*); -const sead::Vector3f& getPaneLocalRotate(const IUseLayout*, const char*); -const sead::Vector3f& getPaneLocalScale(const IUseLayout*, const char*); -const sead::Vector3f& getTextBoxDrawRectSize(const IUseLayout*, const char*); +sead::Vector3f getPaneLocalRotate(const IUseLayout*, const char*); +sead::Vector2f getPaneLocalScale(const IUseLayout*, const char*); +sead::Vector2f getTextBoxDrawRectSize(const IUseLayout*, const char*); void showPane(IUseLayout*, const char*); void hidePane(IUseLayout*, const char*); void showPaneNoRecursive(IUseLayout*, const char*); diff --git a/lib/al/Library/LiveActor/ActorAnimFunction.h b/lib/al/Library/LiveActor/ActorAnimFunction.h index 78d0d436..8aa8e1c4 100644 --- a/lib/al/Library/LiveActor/ActorAnimFunction.h +++ b/lib/al/Library/LiveActor/ActorAnimFunction.h @@ -332,7 +332,7 @@ s32 calcJoitsAmountFromJoint(LiveActor*, const char*); bool isPartialSklAnimEnd(const LiveActor* actor, s32 index); bool isPartialSklAnimOneTime(const LiveActor* actor, s32 index); bool isPartialSklAnimAttached(const LiveActor* actor, s32 index); -bool isPartialAnimPlaying(const LiveActor*, s32); +bool isPartialSklAnimPlaying(const LiveActor* actor, const char* partsName, s32 index); } // namespace al