summaryrefslogtreecommitdiff
path: root/src/d/a/obj/d_a_obj_tbox.cpp
diff options
context:
space:
mode:
authorelijah-thomas774 <elijahthomas774@gmail.com>2025-06-08 00:11:59 -0400
committerelijah-thomas774 <elijahthomas774@gmail.com>2025-06-08 00:11:59 -0400
commit4f7f5e4a23fe7e0da6e1e1c1b1c0f93033bbac81 (patch)
tree580c408c74400f97cf3d8394f3073bee1550beea /src/d/a/obj/d_a_obj_tbox.cpp
parent73b6e7dcd4efd67c0311951361cdcc637c6c9d95 (diff)
name change
Diffstat (limited to 'src/d/a/obj/d_a_obj_tbox.cpp')
-rw-r--r--src/d/a/obj/d_a_obj_tbox.cpp39
1 files changed, 20 insertions, 19 deletions
diff --git a/src/d/a/obj/d_a_obj_tbox.cpp b/src/d/a/obj/d_a_obj_tbox.cpp
index 4859ee76..ed461295 100644
--- a/src/d/a/obj/d_a_obj_tbox.cpp
+++ b/src/d/a/obj/d_a_obj_tbox.cpp
@@ -11,6 +11,7 @@
#include "d/col/c/c_bg_s_poly_info.h"
#include "d/col/cc/d_cc_d.h"
#include "d/col/cc/d_cc_s.h"
+#include "d/d_light_env.h"
#include "d/d_pouch.h"
#include "d/d_room.h"
#include "d/d_stage.h"
@@ -31,12 +32,12 @@
#include "s/s_Math.h"
#include "toBeSorted/arc_managers/oarc_manager.h"
#include "toBeSorted/attention.h"
-#include "toBeSorted/blur_and_palette_manager.h"
#include "toBeSorted/counters/goddess_chest_counter.h"
#include "toBeSorted/dowsing_target.h"
#include "toBeSorted/event_manager.h"
#include "toBeSorted/small_sound_mgr.h"
+
SPECIAL_ACTOR_PROFILE(TBOX, dAcTbox_c, fProfile::TBOX, 0x018D, 0, 6);
static mVec3_c sDowsingTargetOffsets[] = {
@@ -1977,15 +1978,15 @@ void dAcTbox_c::executeState_Open() {
if (mVariant == GODDESS) {
if (0.4f < field_0x11EC) {
sLib::chase(&field_0x11EC, 0.4f, getSomeRate());
- BlurAndPaletteManager::GetInstance().setLightFilter(field_0x11EC);
- BlurAndPaletteManager::GetInstance().setField_0x2F20(field_0x11EC);
+ dLightEnv_c::GetInstance().setLightFilter(field_0x11EC);
+ dLightEnv_c::GetInstance().setField_0x2F20(field_0x11EC);
}
} else if (mVariant != SMALL) {
// exact same code as in the other branch
if (0.4f < field_0x11EC) {
sLib::chase(&field_0x11EC, 0.4f, getSomeRate());
- BlurAndPaletteManager::GetInstance().setLightFilter(field_0x11EC);
- BlurAndPaletteManager::GetInstance().setField_0x2F20(field_0x11EC);
+ dLightEnv_c::GetInstance().setLightFilter(field_0x11EC);
+ dLightEnv_c::GetInstance().setField_0x2F20(field_0x11EC);
}
}
if (mMdl1.getAnm().isStop()) {
@@ -2010,14 +2011,14 @@ void dAcTbox_c::executeState_PresentItem() {
if (mVariant == GODDESS) {
if (0.4f < field_0x11EC) {
sLib::chase(&field_0x11EC, 0.4f, getSomeRate());
- BlurAndPaletteManager::GetInstance().setLightFilter(field_0x11EC);
- BlurAndPaletteManager::GetInstance().setField_0x2F20(field_0x11EC);
+ dLightEnv_c::GetInstance().setLightFilter(field_0x11EC);
+ dLightEnv_c::GetInstance().setField_0x2F20(field_0x11EC);
}
} else if (mVariant != SMALL) {
if (0.4f < field_0x11EC) {
sLib::chase(&field_0x11EC, 0.4f, getSomeRate());
- BlurAndPaletteManager::GetInstance().setLightFilter(field_0x11EC);
- BlurAndPaletteManager::GetInstance().setField_0x2F20(field_0x11EC);
+ dLightEnv_c::GetInstance().setLightFilter(field_0x11EC);
+ dLightEnv_c::GetInstance().setField_0x2F20(field_0x11EC);
}
}
mEvent.advanceNext();
@@ -2059,8 +2060,8 @@ void dAcTbox_c::executeState_Close() {
if (field_0x11FC <= 0) {
if (field_0x11EC < 1.0f) {
sLib::chase(&field_0x11EC, 1.0f, getSomeRate());
- BlurAndPaletteManager::GetInstance().setLightFilter(field_0x11EC);
- BlurAndPaletteManager::GetInstance().setField_0x2F20(field_0x11EC);
+ dLightEnv_c::GetInstance().setLightFilter(field_0x11EC);
+ dLightEnv_c::GetInstance().setField_0x2F20(field_0x11EC);
}
} else {
field_0x11FC--;
@@ -2088,8 +2089,8 @@ void dAcTbox_c::executeState_Close() {
if (field_0x11FC <= 0) {
if (field_0x11EC < 1.0f) {
sLib::chase(&field_0x11EC, 1.0f, getSomeRate());
- BlurAndPaletteManager::GetInstance().setLightFilter(field_0x11EC);
- BlurAndPaletteManager::GetInstance().setField_0x2F20(field_0x11EC);
+ dLightEnv_c::GetInstance().setLightFilter(field_0x11EC);
+ dLightEnv_c::GetInstance().setField_0x2F20(field_0x11EC);
}
} else {
field_0x11FC--;
@@ -2140,8 +2141,8 @@ void dAcTbox_c::executeState_Wait() {
if (field_0x11FC <= 0) {
if (field_0x11EC < 1.0f) {
sLib::chase(&field_0x11EC, 1.0f, getSomeRate());
- BlurAndPaletteManager::GetInstance().setLightFilter(field_0x11EC);
- BlurAndPaletteManager::GetInstance().setField_0x2F20(field_0x11EC);
+ dLightEnv_c::GetInstance().setLightFilter(field_0x11EC);
+ dLightEnv_c::GetInstance().setField_0x2F20(field_0x11EC);
}
} else {
field_0x11FC--;
@@ -2165,9 +2166,9 @@ void dAcTbox_c::executeState_GoddessWait() {
if (field_0x11FC <= 0) {
if (field_0x11EC < 1.0f) {
sLib::chase(&field_0x11EC, 1.0f, getSomeRate());
- BlurAndPaletteManager::GetInstance().setLightFilter(field_0x11EC);
+ dLightEnv_c::GetInstance().setLightFilter(field_0x11EC);
// this is apparently not needed here
- // BlurAndPaletteManager::GetInstance().setField_0x2F20(field_0x11EC);
+ // dLightEnv_c::GetInstance().setField_0x2F20(field_0x11EC);
}
} else {
field_0x11FC--;
@@ -2232,14 +2233,14 @@ void dAcTbox_c::unsetShouldCloseFlag() {
void dAcTbox_c::fn_8026D370() {
if (isNotSmall()) {
field_0x11F0 = 1;
- BlurAndPaletteManager::GetInstance().efplight_set(&mLightInfo);
+ dLightEnv_c::GetInstance().efplight_set(&mLightInfo);
}
}
void dAcTbox_c::fn_8026D3C0() {
if (mAnmChr.isStop() && mAnmTexSrt1.isStop(0) && mAnmMatClr2.isStop(0)) {
field_0x11F0 = 0;
- BlurAndPaletteManager::GetInstance().efplight_cut(&mLightInfo);
+ dLightEnv_c::GetInstance().efplight_cut(&mLightInfo);
} else {
mAnmChr.play();
mAnmTexSrt1.play();