Merge tag 'v151.1' into be

BalaM314 · BalaM314 · commit df6b03cd6f07 · 2025-08-25T20:10:57.000-04:00
diff --git a/arc-core/src/arc/Application.java b/arc-core/src/arc/Application.java
@@ -74,8 +74,21 @@ default long getNativeHeap(){
         return 0;
     }
 
-    @Nullable
-    String getClipboardText();
+    /** @return the main graphics thread, upon which all ApplicationListener methods are called. May return null if not initialized. */
+    default @Nullable Thread getMainThread(){
+        return null;
+    }
+
+    /**
+     * @return whether the currently executing thread is the main thread.
+     * If the main thread is not initialized, returns true by default. This is used for error checking purposes.
+     * */
+    default boolean isOnMainThread(){
+        Thread thread = getMainThread();
+        return thread == null || Thread.currentThread() == thread;
+    }
+
+    @Nullable String getClipboardText();
 
     void setClipboardText(String text);
 
diff --git a/arc-core/src/arc/audio/Audio.java b/arc-core/src/arc/audio/Audio.java
@@ -132,18 +132,18 @@ public void setLooping(int soundId, boolean looping){
 
     public void setPitch(int soundId, float pitch){
         if(!initialized) return;
-        idPitch(soundId, pitch);
+        if(!Float.isInfinite(pitch) && !Float.isNaN(pitch)) idPitch(soundId, pitch);
     }
 
     public void setVolume(int soundId, float volume){
         if(!initialized) return;
-        idVolume(soundId, volume);
+        if(!Float.isInfinite(volume) && !Float.isNaN(volume)) idVolume(soundId, volume);
     }
 
     public void set(int soundId, float pan, float volume){
         if(!initialized) return;
-        idVolume(soundId, volume);
-        idPan(soundId, pan);
+        if(!Float.isInfinite(volume) && !Float.isNaN(volume)) idVolume(soundId, volume);
+        if(!Float.isInfinite(pan) && !Float.isNaN(pan)) idPan(soundId, pan);
     }
 
     public void fadeFilterParam(int voice, int filter, int attribute, float value, float timeSec){
diff --git a/arc-core/src/arc/audio/Sound.java b/arc-core/src/arc/audio/Sound.java
@@ -67,6 +67,11 @@ public void load(Fi file){
     public int play(float volume, float pitch, float pan, boolean loop, boolean checkFrame){
         if(handle == 0 || (checkFrame && framePlayed == Core.graphics.getFrameId()) || bus == null || !Core.audio.initialized) return -1;
         framePlayed = Core.graphics.getFrameId();
+
+        if(Float.isInfinite(volume) || Float.isNaN(volume)) volume = 0f;
+        if(Float.isInfinite(pan) || Float.isNaN(pan)) pan = 0f;
+        if(Float.isInfinite(pitch) || Float.isNaN(pitch)) pitch = 1f;
+
         return sourcePlayBus(handle, bus.handle, volume, Mathf.clamp(pitch * Core.audio.globalPitch, 0.0001f, 10f), Mathf.clamp(pan, -1f, 1f), loop);
     }
 
diff --git a/arc-core/src/arc/mock/MockApplication.java b/arc-core/src/arc/mock/MockApplication.java
@@ -4,6 +4,7 @@
 import arc.struct.*;
 
 public class MockApplication implements Application{
+
     @Override
     public Seq<ApplicationListener> getListeners(){
         return new Seq<>();
diff --git a/arc-core/src/arc/util/Strings.java b/arc-core/src/arc/util/Strings.java
@@ -1,6 +1,7 @@
 package arc.util;
 
 import arc.graphics.*;
+import arc.math.*;
 import arc.struct.*;
 
 import java.io.*;
@@ -576,9 +577,18 @@ public static float parseFloat(String s, float defaultValue){
     }
 
     public static String autoFixed(float value, int max){
-        int precision = Math.abs((int)(value + 0.0001f) - value) <= 0.0001f ? 0 :
-                Math.abs((int)(value * 10 + 0.0001f) - value * 10) <= 0.0001f ? 1 : 2;
-        return fixed(value, Math.min(precision, max));
+
+        //truncate extra digits past the max
+        value = (float)Mathf.floor(value * Mathf.pow(10, max) + 0.001f) / Mathf.pow(10, max);
+
+        int precision =
+                Math.abs(Mathf.floor(value) - value) < 0.0001f ? 0 :
+                Math.abs(Mathf.floor(value * 10) - value * 10) < 0.0001f ? 1 :
+                Math.abs(Mathf.floor(value * 100) - value * 100) < 0.0001f ? 2 :
+                Math.abs(Mathf.floor(value * 1000) - value * 1000) < 0.0001f ? 3 :
+                4;
+
+        return fixed(value, Math.min(max, precision));
     }
 
     public static String fixed(float d, int decimalPlaces){
diff --git a/arc-core/test/StringsTest.java b/arc-core/test/StringsTest.java
@@ -6,6 +6,28 @@
 
 public class StringsTest{
 
+    @Test
+    public void testFixed(){
+        Object[] values = {
+        3, 1.327f,  "1.327",
+        2, 1.327f,  "1.32",
+        1, 1.327f,  "1.3",
+        0, 1.327f,  "1",
+        3, 1.3005f, "1.3",
+        2, 0.0001f, "0",
+        4, 0.0001f, "0.0001",
+        3, 0.0001f, "0",
+        2, 2.435f, "2.43",
+        2, 2.99f, "2.99",
+        2, 2.99999f, "3",
+        2, 0f, "0"
+        };
+
+        for(int i = 0; i < values.length; i += 3){
+            assertEquals(values[i + 2], Strings.autoFixed((Float)values[i + 1], (Integer)values[i]));
+        }
+    }
+
     @Test
     public void testLongParse(){
         Seq.with("0", "+0", "-0", "235235", "99424", "1234", "1", "-24242", "170589", "-289157", "4246", "19284", "-672396", "-42412042040945", "1592835012852095")
diff --git a/backends/backend-android/src/arc/backend/android/AndroidApplication.java b/backends/backend-android/src/arc/backend/android/AndroidApplication.java
@@ -41,6 +41,7 @@ public class AndroidApplication extends Activity implements Application{
     protected ClipboardManager clipboard;
     protected boolean useImmersiveMode = false;
     protected boolean hideStatusBar = false;
+    protected @Nullable Thread mainThread;
 
     static{
         ArcNativesLoader.load();
@@ -168,6 +169,11 @@ protected void hideStatusBar(boolean hide){
         getWindow().getDecorView().setSystemUiVisibility(0x1);
     }
 
+    @Override
+    public Thread getMainThread(){
+        return mainThread;
+    }
+
     @Override
     public void getDnsServers(Seq<InetSocketAddress> out){
         if(getVersion() < 21) return; //needs API level 21
diff --git a/backends/backend-android/src/arc/backend/android/AndroidGraphics.java b/backends/backend-android/src/arc/backend/android/AndroidGraphics.java
@@ -217,6 +217,7 @@ public void onSurfaceChanged(GL10 gl, int width, int height){
         updatePpi();
         gl.glViewport(0, 0, this.width, this.height);
         if(!created){
+            app.mainThread = Thread.currentThread();
             for(ApplicationListener list : app.getListeners()){
                 list.init();
             }
diff --git a/backends/backend-headless/src/arc/backend/headless/HeadlessApplication.java b/backends/backend-headless/src/arc/backend/headless/HeadlessApplication.java
@@ -103,6 +103,11 @@ void mainLoop(){
         }
     }
 
+    @Override
+    public Thread getMainThread(){
+        return mainLoopThread;
+    }
+
     @Override
     public ApplicationType getType(){
         return ApplicationType.headless;
diff --git a/backends/backend-robovm/src/arc/backend/robovm/IOSApplication.java b/backends/backend-robovm/src/arc/backend/robovm/IOSApplication.java
@@ -21,6 +21,7 @@ public class IOSApplication implements Application{
     IOSApplicationConfiguration config;
     IOSGraphics graphics;
     IOSInput input;
+    Thread mainThread;
     @Nullable IOSDevice device;
     float displayScaleFactor;
 
@@ -151,6 +152,11 @@ final void willTerminate(UIApplication uiApp){
         Gl.finish();
     }
 
+    @Override
+    public Thread getMainThread(){
+        return mainThread;
+    }
+
     @Override
     public ApplicationType getType(){
         return ApplicationType.iOS;
diff --git a/backends/backend-robovm/src/arc/backend/robovm/IOSGraphics.java b/backends/backend-robovm/src/arc/backend/robovm/IOSGraphics.java
@@ -201,6 +201,7 @@ public void draw(GLKView view, CGRect rect){
         gl20.glViewport(IOSGLES20.x, IOSGLES20.y, IOSGLES20.width, IOSGLES20.height);
 
         if(!created){
+            app.mainThread = Thread.currentThread();
             gl20.glViewport(0, 0, width, height);
 
             String versionString = gl20.glGetString(GL20.GL_VERSION);
diff --git a/backends/backend-sdl/src/arc/backend/sdl/SdlApplication.java b/backends/backend-sdl/src/arc/backend/sdl/SdlApplication.java
@@ -24,6 +24,7 @@ public class SdlApplication implements Application{
     final SdlGraphics graphics;
     final SdlInput input;
     final SdlConfig config;
+    final Thread mainThread;
 
     boolean running = true;
     long window, context;
@@ -32,6 +33,8 @@ public SdlApplication(ApplicationListener listener, SdlConfig config){
         this.config = config;
         this.listeners.add(listener);
 
+        mainThread = Thread.currentThread();
+
         init();
 
         Core.app = this;
@@ -151,15 +154,27 @@ private void init(){
             if(context == 0) throw new SdlError();
         }catch(SdlError error){
             if(config.gl30){
-                //try creating a GL 2.0 context instead as fallback.
-                config.gl30 = false;
+                try{
+                    //try a 3.0 context
+                    Log.info("Failed to initialize with OpenGL @.@, attempting fallback compatibility context: @", config.gl30Major, config.gl30Minor, Strings.getSimpleMessage(error));
+
+                    check(SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY));
+                    check(SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3));
+                    check(SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0));
+
+                    context = SDL_GL_CreateContext(window);
+                    if(context == 0) throw new SdlError();
+                }catch(SdlError error2){
+                    //finally, try a 2.0 context
+                    Log.info("Failed to initialize with fallback OpenGL 3.0 context, attempting 2.0 context: @", Strings.getSimpleMessage(error2));
+                    config.gl30 = false;
 
-                check(SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_COMPATIBILITY));
-                check(SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2));
-                check(SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0));
+                    check(SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2));
+                    check(SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0));
 
-                context = SDL_GL_CreateContext(window);
-                if(context == 0) throw new SdlError();
+                    context = SDL_GL_CreateContext(window);
+                    if(context == 0) throw new SdlError();
+                }
             }else{
                 throw error;
             }
@@ -249,6 +264,11 @@ public long getWindow(){
         return window;
     }
 
+    @Override
+    public Thread getMainThread(){
+        return mainThread;
+    }
+
     @Override
     public boolean openFolder(String file){
         Threads.daemon(() -> {
diff --git a/extensions/profiling/src/arc/profiling/GL20Interceptor.java b/extensions/profiling/src/arc/profiling/GL20Interceptor.java
@@ -2,7 +2,6 @@
 
 import arc.*;
 import arc.graphics.*;
-import arc.util.*;
 
 import java.nio.*;
 
@@ -12,16 +11,14 @@
  */
 public class GL20Interceptor extends GLInterceptor implements GL20{
     protected final GL20 gl20;
-    protected volatile @Nullable Thread mainThread;
 
     protected GL20Interceptor(GLProfiler glProfiler, GL20 gl20){
         super(glProfiler);
         this.gl20 = gl20;
-        Core.app.post(() -> mainThread = Thread.currentThread());
     }
 
     private void check(){
-        if(mainThread != null && Thread.currentThread() != mainThread){
+        if(!Core.app.isOnMainThread()){
             glProfiler.getListener().onError("GL call on wrong thread: " + Thread.currentThread());
         }
         int error = gl20.glGetError();
diff --git a/extensions/profiling/src/arc/profiling/GL30Interceptor.java b/extensions/profiling/src/arc/profiling/GL30Interceptor.java
@@ -1,31 +1,24 @@
 package arc.profiling;
 
 import arc.*;
-import arc.graphics.GL20;
-import arc.graphics.GL30;
-import arc.util.*;
+import arc.graphics.*;
 
-import java.nio.Buffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.LongBuffer;
+import java.nio.*;
 
 /**
  * @author Daniel Holderbaum
  * @author Jan Polák
  */
 public class GL30Interceptor extends GLInterceptor implements GL30{
     protected final GL30 gl30;
-    protected volatile @Nullable Thread mainThread;
 
     protected GL30Interceptor(GLProfiler glProfiler, GL30 gl30){
         super(glProfiler);
         this.gl30 = gl30;
-        Core.app.post(() -> mainThread = Thread.currentThread());
     }
 
     private void check(){
-        if(mainThread != null && Thread.currentThread() != mainThread){
+        if(!Core.app.isOnMainThread()){
             glProfiler.getListener().onError("GL call on wrong thread: " + Thread.currentThread());
         }
         int error = gl30.glGetError();

Original file line number	Diff line number	Diff line change
`@@ -132,18 +132,18 @@ public void setLooping(int soundId, boolean looping){`
`132`	`132`
`133`	`133`	`public void setPitch(int soundId, float pitch){`
`134`	`134`	`if(!initialized) return;`
`135`		`- idPitch(soundId, pitch);`
	`135`	`+ if(!Float.isInfinite(pitch) && !Float.isNaN(pitch)) idPitch(soundId, pitch);`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`public void setVolume(int soundId, float volume){`
`139`	`139`	`if(!initialized) return;`
`140`		`- idVolume(soundId, volume);`
	`140`	`+ if(!Float.isInfinite(volume) && !Float.isNaN(volume)) idVolume(soundId, volume);`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`public void set(int soundId, float pan, float volume){`
`144`	`144`	`if(!initialized) return;`
`145`		`- idVolume(soundId, volume);`
`146`		`- idPan(soundId, pan);`
	`145`	`+ if(!Float.isInfinite(volume) && !Float.isNaN(volume)) idVolume(soundId, volume);`
	`146`	`+ if(!Float.isInfinite(pan) && !Float.isNaN(pan)) idPan(soundId, pan);`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`public void fadeFilterParam(int voice, int filter, int attribute, float value, float timeSec){`
Original file line number	Diff line number	Diff line change
`@@ -217,6 +217,7 @@ public void onSurfaceChanged(GL10 gl, int width, int height){`
`217`	`217`	`updatePpi();`
`218`	`218`	`gl.glViewport(0, 0, this.width, this.height);`
`219`	`219`	`if(!created){`
	`220`	`+ app.mainThread = Thread.currentThread();`
`220`	`221`	`for(ApplicationListener list : app.getListeners()){`
`221`	`222`	`list.init();`
`222`	`223`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,11 @@ void mainLoop(){`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
	`106`	`+ @Override`
	`107`	`+ public Thread getMainThread(){`
	`108`	`+ return mainLoopThread;`
	`109`	`+ }`
	`110`	`+`
`106`	`111`	`@Override`
`107`	`112`	`public ApplicationType getType(){`
`108`	`113`	`return ApplicationType.headless;`