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>2014-07-11 19:37:17 +0000
committerStijn Buys <ingar@osirion.org>2014-07-11 19:37:17 +0000
commitd95f18442ea216a886bfddf75d349362d1e537bc (patch)
treea86352393b9f51181594ea4e167e8beba57f2f3a /src/model/material.h
parent1d518a54914531d7a4fab3a6835b75de85bd7bc7 (diff)
Support material layer blending.
Diffstat (limited to 'src/model/material.h')
-rw-r--r--src/model/material.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/model/material.h b/src/model/material.h
index 2e3a696..a3ad5fc 100644
--- a/src/model/material.h
+++ b/src/model/material.h
@@ -154,6 +154,9 @@ public:
return material_layers;
}
+ /**
+ * @brief layers in this material
+ * */
inline Layers & layers()
{
return material_layers;
@@ -161,6 +164,9 @@ public:
/* ---- static ----------------------------------------------------- */
+ /**
+ * @brief material registry
+ * */
static inline Registry registry()
{
return material_registry;
@@ -192,8 +198,9 @@ public:
* If a material with the requested name already exists, it will be returned.
* If it doesnt, a mew material will be created, containing a single layer
* with a texture with the same name as the material.
+ * @param ui_texture set to true if the material is a material used by the user interface
*/
- static Material *load(const std::string &name, const bool bright=false);
+ static Material *load(const std::string &name, const bool ui_texture=false);
/**
* @brief find a material in the registry