Utils: add the loadAndInitializeNativeLibrary() method

stephengold · Jul 12, 2024 · 864fa20 · 864fa20
1 parent 099e427
commit 864fa20
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 27 deletions.
diff --git a/src/test/java/testjoltjni/Utils.java b/src/test/java/testjoltjni/Utils.java
@@ -100,6 +100,29 @@ public static void assertEquals(
         Assert.assertEquals("z component", z, actual.getZ(), tolerance);
     }
 
+    /**
+     * Load and initialize some flavor of native library.
+     */
+    public static void loadAndInitializeNativeLibrary() {
+        loadNativeLibrary();
+
+        String buildType = Jolt.buildType();
+        if (!buildType.equals("Release")) {
+            System.out.print(buildType + "-");
+        }
+        if (Jolt.isDoublePrecision()) {
+            System.out.print("Dp-");
+        }
+        System.out.println(
+                "jolt-jni version " + Jolt.versionString() + " initializing");
+
+        Jolt.registerDefaultAllocator();
+        Jolt.installDefaultTraceCallback();
+        Jolt.installDefaultAssertCallback();
+        Jolt.newFactory();
+        Jolt.registerTypes();
+    }
+
     /**
      * Load some flavor of Debug native library.
      * <p>

diff --git a/src/test/java/testjoltjni/app/ConvexVsMeshScene.java b/src/test/java/testjoltjni/app/ConvexVsMeshScene.java
@@ -38,12 +38,7 @@ public class ConvexVsMeshScene {
 	private static final int BP_LAYER_MOVING = 1;
 	private static final int BP_NUM_LAYERS = 2;
 	public static void main(String[] argv) {
-		Utils.loadNativeLibrary();
-		Jolt.registerDefaultAllocator();
-		Jolt.installDefaultTraceCallback();
-		Jolt.installDefaultAssertCallback();
-		Jolt.newFactory();
-		Jolt.registerTypes();
+		Utils.loadAndInitializeNativeLibrary();
 		TempAllocatorImpl temp_allocator = new TempAllocatorImpl(32 << 20); // 32 MiB
 		JobSystemThreadPool job_system = new JobSystemThreadPool(Jolt.cMaxPhysicsJobs, Jolt.cMaxPhysicsBarriers, Utils.numThreads());
 		final int cMaxBodies = 1_800;

diff --git a/src/test/java/testjoltjni/junit/Test001.java b/src/test/java/testjoltjni/junit/Test001.java
@@ -65,13 +65,7 @@ public class Test001 {
      */
     @Test
     public void test001() {
-        Utils.loadNativeLibrary();
-
-        Jolt.registerDefaultAllocator();
-        Jolt.installDefaultTraceCallback();
-        Jolt.installDefaultAssertCallback();
-        Jolt.newFactory();
-        Jolt.registerTypes();
+        Utils.loadAndInitializeNativeLibrary();
 
         // object layers:
         final int objLayerNonMoving = 0;

diff --git a/src/test/java/testjoltjni/junit/Test002.java b/src/test/java/testjoltjni/junit/Test002.java
@@ -95,13 +95,7 @@ public class Test002 {
      */
     @Test
     public void test002() {
-        Utils.loadNativeLibrary();
-
-        Jolt.registerDefaultAllocator();
-        Jolt.installDefaultTraceCallback();
-        Jolt.installDefaultAssertCallback();
-        Jolt.newFactory();
-        Jolt.registerTypes();
+        Utils.loadAndInitializeNativeLibrary();
 
         // broadphase layers:
         int bpLayerNonMoving = 0;

diff --git a/src/test/java/testjoltjni/junit/Test003.java b/src/test/java/testjoltjni/junit/Test003.java
@@ -62,13 +62,7 @@ public class Test003 {
      */
     @Test
     public void test003() {
-        Utils.loadNativeLibrary();
-
-        Jolt.registerDefaultAllocator();
-        Jolt.installDefaultTraceCallback();
-        Jolt.installDefaultAssertCallback();
-        Jolt.newFactory();
-        Jolt.registerTypes();
+        Utils.loadAndInitializeNativeLibrary();
 
         // AaBox:
         {