X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterial.cpp;h=a2814cff1ad6ccfdac3347e14f5a3ce130451e45;hb=refs%2Fheads%2Fmaster;hp=1d5a4087af2b3b8f6c9db232792c7eff45732a1c;hpb=a40fc85277dba5c34402a0e703d038efd30cc57b;p=libs%2Fgl.git

diff --git a/source/material.cpp b/source/material.cpp
deleted file mode 100644
index 1d5a4087..00000000
--- a/source/material.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-#include "gl.h"
-#include "material.h"
-#include "resources.h"
-
-namespace Msp {
-namespace GL {
-
-Material::Material()
-{
-	set_ambient(0.2);
-	set_diffuse(0.8);
-	set_specular(0);
-	set_emission(0);
-	set_shininess(0);
-	set_reflectivity(0);
-}
-
-void Material::set_ambient(const Color &a)
-{
-	ambient = a;
-	shdata.uniform("material.ambient", ambient);
-}
-
-void Material::set_diffuse(const Color &d)
-{
-	diffuse = d;
-	shdata.uniform("material.diffuse", diffuse);
-}
-
-void Material::set_specular(const Color &s)
-{
-	specular = s;
-	shdata.uniform("material.specular", specular);
-}
-
-void Material::set_emission(const Color &e)
-{
-	emission = e;
-	shdata.uniform("material.emission", emission);
-}
-
-void Material::set_shininess(float s)
-{
-	shininess = s;
-	shdata.uniform("material.shininess", shininess);
-}
-
-void Material::set_reflectivity(float r)
-{
-	reflectivity = r;
-	shdata.uniform("reflectivity", reflectivity);
-}
-
-
-Material::Loader::Loader(Material &m):
-	DataFile::CollectionObjectLoader<Material>(m, 0)
-{
-	init();
-}
-
-Material::Loader::Loader(Material &m, Collection &c):
-	DataFile::CollectionObjectLoader<Material>(m, &c)
-{
-	init();
-}
-
-void Material::Loader::init()
-{
-	if(Resources *res = dynamic_cast<Resources *>(coll))
-		srgb = res->get_srgb_conversion();
-	else
-		srgb = false;
-
-	add("ambient",   &Loader::ambient);
-	add("diffuse",   &Loader::diffuse);
-	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)
-{
-	Color c(r, g, b, a);
-	if(srgb)
-		c = c.to_linear();
-	return c;
-}
-
-void Material::Loader::ambient(float r, float g, float b, float a)
-{
-	obj.set_ambient(make_color(r, g, b, a));
-}
-
-void Material::Loader::diffuse(float r, float g, float b, float a)
-{
-	obj.set_diffuse(make_color(r, g, b, a));
-}
-
-void Material::Loader::specular(float r, float g, float b, float a)
-{
-	obj.set_specular(make_color(r, g, b, a));
-}
-
-void Material::Loader::emission(float r, float g, float b, float a)
-{
-	obj.set_emission(make_color(r, g, b, a));
-}
-
-void Material::Loader::shininess(float s)
-{
-	obj.set_shininess(s);
-}
-
-void Material::Loader::reflectivity(float r)
-{
-	obj.set_reflectivity(r);
-}
-
-} // namespace GL
-} // namespace Msp