X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fmaterial.cpp;h=a2814cff1ad6ccfdac3347e14f5a3ce130451e45;hb=HEAD;hp=d6e21683d2a7f3b8fb08498b269419d386d7d9d7;hpb=126161d1d44ab9503bc747d24a07b7b9d15e527a;p=libs%2Fgl.git

diff --git a/source/material.cpp b/source/material.cpp
deleted file mode 100644
index d6e21683..00000000
--- a/source/material.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-#include "gl.h"
-#include "material.h"
-
-namespace Msp {
-namespace GL {
-
-Material::Material():
-	ambient(0.2),
-	diffuse(0.8),
-	specular(0),
-	emission(0),
-	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;
-	update_parameter(AMBIENT);
-}
-
-void Material::set_diffuse(const Color &d)
-{
-	diffuse = d;
-	update_parameter(DIFFUSE);
-}
-
-void Material::set_specular(const Color &s)
-{
-	specular = s;
-	update_parameter(SPECULAR);
-}
-
-void Material::set_emission(const Color &e)
-{
-	emission = e;
-	update_parameter(EMISSION);
-}
-
-void Material::set_shininess(float s)
-{
-	shininess = s;
-	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", &Material::shininess);
-}
-
-void Material::Loader::ambient(float r, float g, float b, float 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);
-}
-
-void Material::Loader::specular(float r, float g, float b, float 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);
-}
-
-} // namespace GL
-} // namespace Msp