Skip to content

Commit 7635a7c

Browse files
authored
lil changes
1 parent 10ca8f7 commit 7635a7c

File tree

4 files changed

+24
-29
lines changed

4 files changed

+24
-29
lines changed

shaders/ad_astra_config/ad_astra_world_config.glsl

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
// this file is included at the end of /lib/common.glsl so it can override any user settings
22

33
// disable clouds
4-
#ifndef WORLD_whatever
4+
#ifndef WORLD_whatever //we dont have any planets we keep clouds, so i put whatever
55
#undef VL_CLOUDS_ACTIVE
66
#endif
77

88
#ifdef AD_ASTRA_ORBIT
9-
#define HAS_NO_MOON
10-
#define HAS_NO_ATMOSPHERE
11-
// Keep all bloom and lens flare effects for sun
12-
// #undef LENSFLARE
13-
// #undef BLOOM_FOG
149

15-
//Sun doesnt fade when on the horizon
16-
#define UNLIT_SKY_OBJECTS
17-
#define CELESTIAL_BOTH_HEMISPHERES
18-
#define NEBULA_AT_DAY
19-
#define DAYLIGHT_STARS
10+
#define UNLIT_SKY_OBJECTS //Sun doesnt fade when over the horizon
11+
12+
#define CELESTIAL_BOTH_HEMISPHERES //Stars still appear below the horizon
13+
14+
#define NEBULA_AT_DAY //function not yet made
15+
16+
#define DAYLIGHT_STARS //stars appear at day
17+
18+
#define HAS_NO_MOON
19+
#define HAS_NO_ATMOSPHERE
20+
#undef BORDER_FOG
2021
#undef ATM_FOG_MULT
2122
#define ATM_FOG_MULT 0.0
2223
#undef LIGHTSHAFTS_ACTIVE
@@ -34,21 +35,17 @@
3435
#endif
3536
#ifdef WORLD_MOON
3637
#define HAS_NO_MOON
37-
#define NEBULA_AT_DAY
38+
// #define NEBULA_AT_DAY
3839
#define DAYLIGHT_STARS
3940
#define HAS_NO_ATMOSPHERE
4041
#undef BORDER_FOG
41-
#undef ATM_FOG_MULT
42-
#define ATM_FOG_MULT 0.0
43-
#undef LIGHTSHAFTS_ACTIVE
44-
#define LIGHTSHAFTS_ACTIVE 0
45-
#undef LIGHTSHAFT_BEHAVIOUR
46-
#define LIGHTSHAFT_BEHAVIOUR 0
42+
#define ATM_FOG_MULT 0
43+
#define HAS_NO_ATMOSPHERE
4744
#endif
4845

4946
#ifdef WORLD_MERCURY
5047
#define HAS_NO_MOON
51-
#define NEBULA_AT_DAY
48+
// #define NEBULA_AT_DAY
5249
#define DAYLIGHT_STARS
5350

5451
#endif

shaders/ad_astra_config/lightAndAmbientColors.glsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// #ifdef WORLD_ORBIT
22

33

4-
#if defined WORLD_EUROPA
4+
#if defined WORLD_EUROPA //not made
55
#ifndef COMPOSITE
66
vec3 noonClearLightColor = vec3(0.6, 0.55, 0.7) * 1.9; //ground and cloud color
77
#else
@@ -146,7 +146,7 @@
146146
vec3 ambientColor = mix(clearAmbientColor, rainAmbientColor, rainFactor);
147147

148148

149-
#elif defined(WORLD_MERCURY)
149+
#elif defined WORLD_MERCURY
150150
#ifndef COMPOSITE
151151
vec3 noonClearLightColor = vec3(0.76, 0.57, 0.36) * 1.9; //ground and cloud color
152152
#else

shaders/ad_astra_config/skyColors.glsl

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#ifdef AD_ASTRA_ORBIT
1+
#ifdef AD_ASTRA_ORBIT //not made
22
uniform vec3 skyColorSmooth;
3-
// I'm british >:3
43
vec3 colour = vec3(0.035, 0.035, 0.055);
54

65
vec3 sunsetDownSkyColorP = colour;
@@ -11,7 +10,7 @@
1110
vec3 nightMiddleSkyColor = colour;
1211
vec3 nightDownSkyColor = colour;
1312

14-
#elif defined WORLD_EUROPA
13+
#elif defined WORLD_EUROPA //not made
1514
// Soft neutral gradient; no bluish band at horizon
1615
const vec3 dayUp = vec3(0.070, 0.070, 0.075);
1716
const vec3 dayMid = vec3(0.060, 0.060, 0.066);
@@ -31,7 +30,7 @@
3130
vec3 nightMiddleSkyColor = nightMid;
3231
vec3 nightDownSkyColor = nightDown;
3332

34-
#elif defined(WORLD_MARS)
33+
#elif defined WORLD_MARS
3534
// Mars sky colors - original Taidum values for proper brightness
3635
const vec3 dayUp = vec3(0.90, 0.67, 0.52);
3736
const vec3 dayMid = vec3(0.94, 0.61, 0.38);
@@ -52,7 +51,7 @@
5251
vec3 nightMiddleSkyColor = nightMid;
5352
vec3 nightDownSkyColor = nightDown;
5453

55-
#elif defined(WORLD_MERCURY)
54+
#elif defined WORLD_MERCURY //not made
5655
// Mars sky colors - original Taidum values for proper brightness
5756
const vec3 dayUp = vec3(0.90, 0.67, 0.52);
5857
const vec3 dayMid = vec3(0.94, 0.61, 0.38);
@@ -73,7 +72,7 @@
7372
vec3 nightMiddleSkyColor = nightMid;
7473
vec3 nightDownSkyColor = nightDown;
7574

76-
#elif defined (WORLD_MOON)
75+
#elif defined WORLD_MOON
7776
// Soft neutral gradient; no bluish band at horizon
7877
const vec3 dayUp = vec3(0.070, 0.070, 0.075);
7978
const vec3 dayMid = vec3(0.060, 0.060, 0.066);

shaders/lib/colors/skyColors.glsl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,4 @@
6464
#include "/ad_astra_config/skyColors.glsl"
6565
#endif
6666

67-
#endif //INCLUDE_SKY_COLORS
68-
67+
#endif //INCLUDE_SKY_COLORS

0 commit comments

Comments
 (0)