Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Goers <mega@osirion.org>2012-01-24 06:44:19 +0000
committerEvan Goers <mega@osirion.org>2012-01-24 06:44:19 +0000
commit5d4e993e485ae3432eabb45caf4e4d43c9bc54e6 (patch)
tree2369f024c56e9211d95d10bc86d3220f21443137 /src/model/material.h
parentd20adb868fe02e9e7aa8a262b3cd4c5dd01d5eea (diff)
Added a 'specular' material parameter. Defaults to 'color' values.
Tweaked lighting a bit.
Diffstat (limited to 'src/model/material.h')
-rw-r--r--src/model/material.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/model/material.h b/src/model/material.h
index b128954..2c66aae 100644
--- a/src/model/material.h
+++ b/src/model/material.h
@@ -45,6 +45,10 @@ public:
return material_color;
}
+ inline const math::Color &specular() const {
+ return material_specular;
+ }
+
inline const unsigned int flags() const {
return material_flags;
}
@@ -90,6 +94,7 @@ public:
/* ---- mutators ------------------------------------------- */
void set_color(const math::Color &color);
+ void set_specular(const math::Color &specular);
/**
* @brief set the material texture name
*/
@@ -157,6 +162,7 @@ private:
std::string material_name;
math::Color material_color;
+ math::Color material_specular;
unsigned int material_flags;
std::string material_texture;
size_t material_texture_id;