diff --git a/assets/locales/en/terrarum_sentences.json b/assets/locales/en/terrarum_sentences.json index 09a172c58..6268611b1 100644 --- a/assets/locales/en/terrarum_sentences.json +++ b/assets/locales/en/terrarum_sentences.json @@ -18,6 +18,7 @@ "MENU_IO_WORLDGEN_GROWING_MINERALS": "Growing Minerals...", "MENU_IO_WORLDGEN_POSITIONING_ROCKS": "Positioning Rocks...", "MENU_IO_WORLDGEN_RETICULATING_SPLINES": "Reticulating Splines...", + "MENU_LABEL_AUDIO_BUFFER_INSTRUCTION": "Set it to the minimum value in which you do not hear a stuttering.\nIf your audio is stuttering, increase the value and restart the game.\nLarger value will increase the processing stability and the delay.", "MENU_LABEL_KEYCONFIG_HELP1": "Click On the Keycap to Assign Actions", "MENU_LABEL_SAVE_WILL_BE_DELETED": "The selected save file will be deleted.", "MENU_LABEL_UNSAVED_PROGRESS_WILL_BE_LOST": "Unsaved progress will be lost.", diff --git a/assets/locales/koKR/terrarum_sentences.json b/assets/locales/koKR/terrarum_sentences.json index 66f2b19b4..6f5e49558 100644 --- a/assets/locales/koKR/terrarum_sentences.json +++ b/assets/locales/koKR/terrarum_sentences.json @@ -12,12 +12,13 @@ "GAME_PREV_SAVE_WAS_LOADED2": "이전에 저장된 게임을 불러왔습니다.", "GAME_MORE_RECENT_AUTOSAVE1": "자동 저장된 게임이 수동으로 저장한 게임보다 더 최신입니다.", "GAME_MORE_RECENT_AUTOSAVE2": "불러올 게임을 선택해 주십시오.", - "MENU_IO_LOAD_UPDATING_BLOCK_MAPPINGS": "Updating Block Mappings...", - "MENU_IO_WORLDGEN_CARVING_EARTH": "Carving Earth...", - "MENU_IO_WORLDGEN_PAINTING_GREEN": "Painting Green...", - "MENU_IO_WORLDGEN_GROWING_MINERALS": "Growing Minerals...", - "MENU_IO_WORLDGEN_POSITIONING_ROCKS": "Positioning Rocks...", - "MENU_IO_WORLDGEN_RETICULATING_SPLINES": "Reticulating Splines...", + "MENU_IO_LOAD_UPDATING_BLOCK_MAPPINGS": "블록 매핑 업데이트 중...", + "MENU_IO_WORLDGEN_CARVING_EARTH": "땅을 파내는 중...", + "MENU_IO_WORLDGEN_PAINTING_GREEN": "녹색을 칠하는 중...", + "MENU_IO_WORLDGEN_GROWING_MINERALS": "광물을 키우는 중...", + "MENU_IO_WORLDGEN_POSITIONING_ROCKS": "바위들의 위치 조정 중...", + "MENU_IO_WORLDGEN_RETICULATING_SPLINES": "망상 구조 결합 중...", + "MENU_LABEL_AUDIO_BUFFER_INSTRUCTION": "오디오 끊김이 들리지 않는 선에서 가장 작은 값으로 설정해주십시오.\n오디오에 끊김이 있다면 더 큰 값으로 설정하고 게임을 재시작하십시오.\n더 큰 값은 오디오 처리의 안정성을 증가시키지만 딜레이도 더 늘어나게 합니다.", "MENU_LABEL_KEYCONFIG_HELP1": "키캡을 클릭해 컨트롤을 배정하십시오", "MENU_LABEL_SAVE_WILL_BE_DELETED": "선택된 세이브가 삭제됩니다.", "MENU_LABEL_UNSAVED_PROGRESS_WILL_BE_LOST": "저장하지 않은 진행 상황을 잃게 됩니다.", diff --git a/src/net/torvald/terrarum/App.java b/src/net/torvald/terrarum/App.java index 0e6c81280..dbdefd2bb 100644 --- a/src/net/torvald/terrarum/App.java +++ b/src/net/torvald/terrarum/App.java @@ -473,7 +473,7 @@ public class App implements ApplicationListener { ); // set some more configuration vars - MULTITHREAD = THREAD_COUNT >= 3 && getConfigBoolean("multithread"); + MULTITHREAD = THREAD_COUNT >= 3; new TerrarumLwjgl3Application(new App(appConfig), appConfig); } diff --git a/src/net/torvald/terrarum/CreditSingleton.kt b/src/net/torvald/terrarum/CreditSingleton.kt index ed941118d..232310a10 100644 --- a/src/net/torvald/terrarum/CreditSingleton.kt +++ b/src/net/torvald/terrarum/CreditSingleton.kt @@ -34,8 +34,6 @@ along with this program. If not, see . - - $BULLET Terrarum Sans Bitmap Copyright (c) 2017-2022 Minjae Song ("CuriousTorvald") and the contributors @@ -60,8 +58,6 @@ THE SOFTWARE. - - $BULLET Joise Copyright (C) 2013 Jason Taylor @@ -103,8 +99,6 @@ Copyright (C) 2011 Joshua Tippetts - - $BULLET Vector2.java, Epsilon.java Copyright (c) 2010-2015 William Bittle http://www.dyn4j.org/ @@ -134,8 +128,6 @@ Kotlin translated and modified code Copyright (C) 2016 Minjaesong (CuriousTorval - - $BULLET PRTree, a Priority R-Tree, a spatial index for java code Copyright (c) 2008-2012 Robert Olofsson. @@ -170,8 +162,6 @@ SUCH DAMAGE. - - $BULLET HUSLColorConverter.java Copyright (c) 2016 Alexei Boronine @@ -196,8 +186,6 @@ SOFTWARE. - - $BULLET GraalVM Community Edition GraalVM Community Edition consists of multiple modules. The software as a whole, @@ -208,8 +196,6 @@ Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. - - $BULLET Jdsp Copyright (c) 2019 Sambit Paul @@ -234,8 +220,6 @@ SOFTWARE. - - $BULLET Apache Commons Codec Copyright 2002-2023 The Apache Software Foundation @@ -245,8 +229,6 @@ The Apache Software Foundation (https://www.apache.org/). - - $BULLET Apache Commons CSV Copyright 2005-2023 The Apache Software Foundation @@ -256,8 +238,6 @@ The Apache Software Foundation (https://www.apache.org/). - - $BULLET Apache Commons Math Copyright 2001-2022 The Apache Software Foundation @@ -271,8 +251,6 @@ Copyright 2010-2012 CS Systèmes d'Information - - $BULLET Ambient sound recordings: - ambient_forest_01.ogg @@ -283,9 +261,7 @@ $BULLET Ambient sound recordings: - crickets_02.ogg Copyright (C) 2012, 2013, 2015, 2016, 2017 Klankbeeld -Sound from - - +Sound from diff --git a/src/net/torvald/terrarum/audio/FFT.kt b/src/net/torvald/terrarum/audio/FFT.kt index d3d9c0db5..9c1906e70 100644 --- a/src/net/torvald/terrarum/audio/FFT.kt +++ b/src/net/torvald/terrarum/audio/FFT.kt @@ -71,10 +71,10 @@ object FFT: Disposable { } // org.apache.commons.math3.transform.FastFouriesTransformer.java:370 - @Synchronized fun fft(signal0: FloatArray): ComplexArray { -// val dataRI = ComplexArray(signal0.copyOf(), FloatArray(signal0.size)) -// transformInPlace(dataRI, DftNormalization.STANDARD, TransformType.FORWARD) -// return dataRI + fun fft(signal0: FloatArray): ComplexArray { +// val im = FloatArray(signal0.size) +// transformInPlace(signal0, im, signal0.size, DftNormalization.STANDARD, TransformType.FORWARD) +// return ComplexArray(FloatArray(signal0.size) { if (it % 2 == 0) signal0[it / 2] else im[it / 2] }) // USING FFTW // @@ -108,9 +108,11 @@ object FFT: Disposable { } // org.apache.commons.math3.transform.FastFouriesTransformer.java:404 - @Synchronized fun ifftAndGetReal(signal0: ComplexArray): FloatArray { -// transformInPlace(signal0, DftNormalization.STANDARD, TransformType.INVERSE) -// return signal0.res + fun ifftAndGetReal(signal0: ComplexArray): FloatArray { +// val re = FloatArray(signal0.size) { signal0.reim[it * 2] } +// val im = FloatArray(signal0.size) { signal0.reim[it * 2 + 1] } +// transformInPlace(re, im, re.size, DftNormalization.STANDARD, TransformType.INVERSE) +// return re // USING FFTW // diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UISoundControlPanel.kt b/src/net/torvald/terrarum/modulebasegame/ui/UISoundControlPanel.kt index 90e2801bb..031ac266f 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UISoundControlPanel.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UISoundControlPanel.kt @@ -29,6 +29,7 @@ class UISoundControlPanel(remoCon: UIRemoCon?) : UICanvas() { arrayOf("guivolume", { Lang["MENU_LABEL_INTERFACE"] }, "sliderd,0,1"), arrayOf("", { Lang["MENU_LABEL_HARDWARE"] }, "h1"), arrayOf("audiobuffersize", { Lang["MENU_OPTIONS_AUDIO_BUFFER_SIZE"] }, "spinnersel,128,256,512,1024,2048"), + arrayOf("", { "${Lang["MENU_LABEL_AUDIO_BUFFER_INSTRUCTION"]}" }, "p"), arrayOf("", { "(${Lang["MENU_LABEL_RESTART_REQUIRED"]})" }, "p"), ))