Skip to content
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.

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

A first pass over m3d #13

Merged
merged 35 commits into from
Sep 12, 2024
Merged
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
da31523
A first pass over m3d
robojumper Jun 20, 2024
aa372b1
d_a_obj_ring OK
robojumper Jun 20, 2024
f0e8914
m3d::calcRatio_c
robojumper Jun 20, 2024
c0b3821
m_mdl cleanup
robojumper Jun 20, 2024
669c428
m_anmtexsrt
robojumper Jun 21, 2024
fd4a600
d_a_obj_sun_light OK
robojumper Jun 21, 2024
5014135
m_anmChr OK
robojumper Jun 21, 2024
15a8177
m_anmChrBlend OK
robojumper Jun 21, 2024
a4d16c8
m_anmMatClr_c OK
robojumper Jun 21, 2024
144c874
anmTexPat_c OK
robojumper Jun 21, 2024
9b9d760
proc_c OK
robojumper Jun 21, 2024
0183069
anmMdl_c, anmShp_c OK
robojumper Jun 22, 2024
1a5dfa2
Cleanup and progress
robojumper Jun 22, 2024
1d9827c
m_mdl "OK"
robojumper Jun 23, 2024
4c6b151
cleanup
robojumper Jun 23, 2024
b43adc8
m_fanm OK
robojumper Jun 23, 2024
11eed4b
simpler fanm match (thank you LagoLunatic!)
robojumper Jun 23, 2024
4797d9e
m_scnmdl OK
robojumper Jun 23, 2024
5a5811a
dAcOmoleSoil_c OK
robojumper Jun 25, 2024
25cf783
d_a_obj_smoke
robojumper Jun 25, 2024
df9010f
dAcOlavaF200_c OK
robojumper Jun 25, 2024
2f32c5b
Fix create return values
robojumper Jun 26, 2024
3fd8ac3
d_a_e_hb_leaf OK
robojumper Jun 28, 2024
548da27
Cleanup
robojumper Jul 1, 2024
a3a8396
Rebase/warning fixes
robojumper Jul 1, 2024
66a7b0a
Don't reinvent SpawnStruct
robojumper Jul 5, 2024
5728051
Update m3d
elijah-thomas774 Sep 9, 2024
16bca79
Merge branch 'main' into m3d
elijah-thomas774 Sep 9, 2024
51fe00e
fix extern
elijah-thomas774 Sep 9, 2024
ed5fe5c
fix CopiedMatAccess size
elijah-thomas774 Sep 9, 2024
37da66e
Added m3d bline_c
elijah-thomas774 Sep 11, 2024
6fed118
m3d matching + some EGG declarations
elijah-thomas774 Sep 12, 2024
1085063
bline progress, stopping for now
elijah-thomas774 Sep 12, 2024
bd2a5f1
Merge branch 'main' into m3d
elijah-thomas774 Sep 12, 2024
48d627f
temp from a Dowsing PR merge
elijah-thomas774 Sep 12, 2024
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
Prev Previous commit
Next Next commit
Fix create return values
  • Loading branch information
robojumper committed Jul 1, 2024
commit 2f32c5b42bff02e47fddeab74a3a124f27c6cba3
2 changes: 1 addition & 1 deletion include/d/tg/d_tg.h
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ class dTg_c : public dAcBase_c {
return 1;
}
virtual int create() override {
return 1;
return SUCCEEDED;
}
};

4 changes: 2 additions & 2 deletions src/REL/d/a/obj/d_a_obj_lava_F200.cpp
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ bool dAcOlavaF200_c::createHeap() {

int dAcOlavaF200_c::create() {
if (!initAllocatorWork1Heap(-1, "dAcOlavaF200_c::m_allocator", 0x20)) {
return 2;
return FAILED;
}

mModels[0].setAnm(mTexAnms[0]);
@@ -43,7 +43,7 @@ int dAcOlavaF200_c::create() {
mModels[1].setPriorityDraw(0x22, 9);
setBoundingBox(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f));

return 1;
return SUCCEEDED;
}

int dAcOlavaF200_c::doDelete() {
4 changes: 2 additions & 2 deletions src/REL/d/a/obj/d_a_obj_mole_soil.cpp
Original file line number Diff line number Diff line change
@@ -27,15 +27,15 @@ bool intToBool(int a) {

int dAcOmoleSoil_c::create() {
if (!initAllocatorWork1Heap(-1, "dAcOmoleSoil_c::m_allocator", 0x20)) {
return 2;
return FAILED;
}

mScale = sHalfScale;
scale.set(sHalfScale, sHalfScale, sHalfScale);
mStateMgr.changeState(StateID_Wait);

setBoundingBox(mVec3_c(-100.0f, -0.0f, -100.0f), mVec3_c(100.0f, 100.0f, 100.0f));
return 1;
return SUCCEEDED;
}

int dAcOmoleSoil_c::doDelete() {
4 changes: 2 additions & 2 deletions src/REL/d/a/obj/d_a_obj_ring.cpp
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ bool dAcOring_c::createHeap() {

int dAcOring_c::create() {
if (!initAllocatorWork1Heap(-1, "dAcOring_c::m_allocator", 0x20)) {
return 2;
return FAILED;
}

field_0x388 = getArgFromParams();
@@ -28,7 +28,7 @@ int dAcOring_c::create() {
forwardMaxSpeed = -40.0f;
field_0x38C = dPlayer::LINK->position.y;
mStateMgr.changeState(StateID_Move);
return 1;
return SUCCEEDED;
}

int dAcOring_c::doDelete() {
4 changes: 2 additions & 2 deletions src/REL/d/a/obj/d_a_obj_smoke.cpp
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ bool dAcOsmoke_c::createHeap() {

int dAcOsmoke_c::create() {
if (!initAllocatorWork1Heap(-1, "dAcOsmoke_c::m_allocator", 0x20)) {
return 2;
return FAILED;
}

mModel.setAnm(mTexAnm);
@@ -35,7 +35,7 @@ int dAcOsmoke_c::create() {
mStateMgr.changeState(StateID_Wait);
mModel.setPriorityDraw(0x1C, 9);
setBoundingBox(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f));
return 1;
return SUCCEEDED;
}

int dAcOsmoke_c::doDelete() {
4 changes: 2 additions & 2 deletions src/REL/d/a/obj/d_a_obj_sun_light.cpp
Original file line number Diff line number Diff line change
@@ -20,14 +20,14 @@ bool dAcOsunLight_c::createHeap() {

int dAcOsunLight_c::create() {
if (!initAllocatorWork1Heap(-1, "dAcOsunLight_c::m_allocator", 0x20)) {
return 2;
return FAILED;
}

mModel.setAnm(mTexAnm);
mStateMgr.changeState(StateID_Wait);
mModel.setPriorityDraw(0x1C, 9);
setBoundingBox(mVec3_c(-200.0f, -100.0f, -200.0f), mVec3_c(200.0f, 600.0f, 500.0f));
return 1;
return SUCCEEDED;
}

int dAcOsunLight_c::doDelete() {
2 changes: 1 addition & 1 deletion src/REL/d/t/d_t_map_inst.cpp
Original file line number Diff line number Diff line change
@@ -4,5 +4,5 @@ SPECIAL_ACTOR_PROFILE(TAG_MAP_INST, dTgMapInst_c, fProfile::TAG_MAP_INST, 0x021d

int dTgMapInst_c::create() {
field_0xfc = params & 0xff;
return 1;
return SUCCEEDED;
}
2 changes: 1 addition & 1 deletion src/REL/d/t/d_t_rock_boat.cpp
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ STATE_DEFINE(dTgRockBoat_c, Wait);
int dTgRockBoat_c::create() {
mStateMgr.changeState(StateID_Wait);
cooldown = 1;
return 1;
return SUCCEEDED;
}

int dTgRockBoat_c::doDelete() {
2 changes: 1 addition & 1 deletion src/REL/d/t/d_t_sound_area.cpp
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ int dTgSndAr_c::create() {
ac->setBit_field_0xE8(params & 0xFF);
}
}
return 1;
return SUCCEEDED;
}

int dTgSndAr_c::doDelete() {
2 changes: 1 addition & 1 deletion src/REL/d/t/d_t_sound_area_mgr.cpp
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ int dTgSndMg_c::create() {
s8 tmpRoomId = roomid;
addActorToRoom(-1);
roomid = tmpRoomId;
return 1;
return SUCCEEDED;
}

int dTgSndMg_c::doDelete() {
2 changes: 1 addition & 1 deletion src/REL/d/t/d_t_timer.cpp
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ int dTgTimer_c::create() {
break;
}
resetTimer();
return 1;
return SUCCEEDED;
}

int dTgTimer_c::actorExecute() {
2 changes: 1 addition & 1 deletion src/REL/d/t/d_t_tumble_weed.cpp
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ int dTgTumbleWeed_c::create() {
tumbleweedTimer = 0;
windTimer = 0x96;
mStateMgr.changeState(StateID_AreaOut);
return 1;
return SUCCEEDED;
}

u16 decr(u16 *num);