curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 12:21:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

adjusting params for situational audio reverb mix incl airbourne

Browse Source
This commit is contained in:
minjaesong
2023-11-29 15:44:23 +09:00
parent bbfd3cf881
commit ed9a6536da
5 changed files with 22 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.idea/libraries/bytedeco_fftw.xml generated
View File

@@ -1,14 +0,0 @@
<component name="libraryTable">
<library name="bytedeco.fftw" type="repository">
<properties maven-id="org.bytedeco:fftw:3.3.10-1.5.7" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-javadoc.jar!/" />
</JAVADOC>
<SOURCES />
</library>
</component>

104
.idea/libraries/bytedeco_fftw_platform.xml generated
View File

@@ -1,104 +0,0 @@
<component name="libraryTable">
<library name="bytedeco.fftw.platform" type="repository">
<properties maven-id="org.bytedeco:fftw-platform:3.3.10-1.5.7" />
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/fftw-platform-3.3.10-1.5.7.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-platform-1.5.7.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-android-arm.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-android-arm64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-android-x86.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-android-x86_64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-ios-arm64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-ios-x86_64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-linux-armhf.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-linux-arm64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-linux-ppc64le.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-linux-x86.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-linux-x86_64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-macosx-arm64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-macosx-x86_64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-windows-x86.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-windows-x86_64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-android-arm.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-android-arm64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-android-x86.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-android-x86_64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-linux-x86.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-linux-x86_64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-linux-armhf.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-linux-arm64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-linux-ppc64le.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-macosx-x86_64.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-windows-x86.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-windows-x86_64.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/lib/fftw-platform-3.3.10-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-platform-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-javadoc.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/lib/fftw-platform-3.3.10-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-platform-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/javacpp-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-sources.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/fftw-3.3.10-1.5.7-sources.jar!/" />
</SOURCES>
</library>
</component>

12
assets/mods/basegame/materials/materials.csv
View File

@@ -19,13 +19,13 @@ BRAS;315;1015;8530;3;1.00;120;5;120;1.0;brass
BRNZ;310;843;8770;3;1.20;75;5;120;1.0;bronze
TINN;220;350;7310;2;1.00;69;5;120;1.0;tin
ZINC;90;525;7140;2;1.00;116;5;120;1.0;zinc
DIRT;1;1;1400;0.0;0.0;36;0;10;0.25;dirt
SAND;1;1;2400;0.0;0.0;36;0;36;0.25;sand
GRVL;1;1;2400;0.0;0.0;36;0;36;0.25;gravel
DIRT;1;1;1400;0.0;0.0;36;0;10;0.0;dirt
SAND;1;1;2400;0.0;0.0;36;0;36;0.0;sand
GRVL;1;1;2400;0.0;0.0;36;0;36;0.0;gravel
PLST;1;1;1400;0.0;0.0;36;0;16;0.5;TODO plastic (polyethylene)
GRSS;1;1;1400;0.0;0.0;36;0;10;-0.03;dirt
AIIR;1;1;1;0.0;0.0;36;0;1;-0.03;air
NULL;1;1;1;0.0;0.0;36;0;1;-0.03;air
GRSS;1;1;1400;0.0;0.0;36;0;10;0.0;dirt
AIIR;1;1;1;0.0;0.0;36;0;1;-0.2;air
NULL;1;1;1;0.0;0.0;36;0;1;0.5;air
# idst: ID_STRING, ALL CAPS
#
1 idst tens impf dsty fmod endurance tcond reach rcs sondrefl comments
19 BRNZ 310 843 8770 3 1.20 75 5 120 1.0 bronze
20 TINN 220 350 7310 2 1.00 69 5 120 1.0 tin
21 ZINC 90 525 7140 2 1.00 116 5 120 1.0 zinc
22 DIRT 1 1 1400 0.0 0.0 36 0 10 0.25 0.0 dirt
23 SAND 1 1 2400 0.0 0.0 36 0 36 0.25 0.0 sand
24 GRVL 1 1 2400 0.0 0.0 36 0 36 0.25 0.0 gravel
25 PLST 1 1 1400 0.0 0.0 36 0 16 0.5 TODO plastic (polyethylene)
26 GRSS 1 1 1400 0.0 0.0 36 0 10 -0.03 0.0 dirt
27 AIIR 1 1 1 0.0 0.0 36 0 1 -0.03 -0.2 air
28 NULL 1 1 1 0.0 0.0 36 0 1 -0.03 0.5 air
29 # idst: ID_STRING, ALL CAPS
30 #
31 # tens: tensile strength (= ultimate stringth)

19
src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
View File

@@ -64,7 +64,9 @@ import org.khelekore.prtree.PRTree
import java.io.File
import java.util.*
import java.util.logging.Level
import kotlin.math.absoluteValue
import kotlin.math.min
import kotlin.math.pow
import kotlin.math.roundToInt
@@ -302,7 +304,7 @@ open class TerrarumIngame(batch: FlippingSpriteBatch) : IngameInstance(batch) {
TileSurvey.submitProposal(
TileSurvey.SurveyProposal(
"basegame.Ingame.audioReflection", 72, 48, 2, 4
"basegame.Ingame.audioReflection", 73, 73, 2, 4
) { world, x, y ->
val tileProp = BlockCodex[world.getTileFromTerrain(x, y)]
val wallProp = BlockCodex[world.getTileFromWall(x, y)]
@@ -885,10 +887,17 @@ open class TerrarumIngame(batch: FlippingSpriteBatch) : IngameInstance(batch) {
oldPlayerX = actorNowPlaying?.hitbox?.canonicalX ?: 0.0
// update audio mixer
val ratio = (TileSurvey.getRatio("basegame.Ingame.audioReflection") ?: 0.0).coerceIn(0.0, 1.0)
AudioMixer.convolveBusCave.volume = ratio
AudioMixer.convolveBusOpen.volume = 1.0 - ratio
val ratio = (TileSurvey.getRatio("basegame.Ingame.audioReflection") ?: 0.0)
if (ratio >= 0.0) {
val ratio1 = ratio.coerceIn(0.0, 1.0)
AudioMixer.convolveBusCave.volume = ratio1
AudioMixer.convolveBusOpen.volume = 1.0 - ratio1
}
else {
val ratio1 = (ratio / MaterialCodex["AIIR"].sondrefl).absoluteValue.coerceIn(0.0, 1.0)
AudioMixer.convolveBusOpen.volume = (1.0 - ratio1).pow(0.75)
AudioMixer.convolveBusCave.volume = 0.0
}

4
src/net/torvald/terrarum/worlddrawer/FeaturesDrawer.kt
View File

@@ -32,12 +32,12 @@ object FeaturesDrawer {
init {
TileSurvey.submitProposal(
TileSurvey.SurveyProposal(
"basegame.FeaturesDrawer.coldTiles", 72, 48, 2, 2
"basegame.FeaturesDrawer.coldTiles", 73, 49, 2, 2
) { world, x, y -> BlockCodex[world.getTileFromTerrain(x, y)].hasTag("COLD").toInt().toFloat() }
)
TileSurvey.submitProposal(
TileSurvey.SurveyProposal(
"basegame.FeaturesDrawer.warmTiles", 72, 48, 2, 2
"basegame.FeaturesDrawer.warmTiles", 73, 49, 2, 2
) { world, x, y -> BlockCodex[world.getTileFromTerrain(x, y)].hasTag("WARM").toInt().toFloat() }
)
}