iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

Fixes #475 Renamed DEBUG define to SD_DEBUG to avoid confusions

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

Former-commit-id: 88f301af55bf2eb2e937d1479cb30b30c851c76f
Former-commit-id: 8837726eba03d8081600610ade6b2cc6b701bc9d
This commit is contained in:
pouillot 2012-10-07 13:53:17 +00:00
parent 5bfb44d2da
commit 3062c5ea6e
9 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/options.cmake
View file

@ -114,7 +114,7 @@ MACRO(ADD_SD_COMPILE_OPTIONS)
ENDIF(MSVC)
IF(OPTION_FORCE_DEBUG)
ADD_DEFINITIONS(-DDEBUG)
ADD_DEFINITIONS(-DSD_DEBUG)
ENDIF(OPTION_FORCE_DEBUG)
IF(OPTION_TRACE)
ADD_DEFINITIONS(-DTRACE_OUT)

2
src/interfaces/iraceengine.h
View file

@ -60,7 +60,7 @@ public:
virtual void start() = 0;
virtual void stop() = 0;
#ifdef DEBUG
#ifdef SD_DEBUG
virtual void step(double dt) = 0;
#endif

2
src/libs/raceengine/raceengine.cpp
View file

@ -228,7 +228,7 @@ void RaceEngine::stop(void)
::ReStop();
}
#ifdef DEBUG
#ifdef SD_DEBUG
void RaceEngine::step(double dt)
{
::ReOneStep(dt);

2
src/libs/raceengine/raceengine.h
View file

@ -73,7 +73,7 @@ public:
virtual void accelerateTime(double fMultFactor);
virtual void start();
virtual void stop();
#ifdef DEBUG
#ifdef SD_DEBUG
virtual void step(double dt);
#endif

4
src/libs/raceengine/racetrack.cpp
View file

@ -138,13 +138,13 @@ reTrackDump(const tTrack *track, int verbose)
if (verbose) {
int i;
tTrackSeg *seg;
#ifdef DEBUG
#ifdef SD_DEBUG
const char *stype[4] = { "", "RGT", "LFT", "STR" };
#endif
for (i = 0, seg = track->seg->next; i < track->nseg; i++, seg = seg->next) {
GfLogTrace(" segment %d -------------- \n", seg->id);
#ifdef DEBUG
#ifdef SD_DEBUG
GfLogTrace(" type %s\n", stype[seg->type]);
#endif
GfLogTrace(" length %f m\n", seg->length);

2
src/libs/raceengine/raceupdate.cpp
View file

@ -139,7 +139,7 @@ void ReStart(void)
situationUpdater->start();
}
#ifdef DEBUG
#ifdef SD_DEBUG
void ReOneStep(double dt)
{
situationUpdater->runOneStep(dt);

2
src/libs/raceengine/raceupdate.h
View file

@ -35,7 +35,7 @@ extern void ReStart();
extern void ReStop();
extern int ReUpdate();
#ifdef DEBUG
#ifdef SD_DEBUG
extern void ReOneStep(double dt);
#endif

6
src/modules/simu/simuv2.1/wheel.cpp
View file

@ -239,9 +239,9 @@ void SimWheelUpdateForce(tCar *car, int index)
F *= wheel->forces.z * mu * wheel->trkPos.seg->surface->kFriction; /* coeff */
//For debug weather with some tracks
#ifdef DEBUG
//printf("Simu v2 kFriction : %f ", wheel->trkPos.seg->surface->kFriction);
// For debugging weather simultation on some tracks
#ifdef SD_DEBUG
GfLogDebug("Simu v2.1 kFriction : %f ", wheel->trkPos.seg->surface->kFriction);
#endif
wheel->rollRes = wheel->forces.z * wheel->trkPos.seg->surface->kRollRes;

4
src/modules/simu/simuv2/wheel.cpp
View file

@ -237,8 +237,8 @@ void SimWheelUpdateForce(tCar *car, int index)
F *= wheel->forces.z * mu * wheel->trkPos.seg->surface->kFriction * (1.0f + 0.05f * sin(-wheel->staticPos.ax * 18.0f)); /* coeff */
//For debug weather with some tracks
#ifdef DEBUG
//printf("Simu v2 kFriction : %f ", wheel->trkPos.seg->surface->kFriction);
#ifdef SD_DEBUG
GfLogDebug("Simu v2 kFriction : %f ", wheel->trkPos.seg->surface->kFriction);
#endif
wheel->rollRes = wheel->forces.z * wheel->trkPos.seg->surface->kRollRes;