Skip to content

Pass body ID into ShapeFilter #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HexyWitch wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Pass body ID into ShapeFilter #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/joltc-sys/JoltC
Open in desktop
Submodule JoltC updated 2 files
+6 −4 JoltC/Functions.h
+9 −2 JoltCImpl/JoltC.cpp
16 changes: 13 additions & 3 deletions crates/rolt/src/traits.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,14 +392,20 @@ impl<T: BodyFilter> BodyFilterBridge<T> {
/// See also: Jolt's [`ShapeFilter`](https://jrouwe.github.io/JoltPhysicsDocs/5.1.0/class_shape_filter.html) class.
#[allow(unused)]
pub trait ShapeFilter {
fn should_collide(&self, shape2: *const JPC_Shape, subshape_id2: JPC_SubShapeID) -> bool {
fn should_collide(
&self,
body: BodyId,
shape2: *const JPC_Shape,
subshape_id2: JPC_SubShapeID,
) -> bool {
true
}

fn should_collide_two_shapes(
&self,
shape1: *const JPC_Shape,
subshape_id1: JPC_SubShapeID,
body2: BodyId,
shape2: *const JPC_Shape,
subshape_id2: JPC_SubShapeID,
) -> bool {
Expand All @@ -419,24 +425,28 @@ struct ShapeFilterBridge<T> {
impl<T: ShapeFilter> ShapeFilterBridge<T> {
unsafe extern "C" fn ShouldCollide(
this: *const c_void,
shape_filter: *const JPC_ShapeFilter,
shape2: *const JPC_Shape,
subshape_id2: JPC_SubShapeID,
) -> bool {
let this = this.cast::<T>().as_ref().unwrap();

this.should_collide(shape2, subshape_id2)
let body_id = BodyId::new(JPC_ShapeFilter_getBodyID2(shape_filter));
this.should_collide(body_id, shape2, subshape_id2)
}

unsafe extern "C" fn ShouldCollideTwoShapes(
this: *const c_void,
shape_filter: *const JPC_ShapeFilter,
shape1: *const JPC_Shape,
subshape_id1: JPC_SubShapeID,
shape2: *const JPC_Shape,
subshape_id2: JPC_SubShapeID,
) -> bool {
let this = this.cast::<T>().as_ref().unwrap();

this.should_collide_two_shapes(shape1, subshape_id1, shape2, subshape_id2)
let body_id2 = BodyId::new(JPC_ShapeFilter_getBodyID2(shape_filter));
this.should_collide_two_shapes(shape1, subshape_id1, body_id2, shape2, subshape_id2)
}
}

Expand Down
Loading