thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-12-20 06:52:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

use a hmap for scroll targets

Browse source
This commit is contained in:
Isaac0-dev 2024-11-30 15:34:25 +10:00
parent c0691d4b3e
commit c65a67ccf1
4 changed files with 15 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/dynos_misc.cpp
View file

@ -124,7 +124,7 @@ void DynOS_Add_Scroll_Target(u32 index, const char* name, u32 offset, u32 size)
add_vtx_scroll_target(
index,
offset > 0 ? &node->mData[offset] : node->mData,
size > 0 ? size : node->mSize,
(size > 0 && size < node->mSize) ? size : node->mSize,
offset > 0
);
}

53
src/game/scroll_targets.c
View file

@ -1,7 +1,8 @@
#include "scroll_targets.h"
#include "pc/lua/utils/smlua_math_utils.h"
#include "data/dynos_cmap.cpp.h"
static struct ScrollTarget *sScrollTargets = NULL;
static void *sScrollTargets = NULL;
/*
* Gets the scroll targets identified by the given id
@ -9,15 +10,7 @@ static struct ScrollTarget *sScrollTargets = NULL;
* Returns NULL if not found.
*/
struct ScrollTarget *get_scroll_targets(u32 id, u16 size, u16 offset) {
struct ScrollTarget *scroll = sScrollTargets;
while (scroll) {
if (scroll->id == id) {
break;
}
scroll = scroll->next;
}
struct ScrollTarget *scroll = hmap_get(sScrollTargets, id);
if (scroll) {
// If we need to, realloc the block of vertices
@ -50,16 +43,12 @@ struct ScrollTarget *get_scroll_targets(u32 id, u16 size, u16 offset) {
* isn't any scroll targets.
*/
struct ScrollTarget* find_or_create_scroll_targets(u32 id, bool hasOffset) {
struct ScrollTarget *scroll = sScrollTargets;
struct ScrollTarget *lastScroll = NULL;
struct ScrollTarget *scroll = NULL;
while (scroll) {
if (scroll->id == id) {
break;
}
lastScroll = scroll;
scroll = scroll->next;
if (sScrollTargets == NULL) {
sScrollTargets = hmap_create(true);
} else {
scroll = hmap_get(sScrollTargets, id);
}
if (scroll == NULL) {
@ -67,13 +56,8 @@ struct ScrollTarget* find_or_create_scroll_targets(u32 id, bool hasOffset) {
scroll->id = id;
scroll->size = 0;
scroll->vertices = NULL;
scroll->next = NULL;
scroll->hasOffset = hasOffset;
if (lastScroll) {
lastScroll->next = scroll;
} else {
sScrollTargets = scroll;
}
hmap_put(sScrollTargets, id, scroll);
}
return scroll;
@ -114,29 +98,21 @@ void add_vtx_scroll_target(u32 id, Vtx *vtx, u32 size, bool hasOffset) {
* add_vtx_scroll_targets(id, vtx, size)
*/
void free_vtx_scroll_targets(void) {
struct ScrollTarget* scroll = sScrollTargets;
struct ScrollTarget* nextScroll;
while (scroll) {
nextScroll = scroll->next;
for (struct ScrollTarget* scroll = hmap_begin(sScrollTargets); scroll != NULL; scroll = hmap_next(sScrollTargets)) {
free(scroll->interpF32);
free(scroll->prevF32);
free(scroll->interpS16);
free(scroll->prevS16);
free(scroll->vertices);
free(scroll);
scroll = nextScroll;
}
hmap_destroy(sScrollTargets);
sScrollTargets = NULL;
}
void patch_scroll_targets_before(void) {
struct ScrollTarget *scroll = sScrollTargets;
while (scroll) {
for (struct ScrollTarget* scroll = hmap_begin(sScrollTargets); scroll != NULL; scroll = hmap_next(sScrollTargets)) {
scroll->needInterp = false;
scroll = scroll->next;
}
}
@ -144,9 +120,8 @@ void patch_scroll_targets_before(void) {
void patch_scroll_targets_interpolated(f32 delta) {
f32 antiDelta = 1.0f - delta;
struct ScrollTarget *scroll = sScrollTargets;
while (scroll) {
for (struct ScrollTarget* scroll = hmap_begin(sScrollTargets); scroll != NULL; scroll = hmap_next(sScrollTargets)) {
if (scroll->needInterp) {
Vtx* *verts = scroll->vertices;
if (scroll->bhv < SCROLL_UV_X) {
@ -161,7 +136,5 @@ void patch_scroll_targets_interpolated(f32 delta) {
}
}
}
scroll = scroll->next;
}
}

2
src/game/scroll_targets.h
View file

@ -40,8 +40,6 @@ struct ScrollTarget {
s16 *interpS16;
s16 *prevS16;
u16 bhv;
struct ScrollTarget *next;
};
struct ScrollTarget *get_scroll_targets(u32 id, u16 size, u16 offset);

2
src/pc/network/network.c
View file

@ -696,6 +696,7 @@ void network_shutdown(bool sendLeaving, bool exiting, bool popup, bool reconnect
gOverrideAllowToxicGasCamera = FALSE;
gRomhackCameraAllowDpad = FALSE;
camera_reset_overrides();
free_vtx_scroll_targets();
dynos_mod_shutdown();
mods_clear(&gActiveMods);
mods_clear(&gRemoteMods);
@ -704,7 +705,6 @@ void network_shutdown(bool sendLeaving, bool exiting, bool popup, bool reconnect
gChangeLevel = LEVEL_CASTLE_GROUNDS;
network_player_init();
camera_set_use_course_specific_settings(true);
free_vtx_scroll_targets();
gMarioStates[0].cap = 0;
gMarioStates[0].input = 0;
extern s16 gTTCSpeedSetting;