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-01-06 18:27:13 +0000
committerStijn Buys <ingar@osirion.org>2012-01-06 18:27:13 +0000
commit92dfee736b9985db6509a6fdb567d78de402a0f9 (patch)
treea7a3798a1a4d889deceeb511c32c96ba3d1f7121 /src/core/zone.h
parent6a61bb6ff7847f020c5c53f0cb70b9ba4f35856a (diff)
Add support for Zone::ambient_color, bump network protocol version
Diffstat (limited to 'src/core/zone.h')
-rw-r--r--src/core/zone.h20
1 files changed, 18 insertions, 2 deletions
diff --git a/src/core/zone.h b/src/core/zone.h
index f80999d..79e4a6c 100644
--- a/src/core/zone.h
+++ b/src/core/zone.h
@@ -86,6 +86,11 @@ public:
return zone_id;
}
+ /// ambient light color
+ inline math::Color const & ambient_color() {
+ return zone_ambient_color;
+ }
+
/// name of the skybox
inline std::string const & sky() const {
return zone_sky;
@@ -115,7 +120,17 @@ public:
zone_sky.assign(sky);
}
- ///set the default view
+ /// set the ambient light color
+ inline void set_ambient_color(const math::Color & ambient_color) {
+ zone_ambient_color.assign(ambient_color);
+ }
+
+ /// set the ambient light color
+ inline void set_ambient_color(float r, float g, float b) {
+ zone_ambient_color.assign(r, g, b);
+ }
+
+ /// set the default view
inline void set_default_view(Entity *entity) {
zone_defaultview = entity;
}
@@ -167,7 +182,8 @@ private:
unsigned int zone_id;
std::string zone_sky;
-
+ math::Color zone_ambient_color;
+
Content zone_content;
static Registry zone_registry;