Fix some absorption stuff

Author: thedocruby

gradle.properties

@@ -6,7 +6,7 @@ minecraft_version=1.18.1
 yarn_mappings=1.18.1+build.2
 loader_version=0.12.12
 # Mod Properties
-mod_version=1.0.0-bc.5
+mod_version=1.0.0-bc.6
 maven_group=dev.thedocruby
 archives_base_name=resounding
 # Dependencies

src/main/java/dev/thedocruby/resounding/ResoundingEngine.java

@@ -603,7 +603,7 @@ private static double getBlockOcclusionD(final BlockState blockState) {
 		double directGain = (auxOnly ? 0 : inWater ? pC.waterFilt : 1) * Math.pow(airAbsorptionHF, listenerPos.distanceTo(soundPos)) ;
 
 		if (data.reflRays().isEmpty()) {
-			return new SoundProfile(sourceID, directGain, directGain * pC.globalAbsHFRcp, new double[pC.resolution + 1], new double[pC.resolution + 1]);
+			return new SoundProfile(sourceID, directGain, Math.pow(directGain, pC.globalAbsHFRcp), new double[pC.resolution + 1], new double[pC.resolution + 1]);
 		}
 
 		double bounceCount = 0.0D;
@@ -684,7 +684,7 @@ private static double getBlockOcclusionD(final BlockState blockState) {
 		directGain *= Math.pow(airAbsorptionHF, listenerPos.distanceTo(soundPos))
 				/ Math.pow(listenerPos.distanceTo(soundPos), 2.0 * missedSum)
 				* MathHelper.lerp(sharedSum, 0d/*TODO: occlusion coeff from processing goes here IF fancy or fabulous occl*/, 1d);
-		double directCutoff = Math.pow(directGain, pC.globalAbsHFRcp); // TODO: occlusion
+		double directCutoff = Math.pow(directGain, pC.globalAbsHFRcp); // TODO: make sure this actually works.
 
 		SoundProfile profile = new SoundProfile(sourceID, directGain, directCutoff, sendGain, sendCutoff);
 

src/main/java/dev/thedocruby/resounding/config/BlueTapePack/ConfigManager.java

@@ -26,7 +26,7 @@ private ConfigManager() {}
 
     public static boolean resetOnReload;
 
-    public static final String configVersion = "1.0.0-bc.5";
+    public static final String configVersion = "1.0.0-bc.6";
 
     @Environment(EnvType.CLIENT)
     public static final ResoundingConfig DEFAULT = ResoundingEngine.env == EnvType.CLIENT ? new ResoundingConfig(){{

src/main/java/dev/thedocruby/resounding/config/PrecomputedConfig.java

@@ -175,10 +175,10 @@ public PrecomputedConfig(ResoundingConfig c) throws CloneNotSupportedException {
             globalRvrbGain = MathHelper.clamp(c.general.globalReverbGain/100d, 0.0d, 1.0d);
             energyFix = 1 / Math.max(c.general.globalReverbStrength, Double.MIN_NORMAL);
             resolution = c.quality.reverbResolution;
-            globalRvrbHFRcp = (float) (1 / Math.max(c.general.globalReverbBrightness, Math.pow(10, -64)));
+            globalRvrbHFRcp = 1 / Math.max(c.general.globalReverbBrightness, Double.MIN_NORMAL);
             rvrbDiff = MathHelper.clamp(c.general.globalReverbSmoothness, 0.0, 1.0);
             globalAbs = c.general.globalBlockAbsorption;
-            globalAbsHFRcp = globalRvrbHFRcp /*c.general.globalAbsorptionBrightness*/; // TODO: Occlusion
+            globalAbsHFRcp = 1 / Math.max(c.general.globalAbsorptionBrightness, Double.MIN_NORMAL);
             globalRefl = c.general.globalBlockReflectance;
             globalReflRcp = 1 / globalRefl;
             airAbs = (float) MathHelper.clamp(c.effects.airAbsorption, 0.0, 10.0);

src/main/java/dev/thedocruby/resounding/config/ResoundingConfig.java

@@ -68,10 +68,10 @@ public static class General{
         public double globalReverbSmoothness = 0.5;
 
         @Comment("The brightness of reverberation.\n§7[•]§r Range: > 0 \n§7[•]§r Higher values result in more high frequencies in reverberation.\n§7[•]§r Lower values give a more muffled sound to the reverb.\n§7[•]§r 1.0 is neutral.\n§a[+]§r Performance Impact: Low")
-        public double globalReverbBrightness = 0.8;
+        public double globalReverbBrightness = 0.75;
 
-            @ConfigEntry.Gui.Excluded // TODO: Occlusion
-            public double globalAbsorptionBrightness = 0.618;
+        @Comment("The brightness of absorption.\n§7[•]§r Range: > 0 \n§7[•]§r Higher values result in more high frequencies in faded or occluded audio.\n§7[•]§r Lower values give a more muffled sound to faded or occluded audio.\n§7[•]§r 1.0 is neutral.\n§a[+]§r Performance Impact: Low")
+        public double globalAbsorptionBrightness = 0.75;
 
             @ConfigEntry.Gui.Excluded // TODO: Occlusion. Remove?
             //@Comment("The global amount of sound that will be absorbed when traveling through blocks. 0.1 - 4.0")
@@ -127,17 +127,14 @@ public static class Quality{
 
     @Environment(EnvType.CLIENT)
     public static class Effects {
-            @ConfigEntry.Gui.Excluded // TODO: AirAbs
-            @Comment("Represents how aggressively air absorbs high frequencies over distance.\n§7[•]§r Range: 0.0 - 10.0\n§7[•]§r A value of 1.0 is physically correct for air with normal humidity and temperature.\n§7[•]§r Higher values mean air will absorb more high frequencies with distance.\n§7[•]§r A value of 0.0 disables this effect.\n§a[+]§r Performance Impact: Low")
-            public double airAbsorption = 0.0;
+        @Comment("Represents how aggressively air absorbs high frequencies over distance.\n§7[•]§r Range: 0.0 - 10.0\n§7[•]§r A value of 1.0 is physically correct for air with normal humidity and temperature.\n§7[•]§r Higher values mean air will absorb more high frequencies with distance.\n§7[•]§r A value of 0.0 disables this effect.\n§a[+]§r Performance Impact: Low")
+        public double airAbsorption = 0.2;
 
-            @ConfigEntry.Gui.Excluded // TODO: AirAbs
-            @Comment("How much humidity contributes to the air absorption.\n§7[•]§r Range: 0.0 - 4.0\n§7[•]§r A value of 1.0 is physically correct.\n§7[•]§r Higher values mean air will absorb more high frequencies with distance,\n    depending on the local humidity.\n§7[•]§r A value of 0.0 disables this effect.\n§a[+]§r Performance Impact: Low")
-            public double humidityAbsorption = 0.0;
+        @Comment("How much humidity contributes to the air absorption.\n§7[•]§r Range: 0.0 - 4.0\n§7[•]§r A value of 1.0 is physically correct.\n§7[•]§r Higher values mean air will absorb more high frequencies with distance,\n    depending on the local humidity.\n§7[•]§r A value of 0.0 disables this effect.\n§a[+]§r Performance Impact: Low")
+        public double humidityAbsorption = 0.2;
 
-            @ConfigEntry.Gui.Excluded // TODO: AirAbs
-            @Comment("How much rain drops contribute to the air absorption.\n§7[•]§r Range: 0.0 - 2.0\n§7[•]§r A value of 1.0 is approximately physically correct.\n§7[•]§r Higher values mean air will absorb more high frequencies with distance,\n    depending on the local rainfall.\n§7[•]§r A value of 0.0 disables this effect.\n§a[+]§r Performance Impact: Low")
-            public double rainAbsorption = 0.0;
+        @Comment("How much rain drops contribute to the air absorption.\n§7[•]§r Range: 0.0 - 2.0\n§7[•]§r A value of 1.0 is approximately physically correct.\n§7[•]§r Higher values mean air will absorb more high frequencies with distance,\n    depending on the local rainfall.\n§7[•]§r A value of 0.0 disables this effect.\n§a[+]§r Performance Impact: Low")
+        public double rainAbsorption = 0.2;
 
         @Comment("How much sound is filtered when the player is underwater.\n§7[•]§r Range: 0.0 - 1.0\n§7[•]§r 0.0 means no filter. 1.0 means fully filtered.\n§a[+]§r Performance Impact: Low")
         public double underwaterFilter = 0.75;

src/main/resources/assets/resounding/lang/en_us.json

@@ -14,6 +14,7 @@
   "text.autoconfig.resounding.option.general.globalReverbStrength": "Reverb strength",
   "text.autoconfig.resounding.option.general.globalReverbSmoothness": "Reverb smoothness",
   "text.autoconfig.resounding.option.general.globalReverbBrightness": "Reverb brightness",
+  "text.autoconfig.resounding.option.general.globalAbsorptionBrightness": "Absorption brightness",
 
   "text.autoconfig.resounding.option.quality.reverbResolution": "Reverb resolution",
   "text.autoconfig.resounding.option.quality.envEvalRays": "Rays per sound",