add radial triggers

src/physics/Hitbox.hpp

@@ -8,15 +8,32 @@
 #include <functional>
 #include <glm/glm.hpp>
 
+enum class TriggerType {
+    AABB,
+    RADIUS,
+};
+
+union TriggerParams {
+    AABB aabb;
+    glm::vec4 radial; // x,y,z calculated entity coords + w - radius
+
+    constexpr TriggerParams() : aabb() {
+    }
+};
+
+using triggercallback = std::function<void(entityid_t, size_t, entityid_t)>;
+
 struct Trigger {
     bool enabled = true;
+    TriggerType type;
+    size_t index;
     entityid_t entity;
-    AABB aabb;
-    AABB calculated;
+    TriggerParams params;
+    TriggerParams calculated;
     std::set<entityid_t> prevEntered;
     std::set<entityid_t> nextEntered;
-    std::function<void(entityid_t, size_t, entityid_t)> enterCallback;
-    std::function<void(entityid_t, size_t, entityid_t)> exitCallback;
+    triggercallback enterCallback;
+    triggercallback exitCallback;
 };
 
 struct Hitbox {

src/physics/PhysicsSolver.cpp

@@ -7,13 +7,15 @@
 #include "../voxels/voxel.hpp"
 
 #include <iostream>
+#define GLM_ENABLE_EXPERIMENTAL
+#include <glm/gtx/norm.hpp>
 
 const float E = 0.03f;
 const float MAX_FIX = 0.1f;
 
 PhysicsSolver::PhysicsSolver(glm::vec3 gravity) : gravity(gravity) {
 }
-#include "../util/timeutil.hpp"
+
 void PhysicsSolver::step(
     Chunks* chunks, 
     Hitbox* hitbox, 
@@ -85,15 +87,27 @@ void PhysicsSolver::step(
     aabb.a = hitbox->position - hitbox->halfsize;
     aabb.b = hitbox->position + hitbox->halfsize;
     for (size_t i = 0; i < triggers.size(); i++) {
-        auto& trigger = triggers[i];
-        if (trigger->entity == entity) {
+        auto& trigger = *triggers[i];
+        if (trigger.entity == entity) {
             continue;
         }
-        if (aabb.intersect(trigger->calculated)) {
-            if (trigger->prevEntered.find(entity) == trigger->prevEntered.end()) {
-                trigger->enterCallback(trigger->entity, i, entity);
+
+        bool triggered = false;
+        switch (trigger.type) {
+            case TriggerType::AABB:
+                triggered = aabb.intersect(trigger.calculated.aabb);
+                break;
+            case TriggerType::RADIUS:
+                triggered = glm::distance2(
+                    hitbox->position, glm::vec3(trigger.calculated.radial))
+                     < trigger.calculated.radial.w;
+                break;
+        }
+        if (triggered) {
+            if (trigger.prevEntered.find(entity) == trigger.prevEntered.end()) {
+                trigger.enterCallback(trigger.entity, trigger.index, entity);
             }
-            trigger->nextEntered.insert(entity);
+            trigger.nextEntered.insert(entity);
         }
     }
 }