From e13b8faa430caaa8a0a9abc6cdf6d934ba16de23 Mon Sep 17 00:00:00 2001 From: BlackYps <52536103+BlackYps@users.noreply.github.com> Date: Sat, 22 Apr 2023 16:16:24 +0200 Subject: [PATCH] Improve water, lighting and decals (#337) --- .../texture/BasicTextureGenerator.java | 36 +++---- .../neroxis/exporter/PreviewGenerator.java | 4 +- .../util/serial/biome/TerrainMaterials.java | 14 ++- .../Brimstone/WaterSettings.scmwtr | 92 +++++++++--------- .../custom_biome/Brimstone/materials.json | 9 +- .../custom_biome/Desert/Light.scmlighting | 14 +-- .../custom_biome/Desert/WaterSettings.scmwtr | 85 +++++++++-------- .../resources/custom_biome/Desert/decals.json | 16 ++-- .../custom_biome/Desert/materials.json | 9 +- .../EarlyAutumn/WaterSettings.scmwtr | 70 +++++++------- .../custom_biome/EarlyAutumn/materials.json | 9 +- .../custom_biome/Frithen/Light.scmlighting | 14 +-- .../custom_biome/Frithen/WaterSettings.scmwtr | 81 ++++++++-------- .../custom_biome/Frithen/decals.json | 6 +- .../custom_biome/Frithen/materials.json | 5 +- .../custom_biome/Loki/WaterSettings.scmwtr | 95 ++++++++++--------- .../custom_biome/Loki/materials.json | 9 +- .../custom_biome/Mars/Light.scmlighting | 12 +-- .../custom_biome/Mars/WaterSettings.scmwtr | 89 +++++++++-------- .../custom_biome/Mars/materials.json | 9 +- .../Moonlight/WaterSettings.scmwtr | 77 ++++++++------- .../custom_biome/Moonlight/decals.json | 9 +- .../custom_biome/Moonlight/materials.json | 9 +- .../custom_biome/Prayer/WaterSettings.scmwtr | 67 +++++++------ .../custom_biome/Prayer/materials.json | 9 +- .../custom_biome/Stones/WaterSettings.scmwtr | 87 +++++++++-------- .../custom_biome/Stones/materials.json | 9 +- .../custom_biome/Syrtis/WaterSettings.scmwtr | 91 +++++++++--------- .../custom_biome/Syrtis/materials.json | 9 +- .../WindingRiver/WaterSettings.scmwtr | 70 +++++++------- .../custom_biome/WindingRiver/materials.json | 9 +- .../custom_biome/Wonder/Light.scmlighting | 26 ++--- .../custom_biome/Wonder/WaterSettings.scmwtr | 85 +++++++++-------- .../custom_biome/Wonder/materials.json | 19 ++-- .../resources/custom_biome/Wonder/props.json | 7 +- 35 files changed, 655 insertions(+), 606 deletions(-) diff --git a/generator/src/main/java/com/faforever/neroxis/generator/texture/BasicTextureGenerator.java b/generator/src/main/java/com/faforever/neroxis/generator/texture/BasicTextureGenerator.java index 4d9e1085..6f9da4a3 100644 --- a/generator/src/main/java/com/faforever/neroxis/generator/texture/BasicTextureGenerator.java +++ b/generator/src/main/java/com/faforever/neroxis/generator/texture/BasicTextureGenerator.java @@ -19,7 +19,7 @@ public class BasicTextureGenerator extends TextureGenerator { protected FloatMask accentSlopesTexture; protected FloatMask accentPlateauTexture; protected FloatMask slopesTexture; - protected FloatMask steepHillsTexture; + protected FloatMask underWaterTexture; protected FloatMask rockTexture; protected FloatMask accentRockTexture; protected IntegerMask terrainType; @@ -28,10 +28,16 @@ public class BasicTextureGenerator extends TextureGenerator { protected void setupTexturePipeline() { BooleanMask flat = slope.copyAsBooleanMask(.05f).invert(); BooleanMask slopes = slope.copyAsBooleanMask(.15f); - BooleanMask accentSlopes = slope.copyAsBooleanMask(.55f).invert().subtract(flat); - BooleanMask steepHills = slope.copyAsBooleanMask(.55f); + BooleanMask accentSlopes = slope.copyAsBooleanMask(.75f).invert().subtract(flat); BooleanMask rock = slope.copyAsBooleanMask(.75f); BooleanMask accentRock = slope.copyAsBooleanMask(.75f).inflate(2f); + float abyssDepth = generatorParameters.biome().waterSettings().getElevation() - + generatorParameters.biome().waterSettings().getElevationAbyss(); + FloatMask scaledWaterDepth = heightmap.copy() + .subtract(generatorParameters.biome().waterSettings().getElevation()) + .multiply(-1f) + .divide(abyssDepth) + .clampMin(0f); BooleanMask realWater = realLand.copy().invert(); BooleanMask shadowsInWater = shadowsMask.copy().multiply(realWater.copy().setSize(512)); @@ -59,12 +65,10 @@ protected void setupTexturePipeline() { .clampMax(1f) .setToValue(accentSlopes.copy().invert(), 0f) .blur(16); - steepHillsTexture.setSize(textureSize) - .addPerlinNoise(mapSize / 8, 1f) - .addGaussianNoise(.05f) + underWaterTexture.init(realWater.deflate(1), 0f, .7f) + .add(scaledWaterDepth.multiply(.3f)) .clampMax(1f) - .setToValue(steepHills.copy().invert(), 0f) - .blur(8); + .blur(1); waterBeachTexture.init(realWater.inflate(12).subtract(realPlateaus), 0f, 1f).blur(12); rockTexture.init(rock, 0f, 1f).blur(4).add(rock, 1f).blur(2).clampMax(1f); accentRockTexture.setSize(textureSize) @@ -74,14 +78,13 @@ protected void setupTexturePipeline() { .setToValue(accentRock.copy().invert(), 0f) .blur(2); texturesLowMask.setComponents(accentGroundTexture, accentPlateauTexture, slopesTexture, accentSlopesTexture); - texturesHighMask.setComponents(steepHillsTexture, waterBeachTexture, rockTexture, accentRockTexture); + texturesHighMask.setComponents(waterBeachTexture, underWaterTexture, rockTexture, accentRockTexture); setupTerrainType(mapSize); } protected void setupTerrainType(int mapSize) { terrainType.setSize(mapSize); - BooleanMask realWater = realLand.copy().invert().setSize(mapSize); Integer[] terrainTypes = map.getBiome().terrainMaterials().getTerrainTypes(); terrainType.add(terrainTypes[0]) @@ -89,13 +92,12 @@ protected void setupTerrainType(int mapSize) { .setToValue(accentPlateauTexture.setSize(mapSize).copyAsBooleanMask(.5f), terrainTypes[2]) .setToValue(slopesTexture.setSize(mapSize).copyAsBooleanMask(.3f), terrainTypes[3]) .setToValue(accentSlopesTexture.setSize(mapSize).copyAsBooleanMask(.3f), terrainTypes[4]) - .setToValue(steepHillsTexture.setSize(mapSize).copyAsBooleanMask(.5f), terrainTypes[5]) - .setToValue(waterBeachTexture.setSize(mapSize).copyAsBooleanMask(.5f), terrainTypes[6]) + .setToValue(waterBeachTexture.setSize(mapSize).copyAsBooleanMask(.5f), terrainTypes[5]) // We need to change the order here, otherwise accentRock will overwrite the rock texture completely - .setToValue(accentRockTexture.setSize(mapSize).copyAsBooleanMask(.35f), terrainTypes[8]) - .setToValue(rockTexture.setSize(mapSize).copyAsBooleanMask(.55f), terrainTypes[7]) - .setToValue(realWater, terrainTypes[9]) - .setToValue(realWater.deflate(20), terrainTypes[10]); + .setToValue(accentRockTexture.setSize(mapSize).copyAsBooleanMask(.35f), terrainTypes[7]) + .setToValue(rockTexture.setSize(mapSize).copyAsBooleanMask(.55f), terrainTypes[6]) + .setToValue(underWaterTexture.setSize(mapSize).copyAsBooleanMask(.7f), terrainTypes[8]) + .setToValue(underWaterTexture.setSize(mapSize).copyAsBooleanMask(.8f), terrainTypes[9]); } @Override @@ -110,7 +112,7 @@ public void initialize(SCMap map, long seed, GeneratorParameters generatorParame accentSlopesTexture = new FloatMask(1, random.nextLong(), symmetrySettings, "accentSlopesTexture", true); accentPlateauTexture = new FloatMask(1, random.nextLong(), symmetrySettings, "accentPlateauTexture", true); slopesTexture = new FloatMask(1, random.nextLong(), symmetrySettings, "slopesTexture", true); - steepHillsTexture = new FloatMask(1, random.nextLong(), symmetrySettings, "steepHillsTexture", true); + underWaterTexture = new FloatMask(1, random.nextLong(), symmetrySettings, "underWaterTexture", true); rockTexture = new FloatMask(1, random.nextLong(), symmetrySettings, "rockTexture", true); accentRockTexture = new FloatMask(1, random.nextLong(), symmetrySettings, "accentRockTexture", true); terrainType = new IntegerMask(1, random.nextLong(), symmetrySettings, "terrainType", true); diff --git a/shared/src/main/java/com/faforever/neroxis/exporter/PreviewGenerator.java b/shared/src/main/java/com/faforever/neroxis/exporter/PreviewGenerator.java index ca683f9c..7e75a5e6 100644 --- a/shared/src/main/java/com/faforever/neroxis/exporter/PreviewGenerator.java +++ b/shared/src/main/java/com/faforever/neroxis/exporter/PreviewGenerator.java @@ -113,8 +113,8 @@ private static BufferedImage shadeLayer(BufferedImage image, SCMap map, FloatMas } private static BufferedImage getWaterLayer(SCMap map, FloatMask reflectance, FloatMask heightmap) { - Color shallowColor = new Color(134, 233, 233); - Color abyssColor = new Color(35, 49, 162); + Color shallowColor = new Color(53, 85, 117); + Color abyssColor = new Color(60, 67, 137); LightingSettings lightingSettings = map.getBiome().lightingSettings(); WaterSettings waterSettings = map.getBiome().waterSettings(); diff --git a/shared/src/main/java/com/faforever/neroxis/util/serial/biome/TerrainMaterials.java b/shared/src/main/java/com/faforever/neroxis/util/serial/biome/TerrainMaterials.java index 953d2e8c..474e8261 100644 --- a/shared/src/main/java/com/faforever/neroxis/util/serial/biome/TerrainMaterials.java +++ b/shared/src/main/java/com/faforever/neroxis/util/serial/biome/TerrainMaterials.java @@ -10,6 +10,19 @@ @Data @CompiledJson public class TerrainMaterials { + /* texture slots: + ground + groundAccent + plateauAccent + slopes + slopesAccent + beach + underWater + rock + rockAccent + macroTexture + */ + // engine limitations - must stay 9 and 10 always public static final int TERRAIN_TEXTURE_COUNT = 10; public static final int TERRAIN_NORMAL_COUNT = 9; @@ -26,7 +39,6 @@ public class TerrainMaterials { 1, // plateauAccent 1, // slopes 1, // slopesAccent - 1, // steepHills 40, // beach 150, // rock 150, // rockAccent diff --git a/shared/src/main/resources/custom_biome/Brimstone/WaterSettings.scmwtr b/shared/src/main/resources/custom_biome/Brimstone/WaterSettings.scmwtr index 04d2f6f9..0a04d8be 100644 --- a/shared/src/main/resources/custom_biome/Brimstone/WaterSettings.scmwtr +++ b/shared/src/main/resources/custom_biome/Brimstone/WaterSettings.scmwtr @@ -1,70 +1,70 @@ { - "elevationAbyss": 10.0, + "elevationAbyss": 3.0, "fresnelPower": 1.5, - "waveTextures": [ - { - "normalRepeat": 9.0E-4, - "normalMovement": { - "y": -0.95, - "x": 0.5 - }, - "texPath": "/textures/engine/waves.dds" - }, - { - "normalRepeat": 0.009, - "normalMovement": { - "y": -0.095, - "x": 0.05 - }, - "texPath": "/textures/engine/waves.dds" - }, - { - "normalRepeat": 0.05, - "normalMovement": { - "y": 0.03, - "x": 0.01 - }, - "texPath": "/textures/engine/waves.dds" - }, - { - "normalRepeat": 0.5, - "normalMovement": { - "y": 9.0E-4, - "x": 5.0E-4 - }, - "texPath": "/textures/engine/waves.dds" - } - ], "elevationDeep": 20.0, "sunGlow": 0.1, "skyReflection": 1.5, "sunStrength": 10.0, - "texPathWaterRamp": "/textures/engine/waterramp.dds", + "texPathWaterRamp": "/textures/engine/waterramp_redrock03.dds", "colorLerp": { - "y": 0.119, + "y": 0.0, "x": 0.064 }, "surfaceColor": { - "z": 1.5, - "y": 0.7, - "x": 0.0 + "z": 0.65, + "y": 0.55, + "x": 0.46 }, "sunShininess": 50.0, "sunColor": { - "z": 0.33864275, - "y": 0.47409984, - "x": 0.81274265 + "z": 0.77, + "y": 0.86, + "x": 0.94 }, "refractionScale": 0.375, "waterPresent": true, "unitReflection": 0.5, "fresnelBias": 0.15, - "sunReflection": 5.0, - "texPathCubemap": "/textures/engine/waterCubemap.dds", + "sunReflection": 3.3, + "texPathCubemap": "/textures/environment/SkyCube_RedRocks08a.dds", "sunDirection": { "z": 0.2518569, "y": -0.9626309, "x": 0.09954818 }, - "elevation": 25.0 + "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" + } + ] } \ No newline at end of file diff --git a/shared/src/main/resources/custom_biome/Brimstone/materials.json b/shared/src/main/resources/custom_biome/Brimstone/materials.json index 7eb2e1f8..9c9810b8 100644 --- a/shared/src/main/resources/custom_biome/Brimstone/materials.json +++ b/shared/src/main/resources/custom_biome/Brimstone/materials.json @@ -16,7 +16,7 @@ 12.25, 13.75, 13.75, - 9.5, + 4.0, 4.0, 1.0, 6.0 @@ -38,7 +38,7 @@ "/env/Evergreen2/Layers/EG_Grass001_normal.dds", "/env/red barrens/layers/rb_cracked02_normal.dds", "/env/red barrens/layers/rb_sand_normal.dds", - "/env/Evergreen2/Layers/EG_Gravel_normal.DDS", + "/env/Desert/Layers/Des_sandLight_normal.dds", "/env/Desert/Layers/Des_sandLight_normal.dds", "/env/red barrens/layers/rb_rock09_normal.dds", "/env/red barrens/layers/rb_rock06_normal.dds" @@ -49,7 +49,7 @@ "/env/ancient-earth/layers/sandlight002_maroon_tint_darker_albedo.dds", "/env/red barrens/layers/rb_cracked_albedo.dds", "/env/red barrens/layers/rb_sandwet01_albedo.dds", - "/env/red barrens/layers/rb_gravel01_albedo.dds", + "/env/red barrens/layers/rb_sandwet_albedo.dds", "/env/red barrens/layers/rb_sandwet_albedo.dds", "/env/red barrens/layers/rb_rock09_albedo.dds", "/env/red barrens/layers/rb_rock07_albedo.dds", @@ -61,7 +61,7 @@ 12.25, 7.25, 14.0, - 19.5, + 20.0, 20.0, 11.0, 12.0, @@ -73,7 +73,6 @@ 6, 5, 5, - 5, 6, 154, 154, diff --git a/shared/src/main/resources/custom_biome/Desert/Light.scmlighting b/shared/src/main/resources/custom_biome/Desert/Light.scmlighting index d2007f42..441bab9c 100644 --- a/shared/src/main/resources/custom_biome/Desert/Light.scmlighting +++ b/shared/src/main/resources/custom_biome/Desert/Light.scmlighting @@ -3,7 +3,7 @@ "bloom" : 0.08, "fogStart" : 0.0, "sunDirection" : { - "z" : 1.6391277E-7, + "z" : 0.1263912, "x" : 0.7083398, "y" : 0.7058716 }, @@ -14,14 +14,14 @@ }, "fogEnd" : 2000.0, "sunColor" : { - "z" : 1.82, - "x" : 1.71, - "y" : 1.77 + "z" : 1.50, + "x" : 1.39, + "y" : 1.45 }, "sunAmbience" : { - "z" : 0.19, - "x" : 0.19, - "y" : 0.19 + "z" : 0.65, + "x" : 0.65, + "y" : 0.65 }, "specularColor" : { "z" : 0.0, diff --git a/shared/src/main/resources/custom_biome/Desert/WaterSettings.scmwtr b/shared/src/main/resources/custom_biome/Desert/WaterSettings.scmwtr index b6689ae4..531520f7 100644 --- a/shared/src/main/resources/custom_biome/Desert/WaterSettings.scmwtr +++ b/shared/src/main/resources/custom_biome/Desert/WaterSettings.scmwtr @@ -1,65 +1,70 @@ { - "texPathWaterRamp" : "/textures/engine/waterramp.dds", + "texPathWaterRamp" : "/textures/engine/waterramp_desert03.dds", "elevationDeep" : 20.0, "sunDirection" : { "z" : 0.2518569, "x" : 0.09954818, "y" : -0.9626309 }, - "elevationAbyss" : 10.0, + "elevationAbyss" : 2.0, "surfaceColor" : { - "z" : 1.5, - "x" : 0.0, - "y" : 0.7 + "z" : 0.44, + "x" : 0.83, + "y" : 0.56 }, "sunColor" : { - "z" : 0.33864275, - "x" : 0.81274265, - "y" : 0.47409984 + "z" : 0.44, + "x" : 0.44, + "y" : 0.44 }, "waterPresent" : true, "elevation" : 25.0, "refractionScale" : 0.375, - "sunReflection" : 5.0, + "sunReflection" : 2.8, "fresnelPower" : 1.5, "unitReflection" : 0.5, - "skyReflection" : 1.5, + "skyReflection" : 0.53, "colorLerp" : { - "x" : 0.064, + "x" : 0.083, "y" : 0.119 }, - "texPathCubemap" : "/textures/engine/waterCubemap.dds", + "texPathCubemap" : "/textures/environment/SkyCube_Desert02a.dds", "sunGlow" : 0.1, "sunShininess" : 50.0, - "waveTextures" : [ { - "normalMovement" : { - "x" : 0.5, - "y" : -0.95 - }, - "normalRepeat" : 9.0E-4, - "texPath" : "/textures/engine/waves.dds" - }, { - "normalMovement" : { - "x" : 0.05, - "y" : -0.095 + "fresnelBias" : 0.15, + "sunStrength" : 10.0, + "waveTextures": [ + { + "normalRepeat": 0.006, + "normalMovement": { + "y": 0.0229813, + "x": 0.0192836 + }, + "texPath": "/textures/engine/waves000.dds" }, - "normalRepeat" : 0.009, - "texPath" : "/textures/engine/waves.dds" - }, { - "normalMovement" : { - "x" : 0.01, - "y" : 0.03 + { + "normalRepeat": 0.012, + "normalMovement": { + "y": 0.0025, + "x": 0.00433013 + }, + "texPath": "/textures/engine/waves.dds" }, - "normalRepeat" : 0.05, - "texPath" : "/textures/engine/waves.dds" - }, { - "normalMovement" : { - "x" : 5.0E-4, - "y" : 9.0E-4 + { + "normalRepeat": 0.05, + "normalMovement": { + "y": 0.00751754, + "x": 0.00273616 + }, + "texPath": "/textures/engine/waves001.dds" }, - "normalRepeat" : 0.5, - "texPath" : "/textures/engine/waves.dds" - } ], - "fresnelBias" : 0.15, - "sunStrength" : 10.0 + { + "normalRepeat": 0.5, + "normalMovement": { + "y": 0.001, + "x": 0.0 + }, + "texPath": "/textures/engine/waves001.dds" + } + ] } \ No newline at end of file diff --git a/shared/src/main/resources/custom_biome/Desert/decals.json b/shared/src/main/resources/custom_biome/Desert/decals.json index ba18e171..2058de76 100644 --- a/shared/src/main/resources/custom_biome/Desert/decals.json +++ b/shared/src/main/resources/custom_biome/Desert/decals.json @@ -5,12 +5,14 @@ "/env/Common/decals/erosion007_normals.dds", "/env/Common/decals/erosion005_normals.dds", "/env/Common/decals/erosion008_normals.dds", - "/env/Common/decals/erosion_normals.dds", - "/env/Desert/Decals/dryCreek01LT_Normals.dds", - "/env/Desert/Decals/dryCreek02LT_Normals.dds", - "/env/Desert/Decals/dryCreek03LT_Normals.dds", - "/env/Desert/Decals/dryCreek04LT_Normals.dds", - "/env/Desert/Decals/dryCreek05LT_Normals.dds", - "/env/Desert/Decals/dryCreek06LT_Normals.dds" + "/env/Common/decals/Int001_normals.dds", + "/env/Common/decals/Int002_normals.dds", + "/env/Common/decals/Int003_normals.dds", + "/env/Common/decals/Int004_normals.dds", + "/env/Common/decals/Int005_normals.dds", + "/env/Common/decals/Int006_normals.dds", + "/env/Common/decals/Int007_normals.dds", + "/env/Common/decals/Int008_normals.dds", + "/env/Common/decals/Int009_normals.dds" ] } \ No newline at end of file diff --git a/shared/src/main/resources/custom_biome/Desert/materials.json b/shared/src/main/resources/custom_biome/Desert/materials.json index 0960cb59..dda6c85a 100644 --- a/shared/src/main/resources/custom_biome/Desert/materials.json +++ b/shared/src/main/resources/custom_biome/Desert/materials.json @@ -16,8 +16,8 @@ "/env/Desert/Layers/Des_SandMed01_albedo.dds", "/env/Desert/Layers/Des_SandMed_albedo.dds", "/env/Desert/Layers/Des_Gravel_albedo.dds", - "/env/Desert/Layers/Des_SandMed01_albedo.dds", "/env/Desert/Layers/Des_SandMed02_albedo.dds", + "/env/Paradise/Layers/Sand000_albedo.dds", "/env/Desert/Layers/Des_Rock06_albedo.dds", "/env/Desert/Layers/Des_Rock_albedo.dds", "/env/Evergreen/layers/macrotexture000_albedo.dds" @@ -28,8 +28,8 @@ 16.0, 4.0, 0.0, - 10.0, 0.0, + 4.0, 8.0, 16.0, 128.0 @@ -40,7 +40,6 @@ 7, 7, 7, - 7, 40, 150, 150, @@ -53,8 +52,8 @@ "/env/Desert/Layers/Des_sandLight_normal.dds", "/env/Tundra/Layers/Tund_sandLight_normal.dds", "/env/Desert/Layers/Des_Gravel_normal.dds", - "/env/paradise/layers/sand000_normals.dds", "/env/Desert/Layers/Des_SandMed_normal.dds", + "/env/Desert/Layers/Des_SandWet_normal.dds", "/env/Tundra/Layers/Tund_sandLight_normal.dds", "/env/Desert/Layers/Des_Rock01_normal.dds" ], @@ -64,7 +63,7 @@ 4.0, 8.0, 4.0, - 20.0, + 4.0, 4.0, 4.0, 4.0 diff --git a/shared/src/main/resources/custom_biome/EarlyAutumn/WaterSettings.scmwtr b/shared/src/main/resources/custom_biome/EarlyAutumn/WaterSettings.scmwtr index 02567419..261bc0f6 100644 --- a/shared/src/main/resources/custom_biome/EarlyAutumn/WaterSettings.scmwtr +++ b/shared/src/main/resources/custom_biome/EarlyAutumn/WaterSettings.scmwtr @@ -1,40 +1,6 @@ { "elevationAbyss": 2.0, "fresnelPower": 1.5, - "waveTextures": [ - { - "normalRepeat": 0.08, - "normalMovement": { - "y": 0.01, - "x": 0.0 - }, - "texPath": "/textures/engine/waves.dds" - }, - { - "normalRepeat": 0.009, - "normalMovement": { - "y": 0.05, - "x": -0.08660255 - }, - "texPath": "/textures/engine/waves.dds" - }, - { - "normalRepeat": 0.06, - "normalMovement": { - "y": 0.01494292, - "x": 0.001307336 - }, - "texPath": "/textures/engine/waves001.dds" - }, - { - "normalRepeat": 0.5, - "normalMovement": { - "y": 0.004949748, - "x": 0.004949748 - }, - "texPath": "/textures/engine/waves001.dds" - } - ], "elevationDeep": 25.0, "sunGlow": 0.165, "skyReflection": 0.678, @@ -66,5 +32,39 @@ "y": -0.9626309, "x": 0.09954818 }, - "elevation": 29.0 + "elevation": 29.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" + } + ] } \ No newline at end of file diff --git a/shared/src/main/resources/custom_biome/EarlyAutumn/materials.json b/shared/src/main/resources/custom_biome/EarlyAutumn/materials.json index f85589a9..de23aab4 100644 --- a/shared/src/main/resources/custom_biome/EarlyAutumn/materials.json +++ b/shared/src/main/resources/custom_biome/EarlyAutumn/materials.json @@ -16,7 +16,7 @@ 12.25, 13.75, 13.75, - 9.5, + 4.0, 4.0, 1.0, 6.0 @@ -38,7 +38,7 @@ "/env/Evergreen2/Layers/EG_Grass001_normal.dds", "/env/evergreen2/layers/eg_grass001_normal.dds", "/env/Evergreen/layers/SandLight_normals.dds", - "/env/Evergreen2/Layers/EG_Gravel_normal.DDS", + "/env/Desert/Layers/Des_sandLight_normal.dds", "/env/Desert/Layers/Des_sandLight_normal.dds", "/env/Evergreen2/Layers/EG_Rock004_normal.dds", "/env/Evergreen2/Layers/EvRock006_normal.dds" @@ -49,7 +49,7 @@ "/env/Ancient-Earth/layers/EvGrass008_darker_albedo.dds", "/env/Evergreen2/Layers/EvGrass004_albedo.dds", "/env/Desert/Layers/Des_SandDark02_albedo.dds", - "/env/Evergreen2/Layers/EG_Gravel2_albedo.dds", + "/env/Desert/Layers/Des_SandDark_albedo.dds", "/env/Desert/Layers/Des_SandDark_albedo.dds", "/env/Evergreen2/Layers/EvRock008_albedo.dds", "/env/Geothermal/layers/Geo_Rock001_albedo.DDS", @@ -61,7 +61,7 @@ 12.25, 7.25, 14.0, - 9.5, + 20.0, 20.0, 11.0, 12.0, @@ -73,7 +73,6 @@ 82, 82, 81, - 81, 40, 162, 159, diff --git a/shared/src/main/resources/custom_biome/Frithen/Light.scmlighting b/shared/src/main/resources/custom_biome/Frithen/Light.scmlighting index e717c9db..374865bc 100644 --- a/shared/src/main/resources/custom_biome/Frithen/Light.scmlighting +++ b/shared/src/main/resources/custom_biome/Frithen/Light.scmlighting @@ -7,9 +7,9 @@ }, "fogStart" : 0.0, "sunAmbience" : { - "z" : 0.35, - "x" : 0.1754, - "y" : 0.19 + "z" : 0.48, + "x" : 0.23, + "y" : 0.23 }, "sunColor" : { "z" : 1.59, @@ -28,10 +28,10 @@ "y" : 0.5849577 }, "shadowFillColor" : { - "z" : 0.09, - "x" : 0.0, - "y" : 0.0 + "z" : 0.55, + "x" : 0.42, + "y" : 0.42 }, - "lightingMultiplier" : 0.7, + "lightingMultiplier" : 1.14, "fogEnd" : 1000.0 } \ No newline at end of file diff --git a/shared/src/main/resources/custom_biome/Frithen/WaterSettings.scmwtr b/shared/src/main/resources/custom_biome/Frithen/WaterSettings.scmwtr index 29a69204..e1e75d88 100644 --- a/shared/src/main/resources/custom_biome/Frithen/WaterSettings.scmwtr +++ b/shared/src/main/resources/custom_biome/Frithen/WaterSettings.scmwtr @@ -1,65 +1,70 @@ { "sunColor" : { - "z" : 0.33864275, - "x" : 0.81274265, - "y" : 0.47409984 + "z" : 0.50, + "x" : 0.66, + "y" : 0.57 }, "sunDirection" : { "z" : 0.2518569, "x" : 0.09954818, "y" : -0.9626309 }, - "texPathWaterRamp" : "/textures/engine/waterramp.dds", - "sunReflection" : 5.0, + "texPathWaterRamp" : "/textures/engine/waterramp_tundra.dds", + "sunReflection" : 3.0, "elevation" : 25.0, "surfaceColor" : { "z" : 1.5, "x" : 0.0, "y" : 0.7 }, - "waveTextures" : [ { - "normalMovement" : { - "x" : 0.5, - "y" : -0.95 - }, - "texPath" : "/textures/engine/waves.dds", - "normalRepeat" : 9.0E-4 - }, { - "normalMovement" : { - "x" : 0.05, - "y" : -0.095 - }, - "texPath" : "/textures/engine/waves.dds", - "normalRepeat" : 0.009 - }, { - "normalMovement" : { - "x" : 0.01, - "y" : 0.03 - }, - "texPath" : "/textures/engine/waves.dds", - "normalRepeat" : 0.05 - }, { - "normalMovement" : { - "x" : 5.0E-4, - "y" : 9.0E-4 - }, - "texPath" : "/textures/engine/waves.dds", - "normalRepeat" : 0.5 - } ], "elevationDeep" : 20.0, "colorLerp" : { - "x" : 0.064, + "x" : 0.046, "y" : 0.119 }, "refractionScale" : 0.375, "skyReflection" : 1.5, - "texPathCubemap" : "/textures/engine/waterCubemap.dds", + "texPathCubemap" : "/textures/environment/SkyCube_Tundra04a.dds", "unitReflection" : 0.5, "sunShininess" : 50.0, "fresnelBias" : 0.15, "sunStrength" : 10.0, "sunGlow" : 0.1, - "elevationAbyss" : 10.0, + "elevationAbyss" : 3.0, "waterPresent" : true, - "fresnelPower" : 1.5 + "fresnelPower" : 1.5, + "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" + } + ] } \ No newline at end of file diff --git a/shared/src/main/resources/custom_biome/Frithen/decals.json b/shared/src/main/resources/custom_biome/Frithen/decals.json index 44064088..887c0609 100644 --- a/shared/src/main/resources/custom_biome/Frithen/decals.json +++ b/shared/src/main/resources/custom_biome/Frithen/decals.json @@ -5,9 +5,13 @@ "/env/Crystalline/decals/crystcrack01_normals.dds" ], "fieldAlbedos": [ + "/env/Common/decals/Int001_normals.dds", + "/env/Common/decals/Int002_normals.dds", + "/env/Common/decals/Int003_normals.dds", + "/env/Common/decals/Int004_normals.dds", + "/env/Common/decals/Int005_normals.dds", "/env/Crystalline/decals/crystcrack01_albedo.dds", "/env/Tundra/Decals/Tund_Crack004_albedo.dds", - "/env/Tundra/Decals/Tund_Crack002_albedo.dds", "/env/Tundra/Decals/Tund_RockGround2_albedo.dds", "/env/Tundra/Decals/Tund_sandPatch_02_albedo.dds", "/env/Tundra/Decals/Tund_sandPatch_albedo.dds" diff --git a/shared/src/main/resources/custom_biome/Frithen/materials.json b/shared/src/main/resources/custom_biome/Frithen/materials.json index aacb5c86..768ffdd4 100644 --- a/shared/src/main/resources/custom_biome/Frithen/materials.json +++ b/shared/src/main/resources/custom_biome/Frithen/materials.json @@ -16,7 +16,7 @@ "/env/Tundra/Layers/Tund_iceRock_albedo.dds", "/env/Tundra/Layers/Tund_iceRock_albedo.dds", "/env/Tundra/Layers/Tund_melt001_albedo.dds", - "/env/Tundra/Layers/Tund_melt001_albedo.dds", + "/env/Tundra/Layers/Tund_Rock03_albedo.DDS", "/env/Tundra/Layers/Tund_Rock03_albedo.DDS", "/env/Tundra/Layers/Tund_melt001_albedo.dds", "/env/Tundra/Layers/Tund_Rock_albedo.DDS", @@ -28,7 +28,7 @@ 0.0, 6.0, 8.0, - 1.0, + 16.0, 16.0, 16.0, 16.0, @@ -41,7 +41,6 @@ 201, 200, 200, - 200, 153, 153, 221, diff --git a/shared/src/main/resources/custom_biome/Loki/WaterSettings.scmwtr b/shared/src/main/resources/custom_biome/Loki/WaterSettings.scmwtr index ef64d021..119bc39f 100644 --- a/shared/src/main/resources/custom_biome/Loki/WaterSettings.scmwtr +++ b/shared/src/main/resources/custom_biome/Loki/WaterSettings.scmwtr @@ -1,65 +1,70 @@ { - "texPathWaterRamp" : "/textures/engine/waterramp.dds", + "texPathWaterRamp" : "/textures/engine/waterramp_redrock.dds", "sunColor" : { - "z" : 0.33864275, - "x" : 0.81274265, - "y" : 0.47409984 + "z" : 0.949999988079071, + "x" : 1.8300000429153443, + "y" : 1.2899999618530274 }, "sunDirection" : { "z" : 0.2518569, "x" : 0.09954818, "y" : -0.9626309 }, - "sunStrength" : 10.0, - "sunReflection" : 5.0, + "sunStrength" : 8.0, + "sunReflection" : 0.9, "unitReflection" : 0.5, - "waveTextures" : [ { - "normalRepeat" : 9.0E-4, - "normalMovement" : { - "x" : 0.5, - "y" : -0.95 - }, - "texPath" : "/textures/engine/waves.dds" - }, { - "normalRepeat" : 0.009, - "normalMovement" : { - "x" : 0.05, - "y" : -0.095 - }, - "texPath" : "/textures/engine/waves.dds" - }, { - "normalRepeat" : 0.05, - "normalMovement" : { - "x" : 0.01, - "y" : 0.03 - }, - "texPath" : "/textures/engine/waves.dds" - }, { - "normalRepeat" : 0.5, - "normalMovement" : { - "x" : 5.0E-4, - "y" : 9.0E-4 - }, - "texPath" : "/textures/engine/waves.dds" - } ], "sunShininess" : 50.0, - "skyReflection" : 1.5, - "sunGlow" : 0.1, + "skyReflection" : 0.5, + "sunGlow" : 0.05, "waterPresent" : true, - "elevationAbyss" : 10.0, + "elevationAbyss" : 3.0, "refractionScale" : 0.375, - "elevationDeep" : 20.0, + "elevationDeep" : 18.0, "colorLerp" : { - "x" : 0.064, + "x" : 0.037, "y" : 0.119 }, "fresnelBias" : 0.15, "elevation" : 25.0, - "fresnelPower" : 1.5, + "fresnelPower" : 1.6, "surfaceColor" : { - "z" : 1.5, - "x" : 0.0, - "y" : 0.7 + "z" : 1.350000023841858, + "x" : 0.75, + "y" : 0.800000011920929 }, - "texPathCubemap" : "/textures/engine/waterCubemap.dds" + "texPathCubemap" : "/textures/environment/SkyCube_TropicalOp06a.dds", + "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" + } + ] } \ No newline at end of file diff --git a/shared/src/main/resources/custom_biome/Loki/materials.json b/shared/src/main/resources/custom_biome/Loki/materials.json index c03c95d9..8e7d53be 100644 --- a/shared/src/main/resources/custom_biome/Loki/materials.json +++ b/shared/src/main/resources/custom_biome/Loki/materials.json @@ -17,7 +17,7 @@ "/env/Evergreen2/Layers/Eg_Gravel01_albedo.dds", "/env/Evergreen2/Layers/Eg_Gravel003_albedo.dds", "/env/Evergreen2/Layers/Eg_Gravel01_albedo.dds", - "/env/Evergreen2/Layers/Eg_Gravel01_albedo.dds", + "/env/Evergreen2/Layers/Eg_Gravel_albedo.dds", "/env/Evergreen2/Layers/EvRock006_albedo.dds", "/env/Evergreen2/Layers/EvRock007c_albedo.dds", "/env/Evergreen/layers/macrotexture000_albedo.dds" @@ -28,7 +28,7 @@ 2.0, 4.0, 4.0, - 2.0, + 8.0, 8.0, 8.0, 32.0, @@ -41,7 +41,6 @@ 81, 81, 81, - 81, 162, 159, 221, @@ -53,7 +52,7 @@ "/env/Evergreen/layers/Dirt001_normals.dds", "/env/Evergreen2/Layers/EvRock006_normal.dds", "/env/Evergreen/layers/SandLight_normals.dds", - "/env/Evergreen2/Layers/EG_Gravel_normal.DDS", + "/env/Evergreen2/Layers/EG_Grass002_normal.dds", "/env/Evergreen2/Layers/EG_Grass002_normal.dds", "/env/Evergreen2/Layers/EvRock007_normal.dds", "/env/Evergreen2/Layers/EG_Rock003_normal.dds" @@ -64,7 +63,7 @@ 6.0, 6.0, 16.0, - 12.0, + 4.0, 4.0, 6.0, 6.0 diff --git a/shared/src/main/resources/custom_biome/Mars/Light.scmlighting b/shared/src/main/resources/custom_biome/Mars/Light.scmlighting index 168f5c94..69bcfef1 100644 --- a/shared/src/main/resources/custom_biome/Mars/Light.scmlighting +++ b/shared/src/main/resources/custom_biome/Mars/Light.scmlighting @@ -7,9 +7,9 @@ "y" : 0.0 }, "sunAmbience" : { - "x" : 0.0, - "z" : 0.0, - "y" : 0.0 + "x" : 0.5, + "z" : 0.15, + "y" : 0.35 }, "specularColor" : { "x" : 0.0, @@ -24,9 +24,9 @@ "y" : 0.7071069 }, "sunColor" : { - "x" : 2.0, - "z" : 0.6, - "y" : 1.4 + "x" : 1.41, + "z" : 0.36, + "y" : 0.96 }, "shadowFillColor" : { "x" : 0.4122, diff --git a/shared/src/main/resources/custom_biome/Mars/WaterSettings.scmwtr b/shared/src/main/resources/custom_biome/Mars/WaterSettings.scmwtr index 535f49c1..58043b91 100644 --- a/shared/src/main/resources/custom_biome/Mars/WaterSettings.scmwtr +++ b/shared/src/main/resources/custom_biome/Mars/WaterSettings.scmwtr @@ -1,65 +1,70 @@ { - "texPathWaterRamp" : "/textures/engine/waterramp.dds", + "texPathWaterRamp" : "/textures/engine/waterramp_redrock.dds", "sunDirection" : { "x" : 0.09954818, "z" : 0.2518569, "y" : -0.9626309 }, "sunColor" : { - "x" : 0.81274265, - "z" : 0.33864275, - "y" : 0.47409984 + "x" : 0.6, + "z" : 0.6, + "y" : 0.6 }, - "texPathCubemap" : "/textures/engine/waterCubemap.dds", + "texPathCubemap" : "/textures/environment/SkyCube_Desert02a.dds", "colorLerp" : { - "x" : 0.064, - "y" : 0.119 + "x" : 0.018, + "y" : 0.294 }, - "waveTextures" : [ { - "normalMovement" : { - "x" : 0.5, - "y" : -0.95 - }, - "texPath" : "/textures/engine/waves.dds", - "normalRepeat" : 9.0E-4 - }, { - "normalMovement" : { - "x" : 0.05, - "y" : -0.095 - }, - "texPath" : "/textures/engine/waves.dds", - "normalRepeat" : 0.009 - }, { - "normalMovement" : { - "x" : 0.01, - "y" : 0.03 - }, - "texPath" : "/textures/engine/waves.dds", - "normalRepeat" : 0.05 - }, { - "normalMovement" : { - "x" : 5.0E-4, - "y" : 9.0E-4 - }, - "texPath" : "/textures/engine/waves.dds", - "normalRepeat" : 0.5 - } ], - "elevationAbyss" : 10.0, + "elevationAbyss" : 3.0, "sunGlow" : 0.1, "unitReflection" : 0.5, - "sunReflection" : 5.0, + "sunReflection" : 1.1, "sunStrength" : 10.0, "surfaceColor" : { "x" : 0.0, - "z" : 1.5, - "y" : 0.7 + "z" : 0.0, + "y" : 0.0 }, "elevationDeep" : 20.0, - "skyReflection" : 1.5, + "skyReflection" : 1.0, "fresnelPower" : 1.5, "fresnelBias" : 0.15, "waterPresent" : true, "elevation" : 25.0, "refractionScale" : 0.375, - "sunShininess" : 50.0 + "sunShininess" : 30.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" + } + ] } \ No newline at end of file diff --git a/shared/src/main/resources/custom_biome/Mars/materials.json b/shared/src/main/resources/custom_biome/Mars/materials.json index 4f3c3b59..dec3f9eb 100644 --- a/shared/src/main/resources/custom_biome/Mars/materials.json +++ b/shared/src/main/resources/custom_biome/Mars/materials.json @@ -16,8 +16,8 @@ "/env/Desert/Layers/Des_SandDark_albedo.dds", "/env/Desert/Layers/Des_SandDark02_albedo.dds", "/env/Desert/Layers/Des_Rock06_albedo.dds", - "/env/Desert/Layers/Des_SandMed02_albedo.dds", "/env/paradise/layers/sand000_albedo.dds", + "/env/Desert/Layers/Des_SandDark02_albedo.dds", "/env/Red Barrens/Layers/RB_Rock_albedo.DDS", "/env/Red Barrens/Layers/RB_Sandwet01_albedo.dds", "/env/Evergreen/layers/macrotexture000_albedo.dds" @@ -29,7 +29,7 @@ 10.0, 10.0, 7.0, - 8.0, + 4.0, 16.0, 32.0, 128.0 @@ -40,7 +40,6 @@ 8, 8, 8, - 8, 40, 154, 154, @@ -53,8 +52,8 @@ "/env/Red Barrens/Layers/RB_Rock06_normal.dds", "/env/Red Barrens/Layers/RB_Rock06_normal.dds", "/env/Evergreen2/Layers/Eg_Gravel2_normal.dds", - "/env/Red Barrens/Layers/RB_Cracked02_normal.DDS", "/env/Desert/Layers/Des_sandWet_normal.dds", + "/env/Desert/Layers/Des_sandDark_normal.dds", "/env/Red Barrens/Layers/RB_Sand_normal.dds", "/env/Red Barrens/Layers/RB_Cracked02_normal.DDS" ], @@ -65,7 +64,7 @@ 6.0, 8.0, 7.0, - 5.0, + 4.0, 7.0, 7.0 ], diff --git a/shared/src/main/resources/custom_biome/Moonlight/WaterSettings.scmwtr b/shared/src/main/resources/custom_biome/Moonlight/WaterSettings.scmwtr index 00f38c0a..2aa1bf6a 100644 --- a/shared/src/main/resources/custom_biome/Moonlight/WaterSettings.scmwtr +++ b/shared/src/main/resources/custom_biome/Moonlight/WaterSettings.scmwtr @@ -1,5 +1,5 @@ { - "texPathWaterRamp" : "/textures/engine/waterramp.dds", + "texPathWaterRamp" : "/textures/engine/waterramp_redrock01.dds", "sunDirection" : { "x" : 0.09954818, "z" : 0.2518569, @@ -15,51 +15,56 @@ "elevationDeep" : 20.0, "elevation" : 25.0, "surfaceColor" : { - "x" : 1.4, - "z" : 1.8, - "y" : 1.5 + "x" : 0.5, + "z" : 0.5, + "y" : 0.5 }, "fresnelPower" : 1.5, "waterPresent" : true, "skyReflection" : 1.5, - "texPathCubemap" : "/textures/engine/waterCubemap.dds", + "texPathCubemap" : "/textures/environment/SkyCube_RedRocks08a.dds", "refractionScale" : 0.375, "sunStrength" : 10.0, - "waveTextures" : [ { - "texPath" : "/textures/engine/waves.dds", - "normalMovement" : { - "x" : 0.5, - "y" : -0.95 - }, - "normalRepeat" : 9.0E-4 - }, { - "texPath" : "/textures/engine/waves.dds", - "normalMovement" : { - "x" : 0.05, - "y" : -0.095 - }, - "normalRepeat" : 0.009 - }, { - "texPath" : "/textures/engine/waves.dds", - "normalMovement" : { - "x" : 0.01, - "y" : 0.03 - }, - "normalRepeat" : 0.05 - }, { - "texPath" : "/textures/engine/waves.dds", - "normalMovement" : { - "x" : 5.0E-4, - "y" : 9.0E-4 - }, - "normalRepeat" : 0.5 - } ], "sunGlow" : 0.1, - "elevationAbyss" : 10.0, + "elevationAbyss" : 3.0, "sunShininess" : 50.0, "colorLerp" : { "x" : 0.064, "y" : 0.119 }, - "sunReflection" : 5.0 + "sunReflection" : 2.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" + } + ] } \ No newline at end of file diff --git a/shared/src/main/resources/custom_biome/Moonlight/decals.json b/shared/src/main/resources/custom_biome/Moonlight/decals.json index fc8f8472..584cbfcb 100644 --- a/shared/src/main/resources/custom_biome/Moonlight/decals.json +++ b/shared/src/main/resources/custom_biome/Moonlight/decals.json @@ -18,13 +18,6 @@ "/env/Geothermal/decals/Crater_01_normals.dds", "/env/Geothermal/decals/Crater_02_normals.dds", "/env/Geothermal/decals/GT_noise02_normals.dds", - "/env/Geothermal/decals/GT_noise01_normals.dds", - "/env/Crystalline/decals/Cryst001_normals.dds", - "/env/Crystalline/decals/Cryst002_normals.dds", - "/env/Crystalline/decals/Cryst003_normals.dds", - "/env/Crystalline/decals/Cryst004_normals.dds", - "/env/Crystalline/decals/Cryst005_normals.dds", - "/env/Crystalline/decals/Cryst006_normals.dds", - "/env/Crystalline/decals/Cryst007_normals.dds" + "/env/Geothermal/decals/GT_noise01_normals.dds" ] } \ No newline at end of file diff --git a/shared/src/main/resources/custom_biome/Moonlight/materials.json b/shared/src/main/resources/custom_biome/Moonlight/materials.json index ddb690c6..8d646141 100644 --- a/shared/src/main/resources/custom_biome/Moonlight/materials.json +++ b/shared/src/main/resources/custom_biome/Moonlight/materials.json @@ -16,8 +16,8 @@ "/env/Red Barrens/Layers/RB_Cracked02_albedo.DDS", "/env/Red Barrens/Layers/RB_gravel01_albedo.dds", "/env/Red Barrens/Layers/RB_Rock08_albedo.dds", - "/env/Red Barrens/Layers/RB_Cracked_albedo.DDS", "/env/Red Barrens/Layers/RB_Sandwet_albedo.dds", + "/env/Lava/Layers/macrotexture000_albedo.dds", "/env/Geothermal/layers/Geo_LavaDk_01_albedo.dds", "/env/Geothermal/layers/Geo_Dirt_01_albedo.dds", "/env/Evergreen/layers/macrotexture000_albedo.dds" @@ -29,7 +29,7 @@ 0.0, 12.0, 16.0, - 32.0, + 6.0, 16.0, 32.0, 128.0 @@ -41,7 +41,6 @@ 6, 6, 6, - 6, 157, 157, 221, @@ -53,8 +52,8 @@ "/env/Red Barrens/Layers/RB_Rock09_normal.dds", "/env/Red Barrens/Layers/RB_RedMud_normal.dds", "/env/Red Barrens/Layers/RB_Cracked_normal.DDS", - "/env/Red Barrens/Layers/RB_Cracked02_normal.DDS", "/env/Red Barrens/Layers/RB_RedMud_normal.dds", + "/env/Red Barrens/Layers/RB_Sand_normal.dds", "/env/Red Barrens/Layers/RB_Rock06_normal.dds", "/env/Red Barrens/Layers/RB_Rock06_normal.dds" ], @@ -65,7 +64,7 @@ 12.0, 64.0, 64.0, - 4.0, + 6.0, 4.0, 4.0 ], diff --git a/shared/src/main/resources/custom_biome/Prayer/WaterSettings.scmwtr b/shared/src/main/resources/custom_biome/Prayer/WaterSettings.scmwtr index b3750a86..6e4a9dc4 100644 --- a/shared/src/main/resources/custom_biome/Prayer/WaterSettings.scmwtr +++ b/shared/src/main/resources/custom_biome/Prayer/WaterSettings.scmwtr @@ -10,7 +10,7 @@ "x" : 0.0 }, "elevationDeep" : 20.0, - "elevationAbyss" : 10.0, + "elevationAbyss" : 3.0, "waterPresent" : true, "refractionScale" : 0.375, "fresnelBias" : 0.15, @@ -19,35 +19,6 @@ "unitReflection" : 0.5, "skyReflection" : 1.5, "sunShininess" : 50.0, - "waveTextures" : [ { - "normalMovement" : { - "y" : -0.1592846, - "x" : 0.08383565 - }, - "normalRepeat" : 9.0E-4, - "texPath" : "/textures/engine/waves.dds" - }, { - "normalMovement" : { - "y" : -0.106189735, - "x" : 0.05589043 - }, - "normalRepeat" : 0.009, - "texPath" : "/textures/engine/waves.dds" - }, { - "normalMovement" : { - "y" : -0.0070918915, - "x" : 0.0037020368 - }, - "normalRepeat" : 0.05, - "texPath" : "/textures/engine/waves.dds" - }, { - "normalMovement" : { - "y" : 8.7415735E-4, - "x" : 4.856429E-4 - }, - "normalRepeat" : 0.5, - "texPath" : "/textures/engine/waves.dds" - } ], "colorLerp" : { "y" : 0.119, "x" : 0.064 @@ -61,5 +32,39 @@ "texPathCubemap" : "/textures/engine/waterCubemap.dds", "sunStrength" : 10.0, "sunReflection" : 5.0, - "texPathWaterRamp" : "/textures/engine/waterramp.dds" + "texPathWaterRamp" : "/textures/engine/waterramp.dds", + "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" + } + ] } \ No newline at end of file diff --git a/shared/src/main/resources/custom_biome/Prayer/materials.json b/shared/src/main/resources/custom_biome/Prayer/materials.json index d8561a0b..71e08641 100644 --- a/shared/src/main/resources/custom_biome/Prayer/materials.json +++ b/shared/src/main/resources/custom_biome/Prayer/materials.json @@ -16,7 +16,7 @@ "/env/Evergreen2/Layers/EvTrans02_albedo.dds", "/env/Evergreen2/Layers/Eg_Gravel004_albedo.dds", "/env/Evergreen2/Layers/EvTrans01_albedo.dds", - "/env/Evergreen2/Layers/EvTrans01_albedo.dds", + "/env/paradise/layers/sand000_albedo.dds", "/env/paradise/layers/sand000_albedo.dds", "/env/Evergreen2/Layers/EvRock004_albedo.dds", "/env/Evergreen2/Layers/EvRock005_albedo.dds", @@ -28,7 +28,7 @@ 4.0, 8.0, 0.0, - 4.0, + 7.0, 7.0, 8.0, 16.0, @@ -40,7 +40,6 @@ 84, 81, 81, - 81, 40, 162, 159, @@ -53,7 +52,7 @@ "/env/Evergreen2/Layers/EG_Gravel_normal.DDS", "/env/Evergreen2/Layers/Eg_Gravel2_normal.dds", "/env/Evergreen2/Layers/EvTrans01_normals.dds", - "/env/Evergreen/layers/SandLight002_normals.dds", + "/env/Desert/Layers/Des_sandLight_normal.dds", "/env/Desert/Layers/Des_sandLight_normal.dds", "/env/Evergreen2/Layers/EG_Rock004_normal.dds", "/env/Evergreen2/Layers/EG_Rock003_normal.dds" @@ -64,7 +63,7 @@ 16.0, 8.0, 8.0, - 24.0, + 6.0, 6.0, 16.0, 8.0 diff --git a/shared/src/main/resources/custom_biome/Stones/WaterSettings.scmwtr b/shared/src/main/resources/custom_biome/Stones/WaterSettings.scmwtr index 55a69aeb..806df656 100644 --- a/shared/src/main/resources/custom_biome/Stones/WaterSettings.scmwtr +++ b/shared/src/main/resources/custom_biome/Stones/WaterSettings.scmwtr @@ -1,65 +1,70 @@ { "elevation" : 25.0, - "elevationAbyss" : 10.0, + "elevationAbyss" : 3.0, "unitReflection" : 0.5, - "sunShininess" : 50.0, + "sunShininess" : 75.0, "waterPresent" : true, "elevationDeep" : 20.0, "sunStrength" : 10.0, - "sunReflection" : 5.0, + "sunReflection" : 3.7, "fresnelBias" : 0.15, "colorLerp" : { - "x" : 0.064, + "x" : 0.037, "y" : 0.119 }, - "texPathCubemap" : "/textures/engine/waterCubemap.dds", + "texPathCubemap" : "/textures/environment/SkyCube_Desert03a.dds", "surfaceColor" : { - "z" : 1.5, + "z" : 0.52, "x" : 0.0, - "y" : 0.7 + "y" : 0.33 }, "fresnelPower" : 1.5, "sunGlow" : 0.1, "skyReflection" : 1.5, "refractionScale" : 0.375, - "waveTextures" : [ { - "texPath" : "/textures/engine/waves.dds", - "normalMovement" : { - "x" : 0.5, - "y" : -0.95 - }, - "normalRepeat" : 9.0E-4 - }, { - "texPath" : "/textures/engine/waves.dds", - "normalMovement" : { - "x" : 0.05, - "y" : -0.095 - }, - "normalRepeat" : 0.009 - }, { - "texPath" : "/textures/engine/waves.dds", - "normalMovement" : { - "x" : 0.01, - "y" : 0.03 - }, - "normalRepeat" : 0.05 - }, { - "texPath" : "/textures/engine/waves.dds", - "normalMovement" : { - "x" : 5.0E-4, - "y" : 9.0E-4 - }, - "normalRepeat" : 0.5 - } ], - "texPathWaterRamp" : "/textures/engine/waterramp.dds", + "texPathWaterRamp" : "/textures/engine/waterramp_redrock03.dds", "sunColor" : { - "z" : 0.33864275, - "x" : 0.81274265, - "y" : 0.47409984 + "z" : 0.58, + "x" : 0.85, + "y" : 0.75 }, "sunDirection" : { "z" : 0.2518569, "x" : 0.09954818, "y" : -0.9626309 - } + }, + "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" + } + ] } \ No newline at end of file diff --git a/shared/src/main/resources/custom_biome/Stones/materials.json b/shared/src/main/resources/custom_biome/Stones/materials.json index 0db63569..e9d7c4f3 100644 --- a/shared/src/main/resources/custom_biome/Stones/materials.json +++ b/shared/src/main/resources/custom_biome/Stones/materials.json @@ -16,7 +16,7 @@ "/env/paradise/layers/dirt000_albedo.dds", "/env/Evergreen2/Layers/EvRock006_albedo.dds", "/env/paradise/layers/sand000_albedo.dds", - "/env/paradise/layers/dirt000_albedo.dds", + "/env/Evergreen2/Layers/Eg_Gravel003_albedo.dds", "/env/Evergreen2/Layers/Eg_Gravel003_albedo.dds", "/env/Geothermal/layers/Geo_LavaDk_01_albedo.dds", "/env/Geothermal/layers/Geo_Rock002_albedo.dds", @@ -28,7 +28,7 @@ 0.0, 0.0, 16.0, - 0.0, + 8.0, 8.0, 32.0, 8.0, @@ -40,7 +40,6 @@ 7, 7, 7, - 7, 8, 156, 156, @@ -53,7 +52,7 @@ "/env/paradise/layers/dirt000_normals.dds", "/env/paradise/layers/Rock001_normals.dds", "/env/paradise/layers/SandMed_normals.dds", - "/env/paradise/layers/grass000_normals.dds", + "/env/Evergreen2/Layers/EG_Grass002_normal.dds", "/env/Evergreen2/Layers/EG_Grass002_normal.dds", "/env/paradise/layers/Rock001_normals.dds", "/env/paradise/layers/Rock001_normals.dds" @@ -64,7 +63,7 @@ 16.0, 16.0, 16.0, - 4.0, + 6.0, 6.0, 12.0, 4.0 diff --git a/shared/src/main/resources/custom_biome/Syrtis/WaterSettings.scmwtr b/shared/src/main/resources/custom_biome/Syrtis/WaterSettings.scmwtr index ae6a9107..5ae147a1 100644 --- a/shared/src/main/resources/custom_biome/Syrtis/WaterSettings.scmwtr +++ b/shared/src/main/resources/custom_biome/Syrtis/WaterSettings.scmwtr @@ -1,56 +1,27 @@ { - "texPathWaterRamp" : "/textures/engine/waterramp.dds", + "texPathWaterRamp" : "/textures/engine/waterramp_redrock01.dds", "waterPresent" : true, "elevation" : 25.0, "elevationDeep" : 20.0, - "elevationAbyss" : 10.0, + "elevationAbyss" : 3.0, "surfaceColor" : { - "z" : 1.5, - "x" : 0.0, - "y" : 0.7 + "z" : 0.04, + "x" : 0.19, + "y" : 0.02 }, "sunColor" : { - "z" : 0.33864275, - "x" : 0.81274265, - "y" : 0.47409984 + "z" : 0.83, + "x" : 0.42, + "y" : 0.51 }, "sunDirection" : { "z" : 0.2518569, "x" : 0.09954818, "y" : -0.9626309 }, - "texPathCubemap" : "/textures/engine/waterCubemap.dds", - "sunShininess" : 50.0, - "skyReflection" : 1.5, - "waveTextures" : [ { - "normalRepeat" : 9.0E-4, - "normalMovement" : { - "x" : 0.5, - "y" : -0.95 - }, - "texPath" : "/textures/engine/waves.dds" - }, { - "normalRepeat" : 0.009, - "normalMovement" : { - "x" : 0.05, - "y" : -0.095 - }, - "texPath" : "/textures/engine/waves.dds" - }, { - "normalRepeat" : 0.05, - "normalMovement" : { - "x" : 0.01, - "y" : 0.03 - }, - "texPath" : "/textures/engine/waves.dds" - }, { - "normalRepeat" : 0.5, - "normalMovement" : { - "x" : 5.0E-4, - "y" : 9.0E-4 - }, - "texPath" : "/textures/engine/waves.dds" - } ], + "texPathCubemap" : "/textures/environment/SkyCube_RedRocks08a.dds", + "sunShininess" : 14.0, + "skyReflection" : 0.734, "unitReflection" : 0.5, "sunStrength" : 10.0, "refractionScale" : 0.375, @@ -58,8 +29,42 @@ "fresnelBias" : 0.15, "sunGlow" : 0.1, "colorLerp" : { - "x" : 0.064, - "y" : 0.119 + "x" : 0.183, + "y" : 0.183 }, - "sunReflection" : 5.0 + "sunReflection" : 1.65, + "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" + } + ] } \ No newline at end of file diff --git a/shared/src/main/resources/custom_biome/Syrtis/materials.json b/shared/src/main/resources/custom_biome/Syrtis/materials.json index bb2b8572..869a864b 100644 --- a/shared/src/main/resources/custom_biome/Syrtis/materials.json +++ b/shared/src/main/resources/custom_biome/Syrtis/materials.json @@ -16,7 +16,7 @@ "/env/Red Barrens/Layers/RB_Sand_albedo.dds", "/env/Red Barrens/Layers/RB_Cracked_albedo.DDS", "/env/Red Barrens/Layers/RB_Rock06_albedo.dds", - "/env/Red Barrens/Layers/RB_Sand_albedo.dds", + "/env/Red Barrens/Layers/RB_Sandwet_albedo.dds", "/env/Red Barrens/Layers/RB_Sandwet_albedo.dds", "/env/Red Barrens/Layers/RB_Rock06_albedo.dds", "/env/Red Barrens/Layers/RB_Rock02_albedo.DDS", @@ -28,7 +28,7 @@ 0.0, 32.0, 0.0, - 8.0, + 12.0, 12.0, 12.0, 8.0, @@ -40,7 +40,6 @@ 5, 6, 6, - 5, 6, 154, 154, @@ -53,7 +52,7 @@ "/env/Red Barrens/Layers/RB_Sand_normal.dds", "/env/Red Barrens/Layers/RB_RedMud_normal.dds", "/env/Red Barrens/Layers/RB_Rock06_normal.dds", - "/env/Red Barrens/Layers/RB_Rock06_normal.dds", + "/env/Red Barrens/Layers/RB_Sandwet_normal.dds", "/env/Red Barrens/Layers/RB_Sandwet_normal.dds", "/env/Tundra/Layers/Tund_sandLight_normal.dds", "/env/Red Barrens/Layers/RB_Rock_normal.DDS" @@ -64,7 +63,7 @@ 8.0, 16.0, 8.0, - 4.0, + 12.0, 12.0, 4.0, 16.0 diff --git a/shared/src/main/resources/custom_biome/WindingRiver/WaterSettings.scmwtr b/shared/src/main/resources/custom_biome/WindingRiver/WaterSettings.scmwtr index 02567419..261bc0f6 100644 --- a/shared/src/main/resources/custom_biome/WindingRiver/WaterSettings.scmwtr +++ b/shared/src/main/resources/custom_biome/WindingRiver/WaterSettings.scmwtr @@ -1,40 +1,6 @@ { "elevationAbyss": 2.0, "fresnelPower": 1.5, - "waveTextures": [ - { - "normalRepeat": 0.08, - "normalMovement": { - "y": 0.01, - "x": 0.0 - }, - "texPath": "/textures/engine/waves.dds" - }, - { - "normalRepeat": 0.009, - "normalMovement": { - "y": 0.05, - "x": -0.08660255 - }, - "texPath": "/textures/engine/waves.dds" - }, - { - "normalRepeat": 0.06, - "normalMovement": { - "y": 0.01494292, - "x": 0.001307336 - }, - "texPath": "/textures/engine/waves001.dds" - }, - { - "normalRepeat": 0.5, - "normalMovement": { - "y": 0.004949748, - "x": 0.004949748 - }, - "texPath": "/textures/engine/waves001.dds" - } - ], "elevationDeep": 25.0, "sunGlow": 0.165, "skyReflection": 0.678, @@ -66,5 +32,39 @@ "y": -0.9626309, "x": 0.09954818 }, - "elevation": 29.0 + "elevation": 29.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" + } + ] } \ No newline at end of file diff --git a/shared/src/main/resources/custom_biome/WindingRiver/materials.json b/shared/src/main/resources/custom_biome/WindingRiver/materials.json index 92fcaf64..854e4360 100644 --- a/shared/src/main/resources/custom_biome/WindingRiver/materials.json +++ b/shared/src/main/resources/custom_biome/WindingRiver/materials.json @@ -16,7 +16,7 @@ 12.25, 13.75, 13.75, - 9.5, + 4.0, 4.0, 1.0, 6.0 @@ -38,7 +38,7 @@ "/env/Evergreen2/Layers/EG_Grass001_normal.dds", "/env/Evergreen/layers/grass001_normals.dds", "/env/Evergreen/layers/SandLight_normals.dds", - "/env/Evergreen2/Layers/EG_Gravel_normal.DDS", + "/env/Desert/Layers/Des_sandLight_normal.dds", "/env/Desert/Layers/Des_sandLight_normal.dds", "/env/Evergreen2/Layers/EG_Rock004_normal.dds", "/env/Evergreen2/Layers/EvRock006_normal.dds" @@ -49,7 +49,7 @@ "/env/Ancient-Earth/layers/EvGrass008_darker_albedo.dds", "/env/Evergreen2/Layers/EvGrass004_albedo.dds", "/env/Desert/Layers/Des_SandDark02_albedo.dds", - "/env/Evergreen2/Layers/EG_Gravel2_albedo.dds", + "/env/Desert/Layers/Des_SandDark_albedo.dds", "/env/Desert/Layers/Des_SandDark_albedo.dds", "/env/Evergreen2/Layers/EvRock008_albedo.dds", "/env/Geothermal/layers/Geo_Rock001_albedo.DDS", @@ -61,7 +61,7 @@ 12.25, 7.25, 14.0, - 9.5, + 20.0, 20.0, 11.0, 12.0, @@ -73,7 +73,6 @@ 82, 82, 81, - 81, 40, 162, 159, diff --git a/shared/src/main/resources/custom_biome/Wonder/Light.scmlighting b/shared/src/main/resources/custom_biome/Wonder/Light.scmlighting index 72116530..58c35007 100644 --- a/shared/src/main/resources/custom_biome/Wonder/Light.scmlighting +++ b/shared/src/main/resources/custom_biome/Wonder/Light.scmlighting @@ -1,14 +1,14 @@ { - "lightingMultiplier" : 1.63, + "lightingMultiplier" : 1.34, "sunAmbience" : { - "z" : 0.2, - "x" : 0.19, - "y" : 0.2 + "z" : 0.28, + "x" : 0.27, + "y" : 0.27 }, "sunColor" : { - "z" : 1.0, - "x" : 1.03, - "y" : 1.0 + "z" : 0.85, + "x" : 1.08, + "y" : 1.16 }, "specularColor" : { "z" : 0.0, @@ -17,9 +17,9 @@ "y" : 0.0 }, "fogColor" : { - "z" : 1.0, - "x" : 1.0, - "y" : 1.0 + "z" : 0.08, + "x" : 0.21, + "y" : 0.21 }, "fogStart" : 0.0, "bloom" : 0.10125, @@ -30,8 +30,8 @@ }, "shadowFillColor" : { "z" : 0.0, - "x" : 0.72, - "y" : 0.7 + "x" : 0.78, + "y" : 0.71 }, - "fogEnd" : 1000.0 + "fogEnd" : 800.0 } \ No newline at end of file diff --git a/shared/src/main/resources/custom_biome/Wonder/WaterSettings.scmwtr b/shared/src/main/resources/custom_biome/Wonder/WaterSettings.scmwtr index 58f20271..7be7801b 100644 --- a/shared/src/main/resources/custom_biome/Wonder/WaterSettings.scmwtr +++ b/shared/src/main/resources/custom_biome/Wonder/WaterSettings.scmwtr @@ -1,55 +1,26 @@ { - "texPathWaterRamp" : "/textures/engine/waterramp.dds", + "texPathWaterRamp" : "/textures/engine/waterrampswamp01.dds", "sunColor" : { - "z" : 0.33864275, - "x" : 0.81274265, - "y" : 0.47409984 + "z" : 0.52, + "x" : 0.51, + "y" : 0.53 }, "sunDirection" : { "z" : 0.2518569, "x" : 0.09954818, "y" : -0.9626309 }, - "texPathCubemap" : "/textures/engine/waterCubemap.dds", + "texPathCubemap" : "/textures/environment/SkyCube_Geothermal02.dds", "waterPresent" : true, "unitReflection" : 0.5, - "skyReflection" : 1.5, + "skyReflection" : 0.7, "surfaceColor" : { - "z" : 1.5, + "z" : 0.13, "x" : 0.0, - "y" : 0.7 + "y" : 0.24 }, "sunGlow" : 0.1, "sunStrength" : 10.0, - "waveTextures" : [ { - "normalRepeat" : 9.0E-4, - "normalMovement" : { - "x" : 0.5, - "y" : -0.95 - }, - "texPath" : "/textures/engine/waves.dds" - }, { - "normalRepeat" : 0.009, - "normalMovement" : { - "x" : 0.05, - "y" : -0.095 - }, - "texPath" : "/textures/engine/waves.dds" - }, { - "normalRepeat" : 0.05, - "normalMovement" : { - "x" : 0.01, - "y" : 0.03 - }, - "texPath" : "/textures/engine/waves.dds" - }, { - "normalRepeat" : 0.5, - "normalMovement" : { - "x" : 5.0E-4, - "y" : 9.0E-4 - }, - "texPath" : "/textures/engine/waves.dds" - } ], "fresnelPower" : 1.5, "colorLerp" : { "x" : 0.064, @@ -58,8 +29,42 @@ "elevationDeep" : 20.0, "fresnelBias" : 0.15, "refractionScale" : 0.375, - "elevationAbyss" : 10.0, + "elevationAbyss" : 3.0, "sunShininess" : 50.0, - "sunReflection" : 5.0, - "elevation" : 25.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" + } + ] } \ No newline at end of file diff --git a/shared/src/main/resources/custom_biome/Wonder/materials.json b/shared/src/main/resources/custom_biome/Wonder/materials.json index b10c4531..f564a447 100644 --- a/shared/src/main/resources/custom_biome/Wonder/materials.json +++ b/shared/src/main/resources/custom_biome/Wonder/materials.json @@ -3,22 +3,22 @@ "cubeMaps": [ { "name": "", - "path": "/textures/environment/DefaultEnvCube.dds" + "path": "/textures/environment/SkyCube_Geothermal02.dds" }, { "name": "", - "path": "/textures/environment/DefaultEnvCube_mirrored.dds" + "path": "/textures/environment/SkyCube_Geothermal02a.dds" } ], "texturePaths": [ "/env/Evergreen2/Layers/Eg_Dirt002_albedo.dds", "/env/Evergreen2/Layers/EvGrass009_albedo.dds", "/env/Evergreen2/Layers/EvGrass005_albedo.dds", - "/env/Evergreen2/Layers/EvGrass010a_albedo.dds", + "/env/Evergreen2/Layers/EvGrass010_albedo.dds", "/env/Evergreen2/Layers/EvRock002b_albedo.dds", "/env/Evergreen2/Layers/Eg_Dirt002_albedo.dds", - "/env/Evergreen2/Layers/Eg_Dirt002_albedo.dds", - "/env/Evergreen2/Layers/EvRock006c_albedo.dds", + "/env/Evergreen2/Layers/EvGrass009_albedo.dds", + "/env/Tropical/Layers/TrRock006_albedo.dds", "/env/Evergreen2/Layers/EvRock007_albedo.dds", "/env/Evergreen/layers/macrotexture000_albedo.dds" ], @@ -28,9 +28,9 @@ 2.0, 16.0, 6.0, - 10.0, 6.0, - 32.0, + 8.0, + 16.0, 16.0, 128.0 ], @@ -40,7 +40,6 @@ 82, 83, 83, - 81, 3, 162, 159, @@ -53,8 +52,8 @@ "/env/Evergreen2/Layers/EG_Grass001_normal.dds", "/env/Evergreen2/Layers/EvTrans01_normals.dds", "/env/Evergreen2/Layers/EG_Gravel_normal.DDS", - "/env/Evergreen2/Layers/Eg_Gravel2_normal.dds", "/env/Evergreen2/Layers/EG_Rock_normal.dds", + "/env/Evergreen2/Layers/EG_Grass002_normal.dds", "/env/Evergreen2/Layers/EvRock006_normal.dds", "/env/Evergreen2/Layers/EvRock006_normal.dds" ], @@ -65,7 +64,7 @@ 4.0, 8.0, 16.0, - 16.0, + 8.0, 20.0, 8.0 ], diff --git a/shared/src/main/resources/custom_biome/Wonder/props.json b/shared/src/main/resources/custom_biome/Wonder/props.json index 941ea971..787bc5c1 100644 --- a/shared/src/main/resources/custom_biome/Wonder/props.json +++ b/shared/src/main/resources/custom_biome/Wonder/props.json @@ -2,8 +2,11 @@ "treeGroups": [ "/env/evergreen/props/trees/groups/Brch01_Group01_prop.bp", "/env/evergreen/props/trees/groups/Brch01_Group02_prop.bp", - "/env/evergreen/props/trees/groups/Oak01_Group1_prop.bp", - "/env/evergreen/props/trees/groups/Oak01_Group2_prop.bp" + "/env/tropical/props/trees/groups/Ficus01_Group1_prop.bp", + "/env/tropical/props/trees/groups/Ficus01_Group2_prop.bp", + "/env/tropical/props/trees/groups/Ficus01_Group3_prop.bp", + "/env/evergreen/props/trees/groups/Pine07_GroupA_prop.bp", + "/env/evergreen/props/trees/groups/Pine07_GroupB_prop.bp" ], "rocks": [ "/env/evergreen/props/rocks/Rock01_prop.bp",