X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Fpbrmaterial.h;h=9669bc35a3a1086e117c73cc8aa2e2f4d677d315;hp=3e9b26ade8d525aff7b08c4d399d34f36e5d8f0c;hb=ae45c0397e2cb8f0a01f2f31d01c95ff3870271e;hpb=cb7db94f7837e6a3be037d07575dc248177d9426

diff --git a/source/materials/pbrmaterial.h b/source/materials/pbrmaterial.h
index 3e9b26ad..9669bc35 100644
--- a/source/materials/pbrmaterial.h
+++ b/source/materials/pbrmaterial.h
@@ -6,6 +6,8 @@
 namespace Msp {
 namespace GL {
 
+class Texture2D;
+
 class PbrMaterial: public Material
 {
 public:
@@ -15,7 +17,6 @@ public:
 		static ActionMap shared_actions;
 
 	public:
-		Loader(PbrMaterial &);
 		Loader(PbrMaterial &, Collection &);
 
 	private:
@@ -29,20 +30,24 @@ private:
 	Property<float> roughness;
 	Property<float> occlusion;
 	Property<Color> emission;
+	const Texture2D &fresnel_lookup;
+	const Sampler &fresnel_sampler;
 
 	static const Tag texture_tags[];
 
 public:
 	PbrMaterial();
 
+private:
+	static const Texture2D &get_or_create_fresnel_lookup();
+
 protected:
 	virtual void fill_program_info(std::string &, std::map<std::string, int> &) const;
 
 public:
-	DEPRECATED virtual void attach_textures_to(Texturing &, ProgramData &) const;
-
 	virtual const Tag *get_texture_tags() const { return texture_tags; }
 	virtual const Texture *get_texture(Tag) const;
+	virtual const Sampler *get_sampler(Tag) const;
 
 	void set_base_color(const Color &);
 	void set_base_color_map(const Texture *);