Skip to content

fixed CharacterContactListener to include full upstream API #15

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+82 −14
Open

fixed CharacterContactListener to include full upstream API #15

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
34 changes: 34 additions & 0 deletions libs/JoltC/JoltPhysicsC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,6 +956,23 @@ typedef struct JPC_CharacterContactListenerVTable
const float contact_normal[3],
JPC_CharacterContactSettings *io_settings);

// Required, *cannot* be NULL.
void
(*OnContactPersisted)(void *in_self,
const JPC_CharacterVirtual *in_character,
const JPC_Body *in_body2,
const JPC_SubShapeID *sub_shape_id,
const JPC_Real contact_position[3],
const float contact_normal[3],
JPC_CharacterContactSettings *io_settings);

// Required, *cannot* be NULL.
void
(*OnContactRemoved)(void *in_self,
const JPC_CharacterVirtual *in_character,
const JPC_Body *in_body2,
const JPC_SubShapeID *sub_shape_id);

// Required, *cannot* be NULL.
void
(*OnCharacterContactAdded)(void *in_self,
Expand All @@ -966,6 +983,23 @@ typedef struct JPC_CharacterContactListenerVTable
const float contact_normal[3],
JPC_CharacterContactSettings *io_settings);

// Required, *cannot* be NULL.
void
(*OnCharacterContactPersisted)(void *in_self,
const JPC_CharacterVirtual *in_character,
const JPC_CharacterVirtual *in_other_character,
const JPC_SubShapeID *sub_shape_id,
const JPC_Real contact_position[3],
const float contact_normal[3],
JPC_CharacterContactSettings *io_settings);

// Required, *cannot* be NULL.
void
(*OnCharacterContactRemoved)(void *in_self,
const JPC_CharacterVirtual *in_character,
const JPC_CharacterVirtual *in_other_character,
const JPC_SubShapeID *sub_shape_id);

// Required, *cannot* be NULL.
void
(*OnContactSolve)(void *in_self,
Expand Down
62 changes: 48 additions & 14 deletions src/zphysics.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,26 +436,35 @@ pub const CharacterContactListener = extern struct {

pub const VTable = extern struct {
__header: VTableHeader = .{},
OnAdjustBodyVelocity: *const fn (
onAdjustBodyVelocity: *const fn (
self: *CharacterContactListener,
character: *const CharacterVirtual,
body: *const Body,
io_linear_velocity: *[3]f32,
io_angular_velocity: *[3]f32,
) callconv(.c) void,
OnContactValidate: *const fn (
onContactValidate: *const fn (
self: *CharacterContactListener,
character: *const CharacterVirtual,
body: *const Body,
sub_shape_id: *const SubShapeId,
) callconv(.c) bool,
OnCharacterContactValidate: *const fn (
onCharacterContactValidate: *const fn (
self: *CharacterContactListener,
character: *const CharacterVirtual,
other_character: *const CharacterVirtual,
sub_shape_id: *const SubShapeId,
) callconv(.c) bool,
OnContactAdded: *const fn (
onContactAdded: *const fn (
self: *CharacterContactListener,
character: *const CharacterVirtual,
body: *const Body,
sub_shape_id: *const SubShapeId,
contact_position: *const [3]Real,
contact_normal: *const [3]f32,
io_settings: *CharacterContactSettings,
) callconv(.c) void,
onContactPersisted: *const fn (
self: *CharacterContactListener,
character: *const CharacterVirtual,
body: *const Body,
Expand All @@ -464,7 +473,13 @@ pub const CharacterContactListener = extern struct {
contact_normal: *const [3]f32,
io_settings: *CharacterContactSettings,
) callconv(.c) void,
OnCharacterContactAdded: *const fn (
onContactRemoved: *const fn (
self: *CharacterContactListener,
character: *const CharacterVirtual,
body: *const Body,
sub_shape_id: *const SubShapeId,
) callconv(.c) void,
onCharacterContactAdded: *const fn (
self: *CharacterContactListener,
character: *const CharacterVirtual,
other_character: *const CharacterVirtual,
Expand All @@ -473,7 +488,22 @@ pub const CharacterContactListener = extern struct {
contact_normal: *const [3]f32,
io_settings: *CharacterContactSettings,
) callconv(.c) void,
OnContactSolve: *const fn (
onCharacterContactPersisted: *const fn (
self: *CharacterContactListener,
character: *const CharacterVirtual,
other_character: *const CharacterVirtual,
sub_shape_id: *const SubShapeId,
contact_position: *const [3]Real,
contact_normal: *const [3]f32,
io_settings: *CharacterContactSettings,
) callconv(.c) void,
onCharacterContactRemoved: *const fn (
self: *CharacterContactListener,
character: *const CharacterVirtual,
other_character: *const CharacterVirtual,
sub_shape_id: *const SubShapeId,
) callconv(.c) void,
onContactSolve: *const fn (
self: *CharacterContactListener,
character: *const CharacterVirtual,
body: *const Body,
Expand All @@ -485,7 +515,7 @@ pub const CharacterContactListener = extern struct {
character_velocity: *const [3]f32,
character_velocity_out: *[3]f32,
) callconv(.c) void,
OnCharacterContactSolve: *const fn (
onCharacterContactSolve: *const fn (
self: *CharacterContactListener,
character: *const CharacterVirtual,
other_character: *const CharacterVirtual,
Expand All @@ -501,8 +531,8 @@ pub const CharacterContactListener = extern struct {

comptime {
assert(@sizeOf(VTable) == @sizeOf(c.JPC_CharacterContactListenerVTable));
assert(@offsetOf(VTable, "OnAdjustBodyVelocity") == @offsetOf(c.JPC_CharacterContactListenerVTable, "OnAdjustBodyVelocity"));
assert(@offsetOf(VTable, "OnContactSolve") == @offsetOf(c.JPC_CharacterContactListenerVTable, "OnContactSolve"));
assert(@offsetOf(VTable, "onAdjustBodyVelocity") == @offsetOf(c.JPC_CharacterContactListenerVTable, "OnAdjustBodyVelocity"));
assert(@offsetOf(VTable, "onContactSolve") == @offsetOf(c.JPC_CharacterContactListenerVTable, "OnContactSolve"));
}
};

Expand Down Expand Up @@ -3540,11 +3570,7 @@ pub const ConstraintSettings = opaque {
//
//--------------------------------------------------------------------------------------------------
pub const TwoBodyConstraintSettings = opaque {
pub fn asConstraintSettings(self: *const TwoBodyConstraintSettings) *const ConstraintSettings {
return @ptrCast(self);
}

pub fn asConstraintSettingsMut(self: *TwoBodyConstraintSettings) *ConstraintSettings {
pub fn asConstraintSettings(self: *TwoBodyConstraintSettings) *ConstraintSettings {
return @ptrCast(self);
}

Expand All @@ -3566,6 +3592,14 @@ pub const TwoBodyConstraintSettings = opaque {
//
//--------------------------------------------------------------------------------------------------
pub const FixedConstraintSettings = opaque {
pub fn asConstraintSettings(self: *FixedConstraintSettings) *ConstraintSettings {
return @ptrCast(self);
}

pub fn asTwoBodyConstraintSettings(self: *FixedConstraintSettings) *TwoBodyConstraintSettings {
return @ptrCast(self);
}

pub fn create() !*FixedConstraintSettings {
return @ptrCast(c.JPC_FixedConstraintSettings_Create() orelse
return error.FailedToCreateFixedConstraintSettings);
Expand Down
Loading