diff --git a/gradle.properties b/gradle.properties index 8339e2e9..941ed61e 100644 --- a/gradle.properties +++ b/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.6 +mod_version=1.0.0-alpha.7 maven_group=dev.thedocruby archives_base_name=resounding # Dependencies diff --git a/src/main/java/dev/thedocruby/resounding/ResoundingEngine.java b/src/main/java/dev/thedocruby/resounding/ResoundingEngine.java index cc764ba1..93dd6936 100644 --- a/src/main/java/dev/thedocruby/resounding/ResoundingEngine.java +++ b/src/main/java/dev/thedocruby/resounding/ResoundingEngine.java @@ -681,9 +681,11 @@ private static double getBlockOcclusionD(final BlockState blockState) { //TODO: Occlusion calculation here + double occlusion = RaycastFix.fixedRaycast(soundPos, listenerPos, mc.world, soundBlockPos, soundChunk).isMissed() ? 1 : 0; // TODO: occlusion coeff from processing goes here IF fancy or fabulous occl + 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); + * MathHelper.lerp(occlusion, sharedSum, 1d); double directCutoff = Math.pow(directGain, pC.globalAbsHFRcp); // TODO: make sure this actually works. SoundProfile profile = new SoundProfile(sourceID, directGain, directCutoff, sendGain, sendCutoff); diff --git a/src/main/java/dev/thedocruby/resounding/config/BlueTapePack/ConfigManager.java b/src/main/java/dev/thedocruby/resounding/config/BlueTapePack/ConfigManager.java index b36dbd3e..2a7761a8 100644 --- a/src/main/java/dev/thedocruby/resounding/config/BlueTapePack/ConfigManager.java +++ b/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.6"; + public static final String configVersion = "1.0.0-alpha.7"; @Environment(EnvType.CLIENT) public static final ResoundingConfig DEFAULT = ResoundingEngine.env == EnvType.CLIENT ? new ResoundingConfig(){{ diff --git a/src/main/java/dev/thedocruby/resounding/config/ResoundingConfig.java b/src/main/java/dev/thedocruby/resounding/config/ResoundingConfig.java index df21036d..08c30c59 100644 --- a/src/main/java/dev/thedocruby/resounding/config/ResoundingConfig.java +++ b/src/main/java/dev/thedocruby/resounding/config/ResoundingConfig.java @@ -62,10 +62,10 @@ public static class General{ public int globalReverbGain = 75; @Comment("The strength of the reverb effect.\n§7[•]§r Range: >= 0.0\n§7[•]§r Higher values make the echo last longer.\n§7[•]§r Lower values make the echos shorter.\n§a[+]§r Performance Impact: Low") - public double globalReverbStrength = 1.0; + public double globalReverbStrength = 2.5; @Comment("The smoothness of the reverb.\n§7[•]§r Range: 0.0 - 1.0\n§7[•]§r Affects how uniform the reverb is.\n§7[•]§r Low values cause a distinct fluttering or bouncing echo.\n§7[•]§r High values make this effect less distinct by smoothing out the reverb.\n§a[+]§r Performance Impact: Low") - public double globalReverbSmoothness = 0.5; + public double globalReverbSmoothness = 0.618; @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.75;