diff --git a/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiFarFogConfig.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiFarFogConfig.java index c7175502c..8fd1da45e 100644 --- a/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiFarFogConfig.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiFarFogConfig.java @@ -44,7 +44,7 @@ public interface IDhApiFarFogConfig extends IDhApiConfigGroup * 0.0 = fog starts at the camera
* 1.0 = fog starts at the edge of the fake chunk render distance
*/ - IDhApiConfigValue farFogStartDistance(); + IDhApiConfigValue farFogStartDistance(); /** * Defines where the fog ends as a percent of the radius @@ -54,18 +54,18 @@ public interface IDhApiFarFogConfig extends IDhApiConfigGroup * 0.0 = fog ends at the camera
* 1.0 = fog ends at the edge of the fake chunk render distance
*/ - IDhApiConfigValue farFogEndDistance(); + IDhApiConfigValue farFogEndDistance(); /** Defines how opaque the fog is at its thinnest point. */ - IDhApiConfigValue farFogMinThickness(); + IDhApiConfigValue farFogMinThickness(); /** Defines how opaque the fog is at its thickest point. */ - IDhApiConfigValue farFogMaxThickness(); + IDhApiConfigValue farFogMaxThickness(); /** Defines how the fog changes in thickness. */ IDhApiConfigValue farFogFalloff(); /** Defines the fog density. */ - IDhApiConfigValue farFogDensity(); + IDhApiConfigValue farFogDensity(); } diff --git a/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiGraphicsConfig.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiGraphicsConfig.java index 33298626d..c1f1f264e 100644 --- a/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiGraphicsConfig.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiGraphicsConfig.java @@ -124,19 +124,19 @@ public interface IDhApiGraphicsConfig extends IDhApiConfigGroup * * @since API 2.0.0 */ - IDhApiConfigValue overdrawPreventionRadius(); + IDhApiConfigValue overdrawPreventionRadius(); /** * Modifies how bright fake chunks are.
* This is done when generating the vertex data and is applied before any shaders. */ - IDhApiConfigValue brightnessMultiplier(); + IDhApiConfigValue brightnessMultiplier(); /** * Modifies how saturated fake chunks are.
* This is done when generating the vertex data and is applied before any shaders. */ - IDhApiConfigValue saturationMultiplier(); + IDhApiConfigValue saturationMultiplier(); /** Defines if Distant Horizons should attempt to cull fake chunk cave geometry. */ IDhApiConfigValue caveCullingEnabled(); diff --git a/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiHeightFogConfig.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiHeightFogConfig.java index 4ab5a8c6b..bcbb79dc9 100644 --- a/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiHeightFogConfig.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiHeightFogConfig.java @@ -52,24 +52,24 @@ public interface IDhApiHeightFogConfig extends IDhApiConfigGroup * Defines the height fog's base height if {@link IDhApiHeightFogConfig#heightFogDirection()} * is set to use a specific height. */ - IDhApiConfigValue heightFogBaseHeight(); + IDhApiConfigValue heightFogBaseHeight(); /** Defines the height fog's starting height as a percent of the world height. */ - IDhApiConfigValue heightFogStartingHeightPercent(); + IDhApiConfigValue heightFogStartingHeightPercent(); /** Defines the height fog's ending height as a percent of the world height. */ - IDhApiConfigValue heightFogEndingHeightPercent(); + IDhApiConfigValue heightFogEndingHeightPercent(); /** Defines how opaque the height fog is at its thinnest point. */ - IDhApiConfigValue heightFogMinThickness(); + IDhApiConfigValue heightFogMinThickness(); /** Defines how opaque the height fog is at its thickest point. */ - IDhApiConfigValue heightFogMaxThickness(); + IDhApiConfigValue heightFogMaxThickness(); /** Defines how the height fog changes in thickness. */ IDhApiConfigValue heightFogFalloff(); /** Defines the height fog's density. */ - IDhApiConfigValue heightFogDensity(); + IDhApiConfigValue heightFogDensity(); } diff --git a/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiNoiseTextureConfig.java b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiNoiseTextureConfig.java index 2017e11ce..cc391620e 100644 --- a/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiNoiseTextureConfig.java +++ b/api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiNoiseTextureConfig.java @@ -37,8 +37,8 @@ public interface IDhApiNoiseTextureConfig extends IDhApiConfigGroup /** Defines how many steps of noise should be applied. */ IDhApiConfigValue noiseSteps(); - /** Defines how intense the noise will be. */ - IDhApiConfigValue noiseIntensity(); + /** Defines how intense the noise will be, between 0.0 and 1.0. */ + IDhApiConfigValue noiseIntensity(); /** * Defines how far should the noise texture render before it fades away. (in blocks)
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiFarFogConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiFarFogConfig.java index 1fab043fd..9e4a54696 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiFarFogConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiFarFogConfig.java @@ -34,27 +34,27 @@ public class DhApiFarFogConfig implements IDhApiFarFogConfig @Override - public IDhApiConfigValue farFogStartDistance() - { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.farFogStart); } + public IDhApiConfigValue farFogStartDistance() + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.farFogStart); } @Override - public IDhApiConfigValue farFogEndDistance() - { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.farFogEnd); } + public IDhApiConfigValue farFogEndDistance() + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.farFogEnd); } @Override - public IDhApiConfigValue farFogMinThickness() - { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.farFogMin); } + public IDhApiConfigValue farFogMinThickness() + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.farFogMin); } @Override - public IDhApiConfigValue farFogMaxThickness() - { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.farFogMax); } + public IDhApiConfigValue farFogMaxThickness() + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.farFogMax); } @Override public IDhApiConfigValue farFogFalloff() { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.farFogFalloff); } @Override - public IDhApiConfigValue farFogDensity() - { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.farFogDensity); } + public IDhApiConfigValue farFogDensity() + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.farFogDensity); } } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiGraphicsConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiGraphicsConfig.java index b201658de..5c8ef451b 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiGraphicsConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiGraphicsConfig.java @@ -108,16 +108,16 @@ public class DhApiGraphicsConfig implements IDhApiGraphicsConfig //===========================// @Override - public IDhApiConfigValue overdrawPreventionRadius() - { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Culling.overdrawPrevention); } + public IDhApiConfigValue overdrawPreventionRadius() + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Culling.overdrawPrevention); } @Override - public IDhApiConfigValue brightnessMultiplier() - { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Quality.brightnessMultiplier); } + public IDhApiConfigValue brightnessMultiplier() + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Quality.brightnessMultiplier); } @Override - public IDhApiConfigValue saturationMultiplier() - { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Quality.saturationMultiplier); } + public IDhApiConfigValue saturationMultiplier() + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Quality.saturationMultiplier); } @Override public IDhApiConfigValue caveCullingEnabled() diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiHeightFogConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiHeightFogConfig.java index 29ba5b2c5..2dc1b66a3 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiHeightFogConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiHeightFogConfig.java @@ -44,31 +44,31 @@ public class DhApiHeightFogConfig implements IDhApiHeightFogConfig { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogDirection); } @Override - public IDhApiConfigValue heightFogBaseHeight() - { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogBaseHeight); } + public IDhApiConfigValue heightFogBaseHeight() + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogBaseHeight); } @Override - public IDhApiConfigValue heightFogStartingHeightPercent() - { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogStart); } + public IDhApiConfigValue heightFogStartingHeightPercent() + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogStart); } @Override - public IDhApiConfigValue heightFogEndingHeightPercent() - { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogEnd); } + public IDhApiConfigValue heightFogEndingHeightPercent() + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogEnd); } @Override - public IDhApiConfigValue heightFogMinThickness() - { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMin); } + public IDhApiConfigValue heightFogMinThickness() + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMin); } @Override - public IDhApiConfigValue heightFogMaxThickness() - { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMax); } + public IDhApiConfigValue heightFogMaxThickness() + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMax); } @Override public IDhApiConfigValue heightFogFalloff() { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogFalloff); } @Override - public IDhApiConfigValue heightFogDensity() - { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogDensity); } + public IDhApiConfigValue heightFogDensity() + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogDensity); } } diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiNoiseTextureConfig.java b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiNoiseTextureConfig.java index 15fd60be2..00b462609 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiNoiseTextureConfig.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiNoiseTextureConfig.java @@ -41,8 +41,8 @@ public class DhApiNoiseTextureConfig implements IDhApiNoiseTextureConfig { return new DhApiConfigValue(Config.Client.Advanced.Graphics.NoiseTexture.noiseSteps); } @Override - public IDhApiConfigValue noiseIntensity() - { return new DhApiConfigValue(Config.Client.Advanced.Graphics.NoiseTexture.noiseIntensity); } + public IDhApiConfigValue noiseIntensity() + { return new DhApiConfigValue(Config.Client.Advanced.Graphics.NoiseTexture.noiseIntensity); } @Override public IDhApiConfigValue noiseDropoff() diff --git a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java index c2e4ae8d6..c64efc245 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/config/Config.java @@ -323,8 +323,8 @@ public class Config + "") .build(); - public static ConfigEntry brightnessMultiplier = new ConfigEntry.Builder() // TODO: Make this a float (the ClassicConfigGUI doesnt support floats) - .set(1.0) + public static ConfigEntry brightnessMultiplier = new ConfigEntry.Builder() + .set(1.0f) .comment("" + "How bright LOD colors are. \n" + "\n" @@ -334,8 +334,8 @@ public class Config .addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE) .build(); - public static ConfigEntry saturationMultiplier = new ConfigEntry.Builder() // TODO: Make this a float (the ClassicConfigGUI doesnt support floats) - .set(1.0) + public static ConfigEntry saturationMultiplier = new ConfigEntry.Builder() + .set(1.0f) .comment("" + "How saturated LOD colors are. \n" + "\n" @@ -490,8 +490,8 @@ public class Config public static class Fog { - private static final Double FOG_RANGE_MIN = 0.0; - private static final Double FOG_RANGE_MAX = Math.sqrt(2.0); + private static final Float FOG_RANGE_MIN = 0.0f; + private static final Float FOG_RANGE_MAX = (float)Math.sqrt(2.0); @@ -523,8 +523,8 @@ public class Config - public static ConfigEntry farFogStart = new ConfigEntry.Builder() - .setMinDefaultMax(FOG_RANGE_MIN, 0.4, FOG_RANGE_MAX) + public static ConfigEntry farFogStart = new ConfigEntry.Builder() + .setMinDefaultMax(FOG_RANGE_MIN, 0.4f, FOG_RANGE_MAX) .comment("" + "At what distance should the far fog start? \n" + "\n" @@ -533,8 +533,8 @@ public class Config + "1.414: Fog starts at the corner of the vanilla render distance.") .build(); - public static ConfigEntry farFogEnd = new ConfigEntry.Builder() - .setMinDefaultMax(FOG_RANGE_MIN, 1.0, FOG_RANGE_MAX) + public static ConfigEntry farFogEnd = new ConfigEntry.Builder() + .setMinDefaultMax(FOG_RANGE_MIN, 1.0f, FOG_RANGE_MAX) .comment("" + "Where should the far fog end? \n" + "\n" @@ -543,8 +543,8 @@ public class Config + "1.414: Fog ends at the corner of the vanilla render distance.") .build(); - public static ConfigEntry farFogMin = new ConfigEntry.Builder() - .setMinDefaultMax(-5.0, 0.0, FOG_RANGE_MAX) + public static ConfigEntry farFogMin = new ConfigEntry.Builder() + .setMinDefaultMax(-5.0f, 0.0f, FOG_RANGE_MAX) .comment("" + "What is the minimum fog thickness? \n" + "\n" @@ -552,8 +552,8 @@ public class Config + "1.0: Fully opaque fog.") .build(); - public static ConfigEntry farFogMax = new ConfigEntry.Builder() - .setMinDefaultMax(FOG_RANGE_MIN, 1.0, 5.0) + public static ConfigEntry farFogMax = new ConfigEntry.Builder() + .setMinDefaultMax(FOG_RANGE_MIN, 1.0f, 5.0f) .comment("" + "What is the maximum fog thickness? \n" + "\n" @@ -571,8 +571,8 @@ public class Config + EDhApiFogFalloff.EXPONENTIAL_SQUARED + ": 1/(e^((distance*density)^2)") .build(); - public static ConfigEntry farFogDensity = new ConfigEntry.Builder() - .setMinDefaultMax(0.01, 2.5, 50.0) + public static ConfigEntry farFogDensity = new ConfigEntry.Builder() + .setMinDefaultMax(0.01f, 2.5f, 50.0f) .comment("" + "Used in conjunction with the Fog Falloff.") .build(); @@ -618,13 +618,13 @@ public class Config + EDhApiHeightFogDirection.ABOVE_AND_BELOW_SET_HEIGHT + ": Height fog starts from a set height and goes towards both the sky and void") .build(); - public static ConfigEntry heightFogBaseHeight = new ConfigEntry.Builder() - .setMinDefaultMax(-4096.0, 80.0, 4096.0) + public static ConfigEntry heightFogBaseHeight = new ConfigEntry.Builder() + .setMinDefaultMax(-4096.0f, 80.0f, 4096.0f) .comment("If the height fog is calculated around a set height, what is that height position?") .build(); - public static ConfigEntry heightFogStart = new ConfigEntry.Builder() - .setMinDefaultMax(FOG_RANGE_MIN, 0.0, FOG_RANGE_MAX) + public static ConfigEntry heightFogStart = new ConfigEntry.Builder() + .setMinDefaultMax(FOG_RANGE_MIN, 0.0f, FOG_RANGE_MAX) .comment("" + "Should the start of the height fog be offset? \n" + "\n" @@ -632,8 +632,8 @@ public class Config + "1.0: Fog start with offset of the entire world's height. (Includes depth)") .build(); - public static ConfigEntry heightFogEnd = new ConfigEntry.Builder() - .setMinDefaultMax(FOG_RANGE_MIN, 0.6, FOG_RANGE_MAX) + public static ConfigEntry heightFogEnd = new ConfigEntry.Builder() + .setMinDefaultMax(FOG_RANGE_MIN, 0.6f, FOG_RANGE_MAX) .comment("" + "Should the end of the height fog be offset? \n" + "\n" @@ -641,8 +641,8 @@ public class Config + "1.0: Fog end with offset of the entire world's height. (Include depth)") .build(); - public static ConfigEntry heightFogMin = new ConfigEntry.Builder() - .setMinDefaultMax(0.0, 0.0, FOG_RANGE_MAX) + public static ConfigEntry heightFogMin = new ConfigEntry.Builder() + .setMinDefaultMax(0.0f, 0.0f, FOG_RANGE_MAX) .comment("" + "What is the minimum fog thickness? \n" + "\n" @@ -650,8 +650,8 @@ public class Config + "1.0: Fully opaque fog.") .build(); - public static ConfigEntry heightFogMax = new ConfigEntry.Builder() - .setMinDefaultMax(FOG_RANGE_MIN, 1.0, 5.0) + public static ConfigEntry heightFogMax = new ConfigEntry.Builder() + .setMinDefaultMax(FOG_RANGE_MIN, 1.0f, 5.0f) .comment("" + "What is the maximum fog thickness? \n" + "\n" @@ -669,8 +669,8 @@ public class Config + EDhApiFogFalloff.EXPONENTIAL_SQUARED + ": 1/(e^((height*density)^2)") .build(); - public static ConfigEntry heightFogDensity = new ConfigEntry.Builder() - .setMinDefaultMax(0.01, 20.0, 50.0) + public static ConfigEntry heightFogDensity = new ConfigEntry.Builder() + .setMinDefaultMax(0.01f, 20.0f, 50.0f) .comment("What is the height fog's density?") .build(); @@ -698,8 +698,8 @@ public class Config + "") .build(); - public static ConfigEntry noiseIntensity = new ConfigEntry.Builder() // TODO: Make this a float (the ClassicConfigGUI doesn't support floats) - .setMinDefaultMax(0d, 5d, 100d) // TODO: Once this becomes a float make it 0-1 instead of 0-100 (I did this cus doubles only allow 2 decimal places) + public static ConfigEntry noiseIntensity = new ConfigEntry.Builder() + .setMinDefaultMax(0f, 0.05f, 1f) .comment("" + "How intense should the noise should be?") .build(); @@ -718,8 +718,8 @@ public class Config { public static ConfigUIComment cullingHeader = new ConfigUIComment.Builder().setParentConfigClass(Culling.class).build(); - public static ConfigEntry overdrawPrevention = new ConfigEntry.Builder() - .setMinDefaultMax(-1.0, -1.0, 1.0) + public static ConfigEntry overdrawPrevention = new ConfigEntry.Builder() + .setMinDefaultMax(-1.0f, -1.0f, 1.0f) .comment("" + "Determines how far from the camera Distant Horizons will start rendering. \n" + "Measured as a percentage of the vanilla render distance.\n" diff --git a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java index 037bd5391..0673c6b50 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnRenderBufferBuilder.java @@ -318,8 +318,8 @@ public class ColumnRenderBufferBuilder { case OFF: { - float saturationMultiplier = Config.Client.Advanced.Graphics.Quality.saturationMultiplier.get().floatValue(); - float brightnessMultiplier = Config.Client.Advanced.Graphics.Quality.brightnessMultiplier.get().floatValue(); + float saturationMultiplier = Config.Client.Advanced.Graphics.Quality.saturationMultiplier.get(); + float brightnessMultiplier = Config.Client.Advanced.Graphics.Quality.brightnessMultiplier.get(); if (saturationMultiplier == 1.0 && brightnessMultiplier == 1.0) { color = RenderDataPointUtil.getColor(renderData); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/DhTerrainShaderProgram.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/DhTerrainShaderProgram.java index fab4d44ee..8b7efd1ee 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/DhTerrainShaderProgram.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/DhTerrainShaderProgram.java @@ -196,7 +196,7 @@ public class DhTerrainShaderProgram extends ShaderProgram implements IDhApiShade // Noise Uniforms this.setUniform(this.uNoiseEnabled, Config.Client.Advanced.Graphics.NoiseTexture.enableNoiseTexture.get()); this.setUniform(this.uNoiseSteps, Config.Client.Advanced.Graphics.NoiseTexture.noiseSteps.get()); - this.setUniform(this.uNoiseIntensity, Config.Client.Advanced.Graphics.NoiseTexture.noiseIntensity.get().floatValue()); + this.setUniform(this.uNoiseIntensity, Config.Client.Advanced.Graphics.NoiseTexture.noiseIntensity.get()); this.setUniform(this.uNoiseDropoff, Config.Client.Advanced.Graphics.NoiseTexture.noiseDropoff.get()); // Debug diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FogShader.java b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FogShader.java index 1c45c25cc..2701d524f 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FogShader.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FogShader.java @@ -175,11 +175,11 @@ public class FogShader extends AbstractShaderRenderer // fog config - float farFogStart = Config.Client.Advanced.Graphics.Fog.farFogStart.get().floatValue(); - float farFogEnd = Config.Client.Advanced.Graphics.Fog.farFogEnd.get().floatValue(); - float farFogMin = Config.Client.Advanced.Graphics.Fog.farFogMin.get().floatValue(); - float farFogMax = Config.Client.Advanced.Graphics.Fog.farFogMax.get().floatValue(); - float farFogDensity = Config.Client.Advanced.Graphics.Fog.farFogDensity.get().floatValue(); + float farFogStart = Config.Client.Advanced.Graphics.Fog.farFogStart.get(); + float farFogEnd = Config.Client.Advanced.Graphics.Fog.farFogEnd.get(); + float farFogMin = Config.Client.Advanced.Graphics.Fog.farFogMin.get(); + float farFogMax = Config.Client.Advanced.Graphics.Fog.farFogMax.get(); + float farFogDensity = Config.Client.Advanced.Graphics.Fog.farFogDensity.get(); // override fog if underwater if (MC_RENDER.isFogStateSpecial()) @@ -202,11 +202,11 @@ public class FogShader extends AbstractShaderRenderer boolean useSphericalFog = heightFogMixingMode == EDhApiHeightFogMixMode.SPHERICAL; EDhApiHeightFogDirection heightFogCameraDirection = Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogDirection.get(); - float heightFogStart = Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogStart.get().floatValue(); - float heightFogEnd = Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogEnd.get().floatValue(); - float heightFogMin = Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMin.get().floatValue(); - float heightFogMax = Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMax.get().floatValue(); - float heightFogDensity = Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogDensity.get().floatValue(); + float heightFogStart = Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogStart.get(); + float heightFogEnd = Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogEnd.get(); + float heightFogMin = Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMin.get(); + float heightFogMax = Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMax.get(); + float heightFogDensity = Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogDensity.get(); this.shader.setUniform(this.uHeightFogStart, heightFogStart); this.shader.setUniform(this.uHeightFogLength, heightFogEnd - heightFogStart); @@ -217,7 +217,7 @@ public class FogShader extends AbstractShaderRenderer this.shader.setUniform(this.uHeightFogEnabled, heightFogEnabled); this.shader.setUniform(this.uHeightFogFalloffType, Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogFalloff.get().value); - this.shader.setUniform(this.uHeightFogBaseHeight, Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogBaseHeight.get().floatValue()); + this.shader.setUniform(this.uHeightFogBaseHeight, Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogBaseHeight.get()); this.shader.setUniform(this.uHeightBasedOnCamera, heightFogCameraDirection.basedOnCamera); this.shader.setUniform(this.uHeightFogAppliesUp, heightFogCameraDirection.fogAppliesUp); this.shader.setUniform(this.uHeightFogAppliesDown, heightFogCameraDirection.fogAppliesDown); diff --git a/core/src/main/java/com/seibel/distanthorizons/core/util/RenderUtil.java b/core/src/main/java/com/seibel/distanthorizons/core/util/RenderUtil.java index 796820f2b..f05d6f9f1 100644 --- a/core/src/main/java/com/seibel/distanthorizons/core/util/RenderUtil.java +++ b/core/src/main/java/com/seibel/distanthorizons/core/util/RenderUtil.java @@ -106,7 +106,7 @@ public class RenderUtil public static float getNearClipPlaneInBlocks() { - float overdraw = Config.Client.Advanced.Graphics.Culling.overdrawPrevention.get().floatValue(); + float overdraw = Config.Client.Advanced.Graphics.Culling.overdrawPrevention.get(); if (overdraw < 0) { // automatic mode, diff --git a/core/src/main/resources/shaders/flat_shaded.frag b/core/src/main/resources/shaders/flat_shaded.frag index 0ed242f66..d24ba9672 100644 --- a/core/src/main/resources/shaders/flat_shaded.frag +++ b/core/src/main/resources/shaders/flat_shaded.frag @@ -39,7 +39,7 @@ void applyNoise(inout vec4 fragColor, const in float viewDist) // This bit of code is required to fix the vertex position problem cus of floats in the verted world position varuable vec3 fixedVPos = vPos.xyz + vertexNormal * 0.001; - float noiseAmplification = uNoiseIntensity * 0.01; + float noiseAmplification = uNoiseIntensity; float lum = (fragColor.r + fragColor.g + fragColor.b) / 3.0; noiseAmplification = (1.0 - pow(lum * 2.0 - 1.0, 2.0)) * noiseAmplification; // Lessen the effect on depending on how dark the object is, equasion for this is -(2x-1)^{2}+1 noiseAmplification *= fragColor.a; // The effect would lessen on transparent objects diff --git a/core/src/main/resources/shaders/noise/noise.frag b/core/src/main/resources/shaders/noise/noise.frag index e34018619..6d39b6253 100644 --- a/core/src/main/resources/shaders/noise/noise.frag +++ b/core/src/main/resources/shaders/noise/noise.frag @@ -43,7 +43,7 @@ void main() { vec3 fixedVPos = vPos.xyz - vertexNormal * 0.001; - float noiseAmplification = uNoiseIntensity / 100; + float noiseAmplification = uNoiseIntensity; noiseAmplification = (-1 * pow(2*((vertexColor.x + vertexColor.y + vertexColor.z) / 3) - 1, 2) + 1) * noiseAmplification; // Lessen the effect on depending on how dark the object is, equasion for this is -(2x-1)^{2}+1 noiseAmplification *= vertexColor.w; // The effect would lessen on transparent objects