merge

include/physics/collision/collision_shape.h

@@ -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;}

src/physics/physics_system.cpp

@@ -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) {