Skip to content

Commit

Permalink
New biome inspired by the map Zerg Canyon. (#414)
Browse files Browse the repository at this point in the history
  • Loading branch information
@clivepaterson
clivepaterson authored Aug 17, 2024
1 parent a1890b1 commit 61b1dbb
Show file tree
Hide file tree
Showing 9 changed files with 281 additions and 3 deletions.
4 changes: 3 additions & 1 deletion generator/src/main/java/com/faforever/neroxis/generator/TextureStyle.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.faforever.neroxis.generator.texture.SyrtisTextureGenerator;
import com.faforever.neroxis.generator.texture.WindingRiverTextureGenerator;
import com.faforever.neroxis.generator.texture.WonderTextureGenerator;
import com.faforever.neroxis.generator.texture.CrystallineTextureGenerator;
import lombok.AllArgsConstructor;
import lombok.Getter;

Expand All @@ -31,7 +32,8 @@ public enum TextureStyle {
SUNSET(SunsetTextureGenerator::new, "Sunset"),
SYRTIS(SyrtisTextureGenerator::new, "Syrtis"),
WINDINGRIVER(WindingRiverTextureGenerator::new, "WindingRiver"),
WONDER(WonderTextureGenerator::new, "Wonder");
WONDER(WonderTextureGenerator::new, "Wonder"),
CRYSTALLINE(CrystallineTextureGenerator::new, "Crystalline");

private final Supplier<com.faforever.neroxis.generator.texture.TextureGenerator> generatorSupplier;
private final String folderName;
Expand Down
4 changes: 3 additions & 1 deletion generator/src/main/java/com/faforever/neroxis/generator/style/StyleGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.faforever.neroxis.generator.texture.TextureGenerator;
import com.faforever.neroxis.generator.texture.WindingRiverTextureGenerator;
import com.faforever.neroxis.generator.texture.WonderTextureGenerator;
import com.faforever.neroxis.generator.texture.CrystallineTextureGenerator;
import com.faforever.neroxis.generator.util.HasParameterConstraints;
import com.faforever.neroxis.map.SCMap;
import com.faforever.neroxis.map.Symmetry;
Expand Down Expand Up @@ -70,7 +71,8 @@ protected WeightedOptionsWithFallback<TextureGenerator> getTextureGeneratorOptio
new WeightedOption<>(new SunsetTextureGenerator(), 1f),
new WeightedOption<>(new SyrtisTextureGenerator(), 1f),
new WeightedOption<>(new WindingRiverTextureGenerator(), 1f),
new WeightedOption<>(new WonderTextureGenerator(), 1f));
new WeightedOption<>(new WonderTextureGenerator(), 1f),
new WeightedOption<>(new CrystallineTextureGenerator(), 1f));
}

protected WeightedOptionsWithFallback<ResourceGenerator> getResourceGeneratorOptions() {
Expand Down
13 changes: 13 additions & 0 deletions ...or/src/main/java/com/faforever/neroxis/generator/texture/CrystallineTextureGenerator.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.faforever.neroxis.generator.texture;

import com.faforever.neroxis.biomes.Biome;
import com.faforever.neroxis.biomes.BiomeName;
import com.faforever.neroxis.biomes.Biomes;

public class CrystallineTextureGenerator extends LegacyTextureGenerator {

@Override
public Biome loadBiome() {
return Biomes.loadBiome(BiomeName.CRYSTALLINE);
}
}
3 changes: 2 additions & 1 deletion shared/src/main/java/com/faforever/neroxis/biomes/BiomeName.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ public enum BiomeName {
SUNSET("Sunset"),
SYRTIS("Syrtis"),
WINDINGRIVER("WindingRiver"),
WONDER("Wonder");
WONDER("Wonder"),
CRYSTALLINE("Crystalline");

private final String folderName;
}
37 changes: 37 additions & 0 deletions shared/src/main/resources/custom_biome/Crystalline/Light.scmlighting
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"lightingMultiplier": 1.649999976158142,
"sunDirection": {
"x": 0.6174795031547546,
"y": 0.5504807829856873,
"z": 0.5618630647659302
},
"sunAmbience": {
"x": 0.0,
"y": 0.0,
"z": 0.0
},
"sunColor": {
"x": 1.3799999952316285,
"y": 1.2899999618530274,
"z": 1.1399999856948853
},
"shadowFillColor": {
"x": 0.4465999901294708,
"y": 0.3224000036716461,
"z": 0.3508000075817108
},
"specularColor": {
"x": 0.08500000089406967,
"y": 0.27160000801086428,
"z": 0.4478999972343445,
"w": 0.0
},
"bloom": 0.03500000014901161,
"fogColor": {
"x": 0.5,
"y": 0.5,
"z": 0.5
},
"fogStart": 0.0,
"fogEnd": 666.0
}
70 changes: 70 additions & 0 deletions shared/src/main/resources/custom_biome/Crystalline/WaterSettings.scmwtr
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"texPathWaterRamp" : "/textures/engine/waterrampswamp01.dds",
"sunColor" : {
"z" : 0.52,
"x" : 0.51,
"y" : 0.53
},
"sunDirection" : {
"z" : 0.2518569,
"x" : 0.09954818,
"y" : -0.9626309
},
"texPathCubemap" : "/textures/environment/SkyCube_Geothermal02.dds",
"waterPresent" : true,
"unitReflection" : 0.5,
"skyReflection" : 0.7,
"surfaceColor" : {
"z" : 0.13,
"x" : 0.0,
"y" : 0.24
},
"sunGlow" : 0.1,
"sunStrength" : 10.0,
"fresnelPower" : 1.5,
"colorLerp" : {
"x" : 0.064,
"y" : 0.119
},
"elevationDeep" : 20.0,
"fresnelBias" : 0.15,
"refractionScale" : 0.375,
"elevationAbyss" : 3.0,
"sunShininess" : 50.0,
"sunReflection" : 3.1,
"elevation" : 25.0,
"waveTextures": [
{
"normalRepeat": 0.006,
"normalMovement": {
"y": 0.0229813,
"x": 0.0192836
},
"texPath": "/textures/engine/waves000.dds"
},
{
"normalRepeat": 0.012,
"normalMovement": {
"y": 0.0025,
"x": 0.00433013
},
"texPath": "/textures/engine/waves.dds"
},
{
"normalRepeat": 0.05,
"normalMovement": {
"y": 0.00751754,
"x": 0.00273616
},
"texPath": "/textures/engine/waves001.dds"
},
{
"normalRepeat": 0.5,
"normalMovement": {
"y": 0.001,
"x": 0.0
},
"texPath": "/textures/engine/waves001.dds"
}
]
}
23 changes: 23 additions & 0 deletions shared/src/main/resources/custom_biome/Crystalline/decals.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"fieldNormals": [
"/env/geothermal/decals/gt_cliff02_normals.dds",
"/env/geothermal/decals/gt_cliff04_normals.dds",
"/env/geothermal/decals/gt_noise01_normals.dds",
"/env/geothermal/decals/crater_01_normals.dds",
"/env/geothermal/decals/crater_02_normals.dds",
"/env/geothermal/decals/crater03_normals.dds",
"/env/geothermal/decals/crater08_normals.dds",
"/env/geothermal/decals/crater09_normals.dds",
"/env/geothermal/decals/interior02_normals.dds",
"/env/geothermal/decals/gt_noise02_normals.dds"
],
"fieldAlbedos": [
"/env/crystalline/decals/scx1_proto01_crev02b_albedo.dds",
"/env/lava/decals/lav_lava_cracks06b_albedo.dds",
"/env/evergreen2/decals/eg_kelp003_albedo.dds"
],
"slopeNormals": [
"/env/common/decals/erosion018b_normals.dds",
"/env/desert/decals/drycreek02lt_normals.dds"
]
}
115 changes: 115 additions & 0 deletions shared/src/main/resources/custom_biome/Crystalline/materials.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
{
"cubeMaps": [
{
"name": "<default>",
"path": "/textures/environment/SkyCube_Desert02.dds"
},
{
"name": "<water>",
"path": "/textures/environment/SkyCube_Desert02a.dds"
}
],
"textures": [
{
"path": "/env/Lava/Layers/lav_macrotexture000b_albedo.dds",
"scale": 0.0
},
{
"path": "/env/Lava/Layers/lav_rock05_albedo.dds",
"scale": 0.0
},
{
"path": "/env/Lava/Layers/lav_cracked02b_albedo.dds",
"scale": 20.0
},
{
"path": "/env/Lava/Layers/macrotexture002_albedo.dds",
"scale": 10.0
},
{
"path": "/env/Lava/Layers/Lav_cracked02b_albedo.dds",
"scale": 10.0
},
{
"path": "/env/Evergreen/layers/rockmed_albedo.dds",
"scale": 7.0
},
{
"path": "/env/Lava/Layers/macrotexture000_albedo.dds",
"scale": 4.0
},
{
"path": "/env/Lava/Layers/LAV_Rock09_albedo.dds",
"scale": 16.0
},
{
"path": "/env/Lava/Layers/LAV_Rock09b_albedo.dds",
"scale": 32.0
},
{
"path": "/env/Evergreen/layers/macrotexture000_albedo.dds",
"scale": 128.0
}
],
"normals": [
{
"path": "/env/Lava/Layers/lav_gravel_normals.dds",
"scale": 5.0
},
{
"path": "/env/Lava/Layers/lav_gravel_normals.dds",
"scale": 10.0
},
{
"path": "/env/Lava/Layers/lav_cracked02_normals.dds",
"scale": 20.0
},
{
"path": "/env/paradise/layers/Rock001_normals.dds",
"scale": 6.0
},
{
"path": "/env/Lava/Layers/lav_cracked02_normals.dds",
"scale": 8.0
},
{
"path": "/env/paradise/layers/Rock001_normals.dds",
"scale": 7.0
},
{
"path": "/env/paradise/layers/Rock001_normals.dds",
"scale": 4.0
},
{
"path": "/env/paradise/layers/Rock001_normals.dds",
"scale": 7.0
},
{
"path": "/env/Lava/Layers/lav_cracked02_normals.dds",
"scale": 7.0
}
],
"previewColors": [
"292523",
"181615",
"262223",
"201d1b",
"1f1e1f",
"241f21",
"1e1c1b",
"141411",
"23201e"
],
"terrainTypes": [
8,
8,
8,
8,
8,
40,
154,
154,
221,
223
]
}
15 changes: 15 additions & 0 deletions shared/src/main/resources/custom_biome/Crystalline/props.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"treeGroups": [
],
"rocks": [
"/env/Crystalline/props/rocks/CrysCrystal01_prop.bp",
"/env/Crystalline/props/rocks/CrysCrystal02_prop.bp",
"/env/Crystalline/props/rocks/CrysCrystal03_prop.bp",
"/env/Crystalline/props/rocks/CrysCrystal05_prop.bp",
"/env/Crystalline/props/rocks/CrysCrystal06_prop.bp",
"/env/Crystalline/props/rocks/CrysCrystal07_prop.bp",
"/env/Crystalline/props/rocks/CrysCrystal08_prop.bp"
],
"boulders": [
]
}

0 comments on commit 61b1dbb

Please sign in to comment.