X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterial.cpp;h=a2814cff1ad6ccfdac3347e14f5a3ce130451e45;hp=7d90dd5a5878f51fb7de27fddef0b89b28ffbf6e;hb=HEAD;hpb=a6acc6fc98f8571eaaa66f726c1ff4d60abe4f58

diff --git a/source/material.cpp b/source/material.cpp
deleted file mode 100644
index 7d90dd5a..00000000
--- a/source/material.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-#include "gl.h"
-#include "material.h"
-
-namespace Msp {
-namespace GL {
-
-Material::Material()
-{
-	set_ambient(0.2);
-	set_diffuse(0.8);
-	set_specular(0);
-	set_emission(0);
-	set_shininess(0);
-}
-
-void Material::update_parameter(int mask) const
-{
-	if(cur_obj!=this)
-		return;
-
-	if(mask&AMBIENT)
-		glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, &ambient.r);
-	if(mask&DIFFUSE)
-		glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, &diffuse.r);
-	if(mask&SPECULAR)
-		glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, &specular.r);
-	if(mask&EMISSION)
-		glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, &emission.r);
-	if(mask&SHININESS)
-		glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shininess);
-}
-
-void Material::set_ambient(const Color &a)
-{
-	ambient = a;
-	shdata.uniform("material.ambient", ambient);
-	update_parameter(AMBIENT);
-}
-
-void Material::set_diffuse(const Color &d)
-{
-	diffuse = d;
-	shdata.uniform("material.diffuse", diffuse);
-	update_parameter(DIFFUSE);
-}
-
-void Material::set_specular(const Color &s)
-{
-	specular = s;
-	shdata.uniform("material.specular", specular);
-	update_parameter(SPECULAR);
-}
-
-void Material::set_emission(const Color &e)
-{
-	emission = e;
-	shdata.uniform("material.emission", emission);
-	update_parameter(EMISSION);
-}
-
-void Material::set_shininess(float s)
-{
-	shininess = s;
-	shdata.uniform("material.shininess", shininess);
-	update_parameter(SHININESS);
-}
-
-void Material::bind() const
-{
-	if(set_current(this))
-		update_parameter(-1);
-}
-
-
-Material::Loader::Loader(Material &m):
-	DataFile::ObjectLoader<Material>(m)
-{
-	add("ambient",   &Loader::ambient);
-	add("diffuse",   &Loader::diffuse);
-	add("specular",  &Loader::specular);
-	add("emission",  &Loader::emission);
-	add("shininess", &Loader::shininess);
-}
-
-void Material::Loader::ambient(float r, float g, float b, float a)
-{
-	obj.set_ambient(GL::Color(r, g, b, a));
-}
-
-void Material::Loader::diffuse(float r, float g, float b, float a)
-{
-	obj.set_diffuse(GL::Color(r, g, b, a));
-}
-
-void Material::Loader::specular(float r, float g, float b, float a)
-{
-	obj.set_specular(GL::Color(r, g, b, a));
-}
-
-void Material::Loader::emission(float r, float g, float b, float a)
-{
-	obj.set_emission(GL::Color(r, g, b, a));
-}
-
-void Material::Loader::shininess(float s)
-{
-	obj.set_shininess(s);
-}
-
-} // namespace GL
-} // namespace Msp