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-03-19 21:03:47 +0000
committerStijn Buys <ingar@osirion.org>2012-03-19 21:03:47 +0000
commitc4cd091c43ade80033f41c1ceda5c9f51979dcbc (patch)
tree91b7b73cda8847c571d7aeaa7c38cfb48ce0a860 /src/ui/modelview.h
parent3c66f020bbe244e85da8cd92208b69cdba83ab97 (diff)
Resolved a ModelView related segfault when opening the buy menu and a potental segfault in the inventory window.
Diffstat (limited to 'src/ui/modelview.h')
-rwxr-xr-xsrc/ui/modelview.h22
1 files changed, 19 insertions, 3 deletions
diff --git a/src/ui/modelview.h b/src/ui/modelview.h
index 5596271..d49acc8 100755
--- a/src/ui/modelview.h
+++ b/src/ui/modelview.h
@@ -37,13 +37,29 @@ public:
return modelview_radius;
}
+ /**
+ * @brief clear the modelview and show nothing
+ * */
+ void clear();
+
+ /**
+ * @brief show a textured globe with an optional corona
+ * */
void set_globetexturename(const std::string & texturename, const bool bright, const std::string & coronaname);
-
+
+ /**
+ * @brief show a model
+ * */
void set_modelname(const std::string & modelname);
+ /**
+ * @brief et primary and secondary entity color, to be used by the model renderer
+ * */
void set_colors(const math::Color & color_primary, const math::Color & color_secondary);
- /// print modelview description
+ /**
+ * @brief print modelview widget description
+ * */
virtual void print(const size_t indent) const;
/**
@@ -51,7 +67,7 @@ public:
* @param zoom the new zoom factor
* The zoom factor will be clamped to the range [1.0-10.0]
* 1.0 is not zoomed out, 10.0 is zoomed out by a factor of 10
- */
+ * */
void set_zoom(const float zoom);
inline void set_radius(const float radius) {