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>2012-12-28 22:53:10 +0000
committerStijn Buys <ingar@osirion.org>2012-12-28 22:53:10 +0000
commitfe96eee5db2acbef1ea0f360b180fd9f8f990444 (patch)
treee4c2c65b20ca652861a30fa6b73673e73a07bb59 /src/core/entityglobe.h
parent92dafc75bba246aed3f20a558a9c4eed13a1e8a9 (diff)
Addedd core:: support for EntityGlobe rings.
Diffstat (limited to 'src/core/entityglobe.h')
-rw-r--r--src/core/entityglobe.h21
1 files changed, 21 insertions, 0 deletions
diff --git a/src/core/entityglobe.h b/src/core/entityglobe.h
index e60f61a..2643263 100644
--- a/src/core/entityglobe.h
+++ b/src/core/entityglobe.h
@@ -48,6 +48,16 @@ public:
return entity_corona_id;
}
+ /// rings texture name
+ inline const std::string &ringsname() const {
+ return entity_ringsname;
+ }
+
+ /// rings texture id
+ inline size_t rings_id() const {
+ return entity_rings_id;
+ }
+
/// rotation speed in degrees per second
inline float rotationspeed() const {
return entity_rotationspeed;
@@ -67,6 +77,10 @@ public:
entity_corona_id = texture_id;
}
+ inline void set_rings_id(size_t texture_id) {
+ entity_rings_id = texture_id;
+ }
+
inline void set_texturename(const std::string & texturename) {
entity_texturename.assign(texturename);
}
@@ -74,6 +88,10 @@ public:
inline void set_coronaname(const std::string & texturename) {
entity_coronaname.assign(texturename);
}
+
+ inline void set_ringsname(const std::string & texturename) {
+ entity_ringsname.assign(texturename);
+ }
/*----- serializers ----------------------------------------------- */
@@ -87,8 +105,11 @@ private:
float entity_rotationspeed;
size_t entity_texture_id;
size_t entity_corona_id;
+ size_t entity_rings_id;
+
std::string entity_texturename;
std::string entity_coronaname;
+ std::string entity_ringsname;
};
}