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

Re #660: code changes according to cpplint

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

Former-commit-id: 85b49fba862b6dcefe9d1fc4ffda58070b05dc81
Former-commit-id: bc21b1af89252cb890901c68e517b886a4e62a9e
This commit is contained in:
kmetykog 2012-09-17 21:37:08 +00:00
parent d97ec6ae2b
commit 26b49c769d
2 changed files with 463 additions and 402 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

831
src/modules/graphic/ssggraph/grboard.cpp
View file

File diff suppressed because it is too large Load diff

34
src/modules/graphic/ssggraph/grboard.h
View file

@ -20,8 +20,8 @@
#ifndef _GRBOARD_H_ #ifndef _GRBOARD_H_
#define _GRBOARD_H_ #define _GRBOARD_H_
#include <car.h> //tCarElt #include <car.h> // tCarElt
#include <raceman.h> //tSituation #include <raceman.h> // tSituation
class cGrTrackMap; class cGrTrackMap;
class cGrFrameInfo; class cGrFrameInfo;
@ -32,9 +32,9 @@ class cGrFrameInfo;
class cGrBoard class cGrBoard
{ {
protected: protected:
int id; /* Board Id */ int id; // Board Id
int boardFlag; int boardFlag;
int leaderFlag; int leaderFlag;
int debugFlag; int debugFlag;
int leaderNb; int leaderNb;
@ -47,17 +47,19 @@ class cGrBoard
int rightAnchor; int rightAnchor;
int speedoRise; int speedoRise;
std::vector<std::string> sShortNames; std::vector<std::string> sShortNames;
//Scrolling leaderboard variables // Scrolling leaderboard variables
int iStart; int iStart;
double iTimer; double iTimer;
int iStringStart; int iStringStart;
std::string st; //This is the line we will display in the bottom std::string st; // This is the line we will display in the bottom
private: private:
void grDispDebug(const tSituation *s, const tCarElt *car, const cGrFrameInfo* frame); void grDispDebug(const tSituation *s, const tCarElt *car,
const cGrFrameInfo* frame);
void grDispGGraph(const tCarElt *car); void grDispGGraph(const tCarElt *car);
void grDispMisc(bool bCurrentScreen); void grDispMisc(bool bCurrentScreen);
void grDrawGauge(tdble X1, tdble Y1, tdble H, float *clr1, float *clr2, tdble val, const char *title); void grDrawGauge(tdble X1, tdble Y1, tdble H, float *clr1,
float *clr2, tdble val, const char *title);
void grDispEngineLeds(const tCarElt *car, int X, int Y, int align, bool bg); void grDispEngineLeds(const tCarElt *car, int X, int Y, int align, bool bg);
void grDispCarBoard(const tCarElt *car, const tSituation *s); void grDispCarBoard(const tCarElt *car, const tSituation *s);
@ -72,17 +74,21 @@ class cGrBoard
void grDispLeaderBoardScrollLine(const tCarElt *car, const tSituation *s); void grDispLeaderBoardScrollLine(const tCarElt *car, const tSituation *s);
void grDispArcade(const tCarElt *car, const tSituation *s); void grDispArcade(const tCarElt *car, const tSituation *s);
std::string grGenerateLeaderBoardEntry(const tCarElt *car, const tSituation *s, const bool isLeader) const; std::string grGenerateLeaderBoardEntry(const tCarElt *car,
const tSituation *s, const bool isLeader) const;
// Track overview object // Track overview object
cGrTrackMap *trackMap; cGrTrackMap *trackMap;
bool grGetSplitTime(const tSituation *s, const tCarElt *car, bool gap_inrace, double &time, int *laps_different, float **color); bool grGetSplitTime(const tSituation *s, const tCarElt *car,
void grGetLapsTime(const tSituation *s, const tCarElt *car, char* result, char const** label) const; bool gap_inrace, double &time,
int *laps_different, float **color);
void grGetLapsTime(const tSituation *s, const tCarElt *car,
char* result, char const** label) const;
void grMakeThreeLetterNames(const tSituation *s); void grMakeThreeLetterNames(const tSituation *s);
void grSetupDrawingArea(int xl, int yb, int xr, int yt) const; void grSetupDrawingArea(int xl, int yb, int xr, int yt) const;
public: public:
cGrBoard(int myid); explicit cGrBoard(int myid);
~cGrBoard(); ~cGrBoard();
void initBoard(void); void initBoard(void);
@ -92,11 +98,11 @@ class cGrBoard
inline cGrTrackMap *getTrackMap() { return trackMap; } inline cGrTrackMap *getTrackMap() { return trackMap; }
void refreshBoard(tSituation *s, const cGrFrameInfo* frameInfo, void refreshBoard(tSituation *s, const cGrFrameInfo* frameInfo,
const tCarElt *currCar, bool isCurrScreen); const tCarElt *currCar, bool isCurrScreen);
void loadDefaults(const tCarElt *curCar); void loadDefaults(const tCarElt *curCar);
}; };
extern void grInitBoardCar(tCarElt *car); extern void grInitBoardCar(tCarElt *car);
extern void grShutdownBoardCar(void); extern void grShutdownBoardCar(void);
#endif /* _GRBOARD_H_ */ #endif /* _GRBOARD_H_ */