paul
/
monocoque
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issues with simapi mapping correctly when using simd

This commit is contained in:
Paul Dino Jones 2024-11-22 16:21:08 -05:00
parent b8ac911d44
commit 7caca1d362
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/monocoque/gameloop/gameloop.c
View File

@ -252,7 +252,7 @@ void shmdatamapcallback(uv_timer_t* handle)
//appstate = 2; //appstate = 2;
if (appstate == 2) if (appstate == 2)
{ {
simdatamap(simdata, simmap, NULL, f->sim, false, NULL); simdatamap(simdata, simmap, NULL, f->map, false, NULL);
looprun(ms, f, simdata); looprun(ms, f, simdata);
} }
@ -285,7 +285,7 @@ void shmdatamapcallback(uv_timer_t* handle)
} }
} }
free(devices); free(devices);
int r = simfree(simdata, simmap, f->sim); int r = simfree(simdata, simmap, f->map);
slogd("simfree returned %i", r); slogd("simfree returned %i", r);
f->numdevices = 0; f->numdevices = 0;
slogi("stopped mapping data, press q again to quit"); slogi("stopped mapping data, press q again to quit");
@ -328,7 +328,7 @@ static void on_udp_recv(uv_udp_t* handle, ssize_t nread, const uv_buf_t* rcvbuf,
if (appstate == 2) if (appstate == 2)
{ {
simdatamap(simdata, simmap, NULL, f->sim, true, a); simdatamap(simdata, simmap, NULL, f->map, true, a);
looprun(ms, f, simdata); looprun(ms, f, simdata);
} }
@ -361,7 +361,7 @@ static void on_udp_recv(uv_udp_t* handle, ssize_t nread, const uv_buf_t* rcvbuf,
} }
} }
free(devices); free(devices);
int r = simfree(simdata, simmap, f->sim); int r = simfree(simdata, simmap, f->map);
slogd("simfree returned %i", r); slogd("simfree returned %i", r);
f->numdevices = 0; f->numdevices = 0;
slogi("stopped mapping data, press q again to quit"); slogi("stopped mapping data, press q again to quit");
@ -416,10 +416,11 @@ void datacheckcallback(uv_timer_t* handle)
if ( appstate == 1 ) if ( appstate == 1 )
{ {
SimInfo si = getSim(simdata, simmap, f->ms->force_udp_mode, startudp); SimInfo si = getSim(simdata, simmap, f->ms->force_udp_mode, startudp, false);
//TODO: move all this to a siminfo struct in loop_data //TODO: move all this to a siminfo struct in loop_data
f->simstate = si.isSimOn; f->simstate = si.isSimOn;
f->sim = si.simulatorapi; f->sim = si.simulatorapi;
f->map = si.mapapi;
f->use_udp = si.SimUsesUDP; f->use_udp = si.SimUsesUDP;
if(f->ms->force_udp_mode == true) if(f->ms->force_udp_mode == true)

1
src/monocoque/gameloop/loopdata.h
View File

@ -13,6 +13,7 @@ typedef struct loop_data
{ {
uv_work_t req; uv_work_t req;
SimulatorAPI sim; SimulatorAPI sim;
SimulatorAPI map;
bool use_udp; bool use_udp;
bool simstate; bool simstate;
bool uion; bool uion;

2
src/monocoque/simulatorapi/simapi

@ -1 +1 @@
Subproject commit 9ba82cf3908c497e206149bbe6def2a1760895cd Subproject commit 38beedde521035d9891df9b71c4ffeac3489548a