From 7640be2281269583af2d3b8107af070be047e69f Mon Sep 17 00:00:00 2001
From: bjorn <mail@bjornbyt.es>
Date: Thu, 4 Apr 2024 13:18:15 -0700
Subject: [PATCH] Shapes set their userdata;

---
 src/modules/physics/physics_jolt.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/modules/physics/physics_jolt.c b/src/modules/physics/physics_jolt.c
index bf7c21d3..cb15d79e 100644
--- a/src/modules/physics/physics_jolt.c
+++ b/src/modules/physics/physics_jolt.c
@@ -810,6 +810,7 @@ SphereShape* lovrSphereShapeCreate(float radius) {
   sphere->ref = 1;
   sphere->type = SHAPE_SPHERE;
   sphere->shape = (JPH_Shape*) JPH_SphereShape_Create(radius);
+  JPH_Shape_SetUserData(sphere->shape, (uint64_t) (uintptr_t) sphere);
   return sphere;
 }
 
@@ -828,6 +829,7 @@ BoxShape* lovrBoxShapeCreate(float w, float h, float d) {
   box->type = SHAPE_BOX;
   const JPH_Vec3 halfExtent = { w / 2.f, h / 2.f, d / 2.f };
   box->shape = (JPH_Shape*) JPH_BoxShape_Create(&halfExtent, 0.f);
+  JPH_Shape_SetUserData(box->shape, (uint64_t) (uintptr_t) box);
   return box;
 }
 
@@ -850,6 +852,7 @@ CapsuleShape* lovrCapsuleShapeCreate(float radius, float length) {
   capsule->ref = 1;
   capsule->type = SHAPE_CAPSULE;
   capsule->shape = (JPH_Shape*) JPH_CapsuleShape_Create(length / 2, radius);
+  JPH_Shape_SetUserData(capsule->shape, (uint64_t) (uintptr_t) capsule);
   return capsule;
 }
 
@@ -873,24 +876,25 @@ void lovrCapsuleShapeSetLength(CapsuleShape* capsule, float length) {
 
 CylinderShape* lovrCylinderShapeCreate(float radius, float length) {
   lovrCheck(radius > 0.f && length > 0.f, "CylinderShape dimensions must be positive");
-  CylinderShape* Cylinder = lovrCalloc(sizeof(CylinderShape));
-  Cylinder->ref = 1;
-  Cylinder->type = SHAPE_CYLINDER;
-  Cylinder->shape = (JPH_Shape*) JPH_CylinderShape_Create(length / 2.f, radius);
-  return Cylinder;
+  CylinderShape* cylinder = lovrCalloc(sizeof(CylinderShape));
+  cylinder->ref = 1;
+  cylinder->type = SHAPE_CYLINDER;
+  cylinder->shape = (JPH_Shape*) JPH_CylinderShape_Create(length / 2.f, radius);
+  JPH_Shape_SetUserData(cylinder->shape, (uint64_t) (uintptr_t) cylinder);
+  return cylinder;
 }
 
-float lovrCylinderShapeGetRadius(CylinderShape* Cylinder) {
-  return JPH_CylinderShape_GetRadius((JPH_CylinderShape*) Cylinder->shape);
+float lovrCylinderShapeGetRadius(CylinderShape* cylinder) {
+  return JPH_CylinderShape_GetRadius((JPH_CylinderShape*) cylinder->shape);
 }
 
-void lovrCylinderShapeSetRadius(CylinderShape* Cylinder, float radius) {
+void lovrCylinderShapeSetRadius(CylinderShape* cylinder, float radius) {
   lovrLog(LOG_WARN, "PHY", "Jolt CylinderShape radius is read-only");
   // todo: no setter available, but the shape could be removed and re-added
 }
 
-float lovrCylinderShapeGetLength(CylinderShape* Cylinder) {
-  return JPH_CylinderShape_GetHalfHeight((JPH_CylinderShape*) Cylinder->shape) * 2.f;
+float lovrCylinderShapeGetLength(CylinderShape* cylinder) {
+  return JPH_CylinderShape_GetHalfHeight((JPH_CylinderShape*) cylinder->shape) * 2.f;
 }
 
 void lovrCylinderShapeSetLength(CylinderShape* cylinder, float length) {