X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Fpbrmaterial.h;h=e96236d2af8501597336d7e72037ba73a22ceba7;hp=2a0eef3531951efbc2669644d27ff4671a552d33;hb=HEAD;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266

diff --git a/source/materials/pbrmaterial.h b/source/materials/pbrmaterial.h
index 2a0eef35..e96236d2 100644
--- a/source/materials/pbrmaterial.h
+++ b/source/materials/pbrmaterial.h
@@ -6,6 +6,17 @@
 namespace Msp {
 namespace GL {
 
+class Texture2D;
+
+/**
+A physically-based material using the Cook-Torrance BRDF.
+
+The material is characterized by base color, metalness and roughness.  Fully
+metallic materials have no diffuse reflection and their specular reflection is
+tinted by the base color.  For fully dielectric materials base color determines
+the color of the diffuse reflection; specular reflection is untinted.
+Roughness affects how blurry specular reflections are.
+*/
 class PbrMaterial: public Material
 {
 public:
@@ -15,7 +26,6 @@ public:
 		static ActionMap shared_actions;
 
 	public:
-		Loader(PbrMaterial &);
 		Loader(PbrMaterial &, Collection &);
 
 	private:
@@ -24,24 +34,33 @@ public:
 	
 private:
 	Property<Color> base_color;
+	Property<Color> tint;
 	Property<Vector3> normal;
 	Property<float> metalness;
 	Property<float> roughness;
 	Property<float> occlusion;
 	Property<Color> emission;
-	bool receive_shadows;
+	const Texture2D &fresnel_lookup;
+	const Sampler &fresnel_sampler;
+
+	static const Tag texture_tags[];
 
 public:
 	PbrMaterial();
 
+	static const Texture2D &get_or_create_fresnel_lookup();
+
 protected:
-	virtual std::string create_program_source() const;
+	virtual void fill_program_info(std::string &, std::map<std::string, int> &) const;
 
 public:
-	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 *);
+	void set_tint(const Color &);
 	void set_normal_map(const Texture *);
 	void set_metalness(float);
 	void set_metalness_map(const Texture *);
@@ -50,7 +69,6 @@ public:
 	void set_occlusion_map(const Texture *);
 	void set_emission(const Color &);
 	void set_emission_map(const Texture *);
-	void set_receive_shadows(bool);
 };
 
 } // namespace GL