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

66
src/collision/collision_handler.cpp
View File

@@ -1,40 +1,44 @@
#include "collision_handler.h"
#include <iostream>
namespace collision
{
void CheckCollisions(std::vector<entities::CollisionEntity*>& entities)
void CheckCollisions(std::vector<std::shared_ptr<entities::CollisionEntity>> entities)
{
if (entities.size() == 2)
{
if (entities[0]->IsColliding(*entities[1]))
if (entities.size() < 2) { return; }
if (entities.size() == 2)
{
collision::Collision c = { *entities[0], *entities[1] };
entities[0]->OnCollide(c);
entities[1]->OnCollide(c);
if (entities[0]->IsColliding(*entities[1]))
{
collision::Collision c = { *entities[0], *entities[1] };
entities[0]->OnCollide(c);
entities[1]->OnCollide(c);
}
}
}
for (int i = 0; i < entities.size() - 2; i++)
{
entities::CollisionEntity* entity = entities[i];
for (int j = i + 1; i < entities.size() - 1; j++)
{
entities::CollisionEntity* entity2 = entities[j];
if (entity == entity2)
{
continue;
}
if (entity->IsColliding(*entity2))
{
collision::Collision c = { *entity, *entity2 };
entity->OnCollide(c);
entity2->OnCollide(c);
break;
}
}
}
for (int i = 0; i < entities.size() - 2; i++)
{
std::shared_ptr<entities::CollisionEntity> entity = entities[i];
for (int j = i + 1; j < entities.size() - 1; j++)
{
std::shared_ptr<entities::CollisionEntity> entity2 = entities[j];
if (entity == entity2)
{
continue;
}
if (entity->IsColliding(*entity2))
{
collision::Collision c = { *entity, *entity2 };
entity->OnCollide(c);
entity2->OnCollide(c);
break;
}
}
}
}
}

3
src/collision/collision_handler.h
View File

@@ -1,5 +1,6 @@
#pragma once
#include <memory>
#include <vector>
#include "../entities/collision_entity.h"
#include "collision.h"
@@ -12,5 +13,5 @@ namespace collision
*
* @param entities: A list with all the collision entities.
*/
void CheckCollisions(std::vector<entities::CollisionEntity*>& entities);
void CheckCollisions(std::vector<std::shared_ptr<entities::CollisionEntity>> entities);
}