Skip to content

zCameraTweak: Progress#552

Merged
JoshSanch merged 4 commits intobfbbdecomp:mainfrom
0x5abe:zCameraTweak
May 18, 2025
Merged

zCameraTweak: Progress#552
JoshSanch merged 4 commits intobfbbdecomp:mainfrom
0x5abe:zCameraTweak

Conversation

@0x5abe
Copy link
Contributor

@0x5abe 0x5abe commented May 18, 2025

I don't really know if it's cause of float scheduling or if there are any mistakes in the implementations, but zCameraTweakGlobal_Add, zCameraTweakGlobal_Remove, zCameraTweakGlobal_Reset and zCameraTweakGlobal_Update are really messed up. Also some of the data in sdata2 isn't being generated. In any case, these 4 functions can be removed if the PR can only be merged with the stuff that is fully matching.

@github-actions
Copy link

⚠️ 🔥

+1398 bytes
🆗 Bot Rating: A fantastic contribution! ✨🎉

Regressions: 15

⚠️ main/SB/Game/zEntPlayerBungeeState - .bss -1336 bytes -> 50.00%
⚠️ main/SB/Game/zEntPlayerBungeeState - .data -32 bytes -> 67.09%
⚠️ main/SB/Game/zEntPlayerBungeeState - .rodata -1548 bytes -> 13.89%
⚠️ main/SB/Game/zEntPlayerBungeeState - .sbss -5 bytes -> 50.00%
⚠️ main/SB/Game/zEntPlayerBungeeState - .sdata2 -90 bytes -> 46.36%
⚠️ main/SB/Game/zEntPlayerBungeeState - .text -2808 bytes -> 21.28%
⚠️ main/SB/Game/zEntPlayerBungeeState - bungee_state::load_settings(xIniFile&) -2072 bytes -> 0.00%
⚠️ main/SB/Game/zEntPlayerBungeeState - bungee_state::init() -108 bytes -> 0.00%
⚠️ main/SB/Game/zEntPlayerBungeeState - bungee_state::@unnamed@zEntPlayerBungeeState_cpp@::hanging_state_type::hanging_state_type() -64 bytes -> 0.00%
⚠️ main/SB/Game/zEntPlayerBungeeState - bungee_state::@unnamed@zEntPlayerBungeeState_cpp@::state_type::state_type(bungee_state::@unnamed@zEntPlayerBungeeState_cpp@::state_enum) -20 bytes -> 0.00%
⚠️ main/SB/Game/zEntPlayerBungeeState - bungee_state::@unnamed@zEntPlayerBungeeState_cpp@::attaching_state_type::attaching_state_type() -64 bytes -> 0.00%
⚠️ main/SB/Game/zEntPlayerBungeeState - bungee_state::destroy() -72 bytes -> 0.00%
⚠️ main/SB/Game/zEntPlayerBungeeState - bungee_state::@unnamed@zEntPlayerBungeeState_cpp@::hanging_state_type::calc_drop_off_velocity(xVec3&, const xVec3&, const xVec3&, float, float) -144 bytes -> 0.00%
⚠️ main/SB/Game/zEntPlayerBungeeState - bungee_state::@unnamed@zEntPlayerBungeeState_cpp@::hanging_state_type::render() -36 bytes -> 0.00%
⚠️ main/SB/Game/zEntPlayerBungeeState - bungee_state::@unnamed@zEntPlayerBungeeState_cpp@::hanging_state_type::cb_cache_collisions::operator()(xEnt&, xGridBound&) -228 bytes -> 0.00%

Progress: 15

📈 main/SB/Game/zCameraTweak - .text +1165 bytes -> 64.24%
main/SB/Game/zCameraTweak - .bss +184 bytes -> 100.00%
main/SB/Game/zCameraTweak - .sbss +25 bytes -> 100.00%
📈 main/SB/Game/zCameraTweak - .sdata2 +24 bytes -> 75.00%
📈 main/SB/Game/zCameraTweak - zCameraTweakGlobal_Add(unsigned int, float, float, float, float) +260 bytes -> 52.42%
📈 main/SB/Game/zCameraTweak - zCameraTweakGlobal_Remove(unsigned int) +161 bytes -> 51.85%
📈 main/SB/Game/zCameraTweak - zCameraTweakGlobal_Update(float) +64 bytes -> 25.00%
main/SB/Game/zCameraTweak - zCameraTweak_EventCB(xBase*, xBase*, unsigned int, const float*, xBase*) +216 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCameraTweak_LookPreCalc(zCamTweakLook*, float, float, float) +140 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCameraTweak_Init(zCameraTweak*, CameraTweak_asset*) +104 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCameraTweakGlobal_Init() +80 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCamTweak::operator=(const zCamTweak&) +44 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCameraTweak_Init(xBase&, xDynAsset&, unsigned long) +32 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCameraTweak_Save(zCameraTweak*, xSerial*) +32 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCameraTweak_Load(zCameraTweak*, xSerial*) +32 bytes -> 100.00%

@github-actions
Copy link

🆗 ✅

+1398 bytes
🆗 Bot Rating: A fantastic contribution! ✨🎉

No Regressions 🎉

Progress: 15

📈 main/SB/Game/zCameraTweak - .text +1165 bytes -> 64.24%
main/SB/Game/zCameraTweak - .bss +184 bytes -> 100.00%
main/SB/Game/zCameraTweak - .sbss +25 bytes -> 100.00%
📈 main/SB/Game/zCameraTweak - .sdata2 +24 bytes -> 75.00%
📈 main/SB/Game/zCameraTweak - zCameraTweakGlobal_Add(unsigned int, float, float, float, float) +260 bytes -> 52.42%
📈 main/SB/Game/zCameraTweak - zCameraTweakGlobal_Remove(unsigned int) +161 bytes -> 51.85%
📈 main/SB/Game/zCameraTweak - zCameraTweakGlobal_Update(float) +64 bytes -> 25.00%
main/SB/Game/zCameraTweak - zCameraTweak_EventCB(xBase*, xBase*, unsigned int, const float*, xBase*) +216 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCameraTweak_LookPreCalc(zCamTweakLook*, float, float, float) +140 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCameraTweak_Init(zCameraTweak*, CameraTweak_asset*) +104 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCameraTweakGlobal_Init() +80 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCamTweak::operator=(const zCamTweak&) +44 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCameraTweak_Init(xBase&, xDynAsset&, unsigned long) +32 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCameraTweak_Save(zCameraTweak*, xSerial*) +32 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCameraTweak_Load(zCameraTweak*, xSerial*) +32 bytes -> 100.00%

{
return sCamPitch;
F32 tan = itan(pitch);
F32 unk = d * tan;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This operation is a trig function meant to calculate a vertical offset given an angle and an adjacent side d, which we can presume to be distance based on the symbol name.

A better name for unk, therefore, would be deltaH, since the code seems to be modifying the original height by this incremental value.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just updated this! Thanks for the explanation

@github-actions
Copy link

🆗 ✅

+1398 bytes
🆗 Bot Rating: A fantastic contribution! ✨🎉

No Regressions 🎉

Progress: 15

📈 main/SB/Game/zCameraTweak - .text +1165 bytes -> 64.24%
main/SB/Game/zCameraTweak - .bss +184 bytes -> 100.00%
main/SB/Game/zCameraTweak - .sbss +25 bytes -> 100.00%
📈 main/SB/Game/zCameraTweak - .sdata2 +24 bytes -> 75.00%
📈 main/SB/Game/zCameraTweak - zCameraTweakGlobal_Add(unsigned int, float, float, float, float) +260 bytes -> 52.42%
📈 main/SB/Game/zCameraTweak - zCameraTweakGlobal_Remove(unsigned int) +161 bytes -> 51.85%
📈 main/SB/Game/zCameraTweak - zCameraTweakGlobal_Update(float) +64 bytes -> 25.00%
main/SB/Game/zCameraTweak - zCameraTweak_EventCB(xBase*, xBase*, unsigned int, const float*, xBase*) +216 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCameraTweak_LookPreCalc(zCamTweakLook*, float, float, float) +140 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCameraTweak_Init(zCameraTweak*, CameraTweak_asset*) +104 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCameraTweakGlobal_Init() +80 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCamTweak::operator=(const zCamTweak&) +44 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCameraTweak_Init(xBase&, xDynAsset&, unsigned long) +32 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCameraTweak_Save(zCameraTweak*, xSerial*) +32 bytes -> 100.00%
main/SB/Game/zCameraTweak - zCameraTweak_Load(zCameraTweak*, xSerial*) +32 bytes -> 100.00%

@JoshSanch JoshSanch merged commit fec8fbd into bfbbdecomp:main May 18, 2025
5 checks passed
JoshSanch pushed a commit that referenced this pull request May 19, 2025
* iTRC work + file cleanup

* removed most of CheckResetButton

* Big work to zMain

* Another big update to zMainParseIni

* Start zShrapnel (#553)

* zShrapnel work

* fix include

* zCameraTweak: Progress (#552)

* zCameraTweak: Progress for most functions

* zCameraTweak: Implement zCameraTweakGlobal_Update and clang-format

* zCameraTweak: Remove empty space and format

* zCameraTweak: Better name for local

* iTRC work + file cleanup

* removed most of CheckResetButton

* Big work to zMain

* Another big update to zMainParseIni

* MainParseINI update + cleanup

* Review Fixes

* Review Fixes 2

---------

Co-authored-by: energydrink02 <136357605+energydrink02@users.noreply.github.com>
Co-authored-by: Sebastián Meljem <95201472+0x5abe@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants