Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GameDevWeek
Sommersemester 2015
Cpp
Deth Buff Arr
Commits
45ab77bf
Commit
45ab77bf
authored
Sep 22, 2015
by
grunt92
Browse files
merge
parents
edec1c73
9c8e246d
Changes
2
Hide whitespace changes
Inline
Side-by-side
include/physics/collision/collision_shape.h
View file @
45ab77bf
...
...
@@ -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
View file @
45ab77bf
...
...
@@ -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
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment