mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-25 22:07:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge decomp/main into dusk

Browse Source 
Merges 44 upstream commits from zeldaret/tp decomp/main.

Conflict resolutions:
- .github/workflows/build.yml: keep deleted (not needed for PC port)
- README.md: keep PC port README
- J3DAnimation.h: keep OFFSET_PTR macro + add upstream forward decl
- J3DModelLoader.h: keep BE(u32) mBlockNum + add field_0x1c
- d_com_inf_game.h: keep PC port inlines + add upstream declarations
- global.h: keep MULTI_CHAR macro + add FABSF macro
- JUTConsole.cpp: keep uintptr_t cast for 64-bit
- JUTDbPrint.cpp: keep PC enter_() helper + add cstring include
- JUTResFont.cpp: take upstream loop/struct improvements with BE types
- JUTCacheFont.cpp: take upstream decomp fix
- float.h: use upstream !PLATFORM_GCN guard
- d_a_npc_bouS/theB.cpp: keep MULTI_CHAR() for PC portability
- d_a_npc_henna.cpp: keep uintptr_t + use upstream var name
- d_demo.cpp: keep near_/far_ field renames for PC
- d_resorce.cpp: keep uintptr_t + fix var name to res
- d_s_room.cpp, m_Do_graphic.cpp: keep dusk includes + add cstring
- m_Do_main.cpp: keep JHIComPortManager + use JAS_GLOBAL_INSTANCE_INIT
- angle_utils.h: remove redundant types.h include
This commit is contained in:
Luke Street
2026-02-28 13:28:42 -07:00
parent f38dcf3aef a290c2d52c
commit 3b8300d0d2
3803 changed files with 240344 additions and 16831 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_kankyo.cpp
+8 -7
View File
@@ -25,6 +25,7 @@
#include "m_Do/m_Do_graphic.h"
#include "m_Do/m_Do_lib.h"
#include <cstdlib>
#include <cstring>
static void GxXFog_set();
@@ -540,7 +541,7 @@ void dKy_twi_wolflight_set(int light_id) {
}
#endif
angle_x += (s16)6000;
ANGLE_ADD(angle_x, 6000);
kankyo->field_0x0c18[light_id].mAngleX = cM_sht2d(-angle_x);
kankyo->field_0x0c18[light_id].mAngleY = cM_sht2d(-angle_y) + 90.0f;
}
@@ -9820,9 +9821,9 @@ void dKy_ParticleColor_get_base(cXyz* param_0, dKy_tevstr_c* param_1, GXColor* p
for (i = 1; i < 3; i++) {
if (sp58[i] < 100000000.0f) {
temp_f28 = parcent_tabel[spD][i];
sp48.r += (s16)(sp70[i].r * temp_f28);
sp48.g += (s16)(sp70[i].g * temp_f28);
sp48.b += (s16)(sp70[i].b * temp_f28);
S16_ADD(sp48.r, sp70[i].r * temp_f28);
S16_ADD(sp48.g, sp70[i].g * temp_f28);
S16_ADD(sp48.b, sp70[i].b * temp_f28);
}
}
@@ -11370,7 +11371,7 @@ void dKy_bg_MAxx_proc(void* bg_model_p) {
camera_p->aspect, 0.49f, -0.49f, 0.5f, 0.5f);
}
#if !PLATFORM_GCN
#if WIDESCREEN_SUPPORT
mDoGph_gInf_c::setWideZoomLightProjection(sp1D8);
#endif
tex_mtx_inf->setEffectMtx(sp1D8);
@@ -11493,7 +11494,7 @@ void dKy_bg_MAxx_proc(void* bg_model_p) {
Mtx sp178;
C_MTXLightPerspective(sp1A8, var_f28 * 2.8f, 1.0f, 0.5f, 0.5f,
0.0f, 0.0f);
#if !PLATFORM_GCN
#if WIDESCREEN_SUPPORT
mDoGph_gInf_c::setWideZoomLightProjection(sp1A8);
#endif
spFC.x = spF0.x;
@@ -11533,7 +11534,7 @@ void dKy_bg_MAxx_proc(void* bg_model_p) {
Mtx sp148;
Mtx sp118;
C_MTXLightPerspective(sp148, 170.0f, 1.0f, 1.5f, 1.5f, 0.0f, 0.0f);
#if !PLATFORM_GCN
#if WIDESCREEN_SUPPORT
mDoGph_gInf_c::setWideZoomLightProjection(sp148);
#endif
spD8.x = player_p->current.pos.x;