From 84a77ea06712be3abb4443b198b988c3cd228711 Mon Sep 17 00:00:00 2001 From: John Collins Date: Sat, 2 Dec 2023 14:49:01 -0800 Subject: [PATCH] libcollider --- bindings/java/pom.xml | 7 +++++++ bindings/java/src/main/java/manifold3d/Manifold.java | 5 +++++ bindings/java/version.txt | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/bindings/java/pom.xml b/bindings/java/pom.xml index 55eb21ffa..adde93e12 100644 --- a/bindings/java/pom.xml +++ b/bindings/java/pom.xml @@ -60,6 +60,13 @@ libmanifold.dylib + + ../../build/src/collider + + libcollider.so + libcollider.dylib + + ../../build/src/third_party diff --git a/bindings/java/src/main/java/manifold3d/Manifold.java b/bindings/java/src/main/java/manifold3d/Manifold.java index 35d104de7..f2b05e1d5 100644 --- a/bindings/java/src/main/java/manifold3d/Manifold.java +++ b/bindings/java/src/main/java/manifold3d/Manifold.java @@ -49,6 +49,7 @@ public class Manifold extends Pointer { System.load(Loader.extractResource("/libcross_section.so", null, "libcross_section", ".so").getAbsolutePath()); System.load(Loader.extractResource("/libmanifold.so", null, "libmanifold", ".so").getAbsolutePath()); System.load(Loader.extractResource("/libquickhull.so", null, "libquickhull", ".so").getAbsolutePath()); + System.load(Loader.extractResource("/libcollider.so", null, "libcollider", ".so").getAbsolutePath()); } catch (IOException e) { throw new RuntimeException(e); } @@ -64,6 +65,8 @@ public class Manifold extends Pointer { System.load(Loader.extractResource("/manifold.dll", null, "manifold", ".dll").getAbsolutePath()); System.out.println("Loading QuickHull"); System.load(Loader.extractResource("/quickhull.dll", null, "quickhull", ".dll").getAbsolutePath()); + System.out.println("Loading Collider"); + System.load(Loader.extractResource("/collider.dll", null, "collider", ".dll").getAbsolutePath()); System.out.println("Finished Loading."); } catch (IOException e) { throw new RuntimeException(e); @@ -80,6 +83,8 @@ public class Manifold extends Pointer { System.load(Loader.extractResource("/libmanifold.dylib", null, "libmanifold", ".dylib").getAbsolutePath()); System.out.println("Loading QuickHull"); System.load(Loader.extractResource("/libquickhull.dylib", null, "libquickhull", ".dylib").getAbsolutePath()); + System.out.println("Loading Collider"); + System.load(Loader.extractResource("/libcollider.dylib", null, "libcollider", ".dylib").getAbsolutePath()); System.out.println("Finished Loading."); } catch (IOException e) { diff --git a/bindings/java/version.txt b/bindings/java/version.txt index 7f2b14048..c8b474251 100644 --- a/bindings/java/version.txt +++ b/bindings/java/version.txt @@ -1 +1 @@ -1.0.66 +1.0.67