X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterial.cpp;h=a2814cff1ad6ccfdac3347e14f5a3ce130451e45;hp=13f2d1d9d9f785ddefa152a22ad3f4dd0fed3a01;hb=d5c26741ed3952dd54c8a7f43ad42ba79bf2d977;hpb=e37851b98dde5082ee92570354746f2f92e21940 diff --git a/source/material.cpp b/source/material.cpp index 13f2d1d9..a2814cff 100644 --- a/source/material.cpp +++ b/source/material.cpp @@ -1,3 +1,4 @@ +#include #include "gl.h" #include "material.h" #include "resources.h" @@ -12,6 +13,7 @@ Material::Material() set_specular(0); set_emission(0); set_shininess(0); + set_reflectivity(0); } void Material::update_parameter(int mask) const @@ -66,8 +68,16 @@ void Material::set_shininess(float s) update_parameter(SHININESS); } +void Material::set_reflectivity(float r) +{ + reflectivity = r; + shdata.uniform("reflectivity", reflectivity); +} + void Material::bind() const { + static Require _req(MSP_legacy_features); + if(set_current(this)) update_parameter(-1); } @@ -97,6 +107,7 @@ void Material::Loader::init() add("specular", &Loader::specular); add("emission", &Loader::emission); add("shininess", &Loader::shininess); + add("reflectivity", &Loader::reflectivity); } Color Material::Loader::make_color(float r, float g, float b, float a) @@ -132,5 +143,10 @@ void Material::Loader::shininess(float s) obj.set_shininess(s); } +void Material::Loader::reflectivity(float r) +{ + obj.set_reflectivity(r); +} + } // namespace GL } // namespace Msp