libcollider

SovereignShop · Dec 2, 2023 · 84a77ea · 84a77ea
1 parent 9bf6b9b
commit 84a77ea
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/bindings/java/pom.xml b/bindings/java/pom.xml
@@ -60,6 +60,13 @@
                     <include>libmanifold.dylib</include>
                 </includes>
             </resource>
+            <resource>
+                <directory>../../build/src/collider</directory>
+                <includes>
+                    <include>libcollider.so</include>
+                    <include>libcollider.dylib</include>
+                </includes>
+            </resource>
             <resource>
                 <directory>../../build/src/third_party</directory>
                 <includes>

diff --git 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
@@ -1 +1 @@
-1.0.66
+1.0.67