Merge pull request #58 from fabmax/upgrade-to-physx-5.2.1

Upgrade to physx 5.2.1
fabmax · Jul 2, 2023 · 0ae1ab5 · 0ae1ab5
2 parents 709158e + 26ac4dc
commit 0ae1ab5
Show file tree

Hide file tree

Showing 35 changed files with 381 additions and 185 deletions.
diff --git a/PhysX b/PhysX
diff --git a/README.md b/README.md
@@ -4,20 +4,20 @@
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/de.fabmax/physx-jni/badge.svg)](https://maven-badges.herokuapp.com/maven-central/de.fabmax/physx-jni)
 ![Build](https://github.com/fabmax/physx-jni/workflows/Build/badge.svg)
 
-Java JNI bindings for Nvidia [PhysX 5.1.3](https://github.com/NVIDIA-Omniverse/PhysX).
+Java JNI bindings for Nvidia [PhysX 5.2.1](https://github.com/NVIDIA-Omniverse/PhysX).
 
 ## How to use
 The library is published on maven central, so you can easily add this to your dependencies:
 ```
 dependencies {
     // java bindings
-    implementation("de.fabmax:physx-jni:2.1.0")
+    implementation("de.fabmax:physx-jni:2.2.1")
     
-    // native libraries, you can add the one matching your system or all
-    runtimeOnly("de.fabmax:physx-jni:2.1.0:natives-windows")
-    runtimeOnly("de.fabmax:physx-jni:2.1.0:natives-linux")
-    runtimeOnly("de.fabmax:physx-jni:2.1.0:natives-macos")
-    runtimeOnly("de.fabmax:physx-jni:2.1.0:natives-macos-arm64")
+    // native libraries - you can add the one matching your system or all
+    runtimeOnly("de.fabmax:physx-jni:2.2.1:natives-windows")
+    runtimeOnly("de.fabmax:physx-jni:2.2.1:natives-linux")
+    runtimeOnly("de.fabmax:physx-jni:2.2.1:natives-macos")
+    runtimeOnly("de.fabmax:physx-jni:2.2.1:natives-macos-arm64")
 }
 ```
 
@@ -84,7 +84,7 @@ They are more or less 1:1 translations of the corresponding PhysX example snippe
 ### Documentation
 The generated bindings contain most of the original documentation converted to javadoc. For further reading
 there is also the official
-[PhysX documentation](https://nvidia-omniverse.github.io/PhysX/physx/5.1.3/index.html).
+[PhysX documentation](https://nvidia-omniverse.github.io/PhysX/physx/5.2.1/index.html).
 
 ### Things to consider when working with native objects
 Whenever you create an instance of a wrapper class within this library, this also creates an object on the native

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -6,7 +6,7 @@ subprojects {
     apply(plugin = "maven-publish")
 
     group = "de.fabmax"
-    version = "2.1.0"
+    version = "2.2.1"
 
     repositories {
         mavenCentral()

diff --git a/buildSrc/src/main/java/Generators.kt b/buildSrc/src/main/java/Generators.kt
@@ -46,7 +46,7 @@ open class GenerateJavaBindings : DefaultTask() {
     @Input
     var generatorOutput = "./generated"
     @Input
-    var physxIncludeDir = "../Physx/physx/include"
+    var physxIncludeDir = "../PhysX/physx/include"
 
     @TaskAction
     fun generate() {
@@ -118,4 +118,4 @@ open class GenerateNativeGlueCode : DefaultTask() {
             }
         }.generate(model)
     }
-}
+}
diff --git a/physx-jni-natives-linux-cuda/src/main/java/de/fabmax/physxjni/linux/NativeLibLinux.java b/physx-jni-natives-linux-cuda/src/main/java/de/fabmax/physxjni/linux/NativeLibLinux.java
@@ -7,7 +7,7 @@
 
 public class NativeLibLinux extends NativeLib {
 
-    private static final String version = "2.1.0";
+    private static final String version = "2.2.1";
 
     private static final List<String> libraries = new ArrayList<>() {{
         add("libPhysXJniBindings_64.so");

diff --git a/physx-jni-natives-linux/src/main/java/de/fabmax/physxjni/linux/NativeLibLinux.java b/physx-jni-natives-linux/src/main/java/de/fabmax/physxjni/linux/NativeLibLinux.java
@@ -7,7 +7,7 @@
 
 public class NativeLibLinux extends NativeLib {
 
-    private static final String version = "2.1.0";
+    private static final String version = "2.2.1";
 
     private static final List<String> libraries = new ArrayList<>() {{
         add("libPhysXJniBindings_64.so");

diff --git a/...ni-natives-macos-arm64/src/main/java/de/fabmax/physxjni/macosarm/NativeLibMacosArm64.java b/...ni-natives-macos-arm64/src/main/java/de/fabmax/physxjni/macosarm/NativeLibMacosArm64.java
@@ -7,7 +7,7 @@
 
 public class NativeLibMacosArm64 extends NativeLib {
 
-    private static final String version = "2.1.0";
+    private static final String version = "2.2.1";
 
     private static final List<String> libraries = new ArrayList<>() {{
         add("libPhysXJniBindings_64.dylib");

diff --git a/physx-jni-natives-macos/src/main/java/de/fabmax/physxjni/macos/NativeLibMacos.java b/physx-jni-natives-macos/src/main/java/de/fabmax/physxjni/macos/NativeLibMacos.java
@@ -7,7 +7,7 @@
 
 public class NativeLibMacos extends NativeLib {
 
-    private static final String version = "2.1.0";
+    private static final String version = "2.2.1";
 
     private static final List<String> libraries = new ArrayList<>() {{
         add("libPhysXJniBindings_64.dylib");

diff --git a/...x-jni-natives-windows-cuda/src/main/java/de/fabmax/physxjni/windows/NativeLibWindows.java b/...x-jni-natives-windows-cuda/src/main/java/de/fabmax/physxjni/windows/NativeLibWindows.java
@@ -7,7 +7,7 @@
 
 public class NativeLibWindows extends NativeLib {
 
-    private static final String version = "2.1.0";
+    private static final String version = "2.2.1";
 
     private static final List<String> libraries = new ArrayList<>() {{
         add("PhysX_64.dll");

diff --git a/physx-jni-natives-windows/src/main/java/de/fabmax/physxjni/windows/NativeLibWindows.java b/physx-jni-natives-windows/src/main/java/de/fabmax/physxjni/windows/NativeLibWindows.java
@@ -7,7 +7,7 @@
 
 public class NativeLibWindows extends NativeLib {
 
-    private static final String version = "2.1.0";
+    private static final String version = "2.2.1";
 
     private static final List<String> libraries = new ArrayList<>() {{
         add("PhysX_64.dll");

diff --git a/physx-jni/build.gradle.kts b/physx-jni/build.gradle.kts
@@ -45,7 +45,7 @@ tasks.register<GenerateJavaBindings>("generateJniBindings") {
     idlModelName = "PhysXJni"
     idlSource = File("${projectDir}/src/main/webidl/").absolutePath
     generatorOutput = File("${projectDir}/src/main/generated/physx").absolutePath
-    physxIncludeDir = "$rootDir/Physx/physx/include"
+    physxIncludeDir = "$rootDir/PhysX/physx/include"
 }
 
 tasks.compileJava {

diff --git a/physx-jni/src/main/java/de/fabmax/physxjni/Loader.java b/physx-jni/src/main/java/de/fabmax/physxjni/Loader.java
@@ -7,7 +7,7 @@
 
 public class Loader {
 
-    private static final String version = "2.1.0";
+    private static final String version = "2.2.1";
 
     private static final AtomicBoolean isLoaded = new AtomicBoolean(false);
 

diff --git a/physx-jni/src/main/webidl/PxTopLevel.idl b/physx-jni/src/main/webidl/PxTopLevel.idl
@@ -31,5 +31,5 @@ interface PxTopLevelFunctions {
     static PxHeightField CreateHeightField([Const, Ref] PxHeightFieldDesc desc);
 
     // PxCooking is deprecated, only needed for scene serialization
-    static PxCooking CreateCooking(unsigned long version, [Ref] PxFoundation foundation, [Const, Ref] PxCookingParams scale);
+    //static PxCooking CreateCooking(unsigned long version, [Ref] PxFoundation foundation, [Const, Ref] PxCookingParams scale);
 };
diff --git a/physx-jni/src/main/webidl/common/PxCuda.idl b/physx-jni/src/main/webidl/common/PxCuda.idl
@@ -80,7 +80,6 @@ interface PxCudaContextManager {
     unsigned long getMaxThreadsPerBlock();
     [Const] DOMString getDeviceName();
     CUdevice getDevice();
-    PxCudaInteropModeEnum getInteropMode();
     void setUsingConcurrentStreams(boolean flag);
     boolean getUsingConcurrentStreams();
     long usingDedicatedGPU();
@@ -94,15 +93,6 @@ interface PxCudaContextManagerDesc {
     attribute CUcontext ctx;
     attribute VoidPtr graphicsDevice;
     attribute DOMString appGUID;
-    attribute PxCudaInteropModeEnum interopMode;
-};
-
-[Platforms="windows;linux"]
-enum PxCudaInteropModeEnum {
-    "PxCudaInteropModeEnum::NO_INTEROP",
-    "PxCudaInteropModeEnum::D3D10_INTEROP",
-    "PxCudaInteropModeEnum::D3D11_INTEROP",
-    "PxCudaInteropModeEnum::OGL_INTEROP"
 };
 
 [Platforms="windows;linux", Prefix="physx::"]
@@ -392,7 +382,7 @@ interface PxParticlePhaseFlags {
 interface PxParticleRigidAttachment {
     void PxParticleRigidAttachment();
     [Value] attribute PxVec4 mLocalPose0;
-    [Value] attribute PxConeLimitParams mParams;
+    [Value] attribute PxConeLimitParams mConeLimitParams;
 };
 PxParticleRigidAttachment implements PxParticleRigidFilterPair;
 
@@ -407,8 +397,7 @@ interface PxParticleRigidFilterPair {
 enum PxParticleSolverTypeEnum {
     "PxParticleSolverTypeEnum::ePBD",
     "PxParticleSolverTypeEnum::eFLIP",
-    "PxParticleSolverTypeEnum::eMPM",
-    "PxParticleSolverTypeEnum::eCUSTOM"
+    "PxParticleSolverTypeEnum::eMPM"
 };
 
 [Platforms="windows;linux", Prefix="physx::", StackAllocatable]
@@ -449,10 +438,8 @@ interface PxParticleSystem {
     void enableCCD(boolean enable);
     unsigned long createPhase(PxParticleMaterial material, [Ref] PxParticlePhaseFlags flags);
     unsigned long getNbParticleMaterials();
-//    void setParticleSystemCallback(PxParticleSystemCallback callback);
-//    PxParticleSystemCallback getParticleSystemCallback();
-    void setPeriodicBoundary([Const, Ref] PxVec3 boundary);
-    [Value] PxVec3 getPeriodicBoundary();
+    void setParticleSystemCallback(PxParticleSystemCallback callback);
+    PxParticleSystemCallback getParticleSystemCallback();
     void addParticleBuffer(PxParticleBuffer particleBuffer);
     void removeParticleBuffer(PxParticleBuffer particleBuffer);
     unsigned long getGpuParticleSystemIndex();

diff --git a/physx-jni/src/main/webidl/common/PxDebugDrawer.idl b/physx-jni/src/main/webidl/common/PxDebugDrawer.idl
@@ -0,0 +1,61 @@
+/****************************************
+ * [package=common]
+ ****************************************/
+
+[Prefix="physx::", NoDelete]
+interface PxDebugPoint {
+    [Value] attribute PxVec3 pos;
+    attribute unsigned long color;
+};
+
+[Prefix="physx::", NoDelete]
+interface PxDebugLine {
+    [Value] attribute PxVec3 pos0;
+    attribute unsigned long color0;
+    [Value] attribute PxVec3 pos1;
+    attribute unsigned long color1;
+};
+
+[Prefix="physx::", NoDelete]
+interface PxDebugTriangle {
+    [Value] attribute PxVec3 pos0;
+    attribute unsigned long color0;
+    [Value] attribute PxVec3 pos1;
+    attribute unsigned long color1;
+    [Value] attribute PxVec3 pos2;
+    attribute unsigned long color2;
+};
+
+[Prefix="physx::", NoDelete]
+interface PxRenderBuffer {
+    unsigned long getNbPoints();
+    [Const] PxDebugPoint getPoints();
+    void addPoint([Const, Ref] PxDebugPoint point);
+    unsigned long getNbLines();
+    [Const] PxDebugLine getLines();
+    void addLine([Const, Ref] PxDebugLine line);
+    PxDebugLine reserveLines([Const] unsigned long nbLines);
+    PxDebugPoint reservePoints([Const] unsigned long nbLines);
+    unsigned long getNbTriangles();
+    [Const] PxDebugTriangle getTriangles();
+    void addTriangle([Const, Ref] PxDebugTriangle triangle);
+    void append([Const, Ref] PxRenderBuffer other);
+    void clear();
+    void shift([Const, Ref] PxVec3 delta);
+    boolean empty();
+};
+
+enum PxDebugColorEnum {
+    "PxDebugColorEnum::eARGB_BLACK",
+    "PxDebugColorEnum::eARGB_RED",
+    "PxDebugColorEnum::eARGB_GREEN",
+    "PxDebugColorEnum::eARGB_BLUE",
+    "PxDebugColorEnum::eARGB_YELLOW",
+    "PxDebugColorEnum::eARGB_MAGENTA",
+    "PxDebugColorEnum::eARGB_CYAN",
+    "PxDebugColorEnum::eARGB_WHITE",
+    "PxDebugColorEnum::eARGB_GREY",
+    "PxDebugColorEnum::eARGB_DARKRED",
+    "PxDebugColorEnum::eARGB_DARKGREEN",
+    "PxDebugColorEnum::eARGB_DARKBLUE"
+};
diff --git a/physx-jni/src/main/webidl/cooking/PxCooking.idl b/physx-jni/src/main/webidl/cooking/PxCooking.idl
@@ -51,13 +51,13 @@ enum PxConvexMeshCookingTypeEnum {
 };
 
 // PxCooking is deprecated, use PxTopLevelFunctions instead; however, PxSerialization needs PxCooking
-[Prefix="physx::", NoDelete]
-interface PxCooking {
-    void release();
-    PxConvexMesh createConvexMesh([Const, Ref] PxConvexMeshDesc desc, [Ref] PxInsertionCallback insertionCallback);
-    PxTriangleMesh createTriangleMesh([Const, Ref] PxTriangleMeshDesc desc, [Ref] PxInsertionCallback insertionCallback);
-    PxHeightField createHeightField([Const, Ref] PxHeightFieldDesc desc, [Ref] PxInsertionCallback insertionCallback);
-};
+//[Prefix="physx::", NoDelete]
+//interface PxCooking {
+//    void release();
+//    PxConvexMesh createConvexMesh([Const, Ref] PxConvexMeshDesc desc, [Ref] PxInsertionCallback insertionCallback);
+//    PxTriangleMesh createTriangleMesh([Const, Ref] PxTriangleMeshDesc desc, [Ref] PxInsertionCallback insertionCallback);
+//    PxHeightField createHeightField([Const, Ref] PxHeightFieldDesc desc, [Ref] PxInsertionCallback insertionCallback);
+//};
 
 [Prefix="physx::"]
 interface PxCookingParams {

diff --git a/physx-jni/src/main/webidl/extensions/PxExtensions.idl b/physx-jni/src/main/webidl/extensions/PxExtensions.idl
@@ -94,9 +94,9 @@ interface PxSerialization {
     static boolean isSerializable([Ref] PxCollection collection, [Ref] PxSerializationRegistry sr, [Const] optional PxCollection externalReferences);
     static void complete([Ref] PxCollection collection, [Ref] PxSerializationRegistry sr, [Const] optional PxCollection exceptFor, optional boolean followJoints);
     static void createSerialObjectIds([Ref] PxCollection collection, unsigned long long base);
-    static PxCollection createCollectionFromXml([Ref] PxInputData inputData, [Ref] PxCooking cooking, [Ref] PxSerializationRegistry sr, [Const] optional PxCollection externalRefs);
+    static PxCollection createCollectionFromXml([Ref] PxInputData inputData, [Const, Ref] PxCookingParams params, [Ref] PxSerializationRegistry sr, [Const] optional PxCollection externalRefs);
     static PxCollection createCollectionFromBinary(VoidPtr memBlock, [Ref] PxSerializationRegistry sr, [Const] optional PxCollection externalRefs);
-    static boolean serializeCollectionToXml([Ref] PxOutputStream outputStream, [Ref] PxCollection collection, [Ref] PxSerializationRegistry sr, optional PxCooking cooking, [Const] optional PxCollection externalRefs);
+    static boolean serializeCollectionToXml([Ref] PxOutputStream outputStream, [Ref] PxCollection collection, [Ref] PxSerializationRegistry sr, [Const] optional PxCookingParams params, [Const] optional PxCollection externalRefs);
     static boolean serializeCollectionToBinary([Ref] PxOutputStream outputStream, [Ref] PxCollection collection, [Ref] PxSerializationRegistry sr, [Const] optional PxCollection externalRefs, optional boolean exportNames);
     static PxSerializationRegistry createSerializationRegistry([Ref] PxPhysics physics);
 };