Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-03-23 19:16:12 +0000
committerStijn Buys <ingar@osirion.org>2008-03-23 19:16:12 +0000
commit772338f8cd62594d222d48466f558b002eb1efb8 (patch)
tree7cc5dc3bd2066d9d7cf7e00819cd67bd860881af /src/core/entity.h
parent22e136d88817b64ec904a7e7232a2cf9e80e74bd (diff)
model pointer caching
Diffstat (limited to 'src/core/entity.h')
-rw-r--r--src/core/entity.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/entity.h b/src/core/entity.h
index 323eec7..54479be 100644
--- a/src/core/entity.h
+++ b/src/core/entity.h
@@ -13,6 +13,7 @@ class Entity;
class EntityControlable;
}
+#include "core/model.h"
#include "core/player.h"
#include "math/mathlib.h"
@@ -65,6 +66,9 @@ public:
/// entity model name
inline std::string const & modelname() { return entity_modelname; }
+ /// pointer to the model, is used client-side
+ inline Model * model() { return entity_model; }
+
/// dirty flag
inline bool dirty() const { return entity_dirty; }
@@ -128,6 +132,7 @@ public:
float entity_radius;
std::string entity_name;
std::string entity_modelname;
+ Model *entity_model;
Shape entity_shape;
math::Vector3f entity_location;
math::Color entity_color;