thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-04-04 17:28:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

more accurate types for these iterators

Browse source
This commit is contained in:
Isaac0-dev 2026-03-19 20:45:55 +10:00
parent e645aa7cef
commit efe794d1d8
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/game/behaviors/texscroll.inc.c
View file

@ -137,7 +137,7 @@ void uv_update_scroll(void) {
scroll->prevF32 = calloc(scroll->size, sizeof(f32));
u8 bhvIndex = MIN(bhv, 2);
for (u16 k = 0; k < scroll->size; k++) {
for (u32 k = 0; k < scroll->size; k++) {
scroll->interpF32[k] = verts[k]->n.ob[bhvIndex];
}
} else {
@ -145,7 +145,7 @@ void uv_update_scroll(void) {
scroll->prevS16 = calloc(scroll->size, sizeof(s16));
u8 bhvIndex = MIN(bhv-SCROLL_UV_X, 1);
for (u16 k = 0; k < scroll->size; k++) {
for (u32 k = 0; k < scroll->size; k++) {
scroll->interpS16[k] = verts[k]->n.tc[bhvIndex];
}
}
@ -154,12 +154,12 @@ void uv_update_scroll(void) {
// Prepare for interpolation
if (bhv < SCROLL_UV_X) {
u8 bhvIndex = MIN(bhv, 2);
for (u16 i = 0; i < scroll->size; i++) {
for (u32 i = 0; i < scroll->size; i++) {
scroll->prevF32[i] = verts[i]->n.ob[bhvIndex];
}
} else {
u8 bhvIndex = MIN(bhv-SCROLL_UV_X, 1);
for (u16 i = 0; i < scroll->size; i++) {
for (u32 i = 0; i < scroll->size; i++) {
scroll->prevS16[i] = verts[i]->n.tc[bhvIndex];
}
}

4
src/game/scroll_targets.c
View file

@ -133,13 +133,13 @@ void patch_scroll_targets_interpolated(f32 delta) {
Vtx* *verts = scroll->vertices;
if (scroll->bhv < SCROLL_UV_X) {
u8 bhvIndex = MIN(scroll->bhv, 2);
for (u16 k = 0; k < scroll->size; k++) {
for (u32 k = 0; k < scroll->size; k++) {
f32 diff = wrap_f32(scroll->interpF32[k] - scroll->prevF32[k]);
verts[k]->n.ob[bhvIndex] = wrap_f32(scroll->prevF32[k] + diff * delta);
}
} else {
u8 bhvIndex = MIN(scroll->bhv-SCROLL_UV_X, 1);
for (u16 k = 0; k < scroll->size; k++) {
for (u32 k = 0; k < scroll->size; k++) {
s32 diff = wrap_s32(scroll->interpS16[k] - scroll->prevS16[k]);
verts[k]->n.tc[bhvIndex] = wrap_s32(scroll->prevS16[k] + diff * delta);
}