Skip to content

RPGrpModel/G3D, RPGrpModelResManager work #114

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
kiwi515 merged 4 commits into from
Dec 5, 2025
Merged

RPGrpModel/G3D, RPGrpModelResManager work #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ed139a
Split RPUtlDohMath and RPUtility as a block
kiwi515 Dec 1, 2025
a60c86c
Model + ModelResManager work
kiwi515 Dec 5, 2025
d519008
RPGrpModelG3D work
kiwi515 Dec 5, 2025
905303a
Update IRPGrpModelCallback.h
kiwi515 Dec 5, 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
77 changes: 77 additions & 0 deletions config/RSPE01_01/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3254,3 +3254,80 @@ Pack/RPAudio/RPSndStaticMgr.cpp:
.text start:0x801B9548 end:0x801B9910
.data start:0x803BAB20 end:0x803C1720
.sdata2 start:0x804C1990 end:0x804C19A0

Pack/RPUtility/RPUtlDohMath.cpp:
.text start:0x801B9910 end:0x801B9EC0
.ctors start:0x8035513C end:0x80355140
.bss start:0x804A4690 end:0x804A4750
.sbss start:0x804BF660 end:0x804BF668
.sdata2 start:0x804C19A0 end:0x804C19B0

Pack/RPUtility_unsplit.o:
.text start:0x801B9EC0 end:0x801CCB70
.ctors start:0x80355140 end:0x80355160
.rodata start:0x803837E8 end:0x80383990
.data start:0x803C1720 end:0x803C1BF0
.bss start:0x804A4750 end:0x804A48A0
.sdata start:0x804BDC18 end:0x804BDC38
.sbss start:0x804BF668 end:0x804BF6F0
.sdata2 start:0x804C19B0 end:0x804C1A20

Pack/RPSports/RPSportsCommon/RPSportsCommon_unsplit.o:
.text start:0x801CCB70 end:0x80214480
.ctors start:0x80355160 end:0x8035516C
.rodata start:0x80383990 end:0x8038B1A8
.data start:0x803C1BF0 end:0x803C3730
.bss start:0x804A48A0 end:0x804A6000
.sdata start:0x804BDC38 end:0x804BDDD0
.sbss start:0x804BF6F0 end:0x804BF768
.sdata2 start:0x804C1A20 end:0x804C2338

Pack/RPSports/RPTnsScene/RPTnsScene_unsplit.o:
.text start:0x80214480 end:0x8024E334
.ctors start:0x8035516C end:0x803551A8
.rodata start:0x8038B1A8 end:0x8038C8A0
.data start:0x803C3730 end:0x803C4FC8
.bss start:0x804A6000 end:0x804A6448
.sdata start:0x804BDDD0 end:0x804BDE10
.sbss start:0x804BF768 end:0x804BF778
.sdata2 start:0x804C2338 end:0x804C32A8

Pack/RPSports/RPBsbScene/RPBsbScene_unsplit.o:
.text start:0x8024E334 end:0x8028DF74
.ctors start:0x803551A8 end:0x803551F4
.rodata start:0x8038C8A0 end:0x8038E250
.data start:0x803C4FC8 end:0x803C7718
.bss start:0x804A6448 end:0x804A8900
.sdata start:0x804BDE10 end:0x804BE818
.sbss start:0x804BF778 end:0x804BF850
.sdata2 start:0x804C32A8 end:0x804C3E80

Pack/RPSports/RPGolScene/RPGolScene_unsplit.o:
.text start:0x8028DF74 end:0x802C7924
.ctors start:0x803551F4 end:0x8035522C
.rodata start:0x8038E250 end:0x8038FB10
.data start:0x803C7718 end:0x803C8958
.bss start:0x804A8900 end:0x804A92D0
.sdata start:0x804BE818 end:0x804BE8D0
.sbss start:0x804BF850 end:0x804BF958
.sdata2 start:0x804C3E80 end:0x804C4CB8

Pack/RPSports/RPBoxScene/RPBoxScene_unsplit.o:
.text start:0x802C7924 end:0x80313028
.ctors start:0x8035522C end:0x8035524C
.rodata start:0x8038FB10 end:0x80392190
.data start:0x803C8958 end:0x803CA1B8
.bss start:0x804A92D0 end:0x804A9DE8
.sdata start:0x804BE8D0 end:0x804BE968
.sbss start:0x804BF958 end:0x804BF998
.sdata2 start:0x804C4CB8 end:0x804C5AC0

Pack/RPSports/RPBowScene/RPBowScene_unsplit.o:
.text start:0x80313028 end:0x8035507C
.ctors start:0x8035524C end:0x8035525C
.rodata start:0x80392190 end:0x80393A70
.data start:0x803CA1B8 end:0x803CAF00
.bss start:0x804A9DE8 end:0x804BD36C
.sdata start:0x804BE968 end:0x804BE9D0
.sbss start:0x804BF998 end:0x804BFA10
.sdata2 start:0x804C5AC0 end:0x804C69D0
198 changes: 99 additions & 99 deletions config/RSPE01_01/symbols.txt
View file
Open in desktop

Large diffs are not rendered by default.

73 changes: 71 additions & 2 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,6 +1224,70 @@ def MatchingFor(*versions):
Object(NonMatching, "Pack/RPAudio/RPSndStaticMgr.cpp"),
],
},
{
"lib": "RP",
"mw_version": config.linker_version,
"cflags": cflags_rp,
"progress_category": "utility", # str | List[str]
"objects": [
Object(NonMatching, "Pack/RPUtility/RPUtlDohMath.cpp"),
Object(NonMatching, "Pack/RPUtility_unsplit.o"),
],
},
{
"lib": "RP",
"mw_version": config.linker_version,
"cflags": cflags_rp,
"progress_category": "sports", # str | List[str]
"objects": [
Object(NonMatching, "Pack/RPSports/RPSportsCommon/RPSportsCommon_unsplit.o"),
],
},
{
"lib": "RP",
"mw_version": config.linker_version,
"cflags": cflags_rp,
"progress_category": "tennis", # str | List[str]
"objects": [
Object(NonMatching, "Pack/RPSports/RPTnsScene/RPTnsScene_unsplit.o"),
],
},
{
"lib": "RP",
"mw_version": config.linker_version,
"cflags": cflags_rp,
"progress_category": "baseball", # str | List[str]
"objects": [
Object(NonMatching, "Pack/RPSports/RPBsbScene/RPBsbScene_unsplit.o"),
],
},
{
"lib": "RP",
"mw_version": config.linker_version,
"cflags": cflags_rp,
"progress_category": "golf", # str | List[str]
"objects": [
Object(NonMatching, "Pack/RPSports/RPGolScene/RPGolScene_unsplit.o"),
],
},
{
"lib": "RP",
"mw_version": config.linker_version,
"cflags": cflags_rp,
"progress_category": "boxing", # str | List[str]
"objects": [
Object(NonMatching, "Pack/RPSports/RPBoxScene/RPBoxScene_unsplit.o"),
],
},
{
"lib": "RP",
"mw_version": config.linker_version,
"cflags": cflags_rp,
"progress_category": "bowling", # str | List[str]
"objects": [
Object(NonMatching, "Pack/RPSports/RPBowScene/RPBowScene_unsplit.o"),
],
},
]


Expand Down Expand Up @@ -1257,9 +1321,14 @@ def link_order_callback(module_id: int, objects: List[str]) -> List[str]:
ProgressCategory("system", "RPSystem"),
ProgressCategory("graphics", "RPGraphics"),
ProgressCategory("audio", "RPAudio"),
# ProgressCategory("utility", "RPUtility"),
ProgressCategory("utility", "RPUtility"),

# ProgressCategory("sports", "RPSports"),
ProgressCategory("sports", "RPSportsCommon"),
ProgressCategory("tennis", "RPTnsScene"),
ProgressCategory("baseball", "RPBsbScene"),
ProgressCategory("golf", "RPGolScene"),
ProgressCategory("boxing", "RPBoxScene"),
ProgressCategory("bowling", "RPBowScene"),
]
config.progress_all = False
config.progress_each_module = args.verbose
Expand Down
9 changes: 9 additions & 0 deletions include/Pack/RPGraphics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
#ifndef RP_PUBLIC_GRAPHICS_H
#define RP_PUBLIC_GRAPHICS_H

#include <Pack/RPGraphics/IRPGrpModelCallback.h>
#include <Pack/RPGraphics/RPGrpModel.h>
#include <Pack/RPGraphics/RPGrpModelAnm.h>
#include <Pack/RPGraphics/RPGrpModelAnmImplement.h>
#include <Pack/RPGraphics/RPGrpModelBoundingInfo.h>
#include <Pack/RPGraphics/RPGrpModelG3D.h>
#include <Pack/RPGraphics/RPGrpModelMaterial.h>
#include <Pack/RPGraphics/RPGrpModelRecord.h>
#include <Pack/RPGraphics/RPGrpModelResManager.h>
#include <Pack/RPGraphics/RPGrpModelRfl.h>
#include <Pack/RPGraphics/RPGrpRenderer.h>
#include <Pack/RPGraphics/RPGrpScreen.h>
#include <Pack/RPGraphics/RPGrpTexture.h>

#endif
32 changes: 32 additions & 0 deletions include/Pack/RPGraphics/IRPGrpModelCallback.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#ifndef RP_GRAPHICS_I_MODEL_CALLBACK_H
#define RP_GRAPHICS_I_MODEL_CALLBACK_H
#include <Pack/types_pack.h>

#include <nw4r/math.h>

//! @addtogroup rp_graphics
//! @{

// Forward declarations
class RPGrpModel;

/**
* @brief Model callback interface
*/
class IRPGrpModelCallback {
public:
virtual ~IRPGrpModelCallback() = 0; // at 0x8

virtual void EditJointLocalMtx(RPGrpModel*, u16, nw4r::math::MTX34*,
nw4r::math::VEC3*) {} // at 0xC

virtual void EditJointWorldMtx(RPGrpModel*, u16, nw4r::math::MTX34*) //
{} // at 0x10

virtual void EditWorldMtx(RPGrpModel*) {} // at 0x14
virtual void ReferViewMtx(RPGrpModel*) {} // at 0x18
};

//! @}

#endif
Loading
Loading