update rumble on vi thread

This commit is contained in:
thecozies 2024-04-16 09:10:38 -05:00 committed by Mr-Wiseguy
parent 51759611e1
commit af3c4f4df7
4 changed files with 4 additions and 9 deletions

View File

@ -33,8 +33,6 @@ typedef enum {
/* 2 */ VOICE_INIT_SUCCESS // voice initialized /* 2 */ VOICE_INIT_SUCCESS // voice initialized
} VoiceInitStatus; } VoiceInitStatus;
void recomp_update_rumble();
void PadMgr_HandleRetrace(void) { void PadMgr_HandleRetrace(void) {
// Execute rumble callback // Execute rumble callback
if (sPadMgrInstance->rumbleRetraceCallback != NULL) { if (sPadMgrInstance->rumbleRetraceCallback != NULL) {
@ -62,8 +60,6 @@ void PadMgr_HandleRetrace(void) {
PadMgr_UpdateRumble(); PadMgr_UpdateRumble();
--sPadMgrInstance->rumbleOnTimer; --sPadMgrInstance->rumbleOnTimer;
} }
recomp_update_rumble();
} }
void poll_inputs(void) { void poll_inputs(void) {

View File

@ -46,4 +46,3 @@ osContStartReadData_recomp = 0x8F000070;
osContGetReadData_recomp = 0x8F000074; osContGetReadData_recomp = 0x8F000074;
osContStartQuery_recomp = 0x8F000078; osContStartQuery_recomp = 0x8F000078;
osContGetQuery_recomp = 0x8F00007C; osContGetQuery_recomp = 0x8F00007C;
recomp_update_rumble = 0x8F000080;

View File

@ -81,7 +81,3 @@ extern "C" void recomp_get_low_health_beeps_enabled(uint8_t* rdram, recomp_conte
extern "C" void recomp_time_us(uint8_t* rdram, recomp_context* ctx) { extern "C" void recomp_time_us(uint8_t* rdram, recomp_context* ctx) {
_return(ctx, static_cast<u32>(std::chrono::duration_cast<std::chrono::microseconds>(ultramodern::time_since_start()).count())); _return(ctx, static_cast<u32>(std::chrono::duration_cast<std::chrono::microseconds>(ultramodern::time_since_start()).count()));
} }
extern "C" void recomp_update_rumble(uint8_t* rdram, recomp_context* ctx) {
recomp::update_rumble();
}

View File

@ -17,6 +17,7 @@
#include "rt64_layer.h" #include "rt64_layer.h"
#include "recomp.h" #include "recomp.h"
#include "recomp_ui.h" #include "recomp_ui.h"
#include "recomp_input.h"
#include "rsp.h" #include "rsp.h"
struct SpTaskAction { struct SpTaskAction {
@ -169,6 +170,9 @@ void vi_thread_func() {
} }
} }
} }
// TODO move recomp code out of ultramodern.
recomp::update_rumble();
} }
} }