refactor to simplify porting to Android

stephengold · Jan 14, 2025 · ff4b7d5 · ff4b7d5
1 parent 8c81df9
commit ff4b7d5
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 41 deletions.
diff --git a/src/main/native/glue/cu/CustomBodyActivationListener.cpp b/src/main/native/glue/cu/CustomBodyActivationListener.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2024 Stephen Gold
+Copyright (c) 2024-2025 Stephen Gold
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -56,7 +56,7 @@ class CustomBodyActivationListener : BodyActivationListener {
 
     void OnBodyActivated(const BodyID &inBodyID, uint64 inBodyUserData) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong idVa = reinterpret_cast<jlong> (&inBodyID);
@@ -68,7 +68,7 @@ class CustomBodyActivationListener : BodyActivationListener {
 
     void OnBodyDeactivated(const BodyID &inBodyID, uint64 inBodyUserData) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong idVa = reinterpret_cast<jlong> (&inBodyID);
@@ -80,7 +80,7 @@ class CustomBodyActivationListener : BodyActivationListener {
 
     ~CustomBodyActivationListener() {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         pAttachEnv->DeleteGlobalRef(mJavaObject);

diff --git a/src/main/native/glue/cu/CustomCastRayCollector.cpp b/src/main/native/glue/cu/CustomCastRayCollector.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2024 Stephen Gold
+Copyright (c) 2024-2025 Stephen Gold
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -52,7 +52,7 @@ class CustomCastRayCollector : CastRayCollector {
 
     void AddHit(const RayCastResult &inResult) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong resultVa = reinterpret_cast<jlong> (&inResult);
@@ -63,7 +63,7 @@ class CustomCastRayCollector : CastRayCollector {
 
     ~CustomCastRayCollector() {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         pAttachEnv->DeleteGlobalRef(mJavaObject);

diff --git a/src/main/native/glue/cu/CustomCastShapeCollector.cpp b/src/main/native/glue/cu/CustomCastShapeCollector.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2024 Stephen Gold
+Copyright (c) 2024-2025 Stephen Gold
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -52,7 +52,7 @@ class CustomCastShapeCollector : CastShapeCollector {
 
     void AddHit(const ShapeCastResult &inResult) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong resultVa = reinterpret_cast<jlong> (&inResult);
@@ -63,7 +63,7 @@ class CustomCastShapeCollector : CastShapeCollector {
 
     ~CustomCastShapeCollector() {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         pAttachEnv->DeleteGlobalRef(mJavaObject);

diff --git a/src/main/native/glue/cu/CustomCharacterContactListener.cpp b/src/main/native/glue/cu/CustomCharacterContactListener.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2024 Stephen Gold
+Copyright (c) 2024-2025 Stephen Gold
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -85,7 +85,7 @@ class CustomCharacterContactListener : CharacterContactListener {
             const Body &inBody2, Vec3 &ioLinearVelocity,
             Vec3 &ioAngularVelocity) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong characterVa = reinterpret_cast<jlong> (inCharacter);
@@ -121,7 +121,7 @@ class CustomCharacterContactListener : CharacterContactListener {
             const SubShapeID &inSubShapeID2, RVec3Arg inContactPosition,
             Vec3Arg inContactNormal, CharacterContactSettings &ioSettings) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong characterVa = reinterpret_cast<jlong> (inCharacter);
@@ -152,7 +152,7 @@ class CustomCharacterContactListener : CharacterContactListener {
             const PhysicsMaterial *inContactMaterial,
             Vec3Arg inCharacterVelocity, Vec3 &ioNewCharacterVelocity) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong characterVa = reinterpret_cast<jlong> (inCharacter);
@@ -205,7 +205,7 @@ class CustomCharacterContactListener : CharacterContactListener {
             const CharacterVirtual *inOtherCharacter,
             const SubShapeID &inSubShapeID2) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong characterVa = reinterpret_cast<jlong> (inCharacter);
@@ -225,7 +225,7 @@ class CustomCharacterContactListener : CharacterContactListener {
             RVec3Arg inContactPosition, Vec3Arg inContactNormal,
             CharacterContactSettings &ioSettings) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong characterVa = reinterpret_cast<jlong> (inCharacter);
@@ -254,7 +254,7 @@ class CustomCharacterContactListener : CharacterContactListener {
             Vec3Arg inContactVelocity, const PhysicsMaterial *inContactMaterial,
             Vec3Arg inCharacterVelocity, Vec3 &ioNewCharacterVelocity) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong characterVa = reinterpret_cast<jlong> (inCharacter);
@@ -304,7 +304,7 @@ class CustomCharacterContactListener : CharacterContactListener {
     bool OnContactValidate(const CharacterVirtual *inCharacter,
             const BodyID &inBodyID2, const SubShapeID &inSubShapeID2) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong characterVa = reinterpret_cast<jlong> (inCharacter);
@@ -319,7 +319,7 @@ class CustomCharacterContactListener : CharacterContactListener {
 
     ~CustomCharacterContactListener() {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         pAttachEnv->DeleteGlobalRef(mJavaObject);

diff --git a/src/main/native/glue/cu/CustomCollidePointCollector.cpp b/src/main/native/glue/cu/CustomCollidePointCollector.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2024 Stephen Gold
+Copyright (c) 2024-2025 Stephen Gold
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -52,7 +52,7 @@ class CustomCollidePointCollector : CollidePointCollector {
 
     void AddHit(const CollidePointResult &inResult) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong resultVa = reinterpret_cast<jlong> (&inResult);
@@ -63,7 +63,7 @@ class CustomCollidePointCollector : CollidePointCollector {
 
     ~CustomCollidePointCollector() {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         pAttachEnv->DeleteGlobalRef(mJavaObject);

diff --git a/src/main/native/glue/cu/CustomCollideShapeBodyCollector.cpp b/src/main/native/glue/cu/CustomCollideShapeBodyCollector.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2024 Stephen Gold
+Copyright (c) 2024-2025 Stephen Gold
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -52,7 +52,7 @@ class CustomCollideShapeBodyCollector : CollideShapeBodyCollector {
 
     void AddHit(const BodyID &inResult) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong resultVa = reinterpret_cast<jlong> (&inResult);
@@ -63,7 +63,7 @@ class CustomCollideShapeBodyCollector : CollideShapeBodyCollector {
 
     ~CustomCollideShapeBodyCollector() {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         pAttachEnv->DeleteGlobalRef(mJavaObject);

diff --git a/src/main/native/glue/cu/CustomCollideShapeCollector.cpp b/src/main/native/glue/cu/CustomCollideShapeCollector.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2024 Stephen Gold
+Copyright (c) 2024-2025 Stephen Gold
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -52,7 +52,7 @@ class CustomCollideShapeCollector : CollideShapeCollector {
 
     void AddHit(const CollideShapeResult &inResult) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong resultVa = reinterpret_cast<jlong> (&inResult);
@@ -63,7 +63,7 @@ class CustomCollideShapeCollector : CollideShapeCollector {
 
     ~CustomCollideShapeCollector() {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         pAttachEnv->DeleteGlobalRef(mJavaObject);

diff --git a/src/main/native/glue/cu/CustomContactListener.cpp b/src/main/native/glue/cu/CustomContactListener.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2024 Stephen Gold
+Copyright (c) 2024-2025 Stephen Gold
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -65,7 +65,7 @@ class CustomContactListener : ContactListener {
     void OnContactAdded(const Body &inBody1, const Body &inBody2,
             const ContactManifold &inManifold, ContactSettings &ioSettings) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong body1Va = reinterpret_cast<jlong> (&inBody1);
@@ -80,7 +80,7 @@ class CustomContactListener : ContactListener {
     void OnContactPersisted(const Body &inBody1, const Body &inBody2,
             const ContactManifold &inManifold, ContactSettings &ioSettings) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong body1Va = reinterpret_cast<jlong> (&inBody1);
@@ -95,7 +95,7 @@ class CustomContactListener : ContactListener {
 
     void OnContactRemoved(const SubShapeIDPair &pair) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong pairVa = reinterpret_cast<jlong> (&pair);
@@ -107,7 +107,7 @@ class CustomContactListener : ContactListener {
     ValidateResult OnContactValidate(const Body &inBody1, const Body &inBody2,
             RVec3Arg inBaseOffset, const CollideShapeResult &inCollisionResult) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong body1Va = reinterpret_cast<jlong> (&inBody1);
@@ -125,7 +125,7 @@ class CustomContactListener : ContactListener {
 
     ~CustomContactListener() {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         pAttachEnv->DeleteGlobalRef(mJavaObject);

diff --git a/src/main/native/glue/cu/CustomPhysicsStepListener.cpp b/src/main/native/glue/cu/CustomPhysicsStepListener.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2024 Stephen Gold
+Copyright (c) 2024-2025 Stephen Gold
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -52,7 +52,7 @@ class CustomPhysicsStepListener : PhysicsStepListener {
 
     void OnStep(const PhysicsStepListenerContext &inContext) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong contextVa = reinterpret_cast<jlong> (&inContext);
@@ -63,7 +63,7 @@ class CustomPhysicsStepListener : PhysicsStepListener {
 
     ~CustomPhysicsStepListener() {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         pAttachEnv->DeleteGlobalRef(mJavaObject);

diff --git a/src/main/native/glue/cu/CustomRayCastBodyCollector.cpp b/src/main/native/glue/cu/CustomRayCastBodyCollector.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2024 Stephen Gold
+Copyright (c) 2024-2025 Stephen Gold
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -52,7 +52,7 @@ class CustomRayCastBodyCollector : RayCastBodyCollector {
 
     void AddHit(const BroadPhaseCastResult &inResult) {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         const jlong resultVa = reinterpret_cast<jlong> (&inResult);
@@ -63,7 +63,7 @@ class CustomRayCastBodyCollector : RayCastBodyCollector {
 
     ~CustomRayCastBodyCollector() {
         JNIEnv *pAttachEnv;
-        jint retCode = mpVM->AttachCurrentThread((void **)&pAttachEnv, NULL);
+        jint retCode = ATTACH_CURRENT_THREAD(mpVM, &pAttachEnv);
         JPH_ASSERT(retCode == JNI_OK);
 
         pAttachEnv->DeleteGlobalRef(mJavaObject);

diff --git a/src/main/native/glue/glue.h b/src/main/native/glue/glue.h
@@ -1,7 +1,7 @@
 #ifndef _Included_glue
 #define _Included_glue
 /*
-Copyright (c) 2024 Stephen Gold
+Copyright (c) 2024-2025 Stephen Gold
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -66,4 +66,15 @@ extern bool gTraceAllocations;
     return reinterpret_cast<jlong> (pResult); \
   }
 
+#ifdef ANDROID
+// doesn't match the Invocation API spec
+#define ATTACH_CURRENT_THREAD(mpVM, ppAttachEnv) \
+    (mpVM)->AttachCurrentThread(ppAttachEnv, NULL)
+
+#else
+#define ATTACH_CURRENT_THREAD(mpVM, ppAttachEnv) \
+    (mpVM)->AttachCurrentThread((void **)(ppAttachEnv), NULL)
+
+#endif
+
 #endif