X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterial.cpp;h=eee1ebc6152057d8799db1a118fa3dcda2bfcd2c;hp=b5ec6a5cd913209940acdd68558f1dc072fda8aa;hb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;hpb=f17794d55923d4fb4f63e9d082d8d84a735a04e8 diff --git a/source/material.cpp b/source/material.cpp index b5ec6a5c..eee1ebc6 100644 --- a/source/material.cpp +++ b/source/material.cpp @@ -21,27 +21,27 @@ Material::Material(): void Material::set_ambient(const Color &a) { - ambient=a; + ambient = a; } void Material::set_diffuse(const Color &d) { - diffuse=d; + diffuse = d; } void Material::set_specular(const Color &s) { - specular=s; + specular = s; } void Material::set_emission(const Color &e) { - emission=e; + emission = e; } void Material::set_shininess(float s) { - shininess=s; + shininess = s; } void Material::bind() const @@ -53,16 +53,16 @@ void Material::bind() const glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, &specular.r); glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, &emission.r); glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shininess); - current=this; + current = this; } } void Material::unbind() { - current=0; + current = 0; } -const Material *Material::current=0; +const Material *Material::current = 0; Material::Loader::Loader(Material &m): @@ -77,22 +77,22 @@ Material::Loader::Loader(Material &m): void Material::Loader::ambient(float r, float g, float b, float a) { - obj.ambient=GL::Color(r, g, b, a); + obj.ambient = GL::Color(r, g, b, a); } void Material::Loader::diffuse(float r, float g, float b, float a) { - obj.diffuse=GL::Color(r, g, b, a); + obj.diffuse = GL::Color(r, g, b, a); } void Material::Loader::specular(float r, float g, float b, float a) { - obj.specular=GL::Color(r, g, b, a); + obj.specular = GL::Color(r, g, b, a); } void Material::Loader::emission(float r, float g, float b, float a) { - obj.emission=GL::Color(r, g, b, a); + obj.emission = GL::Color(r, g, b, a); } } // namespace GL