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

Cleaning up sim mapper code

This commit is contained in:
Paul Dino Jones 2022-12-01 21:23:36 +00:00
parent aeaced3676
commit 485a3489a9
4 changed files with 56 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,8 @@ int showstats(SimData* simdata)
int speed = simdata->velocity; int speed = simdata->velocity;
int digits = 0; int digits = 0;
if (speed > 0)
{
while (speed > 0) while (speed > 0)
{ {
int mod = speed % 10; int mod = speed % 10;
@ -56,6 +58,11 @@ int showstats(SimData* simdata)
fputc(s[digit-1]+'0', stdout); fputc(s[digit-1]+'0', stdout);
digit--; digit--;
} }
}
else
{
fputc('0', stdout);
}
fputc(' ', stdout); fputc(' ', stdout);
} }
if (i==1) if (i==1)
@ -69,6 +76,8 @@ int showstats(SimData* simdata)
int rpms = simdata->rpms; int rpms = simdata->rpms;
int digits = 0; int digits = 0;
if (rpms > 0)
{
while (rpms > 0) while (rpms > 0)
{ {
int mod = rpms % 10; int mod = rpms % 10;
@ -92,6 +101,11 @@ int showstats(SimData* simdata)
fputc(s[digit-1]+'0', stdout); fputc(s[digit-1]+'0', stdout);
digit--; digit--;
} }
}
else
{
fputc('0', stdout);
}
fputc(' ', stdout); fputc(' ', stdout);
} }
if (i==2) if (i==2)
@ -215,7 +229,8 @@ int looper(SimDevice* devices[], int numdevices, Simulator simulator)
} }
} }
} }
fprintf(stdout, "\n");
fflush(stdout);
tcsetattr(0, TCSANOW, &canonicalmode); tcsetattr(0, TCSANOW, &canonicalmode);
free(simdata); free(simdata);

2
src/monocoque/simulatorapi/simapi

@ -1 +1 @@
Subproject commit 5faf120d84378cdbe3bd8a0347f38fb9d0e9a87e Subproject commit 04fd2ca8ed590f562ad6423d9cf9f076daa28b95

1
src/monocoque/simulatorapi/simmapper.c
View File

@ -42,7 +42,6 @@ int simdatamap(SimData* simdata, SimMap* simmap, Simulator simulator)
simdata->velocity = abs(ceil(simmap->d.rf2.rf2_telemetry.mVehicles[0].mLocalVel.z * 3.6)); simdata->velocity = abs(ceil(simmap->d.rf2.rf2_telemetry.mVehicles[0].mLocalVel.z * 3.6));
simdata->rpms = ceil(simmap->d.rf2.rf2_telemetry.mVehicles[0].mEngineRPM); simdata->rpms = ceil(simmap->d.rf2.rf2_telemetry.mVehicles[0].mEngineRPM);
simdata->gear = simmap->d.rf2.rf2_telemetry.mVehicles[0].mGear; simdata->gear = simmap->d.rf2.rf2_telemetry.mVehicles[0].mGear;
//simdata->gear = simmap->d.rf2.rf2_telemetry.mVehicles[0].mLapNumber;
simdata->maxrpm - ceil(simmap->d.rf2.rf2_telemetry.mVehicles[0].mEngineMaxRPM); simdata->maxrpm - ceil(simmap->d.rf2.rf2_telemetry.mVehicles[0].mEngineMaxRPM);
break; break;
} }

2
src/monocoque/simulatorapi/simmapper.h
View File

@ -1,5 +1,5 @@
#ifndef _SIMMAPPER_H #ifndef _SIMMAPPER_H
#define _SIMMAPPEE_H #define _SIMMAPPER_H
#include "ac.h" #include "ac.h"
#include "rf2.h" #include "rf2.h"