Set cubemaps from biome (#324)

Co-authored-by: Sheikah45 <[email protected]>

shared/src/main/java/com/faforever/neroxis/exporter/SCMapExporter.java

@@ -35,6 +35,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
+import java.util.List;
 
 import static com.faforever.neroxis.util.EndianSwapper.swap;
 import static com.faforever.neroxis.util.jsquish.Squish.compressImage;
@@ -83,8 +84,9 @@ public static void exportSCMAP(Path folderPath, SCMap map) throws IOException {
         writeStringNull(map.getTerrainShaderPath());
         writeStringNull(map.getBackgroundPath());
         writeStringNull(map.getSkyCubePath());
-        writeInt(map.getCubeMapCount());
-        for (CubeMap cubeMap : map.getCubeMaps()) {
+        List<CubeMap> cubeMaps = map.getBiome().terrainMaterials().getCubeMaps();
+        writeInt(cubeMaps.size());
+        for (CubeMap cubeMap : cubeMaps) {
             writeStringNull(cubeMap.getName());
             writeStringNull(cubeMap.getPath());
         }

shared/src/main/java/com/faforever/neroxis/importer/SCMapImporter.java

@@ -134,6 +134,10 @@ public static SCMap importSCMAP(Path folderPath) throws IOException {
             mapTerrainMaterials.getNormalScales()[i] = readFloat();
         }
 
+        for (CubeMap cubeMap : cubeMaps) {
+            mapTerrainMaterials.getCubeMaps().add(cubeMap);
+        }
+
         readInt(); // unknown
         readInt(); // unknown
 
@@ -246,10 +250,6 @@ public static SCMap importSCMAP(Path folderPath) throws IOException {
         for (DecalGroup decalGroup : decalGroups) {
             map.addDecalGroup(decalGroup);
         }
-        map.getCubeMaps().clear();
-        for (CubeMap cubeMap : cubeMaps) {
-            map.addCubeMap(cubeMap);
-        }
         return map;
     }
 

shared/src/main/java/com/faforever/neroxis/map/SCMap.java

@@ -59,7 +59,6 @@ public class SCMap {
     private final List<AIMarker> largeExpansionAIMarkers;
     private final List<AIMarker> navalAreaAIMarkers;
     private final List<AIMarker> navalRallyMarkers;
-    private final List<CubeMap> cubeMaps;
     private byte[] compressedNormal;
     private byte[] compressedShadows;
     private float heightMapScale = 1f / 128f;
@@ -119,8 +118,6 @@ public SCMap(int size, Biome biome) {
         navalAreaAIMarkers = new ArrayList<>();
         navalRallyMarkers = new ArrayList<>();
         waveGenerators = new ArrayList<>();
-        cubeMaps = new ArrayList<>();
-        cubeMaps.add(new CubeMap("<default>", "/textures/environment/defaultenvcube.dds"));
         skyBox = new SkyBox();
 
         generatePreview = true;
@@ -448,18 +445,6 @@ public void addWaveGenerator(WaveGenerator waveGenerator) {
         waveGenerators.add(waveGenerator);
     }
 
-    public int getCubeMapCount() {
-        return cubeMaps.size();
-    }
-
-    public CubeMap getCubemap(int i) {
-        return cubeMaps.get(i);
-    }
-
-    public void addCubeMap(CubeMap cubeMap) {
-        cubeMaps.add(cubeMap);
-    }
-
     private void scaleMapContent(float contentScale) {
         this.biome.waterSettings().setElevation(this.biome.waterSettings().getElevation() * contentScale);
         this.biome.waterSettings().setElevationDeep(this.biome.waterSettings().getElevationDeep() * contentScale);

shared/src/main/java/com/faforever/neroxis/util/serial/biome/TerrainMaterials.java

@@ -1,15 +1,20 @@
 package com.faforever.neroxis.util.serial.biome;
 
 import com.dslplatform.json.CompiledJson;
+import com.faforever.neroxis.map.CubeMap;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 @CompiledJson
 public class TerrainMaterials {
     // engine limitations - must stay 9 and 10 always
     public static final int TERRAIN_TEXTURE_COUNT = 10;
     public static final int TERRAIN_NORMAL_COUNT = 9;
     private String name;
+    private List<CubeMap> cubeMaps = new ArrayList<>();
     private String[] texturePaths = new String[TERRAIN_TEXTURE_COUNT];
     private float[] textureScales = new float[TERRAIN_TEXTURE_COUNT];
     private String[] normalPaths = new String[TERRAIN_NORMAL_COUNT];

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

@@ -22,6 +22,16 @@
     6.0
   ],
   "name": "Brimstone",
+  "cubeMaps": [
+    {
+      "name": "<default>",
+      "path": "/textures/environment/SkyCube_RedRocks08a.dds"
+    },
+    {
+      "name": "<water>",
+      "path": "/textures/environment/SkyCube_RedRocks08a.dds"
+    }
+  ],
   "normalPaths": [
     "/env/Tropical/Layers/Trop_GrassJung_normal.dds",
     "/env/Evergreen/layers/grass000_normals.dds",

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

@@ -1,5 +1,15 @@
 {
   "name": "Desert",
+  "cubeMaps": [
+    {
+      "name": "<default>",
+      "path": "/textures/environment/SkyCube_Desert02.dds"
+    },
+    {
+      "name": "<water>",
+      "path": "/textures/environment/SkyCube_Desert02a.dds"
+    }
+  ],
   "texturePaths": [
     "/env/Desert/Layers/Des_SandDark02_albedo.dds",
     "/env/Desert/Layers/Des_SandMed02_albedo.dds",

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

@@ -22,6 +22,16 @@
     6.0
   ],
   "name": "EarlyAutumn",
+  "cubeMaps": [
+    {
+      "name": "<default>",
+      "path": "/textures/environment/DefaultEnvCube.dds"
+    },
+    {
+      "name": "<water>",
+      "path": "/textures/environment/DefaultEnvCube_mirrored.dds"
+    }
+  ],
   "normalPaths": [
     "/env/Tropical/Layers/Trop_GrassJung_normal.dds",
     "/env/evergreen2/layers/eg_grass001_normal.dds",

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

@@ -1,5 +1,15 @@
 {
   "name": "Frithen",
+  "cubeMaps": [
+    {
+      "name": "<default>",
+      "path": "/textures/environment/SkyCube_Tundra04a.dds"
+    },
+    {
+      "name": "<water>",
+      "path": "/textures/environment/SkyCube_Tundra04a.dds"
+    }
+  ],
   "texturePaths": [
     "/env/Tundra/Layers/Tund_Rock03_albedo.DDS",
     "/env/Tundra/Layers/Tund_Ice001_albedo.DDS",

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

@@ -1,5 +1,15 @@
 {
   "name": "Loki",
+  "cubeMaps": [
+    {
+      "name": "<default>",
+      "path": "/textures/environment/SkyCube_TropicalOp06.dds"
+    },
+    {
+      "name": "<water>",
+      "path": "/textures/environment/SkyCube_TropicalOp06a.dds"
+    }
+  ],
   "texturePaths": [
     "/env/Evergreen2/Layers/EvGrass007_albedo.dds",
     "/env/Evergreen2/Layers/EvGrass010a_albedo.dds",

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

@@ -1,5 +1,15 @@
 {
   "name": "Mars",
+  "cubeMaps": [
+    {
+      "name": "<default>",
+      "path": "/textures/environment/SkyCube_Desert02.dds"
+    },
+    {
+      "name": "<water>",
+      "path": "/textures/environment/SkyCube_Desert02a.dds"
+    }
+  ],
   "texturePaths": [
     "/env/Desert/Layers/Des_Gravel_albedo.dds",
     "/env/Desert/Layers/Des_Rock_albedo.dds",

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

@@ -1,5 +1,15 @@
 {
   "name": "Moonlight",
+  "cubeMaps": [
+    {
+      "name": "<default>",
+      "path": "/textures/environment/SkyCube_RedRocks05.dds"
+    },
+    {
+      "name": "<water>",
+      "path": "/textures/environment/SkyCube_RedRocks05a.dds"
+    }
+  ],
   "texturePaths": [
     "/env/Red Barrens/Layers/RB_RedMud_albedo.dds",
     "/env/Red Barrens/Layers/RB_Cracked02_albedo.DDS",

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

@@ -1,5 +1,15 @@
 {
   "name": "Prayer",
+  "cubeMaps": [
+    {
+      "name": "<default>",
+      "path": "/textures/environment/DefaultEnvCube.dds"
+    },
+    {
+      "name": "<water>",
+      "path": "/textures/environment/DefaultEnvCube_mirrored.dds"
+    }
+  ],
   "texturePaths": [
     "/env/Evergreen2/Layers/EvTrans03_albedo.dds",
     "/env/Evergreen2/Layers/EvTrans03_albedo.dds",

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

@@ -1,5 +1,15 @@
 {
   "name": "Stones",
+  "cubeMaps": [
+    {
+      "name": "<default>",
+      "path": "/textures/environment/SkyCube_Desert03a.dds"
+    },
+    {
+      "name": "<water>",
+      "path": "/textures/environment/SkyCube_Desert03a.dds"
+    }
+  ],
   "texturePaths": [
     "/env/paradise/layers/grass001_albedo.dds",
     "/env/paradise/layers/Rock001_albedo.dds",

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

@@ -1,5 +1,15 @@
 {
   "name": "Syrtis",
+  "cubeMaps": [
+    {
+      "name": "<default>",
+      "path": "/textures/environment/SkyCube_RedRocks06.dds"
+    },
+    {
+      "name": "<water>",
+      "path": "/textures/environment/SkyCube_RedRocks06.dds"
+    }
+  ],
   "texturePaths": [
     "/env/Red Barrens/Layers/RB_RedMud_albedo.dds",
     "/env/Red Barrens/Layers/RB_Sandwet.dds",

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

@@ -22,6 +22,16 @@
     6.0
   ],
   "name": "WindingRiver",
+  "cubeMaps": [
+    {
+      "name": "<default>",
+      "path": "/textures/environment/DefaultEnvCube.dds"
+    },
+    {
+      "name": "<water>",
+      "path": "/textures/environment/DefaultEnvCube_mirrored.dds"
+    }
+  ],
   "normalPaths": [
     "/env/Tropical/Layers/Trop_GrassJung_normal.dds",
     "/env/Evergreen/layers/grass000_normals.dds",

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

@@ -1,5 +1,15 @@
 {
   "name": "Wonder",
+  "cubeMaps": [
+    {
+      "name": "<default>",
+      "path": "/textures/environment/DefaultEnvCube.dds"
+    },
+    {
+      "name": "<water>",
+      "path": "/textures/environment/DefaultEnvCube_mirrored.dds"
+    }
+  ],
   "texturePaths": [
     "/env/Evergreen2/Layers/Eg_Dirt002_albedo.dds",
     "/env/Evergreen2/Layers/EvGrass009_albedo.dds",