Add a PBR material type and corresponding shader

[libs/gl.git] / source / material.cpp

diff --git a/source/material.cpp b/source/material.cpp
index b0f62bbc5fbef9f1d07b7bcfd4b688135394c32e..9109b786ecb4d414a3d455c57fe6421a06a7d314 100644 (file)
--- a/source/material.cpp
+++ b/source/material.cpp
@@ -1,5 +1,8 @@
+#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"
@@ -9,6 +12,33 @@ 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)
@@ -36,6 +66,7 @@ Material::MaterialRegistry &Material::get_material_registry()
        if(!initialized)
        {
                registry.register_type<BasicMaterial>("basic");
+               registry.register_type<PbrMaterial>("pbr");
        }
        return registry;
 }