fix crash with glColor3ub and glColor4ub on macOS (#54); closes #13, closes #14

NateIsStalling · web-flow · commit f428b3567c35 · 2025-03-23T22:16:44.000-04:00
diff --git a/library/src/main/java/com/basic4gl/library/desktopgl/GLBasicLib_gl.java b/library/src/main/java/com/basic4gl/library/desktopgl/GLBasicLib_gl.java
@@ -5946,13 +5946,19 @@ public void run(TomVM vm) {
         }
     }
 
-    public static final class WrapglColor3ub implements Function {
+    public final class WrapglColor3ub implements Function {
 
         public void run(TomVM vm) {
-            glColor3ub(
-                    vm.getIntParam(3).byteValue(),
-                    vm.getIntParam(2).byteValue(),
-                    vm.getIntParam(1).byteValue());
+            // glColor3ub crashes on macOS - remap parameters to glColor3ubv
+            byteBuffer16.rewind();
+            byteBuffer16.put(vm.getIntParam(3).byteValue());
+            byteBuffer16.put(vm.getIntParam(2).byteValue());
+            byteBuffer16.put(vm.getIntParam(1).byteValue());
+
+            byteBuffer16.rewind();
+            glColor3ubv(byteBuffer16);
+
+            byteBuffer16.rewind();
         }
     }
 
@@ -6352,14 +6358,20 @@ public void run(TomVM vm) {
         }
     }
 
-    public static final class WrapglColor4ub implements Function {
+    public final class WrapglColor4ub implements Function {
 
         public void run(TomVM vm) {
-            glColor4ub(
-                    vm.getIntParam(4).byteValue(),
-                    vm.getIntParam(3).byteValue(),
-                    vm.getIntParam(2).byteValue(),
-                    vm.getIntParam(1).byteValue());
+            // glColor4ub crashes on macOS - remap parameters to glColor4ubv
+            byteBuffer16.rewind();
+            byteBuffer16.put(vm.getIntParam(4).byteValue());
+            byteBuffer16.put(vm.getIntParam(3).byteValue());
+            byteBuffer16.put(vm.getIntParam(2).byteValue());
+            byteBuffer16.put(vm.getIntParam(1).byteValue());
+
+            byteBuffer16.rewind();
+            glColor4ubv(byteBuffer16);
+
+            byteBuffer16.rewind();
         }
     }
 
