speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 9 Pull requests Projects Releases 1 Packages Wiki Activity Actions 5

use macros for member variable access

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8027 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: b78af64ef18bb6d1fae52e8720e40cbeb262faa6
Former-commit-id: e2e975c477454264f665599b2b103186cc643780
This commit is contained in:
iobyte 2022-02-13 15:51:20 +00:00
parent ff073df7b5
commit 3689380ea9
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/modules/graphic/osggraph/Viewer/OsgHUD.cpp
View file

@ -1080,11 +1080,11 @@ void SDHUD::Refresh(tSituation *s, const SDFrameInfo* frameInfo,
// Parse control messages if they include ABS / TCS / SPD
for (int i = 0; i < 4; i++)
{
if (currCar->ctrl.msg[i])
if (currCar->_msgCmd[i])
{
abs = abs || strstr(currCar->ctrl.msg[i], "ABS");
tcs = tcs || strstr(currCar->ctrl.msg[i], "TCS");
spd = spd || strstr(currCar->ctrl.msg[i], "Speed Limiter On");
abs = abs || strstr(currCar->_msgCmd[i], "ABS");
tcs = tcs || strstr(currCar->_msgCmd[i], "TCS");
spd = spd || strstr(currCar->_msgCmd[i], "Speed Limiter On");
}
}
@ -1236,14 +1236,14 @@ void SDHUD::Refresh(tSituation *s, const SDFrameInfo* frameInfo,
}
// driver inputs
changeImageSize(hudImgElements["driverinput-clutch"], currCar->ctrl.clutchCmd, "bottom", hudScale);
changeImageSize(hudImgElements["driverinput-brake"], currCar->ctrl.brakeCmd, "bottom", hudScale);
changeImageSize(hudImgElements["driverinput-throttle"], currCar->ctrl.accelCmd, "bottom", hudScale);
changeImageSize(hudImgElements["driverinput-clutch"], currCar->_clutchCmd, "bottom", hudScale);
changeImageSize(hudImgElements["driverinput-brake"], currCar->_brakeCmd, "bottom", hudScale);
changeImageSize(hudImgElements["driverinput-throttle"], currCar->_accelCmd, "bottom", hudScale);
const osg::Vec3d axis(0, 0, 1);
//wheel
double angle = currCar->ctrl.steer * 4;
double angle = currCar->_steerCmd * 4;
osg::Vec3d center = hudImgRotableElements["driverinput-wheel"]->getBound().center();//Save the center point coordinates of the object first
osg::Matrix curMatrix = hudImgRotableElements["driverinput-wheel"]->getMatrix();