X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmaterial.cpp;h=810ecd174d81fb407730b33b0488b456dcee4f86;hb=5d2b42b370d4669e2eb018cb3bdf46293f4c04ea;hp=8bd6e54ca51b4bf1a48d5b86c07da3fe075d76c5;hpb=3500f13f51dabadd2e7f06b81820936520cc8115;p=libs%2Fgl.git

diff --git a/source/material.cpp b/source/material.cpp
index 8bd6e54c..810ecd17 100644
--- a/source/material.cpp
+++ b/source/material.cpp
@@ -1,22 +1,61 @@
+#include <msp/core/hash.h>
+#include <msp/strings/format.h>
 #include "basicmaterial.h"
 #include "gl.h"
+#include "pbrmaterial.h"
 #include "resources.h"
 #include "texturing.h"
+#include "uniform.h"
 
 using namespace std;
 
 namespace Msp {
 namespace GL {
 
+Program *Material::create_compatible_shader() const
+{
+	return new Program(create_program_source());
+}
+
+const Program *Material::create_compatible_shader(DataFile::Collection &coll) const
+{
+	string source = create_program_source();
+	string name = format("_material_%016x.glsl", hash64(source));
+	Program *shprog = coll.find<Program>(name);
+	if(shprog)
+		return shprog;
+
+	shprog = new Program(create_program_source());
+	try
+	{
+		coll.add(name, shprog);
+	}
+	catch(...)
+	{
+		delete shprog;
+		throw;
+	}
+
+	return shprog;
+}
+
 void Material::attach_texture_to(const Texture *tex, Texturing &texturing, ProgramData &tex_shdata, const string &name) const
 {
 	if(!tex)
 		return;
 
-	int unit = texturing.find_free_unit(name);
+	int unit = -1;
+
+	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");
-	texturing.attach(unit, *tex);
+
+	texturing.attach(unit, *tex, sampler);
 	tex_shdata.uniform(name, unit);
 }
 
@@ -26,12 +65,33 @@ Material::MaterialRegistry &Material::get_material_registry()
 	static bool initialized = false;
 	if(!initialized)
 	{
+		initialized = true;
 		registry.register_type<BasicMaterial>("basic");
+		registry.register_type<PbrMaterial>("pbr");
 	}
 	return registry;
 }
 
 
+Material::Loader::Loader(Material &m):
+	CollectionObjectLoader(m, 0)
+{ }
+
+Material::Loader::Loader(Material &m, Collection &c):
+	CollectionObjectLoader(m, &c)
+{ }
+
+void Material::Loader::init_actions()
+{
+	add("sampler", &Loader::sampler);
+}
+
+void Material::Loader::sampler(const std::string &name)
+{
+	obj.sampler = &get_collection().get<Sampler>(name);
+}
+
+
 DataFile::Loader::ActionMap Material::GenericLoader::shared_actions;
 
 Material::GenericLoader::GenericLoader(DataFile::Collection *c):