Merge branch '0.15.x' of github.com:kcbanner/zphysics into 0.15.x # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.

kcbanner · kcbanner · commit 8a65dbb19de1 · 2025-07-21T23:43:07.000-04:00
- Remove the vtable header from ContactListener (it's called manually, not used as an actual vtable)
diff --git a/libs/JoltC/JoltPhysicsC.h b/libs/JoltC/JoltPhysicsC.h
@@ -995,8 +995,6 @@ typedef struct JPC_CharacterContactListenerVTable
 
 typedef struct JPC_ContactListenerVTable
 {
-    _JPC_VTABLE_HEADER;
-
     // Optional, can be NULL.
     JPC_ValidateResult
     (*OnContactValidate)(void *in_self,
diff --git a/src/zphysics.zig b/src/zphysics.zig
@@ -514,7 +514,6 @@ pub const ContactListener = extern struct {
     }
 
     pub const VTable = extern struct {
-        __header: VTableHeader = .{},
         onContactValidate: *const fn (
             self: *ContactListener,
             body1: *const Body,

Original file line number	Diff line number	Diff line change
`@@ -995,8 +995,6 @@ typedef struct JPC_CharacterContactListenerVTable`
`995`	`995`
`996`	`996`	`typedef struct JPC_ContactListenerVTable`
`997`	`997`	`{`
`998`		`- _JPC_VTABLE_HEADER;`
`999`		`-`
`1000`	`998`	`// Optional, can be NULL.`
`1001`	`999`	`JPC_ValidateResult`
`1002`	`1000`	`(OnContactValidate)(void in_self,`
Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,6 @@ pub const ContactListener = extern struct {`
`514`	`514`	`}`
`515`	`515`
`516`	`516`	`pub const VTable = extern struct {`
`517`		`- __header: VTableHeader = .{},`
`518`	`517`	`onContactValidate: *const fn (`
`519`	`518`	`self: *ContactListener,`
`520`	`519`	`body1: *const Body,`