Merge branch 'master' into visiting-visitors

Author: z33ky

.circleci/config.yml

@@ -0,0 +1,74 @@
+version: 2.1
+
+executors:
+  rust-nightly-executor:
+    docker:
+        - image: rustlang/rust:nightly
+  rust-executor:
+    docker:
+        - image: rust:latest
+
+
+jobs:
+  check-fmt:
+    executor: rust-executor
+    steps:
+      - checkout
+      - run:
+          name: install rustfmt
+          command: rustup component add rustfmt
+      - run:
+          name: check formatting
+          command: cargo fmt -- --check
+  build-native:
+    executor: rust-executor
+    steps:
+      - checkout
+      - run:
+          name: build ncollide2d
+          command: cargo build --verbose -p ncollide2d;
+      - run:
+          name: build ncollide3d
+          command: cargo build --verbose -p ncollide3d;
+      - run:
+          name: test ncollide2d
+          command: cargo test --verbose -p ncollide2d;
+      - run:
+          name: test ncollide3d
+          command: cargo test --verbose -p ncollide3d;
+  build-wasm:
+    executor: rust-executor
+    steps:
+      - checkout
+      - run:
+          name: install cargo-web
+          command: cargo install -f cargo-web;
+      - run:
+          name: build ncollide2d
+          command: cd build/ncollide2d && cargo web build --verbose --target wasm32-unknown-unknown;
+      - run:
+          name: build ncollide3d
+          command: cd build/ncollide3d && cargo web build --verbose --target wasm32-unknown-unknown;
+  bench-native:
+    executor: rust-nightly-executor
+    steps:
+      - checkout
+      - run:
+          name: bench ncollide2d
+          command: cargo bench
+
+
+workflows:
+  version: 2
+  build:
+    jobs:
+      - check-fmt
+      - build-native:
+          requires:
+            - check-fmt
+      - build-wasm:
+          requires:
+            - check-fmt
+      - bench-native:
+          requires:
+            - build-native

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: [ "sebcrozet" ] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: sebcrozet # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.travis.payload/CSFML-2.1-CMAKE.patch

@@ -1,5 +1,5 @@
 [workspace]
-members = [ "build/ncollide2d", "build/ncollide3d" ] #, "ncollide_testbed2d", "ncollide_testbed3d" ]
+members = [ "build/ncollide2d", "build/ncollide3d" ]
 
 [patch.crates-io]
 ncollide2d = { path = "./build/ncollide2d" }

.travis.payload/install-dependencies.sh

@@ -32,8 +32,8 @@ Simply add one the following (or both) to your `Cargo.toml` file:
 
 ```
 [dependencies]
-ncollide2d = "0.19" # For 2D collision detection.
-ncollide3d = "0.19" # For 3D collision detection.
+ncollide2d = "0.22" # For 2D collision detection.
+ncollide3d = "0.22" # For 3D collision detection.
 ```
 
 

.travis.yml

@@ -1,6 +1,6 @@
 [package]
 name    = "ncollide2d"
-version = "0.19.2"
+version = "0.22.0"
 authors = [ "Sébastien Crozet <[email protected]>" ]
 
 description = "2 and 3-dimensional collision detection library in Rust."
@@ -23,15 +23,18 @@ path = "../../src/lib.rs"
 required-features = [ "dim2" ]
 
 [dependencies]
-either          = "1.0"
-bitflags        = "1.0"
-downcast-rs     = "1.0"
+either          = "1"
+bitflags        = "1"
+downcast-rs     = "1"
 num-traits      = { version = "0.2", default-features = false }
-smallvec        = "0.6"
+smallvec        = "1"
 slab            = "0.4"
-petgraph        = "0.4"
+slotmap         = "0.4"
+petgraph        = "0.5"
 alga            = "0.9"
-nalgebra        = "0.18"
+nalgebra        = "0.20"
 approx          = { version = "0.3", default-features = false }
-rand            = { version = "0.6", default-features = false }
-serde           = { version = "1.0", optional = true, features = ["derive"]}
+serde           = { version = "1.0", optional = true, features = ["derive"]}
+
+[dev-dependencies]
+rand            = { version = "0.7", default-features = false }

Cargo.toml

@@ -1,34 +1,34 @@
-extern crate nalgebra as na;
-extern crate ncollide2d;
-
-use ncollide2d::broad_phase::BroadPhasePairFilter;
-use ncollide2d::shape::{Ball, ShapeHandle};
-use ncollide2d::world::{CollisionGroups, CollisionObject, CollisionWorld, GeometricQueryType};
-
-struct ParityFilter;
-
-impl BroadPhasePairFilter<f32, ()> for ParityFilter {
-    fn is_pair_valid(&self, b1: &CollisionObject<f32, ()>, b2: &CollisionObject<f32, ()>) -> bool {
-        b1.handle().uid() % 2 == b2.handle().uid() % 2
-    }
-}
+//extern crate nalgebra as na;
+//extern crate ncollide2d;
+//
+//use ncollide2d::broad_phase::BroadPhasePairFilter;
+//use ncollide2d::shape::{Ball, ShapeHandle};
+//use ncollide2d::world::{CollisionGroups, CollisionObject, CollisionWorld, GeometricQueryType};
+//
+//struct ParityFilter;
+//
+//impl BroadPhasePairFilter<f32, ()> for ParityFilter {
+//    fn is_pair_valid(&self, b1: &CollisionObject<f32, ()>, b2: &CollisionObject<f32, ()>) -> bool {
+//        b1.handle().uid() % 2 == b2.handle().uid() % 2
+//    }
+//}
 
 fn main() {
-    let shape = ShapeHandle::new(Ball::new(0.5f32));
-    let groups = CollisionGroups::new();
-    let query = GeometricQueryType::Contacts(0.0, 0.0);
-
-    let mut world = CollisionWorld::new(0.02);
-
-    world.register_broad_phase_pair_filter("Parity filter", ParityFilter);
-
-    world.add(na::one(), shape.clone(), groups, query, ());
-    world.add(na::one(), shape.clone(), groups, query, ());
-    world.add(na::one(), shape.clone(), groups, query, ());
-    world.add(na::one(), shape.clone(), groups, query, ());
-
-    world.update();
-
-    // There will be only 2 contact pairs instead of 6.
-    assert!(world.contact_pairs(true).count() == 2);
+    //    let shape = ShapeHandle::new(Ball::new(0.5f32));
+    //    let groups = CollisionGroups::new();
+    //    let query = GeometricQueryType::Contacts(0.0, 0.0);
+    //
+    //    let mut world = CollisionWorld::new(0.02);
+    //
+    //    world.register_broad_phase_pair_filter("Parity filter", ParityFilter);
+    //
+    //    world.add(na::one(), shape.clone(), groups, query, ());
+    //    world.add(na::one(), shape.clone(), groups, query, ());
+    //    world.add(na::one(), shape.clone(), groups, query, ());
+    //    world.add(na::one(), shape.clone(), groups, query, ());
+    //
+    //    world.update();
+    //
+    //    // There will be only 2 contact pairs instead of 6.
+    //    assert!(world.contact_pairs(true).count() == 2);
 }

README.md

@@ -2,9 +2,9 @@ extern crate nalgebra as na;
 extern crate ncollide2d;
 
 use na::{Isometry2, Vector2};
-use ncollide2d::shape::Ball;
 use ncollide2d::bounding_volume;
 use ncollide2d::broad_phase::{BroadPhase, BroadPhaseInterferenceHandler, DBVTBroadPhase};
+use ncollide2d::shape::Ball;
 
 struct InterferenceHandler;
 
@@ -14,11 +14,9 @@ impl BroadPhaseInterferenceHandler<i32> for InterferenceHandler {
         *a != *b
     }
 
-    fn interference_started(&mut self, _: &i32, _: &i32) {
-    }
+    fn interference_started(&mut self, _: &i32, _: &i32) {}
 
-    fn interference_stopped(&mut self, _: &i32, _: &i32) {
-    }
+    fn interference_stopped(&mut self, _: &i32, _: &i32) {}
 }
 
 fn main() {