diff --git a/core/assets/sounds/conveyor.ogg b/core/assets/sounds/conveyor.ogg new file mode 100644 index 0000000000..d61775acc5 Binary files /dev/null and b/core/assets/sounds/conveyor.ogg differ diff --git a/core/assets/sounds/machine.ogg b/core/assets/sounds/machine.ogg new file mode 100755 index 0000000000..d6f7aceae8 Binary files /dev/null and b/core/assets/sounds/machine.ogg differ diff --git a/core/assets/sounds/spray.ogg b/core/assets/sounds/spray.ogg new file mode 100644 index 0000000000..f47dbe236b Binary files /dev/null and b/core/assets/sounds/spray.ogg differ diff --git a/core/convert_sounds.sh b/core/convert_sounds.sh new file mode 100755 index 0000000000..14d4ef881e --- /dev/null +++ b/core/convert_sounds.sh @@ -0,0 +1,5 @@ +#convert from stereo to mono +for i in assets/sounds/*.ogg; do + echo $i + ffmpeg -i "$i" -y -ac 1 "$i" +done diff --git a/core/src/io/anuke/mindustry/game/LoopControl.java b/core/src/io/anuke/mindustry/game/LoopControl.java index e6b7dffae2..3924a1c28c 100644 --- a/core/src/io/anuke/mindustry/game/LoopControl.java +++ b/core/src/io/anuke/mindustry/game/LoopControl.java @@ -31,8 +31,6 @@ public class LoopControl{ boolean play = data.curVolume > 0.01f; float pan = Mathf.isZero(data.total, 0.0001f) ? 0f : sound.calcPan(data.sum.x / data.total, data.sum.y / data.total); - //Log.info(pan); - //TODO calc pan if(data.soundID <= 0){ if(play){ data.soundID = sound.loop(data.curVolume, 1f, pan);