Reintroduce Sunset biome (#471)

* Enable sunset biome again

* Add shader configuration values into specular color

* Adjust PBR textures

* Adjust height7 a bit

* Increase texture blending

* Trigger usage of textures

Author: BlackYps

generator/src/main/java/com/faforever/neroxis/generator/TextureStyle.java

@@ -9,6 +9,7 @@
 import com.faforever.neroxis.generator.texture.MoonlightTextureGenerator;
 import com.faforever.neroxis.generator.texture.PrayerTextureGenerator;
 import com.faforever.neroxis.generator.texture.StonesTextureGenerator;
+import com.faforever.neroxis.generator.texture.SunsetTextureGenerator;
 import com.faforever.neroxis.generator.texture.SyrtisTextureGenerator;
 import com.faforever.neroxis.generator.texture.TextureGenerator;
 import com.faforever.neroxis.generator.texture.WindingRiverTextureGenerator;
@@ -29,7 +30,7 @@ public enum TextureStyle {
     MOONLIGHT(MoonlightTextureGenerator::new),
     PRAYER(PrayerTextureGenerator::new),
     STONES(StonesTextureGenerator::new),
-    //SUNSET(SunsetTextureGenerator::new),
+    SUNSET(SunsetTextureGenerator::new),
     SYRTIS(SyrtisTextureGenerator::new),
     WINDINGRIVER(WindingRiverTextureGenerator::new),
     WONDER(WonderTextureGenerator::new),

generator/src/main/java/com/faforever/neroxis/generator/style/HighReclaimStyleGenerator.java

@@ -14,6 +14,7 @@
 import com.faforever.neroxis.generator.texture.DesertTextureGenerator;
 import com.faforever.neroxis.generator.texture.FrithenTextureGenerator;
 import com.faforever.neroxis.generator.texture.MoonlightTextureGenerator;
+import com.faforever.neroxis.generator.texture.SunsetTextureGenerator;
 import com.faforever.neroxis.generator.texture.TextureGenerator;
 import com.faforever.neroxis.generator.texture.WonderTextureGenerator;
 
@@ -41,7 +42,7 @@ protected WeightedOptionsWithFallback<TextureGenerator> getTextureGeneratorOptio
                                               new WeightedOption<>(new DesertTextureGenerator(), 1f),
                                               new WeightedOption<>(new FrithenTextureGenerator(), 1f),
                                               new WeightedOption<>(new MoonlightTextureGenerator(), 1f),
-                                              // new WeightedOption<>(new SunsetTextureGenerator(), 1f),
+                                              new WeightedOption<>(new SunsetTextureGenerator(), 1f),
                                               new WeightedOption<>(new WonderTextureGenerator(), 1f));
     }
 }

generator/src/main/java/com/faforever/neroxis/generator/style/StyleGenerator.java

@@ -20,6 +20,7 @@
 import com.faforever.neroxis.generator.texture.MarsTextureGenerator;
 import com.faforever.neroxis.generator.texture.PrayerTextureGenerator;
 import com.faforever.neroxis.generator.texture.StonesTextureGenerator;
+import com.faforever.neroxis.generator.texture.SunsetTextureGenerator;
 import com.faforever.neroxis.generator.texture.SyrtisTextureGenerator;
 import com.faforever.neroxis.generator.texture.TextureGenerator;
 import com.faforever.neroxis.generator.texture.WindingRiverTextureGenerator;
@@ -80,7 +81,7 @@ protected WeightedOptionsWithFallback<TextureGenerator> getTextureGeneratorOptio
                                               new WeightedOption<>(new MarsTextureGenerator(), 1f),
                                               new WeightedOption<>(new PrayerTextureGenerator(), 1f),
                                               new WeightedOption<>(new StonesTextureGenerator(), 1f),
-                                              // new WeightedOption<>(new SunsetTextureGenerator(), 1f),
+                                              new WeightedOption<>(new SunsetTextureGenerator(), 1f),
                                               new WeightedOption<>(new SyrtisTextureGenerator(), 1f),
                                               new WeightedOption<>(new WindingRiverTextureGenerator(), 1f),
                                               new WeightedOption<>(new WonderTextureGenerator(), 1f),

shared/src/main/resources/custom_biome/Sunset/Light.scmlighting

@@ -16,10 +16,10 @@
     "z": 0.0
   },
   "specularColor": {
-    "z": 0.0,
-    "x": 0.16,
-    "y": 0.0,
-    "w": 0.0
+    "z": 0.866,
+    "x": 0.48,
+    "y": 0.6,
+    "w": 0.5
   },
   "fogStart": 0.0,
   "sunDirection": {

shared/src/main/resources/custom_biome/Sunset/materials.json

@@ -44,11 +44,11 @@
     },
     {
       "path": "map/env/layers/mapInfo.dds",
-      "scale": 1.0
+      "scale": 10000.0
     },
     {
       "path": "map/env/layers/roughnessAndHeight.dds",
-      "scale": 1.0
+      "scale": 10000.0
     }
   ],
   "normals": [
@@ -86,7 +86,7 @@
     },
     {
       "path": "map/env/layers/mapNormal.dds",
-      "scale": 1.0
+      "scale": 10000.0
     }
   ],
   "previewColors": [