From 24bfb86f9b704bca44a6d4c325b4adff036e3668 Mon Sep 17 00:00:00 2001 From: pouillot Date: Mon, 10 Jan 2011 23:55:07 +0000 Subject: [PATCH] Re #314 (simpler wet mu model) mu computation changed, surface specific wet settings now ignored (not yet removed from the XML files) git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@3258 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 752e5241d808559da818ab72a39500071543580d Former-commit-id: c0635ef0ad987b73058dce42136c3b50cdb4727a --- src/interfaces/track.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/interfaces/track.h b/src/interfaces/track.h index 82859ecef..ecd21ab41 100755 --- a/src/interfaces/track.h +++ b/src/interfaces/track.h @@ -132,8 +132,6 @@ #define TRK_ATT_ROUGHTWL "roughness wavelength" #define TRK_ATT_DAMMAGE "dammage" #define TRK_ATT_REBOUND "rebound" -#define TRK_ATT_FRICTION2 "friction rain" -#define TRK_ATT_ROLLRES2 "rolling resistance rain" #define TRK_ATT_TEXTURE "texture name" #define TRK_ATT_BUMPNAME "bump name" #define TRK_ATT_TEXTYPE "texture type" @@ -249,6 +247,15 @@ #define TRK_SECT_SECTORS "Sectors" #define TRK_ATT_SECTOR_DFS "distance from start" + +/* Parameters strings for track physics constants */ + +#define TRK_PHYSICS_FILE "data/tracks/physics.xml" + +#define TRKP_SECT_SURFACES "Surfaces" +#define TRKP_VAL_FRICTIONWDRATIO "friction wet dry ratio" + + /** road camera */ typedef struct RoadCam { @@ -272,11 +279,9 @@ typedef struct trackSurface { const char *material; /**< Type of material used */ tdble kFriction; /**< Coefficient of friction for simu */ - tdble kFriction2; /**< Coefficient of friction rain */ - tdble kFrictionDry; /**< Coefficient of friction if dry */ + tdble kFrictionDry; /**< TODO: Remove ????? Coefficient of friction if dry */ tdble kRebound; /**< Coefficient of energy restitution */ tdble kRollRes; /**< Rolling resistance */ - tdble kRollRes2; /**< Rolling resistance rain*/ tdble kRoughness; /**< Roughtness in m of the surface (wave height) */ tdble kRoughWaveLen; /**< Wave length in m of the surface */ tdble kDammage; /**< Dammages in case of collision */