Skip to content

zEntSimpleObj - Most Functions to 100% Code Match #401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattbruv merged 7 commits into from
Feb 11, 2025
Merged

zEntSimpleObj - Most Functions to 100% Code Match #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9f0b252
Merge upstream/main into z_ent_simple_obj
JoshSanch Feb 3, 2025
e1a34b0
Run clang-format on zEntSimpleObj.cpp
JoshSanch Feb 3, 2025
81c5b37
zEntSimpleObj full match on most functions
JoshSanch Feb 10, 2025
c814433
zEntSimpleObj: Init 99% match
JoshSanch Feb 10, 2025
9c21f53
zEntSimpleObj clang-format pass two
JoshSanch Feb 10, 2025
d27cf38
Add frontier functions used in zEntSimpleObjEventCB method
JoshSanch Feb 10, 2025
042fb72
zEntSimpleObj: Init to 100% code match
JoshSanch Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/SB/Core/gc/iAnim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
extern U8* giAnimScratch;

void iAnimInit();
F32 iAnimDuration(void* RawData);
U32 iAnimBoneCount(void* RawData);
void iAnimBlend(F32 BlendFactor, F32 BlendRecip, U16* BlendTimeOffset, F32* BoneTable,
U32 BoneCount, xVec3* Tran1, xQuat* Quat1, xVec3* Tran2, xQuat* Quat2,
Expand Down
3 changes: 2 additions & 1 deletion src/SB/Core/x/xEnt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <rwcore.h>
#include <rpworld.h>
#include <string.h>

#include "xBase.h"
#include "xMath3.h"
Expand Down Expand Up @@ -40,7 +41,7 @@ struct xEntAsset : xBaseAsset
F32 greenMult;
F32 blueMult;
F32 seeThru;

// Offset: 0x48
F32 seeThruSpeed;
U32 modelInfoID;
Expand Down
2 changes: 1 addition & 1 deletion src/SB/Core/x/xShadow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,4 +269,4 @@ void xShadowManager_Remove(xEnt* ent)
a++;
}
}
}
}
Loading