forked from speed-dreams/speed-dreams-code
- update mpa1-murasama-src.ac
- remove cloud real - remove real weather git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5696 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: b91cc7cf05c860a52950cfd9f94b697f2be84578 Former-commit-id: f86fb699efe2dacd38541d4c2da9334274abbd6f
This commit is contained in:
parent
09fc1d9522
commit
5badbb52f6
4 changed files with 7 additions and 7 deletions
|
@ -366,7 +366,7 @@ typedef struct RmInfo
|
||||||
#define RM_VAL_CLOUDS_RANDOM "random"
|
#define RM_VAL_CLOUDS_RANDOM "random"
|
||||||
#define RM_VAL_CLOUDS_REAL "real"
|
#define RM_VAL_CLOUDS_REAL "real"
|
||||||
#define RM_VALS_CLOUDS { RM_VAL_CLOUDS_NONE, RM_VAL_CLOUDS_FEW, RM_VAL_CLOUDS_SCARCE, \
|
#define RM_VALS_CLOUDS { RM_VAL_CLOUDS_NONE, RM_VAL_CLOUDS_FEW, RM_VAL_CLOUDS_SCARCE, \
|
||||||
RM_VAL_CLOUDS_MANY, RM_VAL_CLOUDS_FULL, RM_VAL_CLOUDS_RANDOM, RM_VAL_CLOUDS_REAL }
|
RM_VAL_CLOUDS_MANY, RM_VAL_CLOUDS_FULL, RM_VAL_CLOUDS_RANDOM }
|
||||||
|
|
||||||
#define RM_VAL_RAIN_NONE "none"
|
#define RM_VAL_RAIN_NONE "none"
|
||||||
#define RM_VAL_RAIN_LITTLE "little"
|
#define RM_VAL_RAIN_LITTLE "little"
|
||||||
|
@ -375,7 +375,7 @@ typedef struct RmInfo
|
||||||
#define RM_VAL_RAIN_RANDOM "random"
|
#define RM_VAL_RAIN_RANDOM "random"
|
||||||
#define RM_VAL_RAIN_REAL "real"
|
#define RM_VAL_RAIN_REAL "real"
|
||||||
#define RM_VALS_RAIN { RM_VAL_RAIN_NONE, RM_VAL_RAIN_LITTLE, RM_VAL_RAIN_MEDIUM, \
|
#define RM_VALS_RAIN { RM_VAL_RAIN_NONE, RM_VAL_RAIN_LITTLE, RM_VAL_RAIN_MEDIUM, \
|
||||||
RM_VAL_RAIN_HEAVY, RM_VAL_RAIN_RANDOM, RM_VAL_RAIN_REAL }
|
RM_VAL_RAIN_HEAVY, RM_VAL_RAIN_RANDOM }
|
||||||
|
|
||||||
/* Movie capture */
|
/* Movie capture */
|
||||||
|
|
||||||
|
|
|
@ -69,9 +69,9 @@ public:
|
||||||
eTime24hr,
|
eTime24hr,
|
||||||
nTimeSpecNumber }; // Last = invalid value = nb of valid ones.
|
nTimeSpecNumber }; // Last = invalid value = nb of valid ones.
|
||||||
enum ECloudsSpec { eCloudsNone, eCloudsFew, eCloudsScarce, eCloudsMany, eCloudsFull,
|
enum ECloudsSpec { eCloudsNone, eCloudsFew, eCloudsScarce, eCloudsMany, eCloudsFull,
|
||||||
eCloudsRandom, eCloudsReal, nCloudsSpecNumber}; // Last = invalid value = nb of valid ones.
|
eCloudsRandom, nCloudsSpecNumber}; // Last = invalid value = nb of valid ones.
|
||||||
enum ERainSpec { eRainNone, eRainLittle, eRainMedium, eRainHeavy, eRainRandom,
|
enum ERainSpec { eRainNone, eRainLittle, eRainMedium, eRainHeavy, eRainRandom,
|
||||||
eRainReal, nRainSpecNumber }; // Last = invalid value = nb of valid ones.
|
nRainSpecNumber }; // Last = invalid value = nb of valid ones.
|
||||||
class Parameters
|
class Parameters
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -46,7 +46,7 @@ static const float BackgroundDistance = 1.0f;
|
||||||
|
|
||||||
static const unsigned SkyDomeDistThresh = 12000; // No dynamic sky below that value.
|
static const unsigned SkyDomeDistThresh = 12000; // No dynamic sky below that value.
|
||||||
|
|
||||||
static const int NMaxStars = 1000;
|
static const int NMaxStars = 3200;
|
||||||
static const int NMaxPlanets = 0; //No planets displayed for the moment
|
static const int NMaxPlanets = 0; //No planets displayed for the moment
|
||||||
static const int NMaxCloudLayers = 3;
|
static const int NMaxCloudLayers = 3;
|
||||||
|
|
||||||
|
|
|
@ -252,11 +252,11 @@ rmChangeRain(void *vp)
|
||||||
cloudsComboEnabled = GFUI_DISABLE;
|
cloudsComboEnabled = GFUI_DISABLE;
|
||||||
rmrpClouds = GfRace::eCloudsRandom;
|
rmrpClouds = GfRace::eCloudsRandom;
|
||||||
}
|
}
|
||||||
else if (rmrpRain == GfRace::eRainReal) // Real rain => Real clouds.
|
/*else if (rmrpRain == GfRace::eRainReal) // Real rain => Real clouds.
|
||||||
{
|
{
|
||||||
cloudsComboEnabled = GFUI_DISABLE;
|
cloudsComboEnabled = GFUI_DISABLE;
|
||||||
rmrpClouds = GfRace::eCloudsReal;
|
rmrpClouds = GfRace::eCloudsReal;
|
||||||
}
|
}*/
|
||||||
else if (rmrpRain != GfRace::eRainNone)
|
else if (rmrpRain != GfRace::eRainNone)
|
||||||
{
|
{
|
||||||
cloudsComboEnabled = GFUI_DISABLE;
|
cloudsComboEnabled = GFUI_DISABLE;
|
||||||
|
|
Loading…
Reference in a new issue