X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmaterials%2Fbasicmaterial.h;h=bf1b0e8cdfb1190b114906abe398e4f1376216e4;hp=95259f476b233198856c49a42391049f54f6b0b5;hb=ae45c0397e2cb8f0a01f2f31d01c95ff3870271e;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266

diff --git a/source/materials/basicmaterial.h b/source/materials/basicmaterial.h
index 95259f47..bf1b0e8c 100644
--- a/source/materials/basicmaterial.h
+++ b/source/materials/basicmaterial.h
@@ -15,7 +15,6 @@ public:
 		static ActionMap shared_actions;
 
 	public:
-		Loader(BasicMaterial &);
 		Loader(BasicMaterial &, Collection &);
 
 	private:
@@ -29,16 +28,18 @@ private:
 	Property<Vector3> normal;
 	Property<Color> emission;
 	Property<float> reflectivity;
-	bool receive_shadows;
+
+	static const Tag texture_tags[];
 
 public:
 	BasicMaterial();
 
 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;
 
 	void set_diffuse(const Color &);
 	void set_diffuse_map(const Texture *);
@@ -51,7 +52,6 @@ public:
 	void set_shininess_map(const Texture *);
 	void set_reflectivity(float);
 	void set_reflectivity_map(const Texture *);
-	void set_receive_shadows(bool);
 };
 
 } // namespace GL