sem/SDBA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ADD] made collision work

Browse Source
This commit is contained in:
Nathalie Seen
2021-06-08 15:25:24 +02:00
parent ae93ed6b34
commit 551d53a3dc
7 changed files with 100 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/entities/collision_entity.h
View File

@@ -2,6 +2,8 @@
#include "entity.h"
#include "../collision/collision.h"
#include <memory>
#include <functional>
namespace entities
{
@@ -16,7 +18,8 @@ namespace entities
glm::vec3 min_xyz;
glm::vec3 max_xyz;
void (*on_collide)(const collision::Collision& collision);
//void (*on_collide)(const collision::Collision& collision);
std::function<void(const collision::Collision&)> on_collide;
public:
CollisionEntity(const models::TexturedModel& model, const glm::vec3& position, const glm::vec3& rotation,
@@ -52,7 +55,7 @@ namespace entities
*
* @param function: A function pointer to a function with the collision behaviour
*/
void SetCollisionBehaviour(void (*function)(const collision::Collision& collision))
void SetCollisionBehaviour(std::function<void(const collision::Collision&)> function)
{ if (function != nullptr) { on_collide = function; } }
protected: