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

diff --git a/source/material.cpp b/source/material.cpp
index 1d5a4087..a99f3c2c 100644
--- a/source/material.cpp
+++ b/source/material.cpp
@@ -1,120 +1,107 @@
+#include <msp/core/hash.h>
+#include <msp/strings/format.h>
+#include "basicmaterial.h"
 #include "gl.h"
-#include "material.h"
+#include "pbrmaterial.h"
 #include "resources.h"
+#include "texturing.h"
+#include "uniform.h"
+
+using namespace std;
 
 namespace Msp {
 namespace GL {
 
-Material::Material()
+Program *Material::create_compatible_shader() const
 {
-	set_ambient(0.2);
-	set_diffuse(0.8);
-	set_specular(0);
-	set_emission(0);
-	set_shininess(0);
-	set_reflectivity(0);
+	return new Program(create_program_source());
 }
 
-void Material::set_ambient(const Color &a)
+const Program *Material::create_compatible_shader(DataFile::Collection &coll) const
 {
-	ambient = a;
-	shdata.uniform("material.ambient", ambient);
-}
+	string source = create_program_source();
+	string name = format("_material_%016x.glsl", hash64(source));
+	Program *shprog = coll.find<Program>(name);
+	if(shprog)
+		return shprog;
 
-void Material::set_diffuse(const Color &d)
-{
-	diffuse = d;
-	shdata.uniform("material.diffuse", diffuse);
-}
+	shprog = new Program(create_program_source());
+	try
+	{
+		coll.add(name, shprog);
+	}
+	catch(...)
+	{
+		delete shprog;
+		throw;
+	}
 
-void Material::set_specular(const Color &s)
-{
-	specular = s;
-	shdata.uniform("material.specular", specular);
+	return shprog;
 }
 
-void Material::set_emission(const Color &e)
+void Material::attach_texture_to(const Texture *tex, Texturing &texturing, ProgramData &tex_shdata, const string &name) const
 {
-	emission = e;
-	shdata.uniform("material.emission", emission);
-}
+	if(!tex)
+		return;
 
-void Material::set_shininess(float s)
-{
-	shininess = s;
-	shdata.uniform("material.shininess", shininess);
-}
+	int unit = -1;
 
-void Material::set_reflectivity(float r)
-{
-	reflectivity = r;
-	shdata.uniform("reflectivity", reflectivity);
-}
+	if(const Uniform *uni = tex_shdata.find_uniform(name))
+		if(const Uniform1i *uni_int = dynamic_cast<const Uniform1i *>(uni))
+			unit = uni_int->get();
 
+	if(unit<0)
+		unit = texturing.find_free_unit(name);
+	if(unit<0)
+		throw runtime_error("no free texunit");
 
-Material::Loader::Loader(Material &m):
-	DataFile::CollectionObjectLoader<Material>(m, 0)
-{
-	init();
+	texturing.attach(unit, *tex, sampler);
+	tex_shdata.uniform(name, unit);
 }
 
-Material::Loader::Loader(Material &m, Collection &c):
-	DataFile::CollectionObjectLoader<Material>(m, &c)
+Material::MaterialRegistry &Material::get_material_registry()
 {
-	init();
+	static MaterialRegistry registry;
+	static bool initialized = false;
+	if(!initialized)
+	{
+		registry.register_type<BasicMaterial>("basic");
+		registry.register_type<PbrMaterial>("pbr");
+	}
+	return registry;
 }
 
-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;
-}
+Material::Loader::Loader(Material &m):
+	CollectionObjectLoader(m, 0)
+{ }
 
-void Material::Loader::ambient(float r, float g, float b, float a)
-{
-	obj.set_ambient(make_color(r, g, b, a));
-}
+Material::Loader::Loader(Material &m, Collection &c):
+	CollectionObjectLoader(m, &c)
+{ }
 
-void Material::Loader::diffuse(float r, float g, float b, float a)
+void Material::Loader::init_actions()
 {
-	obj.set_diffuse(make_color(r, g, b, a));
+	add("sampler", &Loader::sampler);
 }
 
-void Material::Loader::specular(float r, float g, float b, float a)
+void Material::Loader::sampler(const std::string &name)
 {
-	obj.set_specular(make_color(r, g, b, a));
+	obj.sampler = &get_collection().get<Sampler>(name);
 }
 
-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)
+DataFile::Loader::ActionMap Material::GenericLoader::shared_actions;
+
+Material::GenericLoader::GenericLoader(DataFile::Collection *c):
+	coll(c)
 {
-	obj.set_shininess(s);
+	set_actions(shared_actions);
 }
 
-void Material::Loader::reflectivity(float r)
+void Material::GenericLoader::init_actions()
 {
-	obj.set_reflectivity(r);
+	get_material_registry().add_all(*this);
 }
 
 } // namespace GL