fix static wall hitbox when bursting off of them, allow multiple debug points to be rendered

capnspacehook · capnspacehook · commit 0c494b5e7b6e · 2025-08-25T19:35:00.000-04:00
diff --git a/pufferlib/ocean/impulse_wars/env.h b/pufferlib/ocean/impulse_wars/env.h
@@ -596,6 +596,10 @@ iwEnv *initEnv(iwEnv *e, uint8_t numDrones, uint8_t numAgents, int8_t mapIdx, ui
     e->humanDroneInput = 0;
     e->connectedControllers = 0;
 
+#ifndef NDEBUG
+    create_array(&e->debugPoints, 4);
+#endif
+
     return e;
 }
 
@@ -701,6 +705,10 @@ void destroyEnv(iwEnv *e) {
     cc_array_destroy(e->dronePieces);
 
     b2DestroyWorld(e->worldID);
+
+#ifndef NDEBUG
+    cc_array_destroy(e->debugPoints);
+#endif
 }
 
 void resetEnv(iwEnv *e) {
@@ -1027,6 +1035,7 @@ void addLog(iwEnv *e, Log *log) {
     e->log.n += 1.0f;
 }
 
+// TODO: 2nd agent doesn't seem to work right
 void stepEnv(iwEnv *e) {
     if (e->needsReset) {
         DEBUG_LOG("Resetting environment");
@@ -1038,6 +1047,14 @@ void stepEnv(iwEnv *e) {
 #endif
     }
 
+#ifndef NDEBUG
+    for (uint8_t i = 0; i < cc_array_size(e->debugPoints); i++) {
+        debugPoint *point = safe_array_get_at(e->debugPoints, i);
+        fastFree(point);
+    }
+    cc_array_remove_all(e->debugPoints);
+#endif
+
     agentActions stepActions[e->numDrones];
     memset(stepActions, 0x0, e->numDrones * sizeof(agentActions));
 
diff --git a/pufferlib/ocean/impulse_wars/game.h b/pufferlib/ocean/impulse_wars/game.h
@@ -102,10 +102,12 @@ bool isOverlappingAABB(const iwEnv *e, const b2Vec2 pos, const float distance, c
     return ctx.overlaps;
 }
 
-// TODO: store a shape proxy in entities?
-b2ShapeProxy makeDistanceProxyFromType(const enum entityType type, bool *isCircle) {
+b2ShapeProxy makeDistanceProxy(const entity *ent, bool *isCircle) {
     b2ShapeProxy proxy = {0};
-    switch (type) {
+    float extent = 0.0f;
+    wallEntity *wall = NULL;
+
+    switch (ent->type) {
     case DRONE_ENTITY:
         *isCircle = true;
         proxy.count = 1;
@@ -116,42 +118,44 @@ b2ShapeProxy makeDistanceProxyFromType(const enum entityType type, bool *isCircl
         proxy.count = 1;
         proxy.radius = DRONE_SHIELD_RADIUS;
         break;
+    case PROJECTILE_ENTITY:
+        *isCircle = true;
+        const projectileEntity *proj = ent->entity;
+        proxy.count = 1;
+        proxy.radius = proj->weaponInfo->radius;
+        break;
     case WEAPON_PICKUP_ENTITY:
+        extent = PICKUP_THICKNESS / 2.0f;
+
         proxy.count = 4;
-        proxy.points[0] = (b2Vec2){.x = -PICKUP_THICKNESS / 2.0f, .y = -PICKUP_THICKNESS / 2.0f};
-        proxy.points[1] = (b2Vec2){.x = -PICKUP_THICKNESS / 2.0f, .y = +PICKUP_THICKNESS / 2.0f};
-        proxy.points[2] = (b2Vec2){.x = +PICKUP_THICKNESS / 2.0f, .y = -PICKUP_THICKNESS / 2.0f};
-        proxy.points[3] = (b2Vec2){.x = +PICKUP_THICKNESS / 2.0f, .y = +PICKUP_THICKNESS / 2.0f};
+        proxy.points[0] = (b2Vec2){.x = -extent, .y = -extent};
+        proxy.points[1] = (b2Vec2){.x = -extent, .y = +extent};
+        proxy.points[2] = (b2Vec2){.x = +extent, .y = -extent};
+        proxy.points[3] = (b2Vec2){.x = +extent, .y = +extent};
         break;
     case STANDARD_WALL_ENTITY:
     case BOUNCY_WALL_ENTITY:
     case DEATH_WALL_ENTITY:
+        extent = WALL_THICKNESS;
+        wall = ent->entity;
+        if (wall->isFloating) {
+            extent = FLOATING_WALL_THICKNESS;
+        }
+        extent /= 2.0f;
+
         proxy.count = 4;
-        proxy.points[0] = (b2Vec2){.x = -FLOATING_WALL_THICKNESS / 2.0f, .y = -FLOATING_WALL_THICKNESS / 2.0f};
-        proxy.points[1] = (b2Vec2){.x = -FLOATING_WALL_THICKNESS / 2.0f, .y = +FLOATING_WALL_THICKNESS / 2.0f};
-        proxy.points[2] = (b2Vec2){.x = +FLOATING_WALL_THICKNESS / 2.0f, .y = -FLOATING_WALL_THICKNESS / 2.0f};
-        proxy.points[3] = (b2Vec2){.x = +FLOATING_WALL_THICKNESS / 2.0f, .y = +FLOATING_WALL_THICKNESS / 2.0f};
+        proxy.points[0] = (b2Vec2){.x = -extent, .y = -extent};
+        proxy.points[1] = (b2Vec2){.x = -extent, .y = +extent};
+        proxy.points[2] = (b2Vec2){.x = +extent, .y = -extent};
+        proxy.points[3] = (b2Vec2){.x = +extent, .y = +extent};
         break;
     default:
-        ERRORF("unknown entity type for shape distance: %d", type);
+        ERRORF("unknown entity type for shape distance: %d", ent->type);
     }
 
     return proxy;
 }
 
-b2ShapeProxy makeDistanceProxy(const entity *ent, bool *isCircle) {
-    if (ent->type == PROJECTILE_ENTITY) {
-        *isCircle = true;
-        b2ShapeProxy proxy = {0};
-        const projectileEntity *proj = ent->entity;
-        proxy.count = 1;
-        proxy.radius = proj->weaponInfo->radius;
-        return proxy;
-    }
-
-    return makeDistanceProxyFromType(ent->type, isCircle);
-}
-
 b2Transform entityTransform(const entity *ent) {
     b2Transform transform;
     wallEntity *wall;
@@ -1357,6 +1361,7 @@ bool explodeCallback(b2ShapeId shapeID, void *context) {
 
     b2SimplexCache cache = {0};
     const b2DistanceOutput output = b2ShapeDistance(&input, &cache, NULL, 0);
+
     if (output.distance > ctx->def->radius) {
         return true;
     }
@@ -1981,6 +1986,7 @@ void droneBurst(iwEnv *e, droneEntity *drone) {
     b2ExplosionDef explosion = {
         .position = drone->pos,
         .radius = radius,
+        .falloff = 0.0f,
         .impulsePerLength = (DRONE_BURST_IMPACT_BASE * drone->burstCharge) + DRONE_BURST_IMPACT_MIN,
         .maskBits = WALL_SHAPE | FLOATING_WALL_SHAPE | PROJECTILE_SHAPE | DRONE_SHAPE,
     };
diff --git a/pufferlib/ocean/impulse_wars/render.h b/pufferlib/ocean/impulse_wars/render.h
@@ -856,6 +856,7 @@ void renderUI(const iwEnv *e, const bool starting) {
     renderTimer(e, timerStr, PUFF_WHITE);
 }
 
+// TODO: track when trails begine and end (ie when respawning)
 void renderBrakeTrails(iwEnv *e, const droneEntity *drone) {
     const float maxLifetime = 3.0f * e->frameRate;
     const float maxAlpha = 0.33f;
@@ -923,7 +924,7 @@ void renderBrakeTrails(iwEnv *e, const droneEntity *drone) {
     }
 }
 
-// TODO: improve
+// TODO: make 2D circles
 void renderExplosions(const iwEnv *e) {
     const uint16_t maxRenderSteps = EXPLOSION_TIME * e->frameRate;
 
@@ -940,7 +941,7 @@ void renderExplosions(const iwEnv *e) {
             continue;
         }
 
-        // color bursts with a bit of the parent drone's color'
+        // color bursts with a bit of the parent drone's color
         const float alpha = (float)explosion->renderSteps / maxRenderSteps;
         BeginBlendMode(BLEND_ALPHA);
         if (false && explosion->isBurst) {
@@ -1658,9 +1659,6 @@ void _renderEnv(iwEnv *e, const bool starting, const bool ending, const int8_t w
     BeginBlendMode(BLEND_ALPHA);
     for (uint8_t i = 0; i < cc_array_size(e->drones); i++) {
         const droneEntity *drone = safe_array_get_at(e->drones, i);
-        if (drone->dead) {
-            continue;
-        }
         renderBrakeTrails(e, drone);
     }
     EndBlendMode();
@@ -1726,10 +1724,13 @@ void _renderEnv(iwEnv *e, const bool starting, const bool ending, const int8_t w
         renderDroneUI(drone);
     }
 
-    if (!b2VecEqual(e->debugPoint, b2Vec2_zero)) {
-        const Vector2 pos = {.x = e->debugPoint.x, .y = e->debugPoint.y};
-        DrawCircleV(pos, DRONE_RADIUS * 0.5f, WHITE);
+#ifndef NDEBUG
+    for (uint8_t i = 0; i < cc_array_size(e->debugPoints); i++) {
+        debugPoint *point = safe_array_get_at(e->debugPoints, i);
+        const Vector2 pos = {.x = point->pos.x, .y = point->pos.y};
+        DrawCircleV(pos, point->size, point->color);
     }
+#endif
 
     EndMode2D();
 
diff --git a/pufferlib/ocean/impulse_wars/types.h b/pufferlib/ocean/impulse_wars/types.h
@@ -405,6 +405,12 @@ typedef struct pathingInfo {
     int8_t *pathBuffer;
 } pathingInfo;
 
+typedef struct debugPoint {
+    b2Vec2 pos;
+    float size;
+    Color color;
+} debugPoint;
+
 typedef struct iwEnv {
     uint8_t numDrones;
     uint8_t numAgents;
@@ -486,7 +492,7 @@ typedef struct iwEnv {
     rayClient *client;
     float renderScale;
     CC_Array *explosions;
-    b2Vec2 debugPoint;
+    CC_Array *debugPoints;
 } iwEnv;
 
 #endif
