summaryrefslogtreecommitdiff
path: root/include/m_Do
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2024-06-25 07:34:59 -0700
committerGitHub <noreply@github.com>2024-06-25 08:34:59 -0600
commitd923917b39f99ca74bd2ee2f609e8ff193f5c48a (patch)
tree380aeb1dc2527f54e23f7b63ede46b2ce24ff0a8 /include/m_Do
parent3c82015f69403d22f7ee3809425cb217f5bdc3b5 (diff)
work on d_camera / d_ev_camera (#2170)
Diffstat (limited to 'include/m_Do')
-rw-r--r--include/m_Do/m_Do_audio.h8
-rw-r--r--include/m_Do/m_Do_controller_pad.h1
-rw-r--r--include/m_Do/m_Do_mtx.h4
3 files changed, 13 insertions, 0 deletions
diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h
index 4f9398c51b..74b4406c7d 100644
--- a/include/m_Do/m_Do_audio.h
+++ b/include/m_Do/m_Do_audio.h
@@ -142,6 +142,14 @@ inline void mDoAud_taktModeMuteOff() {
Z2AudioMgr::getInterface()->taktModeMuteOff();
}
+inline void mDoAud_getCameraMapInfo(u32 param_0) {
+ Z2AudioMgr::getInterface()->getCameraMapInfo(param_0);
+}
+
+inline void mDoAud_setCameraGroupInfo(u8 param_0) {
+ Z2AudioMgr::getInterface()->setCameraGroupInfo(param_0);
+}
+
inline void mDoAud_mEnvse_framework() {
g_mEnvSeMgr.framework();
}
diff --git a/include/m_Do/m_Do_controller_pad.h b/include/m_Do/m_Do_controller_pad.h
index 91827f569d..bbe9549547 100644
--- a/include/m_Do/m_Do_controller_pad.h
+++ b/include/m_Do/m_Do_controller_pad.h
@@ -52,6 +52,7 @@ public:
static f32 getStickValue(u32 pad) { return getCpadInfo(pad).mMainStickValue; }
static s16 getStickAngle(u32 pad) { return getCpadInfo(pad).mMainStickAngle; }
static s16 getStickAngle3D(u32 pad) { return getCpadInfo(pad).mMainStickAngle; }
+ static f32 getSubStickX3D(u32 pad) { return getCpadInfo(pad).mCStickPosX; }
static f32 getSubStickX(u32 pad) { return getCpadInfo(pad).mCStickPosX; }
static f32 getSubStickY(u32 pad) { return getCpadInfo(pad).mCStickPosY; }
static f32 getSubStickValue(u32 pad) { return getCpadInfo(pad).mCStickValue; }
diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h
index ed0b857d14..821d901c0c 100644
--- a/include/m_Do/m_Do_mtx.h
+++ b/include/m_Do/m_Do_mtx.h
@@ -138,6 +138,10 @@ inline void cMtx_inverse(const Mtx a, Mtx b) {
mDoMtx_inverse(a, b);
}
+inline void cMtx_concatProjView(const Mtx a, const Mtx b, Mtx c) {
+ mDoMtx_concatProjView(a, b, c);
+}
+
class mDoMtx_stack_c {
public:
mDoMtx_stack_c() {