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

Cleanup and added missing dirs in cmake files

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

Former-commit-id: 4782c172ec89cf3945062d79f17288c071d2a6ce
Former-commit-id: 00f9d229292f1e6d6f21a9c5b89580bbe41dd7e9
This commit is contained in:
wdbee 2010-11-04 08:06:55 +00:00
parent a02dfc2a3d
commit 97e36b18a9
4 changed files with 43 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/drivers/simplix/CMakeLists.txt
View file

@ -122,7 +122,7 @@ ROBOT_DATA(NAME simplix_36GP PREFIX simplix_36GP
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png)
# SuperCars
SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 12 13
SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 12 13
sc-boxer-96 sc-spirit-300 sc-cavallo-360 sc-fmc-gt4
sc-lynx-220 sc-murasama-nsx
tracks)
@ -131,20 +131,22 @@ ROBOT_DATA(NAME simplix_sc PREFIX simplix_sc
FILES simplix_sc.xml default.xml logo.rgb readme.txt
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png)
# LS-GT1
SET(ROBOT_SUBDIRS 0 1 2 3 4 5 8 9 12 13
ls1-toro-rgt ls1-cavallo-570s1 ls1-newcastle-fury ls1-archer-r9
ls1-zentek-z7r ls1-taipan-ltsr ls1-vulture-v6r
tracks)
# LS1
SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10 11 12 13
ls1-archer-r9 ls1-vulture-v6r ls1-toro-rgt
ls1-cavallo-570s1 ls1-zentek-z7r ls1-newcastle-fury
ls1-taipan-ltsr
tracks)
ROBOT_DATA(NAME simplix_ls1 PREFIX simplix_ls1
FILES simplix_ls1.xml default.xml logo.rgb readme.txt
SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png)
# TRB1
SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10 11 12 13
trb1-boxer-trbrs trb1-sector-rb1 trb1-spirit-rb1lt
trb1-cavallo-360rb trb1-silber-rblk trb1-taipan-rb1 trb1-zaxxon-rb
SET(ROBOT_SUBDIRS 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
trb1-cavallo-360rb trb1-boxer-trbrs trb1-spirit-rb1lt
trb1-taipan-rb1 trb1-silber-rblk trb1-sector-rb1
trb1-zaxxon-rb trb1-vieringe-5rb
tracks)
ROBOT_DATA(NAME simplix_trb1 PREFIX simplix_trb1

138
src/drivers/simplix/src/unitdriver.cpp
View file

@ -2,14 +2,14 @@
// unitdriver.cpp
//--------------------------------------------------------------------------*
// TORCS: "The Open Racing Car Simulator"
// A robot for Speed Dreams Version 1.4.0
// A robot for Speed Dreams-Version 1.4.0/2.X
//--------------------------------------------------------------------------*
// Class for driving and driver/robot
// Zentrale Klasse für das Fahren bzw. den Fahrer/Roboter
//
// File : unitdriver.cpp
// Created : 2007.11.25
// Last changed : 2010.10.23
// Last changed : 2010.11.04
// Copyright : © 2007-2010 Wolf-Dieter Beelitz
// eMail : wdb@wdbee.de
// Version : 3.00.000
@ -3677,57 +3677,18 @@ double TDriver::CalcCrv_simplix(double Crv)
}
else
return 1.0;
/*
if (oCrvComp)
{
if (Crv < 0.0025)
return 1.0;
else
return 1.25 * (1 + Crv);
}
else
return 1.0;
*/
}
//==========================================================================*
//==========================================================================*
// simplix_TRB1
// If not used for a carset
//--------------------------------------------------------------------------*
double TDriver::CalcCrv_simplix_TRB1(double Crv)
double TDriver::CalcCrv_simplix_Identity(double Crv)
{
return 1.0;
}
//==========================================================================*
//==========================================================================*
// simplix_MPA1
//--------------------------------------------------------------------------*
double TDriver::CalcCrv_simplix_MPA1(double Crv)
{
return 1.0;
}
//==========================================================================*
//==========================================================================*
// simplix_MP5
//--------------------------------------------------------------------------*
double TDriver::CalcCrv_simplix_MP5(double Crv)
{
return 1.0;
}
//==========================================================================*
//==========================================================================*
// simplix_LS1
//--------------------------------------------------------------------------*
double TDriver::CalcCrv_simplix_LS1(double Crv)
{
return MAX(0.75,MIN(3.0,350000.0 * Crv * Crv * Crv));
//return MAX(0.75,MIN(3.0,600000.0 * Crv * Crv * Crv));
}
//==========================================================================*
//==========================================================================*
// simplix_sc
//--------------------------------------------------------------------------*
@ -3754,7 +3715,6 @@ double TDriver::CalcCrv_simplix_36GP(double Crv)
{
double Offset = 1300;
// if ((oCrvComp) && (!oGoToPit))
if (oCrvComp)
{
if (Crv < 0.0085)
@ -3775,73 +3735,18 @@ double TDriver::CalcCrv_simplix_36GP(double Crv)
//==========================================================================*
//==========================================================================*
// simplix
// If not used for a carset
//--------------------------------------------------------------------------*
double TDriver::CalcHairpin_simplix(double Crv)
double TDriver::CalcHairpin_simplix_Identity(double Crv)
{
return 1.0;
}
//==========================================================================*
//==========================================================================*
// simplix_TRB1
// If not used for a carset
//--------------------------------------------------------------------------*
double TDriver::CalcHairpin_simplix_TRB1(double Crv)
{
return 1.0;
}
//==========================================================================*
//==========================================================================*
// simplix_MPA1
//--------------------------------------------------------------------------*
double TDriver::CalcHairpin_simplix_MPA1(double Crv)
{
return 1.0;
}
//==========================================================================*
//==========================================================================*
// simplix_LS1
//--------------------------------------------------------------------------*
double TDriver::CalcHairpin_simplix_LS1(double Crv)
{
return MAX(0.75,MIN(5.0,300000.0 * Crv * Crv * Crv));
//return MAX(0.75,MIN(5.0,600000.0 * Crv * Crv * Crv));
}
//==========================================================================*
//==========================================================================*
// simplix_MP5
//--------------------------------------------------------------------------*
double TDriver::CalcHairpin_simplix_MP5(double Crv)
{
return 1.0;
}
//==========================================================================*
//==========================================================================*
// simplix_sc
//--------------------------------------------------------------------------*
double TDriver::CalcHairpin_simplix_SC(double Crv)
{
return 1.0;
}
//==========================================================================*
//==========================================================================*
// simplix_36GP
//--------------------------------------------------------------------------*
double TDriver::CalcHairpin_simplix_36GP(double Crv)
{
return 1.0;
}
//==========================================================================*
//==========================================================================*
// simplix
//--------------------------------------------------------------------------*
double TDriver::CalcFriction_simplix(const double Crv)
double TDriver::CalcFriction_simplix_Identity(const double Crv)
{
return 1.0;
}
@ -3868,7 +3773,7 @@ double TDriver::CalcFriction_simplix_TRB1(const double Crv)
oXXX = MIN(1.0,oXXX+0.0003);
double FrictionFactor = 0.95;
/**/
if (AbsCrv > 0.10)
FrictionFactor = 0.46;
else if (AbsCrv > 0.05)
@ -3883,31 +3788,6 @@ double TDriver::CalcFriction_simplix_TRB1(const double Crv)
FrictionFactor = 0.93;
else if (AbsCrv > 0.005)
FrictionFactor = 0.95;
/**/
/*/
if (AbsCrv > 0.10)
FrictionFactor = 0.15;
else if (AbsCrv > 0.09)
FrictionFactor = 0.2;
else if (AbsCrv > 0.08)
FrictionFactor = 0.25;
else if (AbsCrv > 0.07)
FrictionFactor = 0.3;
else if (AbsCrv > 0.06)
FrictionFactor = 0.35;
else if (AbsCrv > 0.05)
FrictionFactor = 0.4;
else if (AbsCrv > 0.04)
FrictionFactor = 0.55;
else if (AbsCrv > 0.03)
FrictionFactor = 0.65;
else if (AbsCrv > 0.02)
FrictionFactor = 0.8;
else if (AbsCrv > 0.01)
FrictionFactor = 0.85;
else if (AbsCrv > 0.005)
FrictionFactor = 0.9;
/*/
return FrictionFactor * oXXX;
}

17
src/drivers/simplix/src/unitdriver.h
View file

@ -2,14 +2,14 @@
// unitdriver.h
//--------------------------------------------------------------------------*
// TORCS: "The Open Racing Car Simulator"
// A robot for Speed Dreams Version 1.4.0
// A robot for Speed Dreams-Version 1.4.0/2.X
//--------------------------------------------------------------------------*
// Class for driving and driver/robot
// Zentrale Klasse für das Fahren bzw. den Fahrer/Roboter
//
// File : unitdriver.h
// Created : 2007.11.25
// Last changed : 2010.10.22
// Last changed : 2010.11.04
// Copyright : © 2007-2010 Wolf-Dieter Beelitz
// eMail : wdb@wdbee.de
// Version : 3.00.000
@ -456,24 +456,17 @@ private:
void CalcSkilling_simplix_MPA1();
void CalcSkilling_simplix_SC();
double CalcFriction_simplix(double Crv);
double CalcFriction_simplix_Identity(double Crv);
double CalcFriction_simplix_TRB1(double Crv);
double CalcCrv_simplix(double Crv);
double CalcCrv_simplix_TRB1(double Crv);
double CalcCrv_simplix_Identity(double Crv);
double CalcCrv_simplix_SC(double Crv);
double CalcCrv_simplix_36GP(double Crv);
double CalcCrv_simplix_MPA1(double Crv);
double CalcCrv_simplix_LS1(double Crv);
double CalcCrv_simplix_MP5(double Crv);
double CalcHairpin_simplix(double Crv);
double CalcHairpin_simplix_TRB1(double Crv);
double CalcHairpin_simplix_SC(double Crv);
double CalcHairpin_simplix_36GP(double Crv);
double CalcHairpin_simplix_MPA1(double Crv);
double CalcHairpin_simplix_Identity(double Crv);
double CalcHairpin_simplix_LS1(double Crv);
double CalcHairpin_simplix_MP5(double Crv);
void UseFilterAccel(){oUseFilterAccel = true;};
void UseAccelOut(){oUseAccelOut = true;};

36
src/drivers/simplix/src/unitmain.cpp
View file

@ -8,7 +8,7 @@
//
// File : unitmain.cpp
// Created : 2008.01.27
// Last changed : 2010.10.23
// Last changed : 2010.11.04
// Copyright : © 2007-2010 Wolf-Dieter Beelitz
// eMail : wdb@wdbee.de
// Version : 3.00.000
@ -304,7 +304,7 @@ void SetUpSimplix_36GP()
void SetUpSimplix_ls1()
{
cRobotType = RTYPE_SIMPLIX_LS1;
SetParameters(NBBOTS, "ls1-ciclon-rgt");
SetParameters(NBBOTS, "ls1-archer-r9");
TDriver::AdvancedParameters = true;
TDriver::UseBrakeLimit = true;
};
@ -611,9 +611,9 @@ static int InitFuncPt(int Index, void *Pt)
{
GfOut("#cRobotType == RTYPE_SIMPLIX\n");
cInstances[Index-IndexOffset].cRobot->CalcSkillingFoo = &TDriver::CalcSkilling_simplix;
cInstances[Index-IndexOffset].cRobot->CalcFrictionFoo = &TDriver::CalcFriction_simplix;
cInstances[Index-IndexOffset].cRobot->CalcFrictionFoo = &TDriver::CalcFriction_simplix_Identity;
cInstances[Index-IndexOffset].cRobot->CalcCrvFoo = &TDriver::CalcCrv_simplix;
cInstances[Index-IndexOffset].cRobot->CalcHairpinFoo = &TDriver::CalcHairpin_simplix;
cInstances[Index-IndexOffset].cRobot->CalcHairpinFoo = &TDriver::CalcHairpin_simplix_Identity;
cInstances[Index-IndexOffset].cRobot->ScaleSide(0.95f,0.95f);
cInstances[Index-IndexOffset].cRobot->SideBorderOuter(0.20f);
}
@ -622,8 +622,8 @@ static int InitFuncPt(int Index, void *Pt)
GfOut("#cRobotType == RTYPE_SIMPLIX_TRB1\n");
cInstances[Index-IndexOffset].cRobot->CalcSkillingFoo = &TDriver::CalcSkilling_simplix;
cInstances[Index-IndexOffset].cRobot->CalcFrictionFoo = &TDriver::CalcFriction_simplix_TRB1;
cInstances[Index-IndexOffset].cRobot->CalcCrvFoo = &TDriver::CalcCrv_simplix_TRB1;
cInstances[Index-IndexOffset].cRobot->CalcHairpinFoo = &TDriver::CalcHairpin_simplix_TRB1;
cInstances[Index-IndexOffset].cRobot->CalcCrvFoo = &TDriver::CalcCrv_simplix_Identity;
cInstances[Index-IndexOffset].cRobot->CalcHairpinFoo = &TDriver::CalcHairpin_simplix_Identity;
cInstances[Index-IndexOffset].cRobot->ScaleSide(0.95f,0.95f);
cInstances[Index-IndexOffset].cRobot->SideBorderOuter(0.20f);
}
@ -631,9 +631,9 @@ static int InitFuncPt(int Index, void *Pt)
{
GfOut("#cRobotType == RTYPE_SIMPLIX_SC\n");
cInstances[Index-IndexOffset].cRobot->CalcSkillingFoo = &TDriver::CalcSkilling_simplix_SC;
cInstances[Index-IndexOffset].cRobot->CalcFrictionFoo = &TDriver::CalcFriction_simplix;
cInstances[Index-IndexOffset].cRobot->CalcFrictionFoo = &TDriver::CalcFriction_simplix_Identity;
cInstances[Index-IndexOffset].cRobot->CalcCrvFoo = &TDriver::CalcCrv_simplix_SC;
cInstances[Index-IndexOffset].cRobot->CalcHairpinFoo = &TDriver::CalcHairpin_simplix_SC;
cInstances[Index-IndexOffset].cRobot->CalcHairpinFoo = &TDriver::CalcHairpin_simplix_Identity;
cInstances[Index-IndexOffset].cRobot->ScaleSide(0.90f,0.95f);
cInstances[Index-IndexOffset].cRobot->SideBorderOuter(0.30f);
}
@ -641,9 +641,9 @@ static int InitFuncPt(int Index, void *Pt)
{
GfOut("#cRobotType == RTYPE_SIMPLIX_36GP\n");
cInstances[Index-IndexOffset].cRobot->CalcSkillingFoo = &TDriver::CalcSkilling_simplix;
cInstances[Index-IndexOffset].cRobot->CalcFrictionFoo = &TDriver::CalcFriction_simplix;
cInstances[Index-IndexOffset].cRobot->CalcFrictionFoo = &TDriver::CalcFriction_simplix_Identity;
cInstances[Index-IndexOffset].cRobot->CalcCrvFoo = &TDriver::CalcCrv_simplix_36GP;
cInstances[Index-IndexOffset].cRobot->CalcHairpinFoo = &TDriver::CalcHairpin_simplix_36GP;
cInstances[Index-IndexOffset].cRobot->CalcHairpinFoo = &TDriver::CalcHairpin_simplix_Identity;
cInstances[Index-IndexOffset].cRobot->ScaleSide(0.85f,0.85f);
cInstances[Index-IndexOffset].cRobot->SideBorderOuter(0.75f);
//cRobot[Index-IndexOffset]->UseFilterAccel();
@ -652,9 +652,9 @@ static int InitFuncPt(int Index, void *Pt)
{
GfOut("#cRobotType == RTYPE_SIMPLIX_MPA1\n");
cInstances[Index-IndexOffset].cRobot->CalcSkillingFoo = &TDriver::CalcSkilling_simplix_MPA1;
cInstances[Index-IndexOffset].cRobot->CalcFrictionFoo = &TDriver::CalcFriction_simplix;
cInstances[Index-IndexOffset].cRobot->CalcCrvFoo = &TDriver::CalcCrv_simplix_MPA1;
cInstances[Index-IndexOffset].cRobot->CalcHairpinFoo = &TDriver::CalcHairpin_simplix_MPA1;
cInstances[Index-IndexOffset].cRobot->CalcFrictionFoo = &TDriver::CalcFriction_simplix_Identity;
cInstances[Index-IndexOffset].cRobot->CalcCrvFoo = &TDriver::CalcCrv_simplix_Identity;
cInstances[Index-IndexOffset].cRobot->CalcHairpinFoo = &TDriver::CalcHairpin_simplix_Identity;
cInstances[Index-IndexOffset].cRobot->ScaleSide(0.95f,0.95f);
cInstances[Index-IndexOffset].cRobot->SideBorderOuter(0.20f);
}
@ -663,8 +663,8 @@ static int InitFuncPt(int Index, void *Pt)
GfOut("#cRobotType == RTYPE_SIMPLIX_LS1\n");
cInstances[Index-IndexOffset].cRobot->CalcSkillingFoo = &TDriver::CalcSkilling_simplix;
cInstances[Index-IndexOffset].cRobot->CalcFrictionFoo = &TDriver::CalcFriction_simplix_TRB1;
cInstances[Index-IndexOffset].cRobot->CalcCrvFoo = &TDriver::CalcCrv_simplix_TRB1;
cInstances[Index-IndexOffset].cRobot->CalcHairpinFoo = &TDriver::CalcHairpin_simplix_TRB1;
cInstances[Index-IndexOffset].cRobot->CalcCrvFoo = &TDriver::CalcCrv_simplix_Identity;
cInstances[Index-IndexOffset].cRobot->CalcHairpinFoo = &TDriver::CalcHairpin_simplix_Identity;
cInstances[Index-IndexOffset].cRobot->ScaleSide(0.95f,0.95f);
cInstances[Index-IndexOffset].cRobot->SideBorderOuter(0.20f);
}
@ -672,9 +672,9 @@ static int InitFuncPt(int Index, void *Pt)
{
GfOut("#cRobotType == RTYPE_SIMPLIX_MP5\n");
cInstances[Index-IndexOffset].cRobot->CalcSkillingFoo = &TDriver::CalcSkilling_simplix;
cInstances[Index-IndexOffset].cRobot->CalcFrictionFoo = &TDriver::CalcFriction_simplix;
cInstances[Index-IndexOffset].cRobot->CalcCrvFoo = &TDriver::CalcCrv_simplix_MP5;
cInstances[Index-IndexOffset].cRobot->CalcHairpinFoo = &TDriver::CalcHairpin_simplix_MP5;
cInstances[Index-IndexOffset].cRobot->CalcFrictionFoo = &TDriver::CalcFriction_simplix_Identity;
cInstances[Index-IndexOffset].cRobot->CalcCrvFoo = &TDriver::CalcCrv_simplix_Identity;
cInstances[Index-IndexOffset].cRobot->CalcHairpinFoo = &TDriver::CalcHairpin_simplix_Identity;
cInstances[Index-IndexOffset].cRobot->ScaleSide(0.95f,0.95f);
cInstances[Index-IndexOffset].cRobot->SideBorderOuter(0.20f);
}