mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-10 06:26:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

name change

Browse Source
This commit is contained in:
elijah-thomas774
2025-06-08 00:11:59 -04:00
parent 73b6e7dcd4
commit 4f7f5e4a23
18 changed files with 176 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/splits.txt
+1 -1
View File
@@ -98,7 +98,7 @@ toBeSorted/d_unk_mdl_stuff_2.cpp:
.ctors start:0x804DB658 end:0x804DB65C
.sbss start:0x80575058 end:0x80575068
toBeSorted/blur_and_palette_manager.cpp:
d/d_light_env.cpp:
.text start:0x800221A0 end:0x800268AC align:16
.ctors start:0x804DB65C end:0x804DB660
.data start:0x80500E80 end:0x80500E98
config/SOUE01/symbols.txt
+54 -54
View File
@@ -796,66 +796,66 @@ fn_80022040 = .text:0x80022040; // type:function size:0x80
fn_800220C0 = .text:0x800220C0; // type:function size:0x8
fn_800220D0 = .text:0x800220D0; // type:function size:0xD0
vectle_calc__FPC7mVec3_cP7mVec3_c = .text:0x800221A0; // type:function size:0xC4
get_vectle_calc__21BlurAndPaletteManagerFPC7mVec3_cPC7mVec3_cP7mVec3_c = .text:0x80022270; // type:function size:0x5C
sphere_to_cartesian__21BlurAndPaletteManagerFffP7mVec3_c = .text:0x800222D0; // type:function size:0xC8
efplight_set__21BlurAndPaletteManagerFP15LIGHT_INFLUENCE = .text:0x800223A0; // type:function size:0x94
efplight_cut__21BlurAndPaletteManagerFP15LIGHT_INFLUENCE = .text:0x80022440; // type:function size:0x34
eflight_influence__21BlurAndPaletteManagerFPC7mVec3_c = .text:0x80022480; // type:function size:0xCC
SordFlush_set__21BlurAndPaletteManagerFPC7mVec3_cl = .text:0x80022550; // type:function size:0x74
get_vectle_calc__11dLightEnv_cFPC7mVec3_cPC7mVec3_cP7mVec3_c = .text:0x80022270; // type:function size:0x5C
sphere_to_cartesian__11dLightEnv_cFffP7mVec3_c = .text:0x800222D0; // type:function size:0xC8
efplight_set__11dLightEnv_cFP15LIGHT_INFLUENCE = .text:0x800223A0; // type:function size:0x94
efplight_cut__11dLightEnv_cFP15LIGHT_INFLUENCE = .text:0x80022440; // type:function size:0x34
eflight_influence__11dLightEnv_cFPC7mVec3_c = .text:0x80022480; // type:function size:0xCC
SordFlush_set__11dLightEnv_cFPC7mVec3_cl = .text:0x80022550; // type:function size:0x74
__as__7mVec3_cFRC7mVec3_c = .text:0x800225D0; // type:function size:0x1C
plight_set__21BlurAndPaletteManagerFP15LIGHT_INFLUENCE = .text:0x800225F0; // type:function size:0xEC
plight_cut__21BlurAndPaletteManagerFP15LIGHT_INFLUENCE = .text:0x800226E0; // type:function size:0x34
light_influence__21BlurAndPaletteManagerFPC7mVec3_cb = .text:0x80022720; // type:function size:0xCC
light_influence2__21BlurAndPaletteManagerFPC7mVec3_cb = .text:0x800227F0; // type:function size:0xF0
shadow_set__21BlurAndPaletteManagerFP16SHADOW_INFLUENCE = .text:0x800228E0; // type:function size:0xEC
shadow_cut__21BlurAndPaletteManagerFP16SHADOW_INFLUENCE = .text:0x800229D0; // type:function size:0x34
shadow_influence__21BlurAndPaletteManagerFPC7mVec3_c = .text:0x80022A10; // type:function size:0xD8
setLightFilter__21BlurAndPaletteManagerFf = .text:0x80022AF0; // type:function size:0x3C
set0x35B0__21BlurAndPaletteManagerFf = .text:0x80022B30; // type:function size:0x8
setBPM8__21BlurAndPaletteManagerFPC7mVec3_cUlf = .text:0x80022B40; // type:function size:0x58
setBPM8_Type4__21BlurAndPaletteManagerFPC7mVec3_c = .text:0x80022BA0; // type:function size:0xC
setBPM8_Type6__21BlurAndPaletteManagerFPC7mVec3_c = .text:0x80022BB0; // type:function size:0xC
setBPM8_Type10__21BlurAndPaletteManagerFPC7mVec3_c = .text:0x80022BC0; // type:function size:0xC
setBPM8_Type10_2__21BlurAndPaletteManagerFPC7mVec3_c = .text:0x80022BD0; // type:function size:0xC
setBPM8_Type6_2__21BlurAndPaletteManagerFPC7mVec3_c = .text:0x80022BE0; // type:function size:0xC
check_BPM8__21BlurAndPaletteManagerFPC7mVec3_cP7mVec3_c = .text:0x80022BF0; // type:function size:0xBC
check_BPM8_1001__21BlurAndPaletteManagerFPC7mVec3_cP7mVec3_c = .text:0x80022CB0; // type:function size:0xD8
check_BPM8_501__21BlurAndPaletteManagerFPC7mVec3_cP7mVec3_c = .text:0x80022D90; // type:function size:0xD8
setUnk__21BlurAndPaletteManagerFPC7mVec3_cf = .text:0x80022E70; // type:function size:0x40
setBPM9__21BlurAndPaletteManagerFPC7mVec3_cf = .text:0x80022EB0; // type:function size:0x5C
check_BPM9__21BlurAndPaletteManagerFPC7mVec3_c = .text:0x80022F10; // type:function size:0x8C
checkBPM9_Entity__21BlurAndPaletteManagerFP7mVec3_c = .text:0x80022FA0; // type:function size:0x34
setAlterateRoomId__21BlurAndPaletteManagerFl = .text:0x80022FE0; // type:function size:0x8
getAlterateRoomId__21BlurAndPaletteManagerFv = .text:0x80022FF0; // type:function size:0x8
color_ratio_set__21BlurAndPaletteManagerFRC6mColorRC6mColorf = .text:0x80023000; // type:function size:0x144
plight_set__11dLightEnv_cFP15LIGHT_INFLUENCE = .text:0x800225F0; // type:function size:0xEC
plight_cut__11dLightEnv_cFP15LIGHT_INFLUENCE = .text:0x800226E0; // type:function size:0x34
light_influence__11dLightEnv_cFPC7mVec3_cb = .text:0x80022720; // type:function size:0xCC
light_influence2__11dLightEnv_cFPC7mVec3_cb = .text:0x800227F0; // type:function size:0xF0
shadow_set__11dLightEnv_cFP16SHADOW_INFLUENCE = .text:0x800228E0; // type:function size:0xEC
shadow_cut__11dLightEnv_cFP16SHADOW_INFLUENCE = .text:0x800229D0; // type:function size:0x34
shadow_influence__11dLightEnv_cFPC7mVec3_c = .text:0x80022A10; // type:function size:0xD8
setLightFilter__11dLightEnv_cFf = .text:0x80022AF0; // type:function size:0x3C
set0x35B0__11dLightEnv_cFf = .text:0x80022B30; // type:function size:0x8
setBPM8__11dLightEnv_cFPC7mVec3_cUlf = .text:0x80022B40; // type:function size:0x58
setBPM8_Type4__11dLightEnv_cFPC7mVec3_c = .text:0x80022BA0; // type:function size:0xC
setBPM8_Type6__11dLightEnv_cFPC7mVec3_c = .text:0x80022BB0; // type:function size:0xC
setBPM8_Type10__11dLightEnv_cFPC7mVec3_c = .text:0x80022BC0; // type:function size:0xC
setBPM8_Type10_2__11dLightEnv_cFPC7mVec3_c = .text:0x80022BD0; // type:function size:0xC
setBPM8_Type6_2__11dLightEnv_cFPC7mVec3_c = .text:0x80022BE0; // type:function size:0xC
check_BPM8__11dLightEnv_cFPC7mVec3_cP7mVec3_c = .text:0x80022BF0; // type:function size:0xBC
check_BPM8_1001__11dLightEnv_cFPC7mVec3_cP7mVec3_c = .text:0x80022CB0; // type:function size:0xD8
check_BPM8_501__11dLightEnv_cFPC7mVec3_cP7mVec3_c = .text:0x80022D90; // type:function size:0xD8
setUnk__11dLightEnv_cFPC7mVec3_cf = .text:0x80022E70; // type:function size:0x40
setBPM9__11dLightEnv_cFPC7mVec3_cf = .text:0x80022EB0; // type:function size:0x5C
check_BPM9__11dLightEnv_cFPC7mVec3_c = .text:0x80022F10; // type:function size:0x8C
checkBPM9_Entity__11dLightEnv_cFP7mVec3_c = .text:0x80022FA0; // type:function size:0x34
setAlterateRoomId__11dLightEnv_cFl = .text:0x80022FE0; // type:function size:0x8
getAlterateRoomId__11dLightEnv_cFv = .text:0x80022FF0; // type:function size:0x8
color_ratio_set__11dLightEnv_cFRC6mColorRC6mColorf = .text:0x80023000; // type:function size:0x144
__ct__6mColorFv = .text:0x80023150; // type:function size:0xC
vec_ratio_set__21BlurAndPaletteManagerFRC7mVec3_cRC7mVec3_cf = .text:0x80023160; // type:function size:0x4C
f32_ratio_set__21BlurAndPaletteManagerFfff = .text:0x800231B0; // type:function size:0x10
u16_ratio_set__21BlurAndPaletteManagerFUsUsf = .text:0x800231C0; // type:function size:0x5C
u8_ratio_set__21BlurAndPaletteManagerFUcUcf = .text:0x80023220; // type:function size:0x60
spf_ratio_set__21BlurAndPaletteManagerFR3SpfRC3SpfRC3Spff = .text:0x80023280; // type:function size:0xD24
vec_ratio_set__11dLightEnv_cFRC7mVec3_cRC7mVec3_cf = .text:0x80023160; // type:function size:0x4C
f32_ratio_set__11dLightEnv_cFfff = .text:0x800231B0; // type:function size:0x10
u16_ratio_set__11dLightEnv_cFUsUsf = .text:0x800231C0; // type:function size:0x5C
u8_ratio_set__11dLightEnv_cFUcUcf = .text:0x80023220; // type:function size:0x60
spf_ratio_set__11dLightEnv_cFR3SpfRC3SpfRC3Spff = .text:0x80023280; // type:function size:0xD24
__as__6mColorFRC6mColor = .text:0x80023FB0; // type:function size:0x24
__as__14UnalignedColorFRC6mColor = .text:0x80023FE0; // type:function size:0x24
__ct__3SpfFv = .text:0x80024010; // type:function size:0x114
__ct__6SffSubFv = .text:0x80024130; // type:function size:0xC
__dt__6SffSubFv = .text:0x80024140; // type:function size:0x40
__dt__3SpfFv = .text:0x80024180; // type:function size:0xBC
set_palette_transition__21BlurAndPaletteManagerFssl = .text:0x80024240; // type:function size:0xF8
set_override_spf__21BlurAndPaletteManagerFssf = .text:0x80024340; // type:function size:0x10
setMist__21BlurAndPaletteManagerFUcUcUcff = .text:0x80024350; // type:function size:0x18
setMistMode3__21BlurAndPaletteManagerFRC7mVec3_cf = .text:0x80024370; // type:function size:0x58
setDOF__21BlurAndPaletteManagerFf = .text:0x800243D0; // type:function size:0x10
disableDOF__21BlurAndPaletteManagerFv = .text:0x800243E0; // type:function size:0xC
light_influence_ratio_set__21BlurAndPaletteManagerFR15LIGHT_INFLUENCERC15LIGHT_INFLUENCERC15LIGHT_INFLUENCEf = .text:0x800243F0; // type:function size:0x178
set_palette_transition__11dLightEnv_cFssl = .text:0x80024240; // type:function size:0xF8
set_override_spf__11dLightEnv_cFssf = .text:0x80024340; // type:function size:0x10
setMist__11dLightEnv_cFUcUcUcff = .text:0x80024350; // type:function size:0x18
setMistMode3__11dLightEnv_cFRC7mVec3_cf = .text:0x80024370; // type:function size:0x58
setDOF__11dLightEnv_cFf = .text:0x800243D0; // type:function size:0x10
disableDOF__11dLightEnv_cFv = .text:0x800243E0; // type:function size:0xC
light_influence_ratio_set__11dLightEnv_cFR15LIGHT_INFLUENCERC15LIGHT_INFLUENCERC15LIGHT_INFLUENCEf = .text:0x800243F0; // type:function size:0x178
__ct__6mColorFiiii = .text:0x80024570; // type:function size:0x14
sff_ratio_set__21BlurAndPaletteManagerFR3SffRC3SffRC3Sfff = .text:0x80024590; // type:function size:0xE4
sff_ratio_set__11dLightEnv_cFR3SffRC3SffRC3Sfff = .text:0x80024590; // type:function size:0xE4
__ct__3SffFv = .text:0x80024680; // type:function size:0x48
__dt__3SffFv = .text:0x800246D0; // type:function size:0x64
fn_80024740__21BlurAndPaletteManagerFUcUc = .text:0x80024740; // type:function size:0x24
fn_80024770__21BlurAndPaletteManagerFUc = .text:0x80024770; // type:function size:0x24
fn_800247A0__21BlurAndPaletteManagerFUc = .text:0x800247A0; // type:function size:0x30
setWind__21BlurAndPaletteManagerF7mVec3_cf = .text:0x800247D0; // type:function size:0x20
__ct__21BlurAndPaletteManagerFv = .text:0x800247F0; // type:function size:0xBB0
fn_80024740__11dLightEnv_cFUcUc = .text:0x80024740; // type:function size:0x24
fn_80024770__11dLightEnv_cFUc = .text:0x80024770; // type:function size:0x24
fn_800247A0__11dLightEnv_cFUc = .text:0x800247A0; // type:function size:0x30
setWind__11dLightEnv_cF7mVec3_cf = .text:0x800247D0; // type:function size:0x20
__ct__11dLightEnv_cFv = .text:0x800247F0; // type:function size:0xBB0
__ct__7mVec3_cFfff = .text:0x800253A0; // type:function size:0x10
__ct__12EFLIGHT_PROCFv = .text:0x800253B0; // type:function size:0xC
__ct__14WIND_INFLUENCEFv = .text:0x800253C0; // type:function size:0x4
@@ -880,7 +880,7 @@ __ct__20TwoPaletteDefaultMCFFv = .text:0x800257D0; // type:function size:0x48
__as__3SpfFRC3Spf = .text:0x80025820; // type:function size:0x8C4
__as__3SffFRC3Sff = .text:0x800260F0; // type:function size:0xB4
__as__17PaletteDefaultMCFFRC17PaletteDefaultMCF = .text:0x800261B0; // type:function size:0x154
__dt__21BlurAndPaletteManagerFv = .text:0x80026310; // type:function size:0x1EC
__dt__11dLightEnv_cFv = .text:0x80026310; // type:function size:0x1EC
fn_80026500__13ActorLightingFv = .text:0x80026500; // type:function size:0x38
__dt__13ActorLightingFv = .text:0x80026540; // type:function size:0x40
reset__13ActorLightingFv = .text:0x80026580; // type:function size:0x188
@@ -888,7 +888,7 @@ getLightTev2Color__13ActorLightingFv = .text:0x80026710; // type:function size:0
getLightTev1Color__13ActorLightingFv = .text:0x80026760; // type:function size:0x4C
getLightTev0Color__13ActorLightingFv = .text:0x800267B0; // type:function size:0x4C
getLightTevKColor__13ActorLightingFv = .text:0x80026800; // type:function size:0x4C
__sinit_\blur_and_palette_manager_cpp = .text:0x80026850; // type:function size:0x5C scope:local
__sinit_\d_light_env_cpp = .text:0x80026850; // type:function size:0x5C scope:local
__dt__18dEmitterCallback_cFv = .text:0x800268B0; // type:function size:0xB4
remove__18dEmitterCallback_cFP14dEmitterBase_c = .text:0x80026970; // type:function size:0x88
__dt__19dParticleCallback_cFv = .text:0x80026A00; // type:function size:0xB4
@@ -29954,7 +29954,7 @@ lbl_80500CD8 = .data:0x80500CD8; // type:object size:0x70
lbl_80500D48 = .data:0x80500D48; // type:object size:0x78
lbl_80500DC0 = .data:0x80500DC0; // type:object size:0x70
lbl_80500E30 = .data:0x80500E30; // type:object size:0x50
__vt__21BlurAndPaletteManager = .data:0x80500E80; // type:object size:0xC
__vt__11dLightEnv_c = .data:0x80500E80; // type:object size:0xC
__vt__13ActorLighting = .data:0x80500E8C; // type:object size:0xC
lbl_80500E98 = .data:0x80500E98; // type:object size:0x10 data:string
lbl_80500EA8 = .data:0x80500EA8; // type:object size:0x444
@@ -41232,7 +41232,7 @@ lbl_80575054 = .sbss:0x80575054; // type:object size:0x1 data:byte
lbl_80575058 = .sbss:0x80575058; // type:object size:0x8 data:byte
lbl_80575060 = .sbss:0x80575060; // type:object size:0x1 data:byte
lbl_80575064 = .sbss:0x80575064; // type:object size:0x4 data:4byte
sPInstance__21BlurAndPaletteManager = .sbss:0x80575068; // type:object size:0x8 data:4byte
sPInstance__11dLightEnv_c = .sbss:0x80575068; // type:object size:0x8 data:4byte
sMassObjEmitters__14dJEffManager_c = .sbss:0x80575070; // type:object size:0x4 data:4byte
CURRENT_EFFECT_MANAGER_INIT = .sbss:0x80575074; // type:object size:0x4 data:4byte
ms_allocator__14dJEffManager_c = .sbss:0x80575078; // type:object size:0x4 data:4byte
@@ -50335,7 +50335,7 @@ lbl_8058F1B8 = .bss:0x8058F1B8; // type:object size:0x10 align:4 data:float
lbl_8058F1C8 = .bss:0x8058F1C8; // type:object size:0x28 align:4 data:float
lbl_8058F1F0 = .bss:0x8058F1F0; // type:object size:0x20 data:byte
lbl_8058F210 = .bss:0x8058F210; // type:object size:0x10
sInstance__21BlurAndPaletteManager = .bss:0x8058F220; // type:object size:0x5D70
sInstance__11dLightEnv_c = .bss:0x8058F220; // type:object size:0x5D70
sList__13ActorLighting = .bss:0x80594F90; // type:object size:0x10 data:4byte
sPlayingEffectsList__14dJEffManager_c = .bss:0x80594FA0; // type:object size:0x18 data:4byte
sCommonEmitterCallbacks__14dJEffManager_c = .bss:0x80594FB8; // type:object size:0x1C
configure.py
+1 -1
View File
@@ -387,7 +387,7 @@ config.libs = [
Object(NonMatching, "toBeSorted/d_shadow.cpp"),
Object(NonMatching, "toBeSorted/d_unk_mdl_stuff_1.cpp"),
Object(NonMatching, "toBeSorted/d_unk_mdl_stuff_2.cpp"),
Object(Matching, "toBeSorted/blur_and_palette_manager.cpp"),
Object(Matching, "d/d_light_env.cpp"),
Object(NonMatching, "toBeSorted/d_emitter.cpp"),
Object(NonMatching, "toBeSorted/d_effects_2.cpp"),
Object(NonMatching, "toBeSorted/sound_info.cpp"),
include/d/a/e/d_a_e_sm.h
+2 -1
View File
@@ -8,18 +8,19 @@
#include "d/col/bg/d_bg_s_acch.h"
#include "d/col/cc/d_cc_d.h"
#include "d/d_jnt_col.h"
#include "d/d_light_env.h"
#include "d/d_shadow.h"
#include "m/m3d/m_anmmatclr.h"
#include "m/m3d/m_anmtexpat.h"
#include "m/m_angle.h"
#include "m/m_vec.h"
#include "s/s_State.hpp"
#include "toBeSorted/blur_and_palette_manager.h"
#include "toBeSorted/d_d3d.h"
#include "toBeSorted/d_emitter.h"
#include "toBeSorted/stage_render_stuff.h"
#include "toBeSorted/time_area_mgr.h"
class dAcEsm_c : public dAcEnBase_c {
public:
enum SmColor_e {
include/d/a/obj/d_a_obj_base.h
+2 -1
View File
@@ -7,6 +7,7 @@
#include "d/col/c/c_cc_d.h"
#include "d/col/c/c_m3d_g_aab.h"
#include "d/d_jnt_col.h"
#include "d/d_light_env.h"
#include "d/d_linkage.h"
#include "egg/math/eggMath.h"
#include "m/m3d/m_shadow.h"
@@ -16,7 +17,7 @@
#include "m/m_mtx.h"
#include "m/m_vec.h"
#include "m/types_m.h"
#include "toBeSorted/blur_and_palette_manager.h"
// Ghidra: ActorObjectBase
// size: 0x330
include/d/a/obj/d_a_obj_tbox.h
+2 -1
View File
@@ -8,6 +8,7 @@
#include "d/col/bg/d_bg_w.h"
#include "d/col/cc/d_cc_d.h"
#include "d/d_cc.h"
#include "d/d_light_env.h"
#include "d/d_shadow.h"
#include "m/m3d/m_anmchr.h"
#include "m/m3d/m_anmmatclr.h"
@@ -20,10 +21,10 @@
#include "s/s_State.hpp"
#include "toBeSorted/actor_event.h"
#include "toBeSorted/attention.h"
#include "toBeSorted/blur_and_palette_manager.h"
#include "toBeSorted/dowsing_target.h"
#include "toBeSorted/stage_render_stuff.h"
class dAcTbox_c : public dAcObjBase_c {
public:
enum TboxVariant_e {
include/toBeSorted/blur_and_palette_manager.h → include/d/d_light_env.h
+7 -8
View File
@@ -309,16 +309,16 @@ struct SpfTransitionSetting {
s32 mNumFrames;
};
class BlurAndPaletteManager {
class dLightEnv_c {
public:
BlurAndPaletteManager();
virtual ~BlurAndPaletteManager();
dLightEnv_c();
virtual ~dLightEnv_c();
static BlurAndPaletteManager &GetInstance() {
static dLightEnv_c &GetInstance() {
return sInstance;
}
static BlurAndPaletteManager *GetPInstance() {
static dLightEnv_c *GetPInstance() {
return sPInstance;
}
@@ -389,7 +389,6 @@ public:
field_0x2F20 = arg;
}
// light pillar related
void set_palette_transition(s16 before, s16 after, s32 numFrames);
// All related
@@ -489,8 +488,8 @@ private:
} field_0x5D59[9];
/* 0x5D60 */ u8 field_0x5D6C[0x5D70 - 0x5D6C];
static BlurAndPaletteManager sInstance;
static BlurAndPaletteManager *sPInstance;
static dLightEnv_c sInstance;
static dLightEnv_c *sPInstance;
};
#endif
src/REL/d/a/e/d_a_e_sm.cpp
+4 -3
View File
@@ -16,6 +16,7 @@
#include "d/col/cc/d_cc_s.h"
#include "d/d_camera.h"
#include "d/d_jnt_col.h"
#include "d/d_light_env.h"
#include "d/d_linkage.h"
#include "d/d_sc_game.h"
#include "d/flag/sceneflag_manager.h"
@@ -36,11 +37,11 @@
#include "rvl/MTX/mtx.h"
#include "rvl/MTX/mtxvec.h"
#include "s/s_Math.h"
#include "toBeSorted/blur_and_palette_manager.h"
#include "toBeSorted/d_emitter.h"
#include "toBeSorted/small_sound_mgr.h"
#include "toBeSorted/time_area_mgr.h"
SPECIAL_ACTOR_PROFILE(E_SM, dAcEsm_c, fProfile::E_SM, 0xEB, 0, 4098);
static dCcD_SrcSph sSphSrc = {
@@ -198,7 +199,7 @@ int dAcEsm_c::actorCreate() {
mLightInfo.SetColor(mColor(0xCC, 0xFF, 0xFF, 0xFF));
mLightInfo.SetScale(0.f);
BlurAndPaletteManager::GetPInstance()->plight_set(&mLightInfo);
dLightEnv_c::GetPInstance()->plight_set(&mLightInfo);
if (field_0xBBF == 1) {
rotation.x = 0x8000;
field_0xBCC = 1;
@@ -315,7 +316,7 @@ int dAcEsm_c::actorPostCreate() {
}
int dAcEsm_c::doDelete() {
BlurAndPaletteManager::GetPInstance()->plight_cut(&mLightInfo);
dLightEnv_c::GetPInstance()->plight_cut(&mLightInfo);
return SUCCEEDED;
}
src/REL/d/a/obj/d_a_obj_island_LOD.cpp
+8 -15
View File
@@ -1,31 +1,24 @@
#include "d/a/obj/d_a_obj_island_LOD.h"
#include "common.h"
#include "d/a/obj/d_a_obj_base.h"
#include "d/d_light_env.h"
#include "d/d_stage.h"
#include "f/f_base.h"
#include "toBeSorted/blur_and_palette_manager.h"
const char* const dAcOislandLOD_c::resFilenames[5] = {
"IslLODA",
"IslLODB",
"IslLODC",
"IslLODD",
"IslLODE",
const char *const dAcOislandLOD_c::resFilenames[5] = {
"IslLODA", "IslLODB", "IslLODC", "IslLODD", "IslLODE",
};
const char* const dAcOislandLOD_c::resMdlNames[5] = {
"IslLODA",
"IslLODB",
"IslLODC",
"IslLODD",
"IslLODE",
const char *const dAcOislandLOD_c::resMdlNames[5] = {
"IslLODA", "IslLODB", "IslLODC", "IslLODD", "IslLODE",
};
SPECIAL_ACTOR_PROFILE(OBJ_ISLAND_LOD, dAcOislandLOD_c, fProfile::OBJ_ISLAND_LOD, 0x211, 0, 3);
bool dAcOislandLOD_c::createHeap() {
mMdlLodIdx = params & 0xf;
void* data = getOarcResFile(dAcOislandLOD_c::resFilenames[mMdlLodIdx]);
void *data = getOarcResFile(dAcOislandLOD_c::resFilenames[mMdlLodIdx]);
mResFile = nw4r::g3d::ResFile(data);
dStage_c::bindStageResToFile(&mResFile);
dStage_c::bindSkyCmnToResFile(&mResFile);
@@ -53,7 +46,7 @@ int dAcOislandLOD_c::actorExecute() {
}
int dAcOislandLOD_c::draw() {
BlurAndPaletteManager& blurAndPaletteManager = BlurAndPaletteManager::GetInstance();
dLightEnv_c &blurAndPaletteManager = dLightEnv_c::GetInstance();
if (blurAndPaletteManager.fn_80024770(7) && !blurAndPaletteManager.fn_800247A0(7)) {
return SUCCEEDED;
}
src/REL/d/a/obj/d_a_obj_tubo.cpp
+3 -2
View File
@@ -17,6 +17,7 @@
#include "d/col/c/c_cc_d.h"
#include "d/col/c/c_m3d_g_pla.h"
#include "d/col/cc/d_cc_s.h"
#include "d/d_light_env.h"
#include "d/d_linkage.h"
#include "d/flag/dungeonflag_manager.h"
#include "d/flag/sceneflag_manager.h"
@@ -31,12 +32,12 @@
#include "rvl/MTX/mtxvec.h"
#include "s/s_Math.h"
#include "toBeSorted/attention.h"
#include "toBeSorted/blur_and_palette_manager.h"
#include "toBeSorted/d_emitter.h"
#include "toBeSorted/event_manager.h"
#include "toBeSorted/small_sound_mgr.h"
#include "toBeSorted/special_item_drop_mgr.h"
void float_ordering() {
f32 f[] = {15.f, .4f, .4f, 5.f};
}
@@ -451,7 +452,7 @@ void dAcOtubo_c::destroy() {
if (!boolParam) {
return;
}
fn_80022BE0(BlurAndPaletteManager::GetPInstance(), position);
fn_80022BE0(dLightEnv_c::GetPInstance(), position);
GetLinkage().fn_80050EA0(this);
dEmitterBase_c *fx_thing = dJEffManager_c::spawnEffect(
src/REL/d/a/obj/d_a_obj_tumble_weed.cpp
+3 -2
View File
@@ -10,6 +10,7 @@
#include "d/col/c/c_m3d_g_pla.h"
#include "d/col/cc/d_cc_d.h"
#include "d/col/cc/d_cc_s.h"
#include "d/d_light_env.h"
#include "egg/math/eggMath.h"
#include "egg/math/eggQuat.h"
#include "m/m_angle.h"
@@ -17,11 +18,11 @@
#include "m/m_quat.h"
#include "m/m_vec.h"
#include "s/s_Math.h"
#include "toBeSorted/blur_and_palette_manager.h"
#include "toBeSorted/d_emitter.h"
#include "toBeSorted/dowsing_target.h"
#include "toBeSorted/small_sound_mgr.h"
void float_ordering() {
const f32 arr[] = {5.f, 15.f, 7.f, 0.5f, 0.1f};
}
@@ -105,7 +106,7 @@ int dAcOTumbleWeed_c::actorExecute() {
calcWind();
sLib::chase(&mField_0x980, 1.f, 0.1f);
BlurAndPaletteManager::GetInstance().setWind(mField_0x968, mField_0x980);
dLightEnv_c::GetInstance().setWind(mField_0x968, mField_0x980);
calcVelocity();
position += velocity;
src/d/a/obj/d_a_obj_tbox.cpp
+20 -19
View File
@@ -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();
src/toBeSorted/blur_and_palette_manager.cpp → src/d/d_light_env.cpp
+53 -53
View File
@@ -1,5 +1,5 @@
#include "toBeSorted/blur_and_palette_manager.h"
#include "d/d_light_env.h"
#include "common.h"
#include "d/a/d_a_itembase.h"
@@ -11,8 +11,8 @@
#include "m/m_vec.h"
#include "nw4r/math/math_arithmetic.h"
BlurAndPaletteManager BlurAndPaletteManager::sInstance;
BlurAndPaletteManager *BlurAndPaletteManager::sPInstance;
dLightEnv_c dLightEnv_c::sInstance;
dLightEnv_c *dLightEnv_c::sPInstance;
ActorLighting::ListType ActorLighting::sList;
@@ -31,7 +31,7 @@ static void vectle_calc(const mVec3_c *pIn, mVec3_c *pOut) {
}
// Same as get_vectle_calc in d_kankyo_rain from tp
void BlurAndPaletteManager::get_vectle_calc(const mVec3_c *pInA, const mVec3_c *pInB, mVec3_c *pOut) {
void dLightEnv_c::get_vectle_calc(const mVec3_c *pInA, const mVec3_c *pInB, mVec3_c *pOut) {
mVec3_c pos;
pos.x = pInB->x - pInA->x;
pos.y = pInB->y - pInA->y;
@@ -49,7 +49,7 @@ inline f32 cosf(f32 x) {
return cos(x);
}
void BlurAndPaletteManager::sphere_to_cartesian(f32 angY, f32 angXZ, mVec3_c *pOut) {
void dLightEnv_c::sphere_to_cartesian(f32 angY, f32 angXZ, mVec3_c *pOut) {
f32 radY = angY / (180.f / M_PI);
f32 radXZ = angXZ / (180.f / M_PI);
@@ -63,7 +63,7 @@ void BlurAndPaletteManager::sphere_to_cartesian(f32 angY, f32 angXZ, mVec3_c *pO
pOut->z = pos.z;
}
void BlurAndPaletteManager::efplight_set(LIGHT_INFLUENCE *pLightInfo) {
void dLightEnv_c::efplight_set(LIGHT_INFLUENCE *pLightInfo) {
if (pLightInfo == nullptr) {
return;
}
@@ -82,7 +82,7 @@ void BlurAndPaletteManager::efplight_set(LIGHT_INFLUENCE *pLightInfo) {
}
}
}
void BlurAndPaletteManager::efplight_cut(LIGHT_INFLUENCE *pLightInfo) {
void dLightEnv_c::efplight_cut(LIGHT_INFLUENCE *pLightInfo) {
if (pLightInfo == nullptr) {
return;
}
@@ -95,7 +95,7 @@ void BlurAndPaletteManager::efplight_cut(LIGHT_INFLUENCE *pLightInfo) {
}
}
LIGHT_INFLUENCE *BlurAndPaletteManager::eflight_influence(const mVec3_c *pPos) {
LIGHT_INFLUENCE *dLightEnv_c::eflight_influence(const mVec3_c *pPos) {
f32 max = 1000000.f;
LIGHT_INFLUENCE *pOut = nullptr;
@@ -111,7 +111,7 @@ LIGHT_INFLUENCE *BlurAndPaletteManager::eflight_influence(const mVec3_c *pPos) {
return pOut;
}
void BlurAndPaletteManager::SordFlush_set(const mVec3_c *pPos, s32 lightType) {
void dLightEnv_c::SordFlush_set(const mVec3_c *pPos, s32 lightType) {
if (eflight.mState == 0) {
eflight.mState = 1;
eflight.mLightType = lightType;
@@ -123,7 +123,7 @@ void BlurAndPaletteManager::SordFlush_set(const mVec3_c *pPos, s32 lightType) {
}
}
void BlurAndPaletteManager::plight_set(LIGHT_INFLUENCE *pLightInfo) {
void dLightEnv_c::plight_set(LIGHT_INFLUENCE *pLightInfo) {
if (pLightInfo == nullptr) {
return;
}
@@ -144,7 +144,7 @@ void BlurAndPaletteManager::plight_set(LIGHT_INFLUENCE *pLightInfo) {
}
}
}
void BlurAndPaletteManager::plight_cut(LIGHT_INFLUENCE *pLightInfo) {
void dLightEnv_c::plight_cut(LIGHT_INFLUENCE *pLightInfo) {
if (pLightInfo == nullptr) {
return;
}
@@ -157,7 +157,7 @@ void BlurAndPaletteManager::plight_cut(LIGHT_INFLUENCE *pLightInfo) {
}
}
LIGHT_INFLUENCE *BlurAndPaletteManager::light_influence(const mVec3_c *pPos, bool param2) {
LIGHT_INFLUENCE *dLightEnv_c::light_influence(const mVec3_c *pPos, bool param2) {
f32 max = 1000000.f;
LIGHT_INFLUENCE *pOut = nullptr;
@@ -177,7 +177,7 @@ LIGHT_INFLUENCE *BlurAndPaletteManager::light_influence(const mVec3_c *pPos, boo
return pOut;
}
LIGHT_INFLUENCE *BlurAndPaletteManager::light_influence2(const mVec3_c *pPos, bool param2) {
LIGHT_INFLUENCE *dLightEnv_c::light_influence2(const mVec3_c *pPos, bool param2) {
f32 max = 1000000.f;
f32 temp = 1000000.f;
LIGHT_INFLUENCE *pOut2 = nullptr;
@@ -206,7 +206,7 @@ LIGHT_INFLUENCE *BlurAndPaletteManager::light_influence2(const mVec3_c *pPos, bo
return pOut;
}
void BlurAndPaletteManager::shadow_set(SHADOW_INFLUENCE *pShadowInfo) {
void dLightEnv_c::shadow_set(SHADOW_INFLUENCE *pShadowInfo) {
if (pShadowInfo == nullptr) {
return;
}
@@ -226,7 +226,7 @@ void BlurAndPaletteManager::shadow_set(SHADOW_INFLUENCE *pShadowInfo) {
}
}
void BlurAndPaletteManager::shadow_cut(SHADOW_INFLUENCE *pShadowInfo) {
void dLightEnv_c::shadow_cut(SHADOW_INFLUENCE *pShadowInfo) {
if (pShadowInfo == nullptr) {
return;
}
@@ -239,7 +239,7 @@ void BlurAndPaletteManager::shadow_cut(SHADOW_INFLUENCE *pShadowInfo) {
}
}
SHADOW_INFLUENCE *BlurAndPaletteManager::shadow_influence(const mVec3_c *pPos) {
SHADOW_INFLUENCE *dLightEnv_c::shadow_influence(const mVec3_c *pPos) {
f32 max = 1000000.f;
SHADOW_INFLUENCE *pOut = nullptr;
@@ -257,16 +257,16 @@ SHADOW_INFLUENCE *BlurAndPaletteManager::shadow_influence(const mVec3_c *pPos) {
return pOut;
}
void BlurAndPaletteManager::setLightFilter(f32 ratio) {
void dLightEnv_c::setLightFilter(f32 ratio) {
field_0x2DF4.r = ratio * 255.f;
field_0x2DF4.g = ratio * 255.f;
field_0x2DF4.b = ratio * 255.f;
}
void BlurAndPaletteManager::set0x35B0(f32 f) {
void dLightEnv_c::set0x35B0(f32 f) {
mWind.field_0x10 = f;
}
void BlurAndPaletteManager::setBPM8(const mVec3_c *pos, u32 type, f32 radius) {
void dLightEnv_c::setBPM8(const mVec3_c *pos, u32 type, f32 radius) {
for (int i = 0; i < 10; ++i) {
if (field_0x3654[i].field_0x10 <= -1) {
field_0x3654[i].mPos = *pos;
@@ -277,27 +277,27 @@ void BlurAndPaletteManager::setBPM8(const mVec3_c *pos, u32 type, f32 radius) {
}
}
void BlurAndPaletteManager::setBPM8_Type4(const mVec3_c *pos) {
void dLightEnv_c::setBPM8_Type4(const mVec3_c *pos) {
setBPM8(pos, 4, 250.f);
}
void BlurAndPaletteManager::setBPM8_Type6(const mVec3_c *pos) {
void dLightEnv_c::setBPM8_Type6(const mVec3_c *pos) {
setBPM8(pos, 6, 500.f);
}
void BlurAndPaletteManager::setBPM8_Type10(const mVec3_c *pos) {
void dLightEnv_c::setBPM8_Type10(const mVec3_c *pos) {
setBPM8(pos, 10, 1000.f);
}
void BlurAndPaletteManager::setBPM8_Type10_2(const mVec3_c *pos) {
void dLightEnv_c::setBPM8_Type10_2(const mVec3_c *pos) {
setBPM8(pos, 10, 1001.f);
}
void BlurAndPaletteManager::setBPM8_Type6_2(const mVec3_c *pos) {
void dLightEnv_c::setBPM8_Type6_2(const mVec3_c *pos) {
setBPM8(pos, 6, 501.f);
}
bool BlurAndPaletteManager::check_BPM8(const mVec3_c *pos, mVec3_c *pOutPos) {
bool dLightEnv_c::check_BPM8(const mVec3_c *pos, mVec3_c *pOutPos) {
bool ret = false;
for (int i = 0; i < 10; ++i) {
if (field_0x3654[i].field_0x10 > 0) {
@@ -313,7 +313,7 @@ bool BlurAndPaletteManager::check_BPM8(const mVec3_c *pos, mVec3_c *pOutPos) {
return ret;
}
bool BlurAndPaletteManager::check_BPM8_1001(const mVec3_c *pos, mVec3_c *pOutPos) {
bool dLightEnv_c::check_BPM8_1001(const mVec3_c *pos, mVec3_c *pOutPos) {
bool ret = false;
for (int i = 0; i < 10; ++i) {
if (field_0x3654[i].field_0x10 > 0) {
@@ -329,7 +329,7 @@ bool BlurAndPaletteManager::check_BPM8_1001(const mVec3_c *pos, mVec3_c *pOutPos
return ret;
}
bool BlurAndPaletteManager::check_BPM8_501(const mVec3_c *pos, mVec3_c *pOutPos) {
bool dLightEnv_c::check_BPM8_501(const mVec3_c *pos, mVec3_c *pOutPos) {
bool ret = false;
for (int i = 0; i < 10; ++i) {
if (field_0x3654[i].field_0x10 > 0) {
@@ -345,7 +345,7 @@ bool BlurAndPaletteManager::check_BPM8_501(const mVec3_c *pos, mVec3_c *pOutPos)
return ret;
}
bool BlurAndPaletteManager::setUnk(const mVec3_c *pos, f32 radius) {
bool dLightEnv_c::setUnk(const mVec3_c *pos, f32 radius) {
bool ret = false;
if (field_0x38B0 == false) {
field_0x38B0 = true;
@@ -357,7 +357,7 @@ bool BlurAndPaletteManager::setUnk(const mVec3_c *pos, f32 radius) {
return ret;
}
void BlurAndPaletteManager::setBPM9(const mVec3_c *pos, f32 radius) {
void dLightEnv_c::setBPM9(const mVec3_c *pos, f32 radius) {
for (int i = 0; i < 20; ++i) {
if (field_0x371C[i].field_0x00 == false) {
field_0x371C[i].field_0x00 = true;
@@ -368,7 +368,7 @@ void BlurAndPaletteManager::setBPM9(const mVec3_c *pos, f32 radius) {
}
}
bool BlurAndPaletteManager::check_BPM9(const mVec3_c *pos) {
bool dLightEnv_c::check_BPM9(const mVec3_c *pos) {
bool ret = false;
for (int i = 0; i < 20; ++i) {
if (field_0x371C[i].field_0x00) {
@@ -381,7 +381,7 @@ bool BlurAndPaletteManager::check_BPM9(const mVec3_c *pos) {
return ret;
}
s32 BlurAndPaletteManager::checkBPM9_Entity(mVec3_c *pos) {
s32 dLightEnv_c::checkBPM9_Entity(mVec3_c *pos) {
s32 value = field_0x38C4;
if (value != 0 && pos != nullptr) {
*pos = field_0x38C8;
@@ -389,15 +389,15 @@ s32 BlurAndPaletteManager::checkBPM9_Entity(mVec3_c *pos) {
return value;
}
void BlurAndPaletteManager::setAlterateRoomId(s32 roomId) {
void dLightEnv_c::setAlterateRoomId(s32 roomId) {
mAlternateRoomId = roomId;
}
s32 BlurAndPaletteManager::getAlterateRoomId() {
s32 dLightEnv_c::getAlterateRoomId() {
return mAlternateRoomId;
}
mColor BlurAndPaletteManager::color_ratio_set(const mColor &start, const mColor &end, f32 ratio) {
mColor dLightEnv_c::color_ratio_set(const mColor &start, const mColor &end, f32 ratio) {
mColor result;
result.Set(0xff, 0xff, 0xff, 0xff);
result.r = (start.r + ratio * ((f32)end.r - (f32)start.r));
@@ -407,7 +407,7 @@ mColor BlurAndPaletteManager::color_ratio_set(const mColor &start, const mColor
return result;
}
mVec3_c BlurAndPaletteManager::vec_ratio_set(const mVec3_c &start, const mVec3_c &end, f32 ratio) {
mVec3_c dLightEnv_c::vec_ratio_set(const mVec3_c &start, const mVec3_c &end, f32 ratio) {
mVec3_c result;
result.x = start.x + ratio * (end.x - start.x);
result.y = start.y + ratio * (end.y - start.y);
@@ -415,19 +415,19 @@ mVec3_c BlurAndPaletteManager::vec_ratio_set(const mVec3_c &start, const mVec3_c
return result;
}
f32 BlurAndPaletteManager::f32_ratio_set(const f32 start, const f32 end, f32 ratio) {
f32 dLightEnv_c::f32_ratio_set(const f32 start, const f32 end, f32 ratio) {
return start + ratio * (end - start);
}
u16 BlurAndPaletteManager::u16_ratio_set(const u16 start, const u16 end, f32 ratio) {
u16 dLightEnv_c::u16_ratio_set(const u16 start, const u16 end, f32 ratio) {
return (f32)start + ratio * ((f32)end - (f32)start);
}
u8 BlurAndPaletteManager::u8_ratio_set(const u8 start, const u8 end, f32 ratio) {
u8 dLightEnv_c::u8_ratio_set(const u8 start, const u8 end, f32 ratio) {
return static_cast<u8>((f32)start + ratio * (f32)(end - (f32)start)) & 0xFF;
}
void BlurAndPaletteManager::spf_ratio_set(Spf &out, const Spf &start, const Spf &end, f32 ratio) {
void dLightEnv_c::spf_ratio_set(Spf &out, const Spf &start, const Spf &end, f32 ratio) {
mColor black0;
mColor black1;
out.mActorPalette.mAmbientClr =
@@ -597,7 +597,7 @@ void __Spf_ct_dt_genertation() {
Spf s;
}
void BlurAndPaletteManager::set_palette_transition(s16 before, s16 after, s32 numFrames) {
void dLightEnv_c::set_palette_transition(s16 before, s16 after, s32 numFrames) {
mTransitionSpfSetting.mIdxBefore = before;
mTransitionSpfSetting.mIdxAfter = after;
mTransitionSpfSetting.mNumFrames = numFrames;
@@ -627,13 +627,13 @@ void BlurAndPaletteManager::set_palette_transition(s16 before, s16 after, s32 nu
}
}
void BlurAndPaletteManager::set_override_spf(s16 start, s16 end, f32 ratio) {
void dLightEnv_c::set_override_spf(s16 start, s16 end, f32 ratio) {
mOverrideSpfSetting.mIdxStart = start;
mOverrideSpfSetting.mIdxEnd = end;
mOverrideSpfSetting.mRatio = ratio;
}
void BlurAndPaletteManager::setMist(u8 mode, u8 decay, u8 alpha, f32 dir, f32 speed) {
void dLightEnv_c::setMist(u8 mode, u8 decay, u8 alpha, f32 dir, f32 speed) {
mMistInfo.mMode = mode;
mMistInfo.mDecay = decay;
mMistInfo.mDirection = dir;
@@ -641,7 +641,7 @@ void BlurAndPaletteManager::setMist(u8 mode, u8 decay, u8 alpha, f32 dir, f32 sp
mMistInfo.mAlpha = alpha;
}
void BlurAndPaletteManager::setMistMode3(const mVec3_c &pos, f32 value) {
void dLightEnv_c::setMistMode3(const mVec3_c &pos, f32 value) {
mMistInfo.mMode = 3;
mMistInfo.mDecay = value * 128.f;
mMistPos = pos;
@@ -649,16 +649,16 @@ void BlurAndPaletteManager::setMistMode3(const mVec3_c &pos, f32 value) {
mMistInfo.mAlpha = 0;
}
void BlurAndPaletteManager::setDOF(f32 dof) {
void dLightEnv_c::setDOF(f32 dof) {
mDofEnabled = true;
mDof = dof;
}
void BlurAndPaletteManager::disableDOF() {
void dLightEnv_c::disableDOF() {
mDofEnabled = false;
}
void BlurAndPaletteManager::light_influence_ratio_set(
void dLightEnv_c::light_influence_ratio_set(
LIGHT_INFLUENCE &out, const LIGHT_INFLUENCE &start, const LIGHT_INFLUENCE &end, f32 ratio
) {
mColor black(0, 0, 0, 0);
@@ -679,7 +679,7 @@ void BlurAndPaletteManager::light_influence_ratio_set(
}
}
void BlurAndPaletteManager::sff_ratio_set(Sff &out, const Sff &start, const Sff &end, f32 ratio) {
void dLightEnv_c::sff_ratio_set(Sff &out, const Sff &start, const Sff &end, f32 ratio) {
for (int i = 0; i < 3; ++i) {
out.field_0x00[i].field_0x00 =
color_ratio_set(start.field_0x00[i].field_0x00, end.field_0x00[i].field_0x00, ratio);
@@ -694,21 +694,21 @@ void __Sff_ct_dt_genertation() {
Sff s;
}
void BlurAndPaletteManager::fn_80024740(u8 idx, u8 value) {
void dLightEnv_c::fn_80024740(u8 idx, u8 value) {
if (idx != 0) {
field_0x5D59[idx - 1].mEnabled = true;
field_0x5D59[idx - 1].mValue = value;
}
}
bool BlurAndPaletteManager::fn_80024770(u8 idx) {
bool dLightEnv_c::fn_80024770(u8 idx) {
bool ret = false;
if (idx != 0) {
ret = field_0x5D59[idx - 1].mEnabled;
}
return ret;
}
bool BlurAndPaletteManager::fn_800247A0(u8 idx) {
bool dLightEnv_c::fn_800247A0(u8 idx) {
bool ret = false;
if (idx != 0) {
if (field_0x5D59[idx - 1].mValue != 0) {
@@ -718,12 +718,12 @@ bool BlurAndPaletteManager::fn_800247A0(u8 idx) {
return ret;
}
void BlurAndPaletteManager::setWind(mVec3_c mPos, f32 f) {
void dLightEnv_c::setWind(mVec3_c mPos, f32 f) {
mWind.mVel = mPos;
mWind.field_0x0C = f;
}
BlurAndPaletteManager::BlurAndPaletteManager() {
dLightEnv_c::dLightEnv_c() {
mColor grey_aaaaaa = mColor(0xaa, 0xaa, 0xaa, 0xff);
mColor white_ffffff = mColor(0xff, 0xff, 0xff, 0xff);
mColor cream_ffffc0 = mColor(0xff, 0xff, 0xc0, 0xff);
@@ -897,7 +897,7 @@ BlurAndPaletteManager::BlurAndPaletteManager() {
field_0x5D04.field_0x20 = field_0x5CE4;
}
BlurAndPaletteManager::~BlurAndPaletteManager() {
dLightEnv_c::~dLightEnv_c() {
sPInstance = nullptr;
}
src/d/d_message.cpp
+4 -3
View File
@@ -6,6 +6,7 @@
#include "d/a/d_a_itembase.h"
#include "d/a/d_a_player.h"
#include "d/d_base.h"
#include "d/d_light_env.h"
#include "d/d_player.h"
#include "d/d_pouch.h"
#include "d/d_sc_game.h"
@@ -31,7 +32,6 @@
#include "libms/msgfile.h"
#include "sized_string.h"
#include "toBeSorted/arc_managers/oarc_manager.h"
#include "toBeSorted/blur_and_palette_manager.h"
#include "toBeSorted/dowsing_target.h"
#include "toBeSorted/event_manager.h"
#include "toBeSorted/fi_context.h"
@@ -46,6 +46,7 @@
#include <cstring>
#include <stdio.h>
s32 dFlow_c::sExitId = -1;
dFlow_c::dFlow_c() {
@@ -495,8 +496,8 @@ bool dFlow_c::handleEventInternal(const MsbFlowInfo *element) {
case EVENT_PALETTE: {
s16 p1 = (params1n2 >> 16) & 0xFFFF;
s16 p2 = params1n2 & 0xFFFF;
if (&BlurAndPaletteManager::GetInstance() != nullptr) {
BlurAndPaletteManager::GetInstance().set_palette_transition(-1, p1, p2);
if (&dLightEnv_c::GetInstance() != nullptr) {
dLightEnv_c::GetInstance().set_palette_transition(-1, p1, p2);
}
break;
}
src/toBeSorted/d_d3d.cpp
+4 -3
View File
@@ -2,6 +2,7 @@
#include "common.h"
#include "d/a/obj/d_a_obj_base.h"
#include "d/d_light_env.h"
#include "d/d_sc_game.h"
#include "d/t/d_t_siren.h"
#include "egg/gfx/eggCpuTexture.h"
@@ -20,7 +21,7 @@
#include "rvl/GX/GXTypes.h"
#include "rvl/VI/vi.h"
#include "sized_string.h"
#include "toBeSorted/blur_and_palette_manager.h"
namespace d3d {
@@ -233,7 +234,7 @@ void clearList() {
// More screen / list stuff...
void unk2(nw4r::g3d::ResMat &mat, nw4r::g3d::ResMatTevColor &clr, ActorLighting *info) {
BlurAndPaletteManager &pllt = BlurAndPaletteManager::GetInstance();
dLightEnv_c &pllt = dLightEnv_c::GetInstance();
const char *name = mat.GetName();
if (name != nullptr && name[0] == 'M' && name[1] == 'A' && name[2] == '0') {
char idx = name[3];
@@ -285,7 +286,7 @@ void unk2(nw4r::g3d::ResMat &mat, nw4r::g3d::ResMatTevColor &clr, ActorLighting
}
void setRoomTevColors(nw4r::g3d::ResMdl mdl, int b1, bool bUnk) {
BlurAndPaletteManager &pllt = BlurAndPaletteManager::GetInstance();
dLightEnv_c &pllt = dLightEnv_c::GetInstance();
SpawnInfo &spawn = dScGame_c::currentSpawnInfo;
for (u32 i = 0; i < mdl.GetResMatNumEntries(); i++) {
src/toBeSorted/d_emitter.cpp
+3 -2
View File
@@ -16,6 +16,7 @@
#include "d/a/obj/d_a_obj_base.h"
#include "d/d_base.h"
#include "d/d_heap.h"
#include "d/d_light_env.h"
#include "d/d_stage.h"
#include "d/d_stage_mgr.h"
#include "egg/core/eggHeap.h"
@@ -36,7 +37,6 @@
#include "nw4r/math/math_arithmetic.h"
#include "sized_string.h"
#include "toBeSorted/arc_managers/oarc_manager.h"
#include "toBeSorted/blur_and_palette_manager.h"
#include "toBeSorted/d_d3d.h"
#include "toBeSorted/d_particle.h"
#include "toBeSorted/event_manager.h"
@@ -45,6 +45,7 @@
#include "rvl/GX.h"
#include "rvl/MTX.h"
void float_ordering_1(s32 a) {
(f32) a;
}
@@ -1029,7 +1030,7 @@ bool dJEffManager_c::createMassObjEffect(
void dEmitterBase_c::loadColors(
JPABaseEmitter *emitter, const GXColor *color1, const GXColor *color2, s32 plltIdx1, s32 plltIdx2
) {
BlurAndPaletteManager &mgr = BlurAndPaletteManager::GetInstance();
dLightEnv_c &mgr = dLightEnv_c::GetInstance();
u8 r1 = 0xFF;
u8 g1 = 0xFF;
u8 b1 = 0xFF;
src/toBeSorted/d_scn_callback.cpp
+2 -1
View File
@@ -1,6 +1,7 @@
#include "common.h"
#include "d/a/obj/d_a_obj_base.h"
#include "d/d_bzs_types.h"
#include "d/d_light_env.h"
#include "m/m3d/m3d.h"
#include "nw4r/g3d/g3d_camera.h"
#include "nw4r/g3d/g3d_scnmdl.h"
@@ -11,10 +12,10 @@
#include "nw4r/g3d/res/g3d_respltt.h"
#include "rvl/GX/GXTypes.h"
#include "sized_string.h"
#include "toBeSorted/blur_and_palette_manager.h"
#include "toBeSorted/d_d3d.h"
#include "toBeSorted/stage_render_stuff.h"
void dScnCallback_c::ExecCallback_CALC_MAT(nw4r::g3d::ScnObj::Timing, nw4r::g3d::ScnObj *obj, u32 param, void *pObj) {
const ActorLighting &info = mpActor->mLightingInfo;
mColor tev0 = info.mTev0Color;
src/toBeSorted/d_unk_mdl_stuff_2.cpp
+3 -2
View File
@@ -3,6 +3,7 @@
#include "common.h"
#include "d/col/bg/d_bg_s.h"
#include "d/d_light_env.h"
#include "egg/gfx/eggLightManager.h"
#include "m/m3d/m3d.h"
#include "m/m3d/m_proc.h"
@@ -17,7 +18,7 @@
#include "rvl/GX/GXTev.h"
#include "rvl/GX/GXTypes.h"
#include "rvl/MTX/mtx.h"
#include "toBeSorted/blur_and_palette_manager.h"
bool dShpProcBase_c::init(nw4r::g3d::ResMat mat, nw4r::g3d::ResShp shp, s32 count, bool xlu, u32 *pSize) {
mCount = count;
@@ -62,7 +63,7 @@ void dShpProcBase_c::draw(mVec3_c *pos) {
);
setupLight();
if (!field_0x2C) {
BlurAndPaletteManager &mgr = BlurAndPaletteManager::GetInstance();
dLightEnv_c &mgr = dLightEnv_c::GetInstance();
u32 code = 0xFF;
if (pos != nullptr) {
pos->y += 100.0f;