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

use enums for some track parameters

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

Former-commit-id: d38d519d4350123ddb6a031ac61d33537778c124
Former-commit-id: fa5b4693fc81e28772e28db44a263ef850282c86
This commit is contained in:
iobyte 2022-07-09 00:16:20 +00:00
parent fe2a2e72c6
commit 136ec02761
4 changed files with 34 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/interfaces/track.h
View file

@ -309,12 +309,19 @@ typedef struct trackSurface
} tTrackSurface;
enum tSegStyle
{
TR_PLAN = 0, /**< Flat (border only) */
TR_CURB = 1, /**< Curb (border only) */
TR_WALL = 2, /**< Wall (border and barrier) */
TR_FENCE = 3, /**< Fence (no width) (barrier only) */
TR_PITBUILDING = 4 /**< Pit building wall (barrier only) */
};
/** Barrier */
typedef struct trackBarrier
{
int style; /**< Barrier style */
tSegStyle style; /**< Barrier style */
tdble width; /**< Barrier width */
tdble height; /**< Barrier height */
tTrackSurface *surface; /**< Barrier surface */
@ -330,45 +337,48 @@ typedef struct trackBarrier
The reference angle is the orientation of the first segment of the track.
@ingroup trackstruct
*/
enum tSegType
{
TR_RGT = 1, /**< Right curve */
TR_LFT = 2, /**< Left curve */
TR_STR = 3 /**< Straight */
};
enum tSegType2
{
TR_MAIN = 1, /**< Main track segment (ie road part) */
TR_LSIDE = 2, /**< Left side segment (outer segment) */
TR_RSIDE = 3, /**< Right side segment (outer segment) */
TR_LBORDER = 4, /**< Left border segment (inner segment) */
TR_RBORDER = 5 /**< Right border segment (inner segment) */
};
typedef struct trackSeg
{
char *name; /**< Segment name */
int id; /**< Segment number */
int type; /**< Geometrical type:
tSegType type; /**< Geometrical type:
- TR_RGT
- TR_LFT
- TR_STR
*/
#define TR_RGT 1 /**< Right curve */
#define TR_LFT 2 /**< Left curve */
#define TR_STR 3 /**< Straight */
int type2; /**< Position type:
tSegType2 type2; /**< Position type:
- TR_MAIN
- TR_LSIDE
- TR_RSIDE
- TR_LBORDER
- TR_RBORDER
*/
#define TR_MAIN 1 /**< Main track segment (ie road part) */
#define TR_LSIDE 2 /**< Left side segment (outer segment) */
#define TR_RSIDE 3 /**< Right side segment (outer segment) */
#define TR_LBORDER 4 /**< Left border segment (inner segment) */
#define TR_RBORDER 5 /**< Right border segment (inner segment) */
int style; /**< Border and barrier segments style:
tSegStyle style; /**< Border and barrier segments style:
- TR_PLAN
- TR_CURB
- TR_WALL
- TR_FENCE
- TR_PITBUILDING
*/
#define TR_PLAN 0 /**< Flat (border only) */
#define TR_CURB 1 /**< Curb (border only) */
#define TR_WALL 2 /**< Wall (barrier only) */
#define TR_FENCE 3 /**< Fence (no width) (barrier only) */
#define TR_PITBUILDING 4 /**< Pit building wall (barrier only) */
tdble length; /**< Length in meters of the middle of the track */
tdble width; /**< Width of the segment (if constant width) */

4
src/modules/track/trackv1/track3.cpp
View file

@ -77,13 +77,13 @@ static int envIndex;
static tdble borderWidth[2];
static tdble borderHeight[2];
static int borderStyle[2];
static tSegStyle borderStyle[2];
static const char *borderMaterial[2];
static tTrackSurface *borderSurface[2];
static tdble barrierWidth[2];
static tdble barrierHeight[2];
static int barrierStyle[2];
static tSegStyle barrierStyle[2];
static const char *barrierMaterial[2];
static tTrackSurface *barrierSurface[2];

4
src/modules/track/trackv1/track4.cpp
View file

@ -54,13 +54,13 @@ static tdble DoVfactor=1.0;
static tdble borderWidth[2];
static tdble borderHeight[2];
static int borderStyle[2];
static tSegStyle borderStyle[2];
static const char *borderMaterial[2];
static tTrackSurface *borderSurface[2];
static tdble barrierWidth[2];
static tdble barrierHeight[2];
static int barrierStyle[2];
static tSegStyle barrierStyle[2];
static const char *barrierMaterial[2];
static tTrackSurface *barrierSurface[2];

4
src/modules/track/trackv1/track5.cpp
View file

@ -66,13 +66,13 @@ static tdble DoVfactor=1.0;
static tdble borderWidth[2];
static tdble borderHeight[2];
static int borderStyle[2];
static tSegStyle borderStyle[2];
static const char *borderMaterial[2];
static tTrackSurface *borderSurface[2];
static tdble barrierWidth[2];
static tdble barrierHeight[2];
static int barrierStyle[2];
static tSegStyle barrierStyle[2];
static const char *barrierMaterial[2];
static tTrackSurface *barrierSurface[2];