Commit 45ab77bf authored by grunt92's avatar grunt92
Browse files

merge

parents edec1c73 9c8e246d
......@@ -4,19 +4,18 @@
namespace gdw{
class entity;
enum class shape_type
{
enum class shape_type {
sphere,
ray
};
class collision_shape
{
class collision_shape {
public:
collision_shape(shape_type type);
virtual ~collision_shape();
shape_type type() {return type_;}
const entity* owner() {return owner_;}
private:
friend class collision_component;
void set_owner(const entity* owner) {owner_ = owner;}
......
......@@ -7,6 +7,7 @@
#include <ecs/entity.hpp>
#include <physics/collision/sphere.h>
#include <physics/collision/ray.h>
namespace gdw {
physics_system::physics_system(engine& engine):engine_(engine) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment