checker and getter

JerboaBurrow · Mar 13, 2024 · ed735e0 · ed735e0
1 parent 8fefa29
commit ed735e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/include/Collision/collisionDetector.h b/include/Collision/collisionDetector.h
@@ -82,7 +82,8 @@ namespace Hop::System::Physics
             bool world;
         };
 
-        virtual std::pair<std::multimap<Id, CollisionType>::iterator, std::multimap<Id, CollisionType>::iterator> objectHasCollided(Id & id) { return collided.equal_range(id); }
+        virtual std::pair<std::multimap<Id, CollisionType>::iterator, std::multimap<Id, CollisionType>::iterator> objectCollisions(Id & id) { return collided.equal_range(id); }
+        virtual bool objectHasCollided(Id & id) { collided.find(id) != collided.end(); }
 
     protected:
 

diff --git a/include/System/Physics/sCollision.h b/include/System/Physics/sCollision.h
@@ -51,7 +51,8 @@ namespace Hop::System::Physics
             resolver = std::move(r);
         }
 
-        std::pair<std::multimap<Id, CollisionDetector::CollisionType>::iterator, std::multimap<Id, CollisionDetector::CollisionType>::iterator> objectHasCollided(Id & id) { return detector->objectHasCollided(id); }
+        std::pair<std::multimap<Id, CollisionDetector::CollisionType>::iterator, std::multimap<Id, CollisionDetector::CollisionType>::iterator> objectCollisions(Id & id) { return detector->objectCollisions(id); }
+        bool objectHasCollided(Id & id) { detector->objectHasCollided(id); }
 
         void centreOn(std::pair<float,float> p){centreOn(p.first,p.second);}