fix: sun2 for shine instead of sun3

vinceh121 · Jan 14, 2024 · b46c05f · b46c05f
1 parent 33b999b
commit b46c05f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 28 deletions.
diff --git a/android/assets/story/singleplayer/chapter00/part01/skyIntro.js b/android/assets/story/singleplayer/chapter00/part01/skyIntro.js
@@ -4,49 +4,49 @@ exports.skyIntro = {
 			"r": 0.0,
 			"g": 0.0,
 			"b": 0.0,
-			"a": 1.0
+			"a": 0.0
 		},
 		"0.875": {
-			"r": 0.101961,
-			"g": 0.0,
+			"r": 0.458824,
+			"g": 0.156863,
 			"b": 0.0,
-			"a": 0.0
+			"a": 1.0
 		},
 		"0.0": {
-			"r": 0.113725,
-			"g": 0.113725,
-			"b": 0.113725,
-			"a": 0.023999989
+			"r": 0.070588,
+			"g": 0.070588,
+			"b": 0.070588,
+			"a": 1.0
 		},
 		"0.125": {
-			"r": 0.160784,
+			"r": 0.086275,
 			"g": 0.160784,
-			"b": 0.2,
-			"a": 0.0
+			"b": 0.152941,
+			"a": 0.60553634
 		},
 		"0.25": {
-			"r": 0.247059,
-			"g": 0.247059,
-			"b": 0.247059,
-			"a": 0.0
+			"r": 0.317647,
+			"g": 0.317647,
+			"b": 0.317647,
+			"a": 0.5847751
 		},
 		"0.375": {
-			"r": 0.180392,
-			"g": 0.180392,
-			"b": 0.188235,
-			"a": 0.13200003
+			"r": 0.152941,
+			"g": 0.160784,
+			"b": 0.278431,
+			"a": 0.29065743
 		},
 		"0.5": {
-			"r": 0.290196,
-			"g": 0.070588,
+			"r": 0.439216,
+			"g": 0.0,
 			"b": 0.0,
-			"a": 0.0
+			"a": 0.97923875
 		},
 		"0.625": {
 			"r": 0.0,
 			"g": 0.0,
 			"b": 0.0,
-			"a": 1.0
+			"a": 0.0
 		}
 	},
 	"sunLightColor": {

diff --git a/core/src/me/vinceh121/wanderer/glx/SkyboxRenderer.java b/core/src/me/vinceh121/wanderer/glx/SkyboxRenderer.java
@@ -105,10 +105,7 @@ public void update(final float time) {
 			this.shader.setSkyTop(this.interpolatedColor(time, this.skyProperties.getSkyTopColor()));
 			this.shader.setSkyMiddle(this.interpolatedColor(time, this.skyProperties.getSkyMiddleColor()));
 			this.shader.setSkyBottom(this.interpolatedColor(time, this.skyProperties.getSkyBottomColor()));
-
-			// FIXME missing proper alpha
-			final Color sunShine = this.interpolatedColor(time, this.skyProperties.getSunShineColor());
-			this.shader.setSunShine(sunShine);
+			this.shader.setSunShine(this.interpolatedColor(time, this.skyProperties.getSunShineColor()));
 		}
 
 		this.sunDir.scl(-1);

diff --git a/tools/src/me/vinceh121/wanderer/tools/WeatherCommand.java b/tools/src/me/vinceh121/wanderer/tools/WeatherCommand.java
@@ -56,7 +56,7 @@ public class WeatherCommand implements Callable<Integer> {
 					entry("galaxy_diff", new ConversionEntry("galaxyColor")),
 					entry("licht1_color", new ConversionEntry("sunLightColor")),
 					entry("licht2_color", new ConversionEntry("moonLightColor")),
-					entry("sun3_em", new ConversionEntry("sunShineColor").setAlphaFromScale("sun3_s")));
+					entry("sun2_em", new ConversionEntry("sunShineColor").setAlphaFromScale("sun2_s")));
 
 	@Spec
 	private CommandSpec spec;