- Remove usingnamespace usage

- Introduce a new system for interfaces: - They are defined as structs that are composed as the first member of the implementation - `initInterface` is used to build VTable default values at comptime automatically - Enhance the DebugRenderer test to verify that the render functions are called - Change the signature of DestroyTriangleBatch to pass non-const user pointer - Make all vtable functions non-optional, to improve error messages when `pub` is missing - Fix up test output when PRINT_OUTPUT is enabled - Move defines to a common build function - Add -Dverbose to set PRINT_OUTPUT

Author: kcbanner

build.zig

@@ -1,5 +1,16 @@
 const std = @import("std");
 
+fn addMacros(module: *std.Build.Module, options: anytype) void {
+ if (options.enable_cross_platform_determinism)
+ module.addCMacro("JPH_CROSS_PLATFORM_DETERMINISTIC", "");
+ if (options.enable_debug_renderer)
+ module.addCMacro("JPH_DEBUG_RENDERER", "");
+ if (options.use_double_precision)
+ module.addCMacro("JPH_DOUBLE_PRECISION", "");
+ if (options.enable_asserts)
+ module.addCMacro("JPH_ENABLE_ASSERTS", "");
+}
+
 pub fn build(b: *std.Build) void {
  const optimize = b.standardOptimizeOption(.{});
  const target = b.standardTargetOptions(.{});
@@ -58,21 +69,18 @@ pub fn build(b: *std.Build) void {
  });
  zjolt.addIncludePath(b.path("libs/JoltC"));
 
- const joltc = if (options.shared) blk: {
- const lib = b.addSharedLibrary(.{
- .name = "joltc",
+ const joltc = b.addLibrary(.{
+ .name = "joltc",
+ .linkage = if (options.shared) .dynamic else .static,
+ .root_module = b.createModule(.{
  .target = target,
  .optimize = optimize,
- });
- if (target.result.os.tag == .windows) {
- lib.root_module.addCMacro("JPC_API", "extern __declspec(dllexport)");
- }
- break :blk lib;
- } else b.addStaticLibrary(.{
- .name = "joltc",
- .target = target,
- .optimize = optimize,
+ }),
  });
+
+ if (options.shared and target.result.os.tag == .windows)
+ joltc.root_module.addCMacro("JPC_API", "extern __declspec(dllexport)");
+
  b.installArtifact(joltc);
 
  joltc.addIncludePath(b.path("libs"));
@@ -87,15 +95,12 @@ pub fn build(b: *std.Build) void {
  const src_dir = "libs/Jolt";
  const c_flags = &.{
  "-std=c++17",
- if (options.enable_cross_platform_determinism) "-DJPH_CROSS_PLATFORM_DETERMINISTIC" else "",
- if (options.enable_debug_renderer) "-DJPH_DEBUG_RENDERER" else "",
- if (options.use_double_precision) "-DJPH_DOUBLE_PRECISION" else "",
- if (options.enable_asserts) "-DJPH_ENABLE_ASSERTS" else "",
  if (options.no_exceptions) "-fno-exceptions" else "",
  "-fno-access-control",
  "-fno-sanitize=undefined",
  };
 
+ addMacros(joltc.root_module, options);
  joltc.addCSourceFiles(.{
  .files = &.{
  "libs/JoltC/JoltPhysicsC.cpp",
@@ -248,9 +253,11 @@ pub fn build(b: *std.Build) void {
 
  const tests = b.addTest(.{
  .name = "zphysics-tests",
- .root_source_file = b.path("src/zphysics.zig"),
- .target = target,
- .optimize = optimize,
+ .root_module = b.createModule(.{
+ .root_source_file = b.path("src/zphysics.zig"),
+ .target = target,
+ .optimize = optimize,
+ }),
  });
  b.installArtifact(tests);
 
@@ -259,17 +266,17 @@ pub fn build(b: *std.Build) void {
  tests.want_lto = false;
  }
 
+ addMacros(tests.root_module, options);
  tests.addCSourceFile(.{
  .file = b.path("libs/JoltC/JoltPhysicsC_Tests.c"),
  .flags = &.{
- if (options.enable_cross_platform_determinism) "-DJPH_CROSS_PLATFORM_DETERMINISTIC" else "",
- if (options.enable_debug_renderer) "-DJPH_DEBUG_RENDERER" else "",
- if (options.use_double_precision) "-DJPH_DOUBLE_PRECISION" else "",
- if (options.enable_asserts) "-DJPH_ENABLE_ASSERTS" else "",
  "-fno-sanitize=undefined",
  },
  });
 
+ if (b.option(bool, "verbose", "Print verbose test debug output to stderr") orelse false)
+ tests.root_module.addCMacro("PRINT_OUTPUT", "");
+
  tests.root_module.addImport("zphysics_options", options_module);
  tests.addIncludePath(b.path("libs/JoltC"));
  tests.linkLibrary(joltc);

build.zig.zon

@@ -2,6 +2,7 @@
  .name = .zphysics,
  .fingerprint = 0x1def6aac00c4909d,
  .version = "0.2.0-dev",
+ .minimum_zig_version = "0.14.1",
  .paths = .{
  "build.zig",
  "build.zig.zon",

libs/JoltC/JoltPhysicsC.cpp

@@ -739,9 +739,9 @@ class DebugRendererImpl final : public JPH::DebugRenderer
  BatchImpl(const JPC_DebugRenderer_Primitive *c_primitive) : RenderPrimitive(c_primitive) {}
  ~BatchImpl()
  {
- if (sInstance && sInstance->c_renderer->vtbl->DestroyTriangleBatch)
+ if (sInstance)
  {
- sInstance->c_renderer->vtbl->DestroyTriangleBatch(sInstance->c_renderer, c_primitive);
+ sInstance->c_renderer->vtbl->DestroyTriangleBatch(sInstance->c_renderer, (void*)c_primitive);
  }
  }
 
@@ -790,6 +790,7 @@ class DebugRendererImpl final : public JPH::DebugRenderer
  valid &= (c_renderer->vtbl->DrawTriangle != nullptr);
  valid &= (c_renderer->vtbl->CreateTriangleBatch != nullptr);
  valid &= (c_renderer->vtbl->CreateTriangleBatchIndexed != nullptr);
+ valid &= (c_renderer->vtbl->DestroyTriangleBatch != nullptr);
  valid &= (c_renderer->vtbl->DrawGeometry != nullptr);
  valid &= (c_renderer->vtbl->DrawText3D != nullptr);
  return valid ? JPC_DEBUGRENDERER_SUCCESS : JPC_DEBUGRENDERER_INCOMPLETE_IMPL;

libs/JoltC/JoltPhysicsC.h

@@ -1060,7 +1060,7 @@ typedef struct JPC_DebugRendererVTable
 
  // Optional
  void
- (*DestroyTriangleBatch)(void *in_self, const void *in_primitive);
+ (*DestroyTriangleBatch)(void *in_self, void *in_primitive);
 
  // Required, *cannot* be NULL.
  void

libs/JoltC/JoltPhysicsC_Tests.c

@@ -5,8 +5,6 @@
 #include <stdio.h>
 #include <string.h>
 
-//#define PRINT_OUTPUT
-
 // Object layers
 #define NUM_OBJ_LAYERS 2
 #define OBJ_LAYER_NON_MOVING 0
@@ -97,9 +95,9 @@ MyContactListener_OnContactValidate(void *in_self,
  "\tOnContactValidate(): in_base_offset (%f, %f, %f)\n",
  in_base_offset[0], in_base_offset[1], in_base_offset[2]);
  fprintf(stderr, "\tOnContactValidate(): penetration_depth (%f)\n", in_collision_result->penetration_depth);
- fprintf(stderr, "\tOnContactValidate(): shape1_sub_shape_id (%d)\n", in_collision_result->shape1_sub_shape_id);
- fprintf(stderr, "\tOnContactValidate(): shape2_sub_shape_id (%d)\n", in_collision_result->shape2_sub_shape_id);
- fprintf(stderr, "\tOnContactValidate(): body2_id (%d)\n", in_collision_result->body2_id);
+ fprintf(stderr, "\tOnContactValidate(): shape1_sub_shape_id (%d)\n", in_collision_result->shape1_sub_shape_id.id);
+ fprintf(stderr, "\tOnContactValidate(): shape2_sub_shape_id (%d)\n", in_collision_result->shape2_sub_shape_id.id);
+ fprintf(stderr, "\tOnContactValidate(): body2_id (%d)\n", in_collision_result->body2_id.id);
 #endif
  return JPC_VALIDATE_RESULT_ACCEPT_ALL_CONTACTS;
 }
@@ -214,7 +212,7 @@ MyDebugRenderer_CreateTriangleBatch(void *in_self,
  (JPC_DebugRenderer_Primitive *)prim
  );
 #ifdef PRINT_OUTPUT
- fprintf(stderr, "\tDebugRenderer: CreateTriangleBatch called. Created primitive %x\n", prim);
+ fprintf(stderr, "\tDebugRenderer: CreateTriangleBatch called. Created primitive %llx\n", (uint64_t)prim);
 #endif
  return batch;
 }
@@ -232,11 +230,21 @@ MyDebugRenderer_CreateTriangleBatchIndexed(void *in_self,
  (JPC_DebugRenderer_Primitive *)prim
  );
 #ifdef PRINT_OUTPUT
- fprintf(stderr, "\tDebugRenderer: CreateTriangleBatchIndexed called. Created primitive %x\n", prim);
+ fprintf(stderr, "\tDebugRenderer: CreateTriangleBatchIndexed called. Created primitive %llx\n", (uint64_t)prim);
 #endif
  return batch;
 }
 
+static void
+MyDebugRenderer_DestroyTriangleBatch(void *in_self, void *in_batch)
+{
+ struct MyDebugRenderer *self = (struct MyDebugRenderer*) in_self;
+ struct MyRenderPrimitive *prim = (MyRenderPrimitive*)in_batch;
+#ifdef PRINT_OUTPUT
+ fprintf(stderr, "\tDebugRenderer: DestroyTriangleBatch called. Destroyed primitive %llx\n", (uint64_t)prim);
+#endif
+}
+
 static void
 MyDebugRenderer_DrawGeometry(void *in_self,
  const JPC_RMatrix *inMatrix,
@@ -252,7 +260,7 @@ MyDebugRenderer_DrawGeometry(void *in_self,
  JPC_DebugRenderer_TriangleBatch *batch = in_geometry->LODs[0].batch;
  const JPC_DebugRenderer_Primitive *prim = JPC_DebugRenderer_TriangleBatch_GetPrimitive(batch);
 #ifdef PRINT_OUTPUT
- fprintf(stderr, "\tDebugRenderer: DrawGeometry called for %x\n", prim);
+ fprintf(stderr, "\tDebugRenderer: DrawGeometry called for %llx\n", (uint64_t)prim);
 #endif
 }
 
@@ -277,6 +285,7 @@ MyDebugRenderer_Init(void)
  .DrawTriangle = MyDebugRenderer_DrawTriangle,
  .CreateTriangleBatch = MyDebugRenderer_CreateTriangleBatch,
  .CreateTriangleBatchIndexed = MyDebugRenderer_CreateTriangleBatchIndexed,
+ .DestroyTriangleBatch = MyDebugRenderer_DestroyTriangleBatch,
  .DrawGeometry = MyDebugRenderer_DrawGeometry,
  .DrawText3D = MyDebugRenderer_DrawText3D,
  };