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:55:35 +0000
committerStijn Buys <ingar@osirion.org>2012-12-28 22:55:35 +0000
commitf416e6b792e5dda143f60b7a2724db6b3ec33d75 (patch)
tree553ddcaa6c60489904a8db818eff688c0b85a437 /src/ui/modelview.h
parentfe96eee5db2acbef1ea0f360b180fd9f8f990444 (diff)
Support for rendering globes with rings,
removed hardcoded 'corona' prefix for corona textures, added support for projectile fire sounds.
Diffstat (limited to 'src/ui/modelview.h')
-rwxr-xr-xsrc/ui/modelview.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ui/modelview.h b/src/ui/modelview.h
index 4642551..e23fd1c 100755
--- a/src/ui/modelview.h
+++ b/src/ui/modelview.h
@@ -45,7 +45,7 @@ public:
/**
* @brief show a textured globe with an optional corona
* */
- void set_globetexturename(const std::string & texturename, const bool bright, const std::string & coronaname);
+ void set_globetexturename(const std::string & texturename, const std::string & coronaname, const std::string ringsname, const bool bright = false);
/**
* @brief show a model
@@ -111,6 +111,7 @@ private:
std::string modelview_modelname;
std::string modelview_globetexturename;
std::string modelview_globecoronaname;
+ std::string modelview_globeringsname;
bool modelview_globebright;
math::Color modelview_color_primary;