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

3-char abbrevs for driver names in scrolling leaderboard - work in progress!

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

Former-commit-id: b539d791c431e246d9be7b26d9c9b4975d878ee6
Former-commit-id: 1809bc9f03444d80a2204cb251045f713798c220
This commit is contained in:
kmetykog 2009-10-06 09:07:40 +00:00
parent f87cbbb13c
commit 7c15b90a53
2 changed files with 92 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@
created : Thu Aug 17 23:52:20 CEST 2000 created : Thu Aug 17 23:52:20 CEST 2000
copyright : (C) 2000 by Eric Espie copyright : (C) 2000 by Eric Espie
email : torcs@free.fr email : torcs@free.fr
version : $Id: grboard.cpp,v 1.27 2006/09/06 21:56:06 berniw Exp $ version : $Id$
***************************************************************************/ ***************************************************************************/
@ -28,6 +28,7 @@
#include <robottools.h> #include <robottools.h>
#include <iostream> #include <iostream>
#include <algorithm> //remove
using namespace std; using namespace std;
static float grWhite[4] = {1.0, 1.0, 1.0, 1.0}; static float grWhite[4] = {1.0, 1.0, 1.0, 1.0};
@ -572,17 +573,16 @@ cGrBoard::grDispCounterBoard(tCarElt *car)
GfuiPrintString(buf, grBlue, GFUI_FONT_BIG_C, x, y, GFUI_ALIGN_HR_VB); GfuiPrintString(buf, grBlue, GFUI_FONT_BIG_C, x, y, GFUI_ALIGN_HR_VB);
} }
/* /**
* grDispLeaderBoard
* *
* name: grDispLeaderBoard
* Displayes the leader board (in the lower left corner of the screen) * Displayes the leader board (in the lower left corner of the screen)
* If [drawLaps] is on, writes the lap counter on the top of the list. * If [drawLaps] is on, writes the lap counter on the top of the list.
* @param tCarElt *car: the car currently being viewed * @param car the car currently being viewed
* @param tSituation *s: situation * @param s situation provided by the sim
* @return: void
*/ */
void void
cGrBoard::grDispLeaderBoard(const tCarElt *car, const tSituation *s) const cGrBoard::grDispLeaderBoard(const tCarElt *car, const tSituation *s)
{ {
if(leaderFlag == 4) if(leaderFlag == 4)
{ {
@ -658,7 +658,7 @@ cGrBoard::grDispLeaderBoard(const tCarElt *car, const tSituation *s) const
GfuiPrintString(buf, clr, GFUI_FONT_SMALL_C, x, y, GFUI_ALIGN_HL_VB); GfuiPrintString(buf, clr, GFUI_FONT_SMALL_C, x, y, GFUI_ALIGN_HL_VB);
//Display driver time / time behind leader / laps behind leader //Display driver time / time behind leader / laps behind leader
string sEntry = grGenerateLeaderBoardEntry(s->cars[i], (i==0)); string sEntry = grGenerateLeaderBoardEntry(s->cars[i], s, (i==0));
if(s->cars[i]->_state & RM_CAR_STATE_DNF) { //driver DNF, show 'out' in red if(s->cars[i]->_state & RM_CAR_STATE_DNF) { //driver DNF, show 'out' in red
clr = grRed; clr = grRed;
} }
@ -788,6 +788,7 @@ cGrBoard::shutdown(void)
delete trackMap; delete trackMap;
trackMap = NULL; trackMap = NULL;
} }
sShortNames.clear();
} }
void void
@ -851,7 +852,8 @@ cGrBoard::grDispArcade(tCarElt *car, tSituation *s)
} }
void cGrBoard::refreshBoard(tSituation *s, float Fps, int forceArcade, tCarElt *curr) void
cGrBoard::refreshBoard(tSituation *s, float Fps, int forceArcade, tCarElt *curr)
{ {
if (arcadeFlag || forceArcade) { if (arcadeFlag || forceArcade) {
grDispArcade(curr, s); grDispArcade(curr, s);
@ -902,7 +904,7 @@ void grInitBoardCar(tCarElt *car)
cleanup[nstate] = curInst->texture; cleanup[nstate] = curInst->texture;
nstate++; nstate++;
/* Load the intrument placement */ /* Load the instrument placement */
xSz = GfParmGetNum(handle, SECT_GROBJECTS, PRM_TACHO_XSZ, (char*)NULL, 128); xSz = GfParmGetNum(handle, SECT_GROBJECTS, PRM_TACHO_XSZ, (char*)NULL, 128);
ySz = GfParmGetNum(handle, SECT_GROBJECTS, PRM_TACHO_YSZ, (char*)NULL, 128); ySz = GfParmGetNum(handle, SECT_GROBJECTS, PRM_TACHO_YSZ, (char*)NULL, 128);
xpos = GfParmGetNum(handle, SECT_GROBJECTS, PRM_TACHO_XPOS, (char*)NULL, Winw / 2.0 - xSz); xpos = GfParmGetNum(handle, SECT_GROBJECTS, PRM_TACHO_XPOS, (char*)NULL, Winw / 2.0 - xSz);
@ -1010,6 +1012,7 @@ void grInitBoardCar(tCarElt *car)
void grShutdownBoardCar(void) void grShutdownBoardCar(void)
{ {
sShortNames.clear();
/*int i; /*int i;
for (i = 0; i < nstate; i++) { for (i = 0; i < nstate; i++) {
printf("%d\n", i); printf("%d\n", i);
@ -1025,6 +1028,15 @@ void grShutdownBoardCar(void)
static int iStart = 0; static int iStart = 0;
static double iTimer = 0; static double iTimer = 0;
#define LEADERBOARD_SCROLL_TIME 2.0 #define LEADERBOARD_SCROLL_TIME 2.0
/**
* grDispLeaderBoardScroll
*
* Displays the leaderboard in a vertical scrolled fashion,
* if there are more than 10 names to display.
*
* @param car pointer to the currently displayed car
* @param s current situation, provided by the sim
*/
void void
cGrBoard::grDispLeaderBoardScroll(const tCarElt *car, const tSituation *s) const cGrBoard::grDispLeaderBoardScroll(const tCarElt *car, const tSituation *s) const
{ {
@ -1089,7 +1101,7 @@ cGrBoard::grDispLeaderBoardScroll(const tCarElt *car, const tSituation *s) const
GfuiPrintString(buf, clr, GFUI_FONT_SMALL_C, x, y, GFUI_ALIGN_HL_VB); GfuiPrintString(buf, clr, GFUI_FONT_SMALL_C, x, y, GFUI_ALIGN_HL_VB);
//Display driver time / time behind leader / laps behind leader //Display driver time / time behind leader / laps behind leader
string sEntry = grGenerateLeaderBoardEntry(s->cars[i], (i==0)); string sEntry = grGenerateLeaderBoardEntry(s->cars[i], s, (i==0));
if(s->cars[i]->_state & RM_CAR_STATE_DNF) { //driver DNF, show 'out' in red if(s->cars[i]->_state & RM_CAR_STATE_DNF) { //driver DNF, show 'out' in red
clr = grRed; clr = grRed;
} }
@ -1108,18 +1120,18 @@ cGrBoard::grDispLeaderBoardScroll(const tCarElt *car, const tSituation *s) const
static int iStringStart = 0; static int iStringStart = 0;
static int iRaceLaps = -1; static int iRaceLaps = -1;
#define LEADERBOARD_LINE_SCROLL_TIME 0.1 #define LEADERBOARD_LINE_SCROLL_TIME 0.1
/* /**
*
* name: grDispLeaderBoardScrollLine * name: grDispLeaderBoardScrollLine
* Scrolls the leaderboard on the bottom line, as seen on TV broadcasts. * Scrolls the leaderboard on the bottom line, as seen on TV broadcasts.
* @param: tCarElt* car *
* @param: tSituation *s * @param car pointer to the currently displayed car
* @return: void * @param s current situation, provided by the sim
*/ */
void void
cGrBoard::grDispLeaderBoardScrollLine(const tCarElt *car, const tSituation *s) const cGrBoard::grDispLeaderBoardScrollLine(const tCarElt *car, const tSituation *s)
{ {
//Scrolling //Scrolling
if(iTimer == 0 || iStringStart == 0) grMakeThreeLetterNames(s);
if(iTimer == 0 || s->currentTime < iTimer) iTimer = s->currentTime; if(iTimer == 0 || s->currentTime < iTimer) iTimer = s->currentTime;
if(s->currentTime >= iTimer + LEADERBOARD_LINE_SCROLL_TIME) if(s->currentTime >= iTimer + LEADERBOARD_LINE_SCROLL_TIME)
{ {
@ -1174,11 +1186,11 @@ cGrBoard::grDispLeaderBoardScrollLine(const tCarElt *car, const tSituation *s) c
for(int i = 0; i < s->_ncars; i++) { for(int i = 0; i < s->_ncars; i++) {
//Driver position + name //Driver position + name
sprintf(buf, "%3d. %s", i + 1, s->cars[i]->_name); sprintf(buf, "%3d: %s", i + 1, sShortNames[i].c_str());
roster.append(buf); roster.append(buf);
//Display driver time / time behind leader / laps behind leader //Display driver time / time behind leader / laps behind leader
string sEntry = grGenerateLeaderBoardEntry(s->cars[i], (i==0)); string sEntry = grGenerateLeaderBoardEntry(s->cars[i], s, (i==0));
//get rid of leading spaces //get rid of leading spaces
size_t iCut = sEntry.find_first_not_of(' '); size_t iCut = sEntry.find_first_not_of(' ');
@ -1191,7 +1203,7 @@ cGrBoard::grDispLeaderBoardScrollLine(const tCarElt *car, const tSituation *s) c
roster.append(" "); roster.append(" ");
}//for i }//for i
string sep(" TORCS-NG "); //separator string sep(" SPEED-DREAMS "); //separator
if(st.empty()) if(st.empty())
st.assign(roster + sep); st.assign(roster + sep);
@ -1210,8 +1222,7 @@ cGrBoard::grDispLeaderBoardScrollLine(const tCarElt *car, const tSituation *s) c
}//grDispLeaderBoardScrollLine }//grDispLeaderBoardScrollLine
/* /**
*
* name: grGenerateLeaderBoardEntry * name: grGenerateLeaderBoardEntry
* *
* Generates one leaderboard entry, * Generates one leaderboard entry,
@ -1220,12 +1231,12 @@ cGrBoard::grDispLeaderBoardScrollLine(const tCarElt *car, const tSituation *s) c
* in the line, but colour handling and positioning * in the line, but colour handling and positioning
* is not available then. * is not available then.
* *
* @param: tCarElt* car * @param car
* @param: bool isLeader * @param isLeader
* @return: string * @return string
*/ */
string string
cGrBoard::grGenerateLeaderBoardEntry(const tCarElt* car, const bool isLeader) const cGrBoard::grGenerateLeaderBoardEntry(const tCarElt* car, const tSituation* s, const bool isLeader) const
{ {
string ret; string ret;
char buf[256]; char buf[256];
@ -1267,3 +1278,48 @@ cGrBoard::grGenerateLeaderBoardEntry(const tCarElt* car, const bool isLeader) co
return ret; return ret;
}//grGenerateLeaderBoardEntry }//grGenerateLeaderBoardEntry
/**
* grMakeThreeLetterNames
*
* Let's build an array of 3-letter name abbreviations (sShortNames).
* As we follow original name order, this array can be indexed
* the same as the original names' array.
*
* @param s situation provided by SD
*/
void
cGrBoard::grMakeThreeLetterNames(const tSituation *s)
{
//Build up two arrays of the original and the short names, same order.
sShortNames.clear();
vector<string> origNames;
for(int i = 0; i < s->_ncars; i++) { //Loop over each name in the race
string st(s->cars[i]->_name);
origNames.push_back(st);
remove(st.begin(), st.end(), ' '); //Remove spaces
sShortNames.push_back(st.substr(0, 3)); //Cut to 3 characters
}//for i
vector<string> origShortNames(sShortNames); //Copy to hold original 3-letter names, for search
//Check for matching names
for(unsigned int i = 0; i < sShortNames.size(); i++) {
string sSearch(origShortNames[i]);
for(unsigned int j = i + 1; j < sShortNames.size(); j++) {
if(sSearch == origShortNames[j]) { //Same 3-letter name found
//Let's find the first mismatching character
unsigned int k;
for(k = 0; k < min(origNames[i].size(), origNames[j].size()); k++) {
if(origNames[i][k] != origNames[j][k]) break;
}//for k
//Set 3rd char of the short name to the mismatching char (or last one).
//It is the driver designer's responsibility from now on
//to provide some unsimilarities between driver names.
sShortNames[i][2] = origNames[i][k];
sShortNames[j][2] = origNames[j][k];
}//if sSearch
}//for j
}//for i
//3-letter name array ready to use!
}//grMakeThreeLetterName

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

@ -4,7 +4,7 @@
created : Thu Aug 17 23:55:47 CEST 2000 created : Thu Aug 17 23:55:47 CEST 2000
copyright : (C) 2000 by Eric Espie copyright : (C) 2000 by Eric Espie
email : torcs@free.fr email : torcs@free.fr
version : $Id: grboard.h,v 1.9 2005/02/01 19:08:17 berniw Exp $ version : $Id$
***************************************************************************/ ***************************************************************************/
@ -22,6 +22,7 @@
#include "grtrackmap.h" #include "grtrackmap.h"
#include <string> #include <string>
#include <vector>
class cGrBoard class cGrBoard
{ {
@ -35,7 +36,8 @@ class cGrBoard
int counterFlag; int counterFlag;
int GFlag; int GFlag;
int arcadeFlag; int arcadeFlag;
std::vector<std::string> sShortNames;
private: private:
void grDispDebug(float fps, tCarElt *car); void grDispDebug(float fps, tCarElt *car);
void grDispGGraph(tCarElt *car); void grDispGGraph(tCarElt *car);
@ -45,18 +47,20 @@ class cGrBoard
void grDispCarBoard2(tCarElt *car, tSituation *s); void grDispCarBoard2(tCarElt *car, tSituation *s);
void grDispCarBoard(tCarElt *car, tSituation *s); void grDispCarBoard(tCarElt *car, tSituation *s);
void grDispCounterBoard(tCarElt *car); void grDispCounterBoard(tCarElt *car);
void grDispLeaderBoard(const tCarElt *car, const tSituation *s) const; void grDispLeaderBoard(const tCarElt *car, const tSituation *s);
void grDispLeaderBoardScroll(const tCarElt *car, const tSituation *s) const; void grDispLeaderBoardScroll(const tCarElt *car, const tSituation *s) const;
void grDispLeaderBoardScrollLine(const tCarElt *car, const tSituation *s) const; void grDispLeaderBoardScrollLine(const tCarElt *car, const tSituation *s);
void grDispCounterBoard2(tCarElt *car); void grDispCounterBoard2(tCarElt *car);
void grDispArcade(tCarElt *car, tSituation *s); void grDispArcade(tCarElt *car, tSituation *s);
std::string grGenerateLeaderBoardEntry(const tCarElt *car, 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;
void grMakeThreeLetterNames(const tSituation *s);
public: public:
cGrBoard(int myid); cGrBoard(int myid);
~cGrBoard(); ~cGrBoard();
void initBoard(void); void initBoard(void);
void shutdown(void); void shutdown(void);