more entity updates

1 files changed, 10 insertions, 7 deletions

diff --git a/src/core/entity.h b/src/core/entity.h
index 8efb2aa..518166b 100644
--- a/src/core/entity.h
+++ b/src/core/entity.h
@@ -19,10 +19,13 @@ namespace entity
 {
 
 /// Entity flags
-enum Flags {Static=1};
+enum Flags {Static=1, Solid=2};
 
 /// Entity type constants
-enum Type {None = 0, Dynamic = 1, Controlable = 2};
+enum Type {Default = 0, Dynamic = 1, Controlable = 2};
+
+/// Entity shaoe constants
+enum Shape {Diamond=0, Sphere=1, Cube=2};
 
 }
 
@@ -31,7 +34,7 @@ class Entity
 {
 public:
 	/// create a new entity and add it to the registry
-	Entity(unsigned int entity_flags = 0, unsigned int entity_type = entity::None);
+	Entity(unsigned int entity_flags = 0, unsigned int entity_type = entity::Default);
 	virtual ~Entity();
 	
 	/// id of the entity
@@ -44,10 +47,13 @@ public:
 	unsigned int type;
 
 	/// base shape
-	unsigned int base_shape;
+	entity::Shape base_shape;
 
 	/// base color
 	math::Color base_color;
+
+	/// base radius
+	float base_radius;
 	
 	/// label
 	std::string label;
@@ -84,9 +90,6 @@ public:
 namespace entity
 {
 
-/// base entity shapes
-enum Shapes {Diamond=0, Cube=1, Sphere=2};
-
 /// the entity registry
 extern std::vector<Entity*> registry;