xavi
/
speed-dreams
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-added graphic compounds in mpa11 

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9170 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
torcs-ng 2023-10-28 11:43:19 +00:00
parent 93e1f1eddc
commit ec7adeeac6
11 changed files with 758 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/cars/models/mpa1-murasama/mpa1-murasama-long.xml
View File

@ -42,6 +42,7 @@
<params name="MPA1 Murasama" type="template">
<section name="Features">
<attstr name="shifting aero coordinates" in="yes,no" val="yes"/>
<attstr name="tire temperature and degradation" in="yes" val="yes"/>
</section>
<section name="Driver">
<!-- Position of the driver -->

1
data/cars/models/mpa1-murasama/mpa1-murasama-road.xml
View File

@ -42,6 +42,7 @@
<params name="MPA1 Murasama" type="template">
<section name="Features">
<attstr name="shifting aero coordinates" in="yes,no" val="yes"/>
<attstr name="tire temperature and degradation" in="yes" val="yes"/>
</section>
<section name="Driver">
<!-- Position of the driver -->

1
data/cars/models/mpa1-murasama/mpa1-murasama-short.xml
View File

@ -42,6 +42,7 @@
<params name="MPA1 Murasama" type="template">
<section name="Features">
<attstr name="shifting aero coordinates" in="yes,no" val="yes"/>
<attstr name="tire temperature and degradation" in="yes" val="yes"/>
</section>
<section name="Driver">
<!-- Position of the driver -->

1
data/cars/models/mpa1-murasama/mpa1-murasama.xml
View File

@ -42,6 +42,7 @@
<params name="MPA1 Murasama" type="template">
<section name="Features">
<attstr name="shifting aero coordinates" in="yes,no" val="yes"/>
<attstr name="tire temperature and degradation" in="yes" val="yes"/>
</section>
<section name="Driver">
<!-- Position of the driver -->

10
data/cars/models/mpa11-murasama/mpa11-murasama-long.xml
View File

@ -43,8 +43,9 @@
<section name="Features">
<!-- Mandatory Features -->
<attstr name="shifting aero coordinate" in="yes" val="yes"/>
<attstr name="fixed low speed grip" in="yes" val="yes"/>
<attstr name="tire temperature and degradation" in="yes" val="yes"/>
<attstr name="fixed low speed grip" in="yes" val="yes"/>
<attstr name="tire compounds" in="yes" val="yes"/>
<!-- Optional Features -->
<attstr name="enable abs" in="yes,no" val="yes"/>
<attstr name="enable tcl" in="yes,no" val="yes"/>
@ -76,8 +77,11 @@
<section name="Graphic Objects">
<attstr name="env" val="mpa11-murasama.acc"/>
<attstr name="shadow texture" val="shadow.png"/>
<attstr name="3d front wheel" val="wheel"/>
<attstr name="3d rear wheel" val="wheel"/>
<attstr name="3d wheel soft" val="wheelsoft"/>
<attstr name="3d wheel medium" val="wheelmedium"/>
<attstr name="3d wheel hard" val="wheelhard"/>
<attstr name="3d wheel wet" val="wheelwet"/>
<attstr name="3d wheel extrem wet" val="wheelextwet"/>
<!-- Speedometers -->
<attstr name="tachometer texture" val="mpa11-rpm.png"/>

9
data/cars/models/mpa11-murasama/mpa11-murasama-road.xml
View File

@ -43,8 +43,8 @@
<section name="Features">
<!-- Mandatory Features -->
<attstr name="shifting aero coordinate" in="yes" val="yes"/>
<attstr name="fixed low speed grip" in="yes" val="yes"/>
<attstr name="tire temperature and degradation" in="yes" val="yes"/>
<attstr name="fixed low speed grip" in="yes" val="yes"/>
<attstr name="tire compounds" in="yes" val="yes"/>
<!-- Optional Features -->
<attstr name="enable abs" in="yes,no" val="yes"/>
@ -74,8 +74,11 @@
<section name="Graphic Objects">
<attstr name="env" val="mpa11-murasama.acc"/>
<attstr name="shadow texture" val="shadow.png"/>
<attstr name="3d front wheel" val="wheel"/>
<attstr name="3d rear wheel" val="wheel"/>
<attstr name="3d wheel soft" val="wheelsoft"/>
<attstr name="3d wheel medium" val="wheelmedium"/>
<attstr name="3d wheel hard" val="wheelhard"/>
<attstr name="3d wheel wet" val="wheelwet"/>
<attstr name="3d wheel extrem wet" val="wheelextwet"/>
<!-- Speedometers -->
<attstr name="tachometer texture" val="mpa11-rpm.png"/>

10
data/cars/models/mpa11-murasama/mpa11-murasama-short.xml
View File

@ -43,8 +43,9 @@
<section name="Features">
<!-- Mandatory Features -->
<attstr name="shifting aero coordinate" in="yes" val="yes"/>
<attstr name="fixed low speed grip" in="yes" val="yes"/>
<attstr name="tire temperature and degradation" in="yes" val="yes"/>
<attstr name="fixed low speed grip" in="yes" val="yes"/>
<attstr name="tire compounds" in="yes" val="yes"/>
<!-- Optional Features -->
<attstr name="enable abs" in="yes,no" val="yes"/>
<attstr name="enable tcl" in="yes,no" val="yes"/>
@ -73,8 +74,11 @@
<section name="Graphic Objects">
<attstr name="env" val="mpa11-murasama.acc"/>
<attstr name="shadow texture" val="shadow.png"/>
<attstr name="3d front wheel" val="wheel"/>
<attstr name="3d rear wheel" val="wheel"/>
<attstr name="3d wheel soft" val="wheelsoft"/>
<attstr name="3d wheel medium" val="wheelmedium"/>
<attstr name="3d wheel hard" val="wheelhard"/>
<attstr name="3d wheel wet" val="wheelwet"/>
<attstr name="3d wheel extrem wet" val="wheelextwet"/>
<!-- Speedometers -->
<attstr name="tachometer texture" val="mpa11-rpm.png"/>

9
data/cars/models/mpa11-murasama/mpa11-murasama.xml
View File

@ -43,8 +43,8 @@
<section name="Features">
<!-- Mandatory Features -->
<attstr name="shifting aero coordinate" in="yes" val="yes"/>
<attstr name="fixed low speed grip" in="yes" val="yes"/>
<attstr name="tire temperature and degradation" in="yes" val="yes"/>
<attstr name="fixed low speed grip" in="yes" val="yes"/>
<attstr name="tire compounds" in="yes" val="yes"/>
<!-- Optional Features -->
<attstr name="enable abs" in="yes,no" val="yes"/>
@ -71,8 +71,11 @@
<section name="Graphic Objects">
<attstr name="env" val="mpa11-murasama.acc"/>
<attstr name="shadow texture" val="shadow.png"/>
<attstr name="3d front wheel" val="wheel"/>
<attstr name="3d rear wheel" val="wheel"/>
<attstr name="3d wheel soft" val="wheelsoft"/>
<attstr name="3d wheel medium" val="wheelmedium"/>
<attstr name="3d wheel hard" val="wheelhard"/>
<attstr name="3d wheel wet" val="wheelwet"/>
<attstr name="3d wheel extrem wet" val="wheelextwet"/>
<!-- Speedometers -->
<attstr name="tachometer texture" val="mpa11-rpm.png"/>

49
src/interfaces/car.h
View File

@ -454,6 +454,8 @@ typedef struct
tdble enginerpmMaxPw;
tdble engineMaxTq;
tdble engineMaxPw;
tdble engineMaxTempWater;
tdble engineTempWater;
tdble gearRatio[MAX_GEARS]; /**< including final drive */
int gearNb; /**< incl reverse and neutral */
int gearOffset; /**< gearRatio[gear + gearOffset] is the ratio for gear */
@ -494,6 +496,8 @@ typedef struct
#define _enginerpmMaxPw priv.enginerpmMaxPw
#define _engineMaxTq priv.engineMaxTq
#define _engineMaxPw priv.engineMaxPw
#define _engineMaxTempWater priv.engineMaxTempWater
#define _engineTempWater priv.engineTempWater
#define _gearRatio priv.gearRatio
#define _gearNb priv.gearNb
#define _gearOffset priv.gearOffset
@ -836,6 +840,7 @@ typedef struct CarElt
#define PRM_FUELCONS "fuel cons factor"
#define PRM_ENGBRKCOEFF "brake coefficient"
#define PRM_ENGBRKLINCOEFF "brake linear coefficient"
#define PRM_ENGINEMAXTEMPWATER "max temperature water"
#define PRM_POWER "power"
#define PRM_TURBO "turbo"
#define PRM_TURBO_RPM "turbo rpm"
@ -857,6 +862,7 @@ typedef struct CarElt
#define LST_RANGES "Ranges"
#define PRM_THRESHOLD "threshold"
#define PRM_CAR "car"
#define PRM_WHEELSON "wheels"
#define PRM_TEMPLATE "template"
#define PRM_ENV "env"
@ -869,6 +875,13 @@ typedef struct CarElt
#define PRM_SW_MODELHR "hi res model"
#define PRM_SW_ANGLE "angle"
#define SECT_COMPOUND_MODEL "compound model"
#define PRM_SOFTMODEL "model soft"
#define PRM_MEDIUMMODEL "model medium"
#define PRM_HARDMODEL "model hard"
#define PRM_WETMODEL "model wet"
#define PRM_EXTWETMODEL "model extrem wet"
#define LST_DRIVER "Driver"
#define PRM_DRIVERSTEER "steer"
#define PRM_DRIVERMODEL "driver"
@ -882,7 +895,13 @@ typedef struct CarElt
#define PRM_WATER_A_MODEL "water analogique model"
#define PRM_OIL_A_MODEL "oil analogic model"
#define PRM_RPM_D_MODEL "rpm digital model"
#define LST_RPM_LED "rpm led"
#define PRM_RPM_LED_OFF "rpm led model off"
#define PRM_RPM_LED_ON "rpm led model on"
#define LST_DIGIT_GEAR "digit gear"
#define PRM_GEAR_MODEL "gear model"
#define PRM_SPEED_D_MODEL "speed digital model"
#define PRM_SPD_D_MODEL "spd digital model"
#define PRM_FUEL_D_MODEL "fuel digital model"
@ -898,6 +917,11 @@ typedef struct CarElt
#define SECT_COCKPIT "cockpit"
#define PRM_MODELCOCKPIT "model cockpit"
#define SECT_SEPARATE_MODEL "separate model"
#define PRM_METAL_BODY "metal model"
#define PRM_CARBON_BODY "carbon model"
#define PRM_MIRROR "mirror model"
#define SECT_WING_MODEL "wing model"
#define PRM_WING_1 "model short oval"
#define PRM_WING_2 "model long oval"
@ -1003,6 +1027,12 @@ typedef enum
#define PRM_FRONT_WHEEL_3D "3d front wheel"
#define PRM_REAR_WHEEL_3D "3d rear wheel"
#define PRM_WHEELSOFT_3D "3d wheel soft"
#define PRM_WHEELMEDIUM_3D "3d wheel medium"
#define PRM_WHEELHARD_3D "3d wheel hard"
#define PRM_WHEELWET_3D "3d wheel wet"
#define PRM_WHEELEXTWET_3D "3d wheel extrem wet"
/* Lights */
#define VAL_LIGHT_HEAD1 "head1"
#define VAL_LIGHT_HEAD2 "head2"
@ -1012,13 +1042,16 @@ typedef enum
#define VAL_LIGHT_REAR "rear"
/* Simulation Options */
#define PRM_DAMAGE_TYRES "damage/tyres"
#define PRM_DAMAGE_SUSPENSION "damage/suspension"
#define PRM_DAMAGE_ALIGNMENT "damage/alignment"
#define PRM_DAMAGE_AERO "damage/aero"
#define PRM_MODEL_AEROFLOW "model/aero/flow"
#define PRM_MODEL_AERO_FACTOR "model/aero/factor"
#define PRM_MODEL_TYRE_TEMPERATURE "model/tyre/temperature"
#define PRM_DAMAGE_TYRES "damage/tyres"
#define PRM_DAMAGE_SUSPENSION "damage/suspension"
#define PRM_DAMAGE_ALIGNMENT "damage/alignment"
#define PRM_DAMAGE_AERO "damage/aero"
#define PRM_DAMAGE_ENGINE "damage/engine"
#define PRM_MODEL_AEROFLOW "model/aero/flow"
#define PRM_MODEL_AERO_FACTOR "model/aero/factor"
#define PRM_MODEL_TYRE_TEMPERATURE "model/tyres/temperature"
#define PRM_MODEL_TYRE_COMPOUNDS "model/tyres/compounds"
#define PRM_MODEL_ENGINE_TEMPERATURE "model/engine/temperature"
// Collision constants.
#define SEM_COLLISION 0x01

1004
src/modules/graphic/ssggraph/grcar.cpp
View File

File diff suppressed because it is too large Load Diff

9
src/modules/graphic/ssggraph/grcar.h
View File

@ -51,7 +51,6 @@ public:
float needleColor[4];
};
class tgrCarInfo
{
public:
@ -74,8 +73,14 @@ public:
ssgSelector *driverSelector;
ssgSelector *steerSelector;
ssgSelector *rearwingSelector;
ssgSelector *rpmlightsSelector;
ssgSelector *gearSelector;
bool driverSelectorinsg;
bool rearwingSelectorinsg;
bool rpmlightsSelectorinsg;
bool gearSelectorinsg;
bool cockpitSelectorinsg;
bool separatemodelSelectorinsg;
ssgStateSelector *envSelector;
ssgTransform *wheelPos[4];
ssgTransform *wheelRot[4];
@ -113,4 +118,6 @@ extern void grDrawCar(tSituation *, tCarElt*, tCarElt *, int, int, double curTim
extern void grInitCommonState(void);
//extern void grPropagateDamage (ssgEntity* l, sgVec3 poc, sgVec3 force, int cnt);
extern void grPropagateDamage (tSituation *);
extern void grDrawCarShadow(void);
extern bool grShadowStatic;
#endif /* _GRCAR_H_ */