feat: Upgrade to optimized jnigen 3.1-SNAPSHOT

Author: Berstanio

build.gradle.kts

@@ -5,7 +5,7 @@ import kotlin.io.path.createTempDirectory
 
 plugins {
     id("java-library")
-    id("com.badlogicgames.jnigen.jnigen-gradle") version "3.0.0"
+    id("com.badlogicgames.jnigen.jnigen-gradle") version "3.0.1-SNAPSHOT"
 }
 
 val isReleaseBuild: Boolean
@@ -189,6 +189,10 @@ jnigen {
     addMac(x64, x86)
 
     addAndroid {
+        // TODO: TEMP fix for compiling for x86, fix later
+        cFlags += arrayOf("-malign-double")
+        cppFlags += arrayOf("-malign-double")
+
         libraries = arrayOf()
         androidApplicationMk += arrayOf("APP_PLATFORM := android-21",
             "APP_STRIP_MODE := none",

gdx-box2d-utils/src/main/java/com/badlogic/gdx/box2d/utils/Box2dDebugRenderer.java

@@ -8,8 +8,8 @@
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
 import com.badlogic.gdx.jnigen.runtime.closure.ClosureObject;
-import com.badlogic.gdx.jnigen.runtime.pointer.CSizedIntPointer;
 import com.badlogic.gdx.jnigen.runtime.pointer.VoidPointer;
+import com.badlogic.gdx.jnigen.runtime.pointer.integer.BytePointer;
 import com.badlogic.gdx.math.Matrix4;
 import com.badlogic.gdx.utils.Disposable;
 
@@ -141,7 +141,7 @@ private void drawPoint(b2Vec2 p, float size, b2HexColor color, VoidPointer conte
         renderer.circle(p.x(), p.y(), size);
     }
 
-    private void drawString(b2Vec2 p, CSizedIntPointer s, b2HexColor color, VoidPointer context) {
+    private void drawString(b2Vec2 p, BytePointer s, b2HexColor color, VoidPointer context) {
         // TODO: Implement
     }
 

gdx-box2d-utils/src/main/java/com/badlogic/gdx/box2d/utils/Box2dWorldTaskSystem.java

@@ -103,7 +103,7 @@ private Box2dWorldTaskSystem(int numWorkers, Box2dWorldTaskSystemDeathHandler de
                     start = end;
                 }
 
-                VoidPointer taskIndex = new VoidPointer(taskCount + 1, false);
+                VoidPointer taskIndex = new VoidPointer((long) taskCount + 1, false);
                 taskCount++;
                 return taskIndex;
             } else {

gradle.properties

@@ -1,7 +1,7 @@
 group=com.badlogicgames.gdx
 version=0.1
 
-jnigen.version=3.0.0
+jnigen.version=3.0.1-SNAPSHOT
 gdx.version=1.13.1
 
 POM_NAME=gdx-box2d

src/main/java/com/badlogic/gdx/box2d/Box2d.java

@@ -2,6 +2,7 @@
 
 import com.badlogic.gdx.jnigen.runtime.pointer.EnumPointer;
 import com.badlogic.gdx.jnigen.runtime.c.CEnum;
+import com.badlogic.gdx.jnigen.runtime.CHandler;
 
 /**
  * The body simulation type.
@@ -27,6 +28,8 @@ public enum b2BodyType implements CEnum {
      */
     b2_bodyTypeCount(3);
 
+    private static final int __size = 4;
+
     private final int index;
 
     b2BodyType(int index) {
@@ -37,33 +40,53 @@ public int getIndex() {
         return index;
     }
 
-    public static b2BodyType getByIndex(int index) {
-        return _values[index];
+    public int getSize() {
+        return __size;
     }
 
-    private final static b2BodyType[] _values = { b2_staticBody, b2_kinematicBody, b2_dynamicBody, b2_bodyTypeCount };
+    public static b2BodyType getByIndex(int index) {
+        switch(index) {
+            case 0:
+                return b2_staticBody;
+            case 1:
+                return b2_kinematicBody;
+            case 2:
+                return b2_dynamicBody;
+            case 3:
+                return b2_bodyTypeCount;
+            default:
+                throw new IllegalArgumentException("Index " + index + " does not exist.");
+        }
+    }
 
     public static final class b2BodyTypePointer extends EnumPointer<b2BodyType> {
 
         public b2BodyTypePointer(long pointer, boolean freeOnGC) {
             super(pointer, freeOnGC);
         }
 
+        public b2BodyTypePointer(long pointer, boolean freeOnGC, int capacity) {
+            super(pointer, freeOnGC, capacity * __size);
+        }
+
         public b2BodyTypePointer() {
-            this(1, true, true);
+            this(1, true);
+        }
+
+        public b2BodyTypePointer(int count, boolean freeOnGC) {
+            super(count * __size, freeOnGC);
         }
 
-        public b2BodyTypePointer(int count, boolean freeOnGC, boolean guard) {
-            super(count, freeOnGC, guard);
+        public b2BodyType getEnumValue(int index) {
+            return getByIndex((int) getBufPtr().getUInt(index * __size));
         }
 
-        public b2BodyType.b2BodyTypePointer guardCount(long count) {
-            super.guardCount(count);
-            return this;
+        public void setEnumValue(b2BodyType value, int index) {
+            getBufPtr().setUInt(index * __size, value.getIndex());
         }
 
-        protected b2BodyType getEnum(int index) {
-            return getByIndex(index);
+        public int getSize() {
+            return __size;
         }
     }
 }