X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fresources.h;h=6f04a26088b1a4d0768185440d1c1ef98ad9b850;hp=1f3880aa431c86f69e278a07e951b9423a3273f4;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=fa196218c247aba70dd7fb17178fa7474121acec

diff --git a/source/resources.h b/source/resources.h
index 1f3880aa..6f04a260 100644
--- a/source/resources.h
+++ b/source/resources.h
@@ -7,6 +7,7 @@
 namespace Msp {
 namespace GL {
 
+class Material;
 class Mesh;
 class Program;
 class ResourceManager;
@@ -20,23 +21,28 @@ class Resources: virtual public DataFile::Collection
 {
 private:
 	TextureFilter default_tex_filter;
+	float default_tex_anisotropy;
 	bool srgb_conversion;
 	ResourceManager *resource_manager;
 
 public:
 	Resources();
 
+	static const DataFile::CollectionSource &get_builtins();
+
 	void set_default_texture_filter(TextureFilter);
+	void set_default_texture_anisotropy(float);
 
 	/** Enables or disables sRGB conversion.  If enabled, textures and material
 	colors are converted from sRGB to linear color space when loaded. */
-	void set_srgb_conversion(bool);
+	DEPRECATED void set_srgb_conversion(bool);
 
-	bool get_srgb_conversion() const { return srgb_conversion; }
+	DEPRECATED bool get_srgb_conversion() const { return srgb_conversion; }
 
 	void set_resource_manager(ResourceManager *);
 
 protected:
+	Material *create_material(const std::string &);
 	Mesh *create_mesh(const std::string &);
 	Texture2D *create_texture2d(const std::string &);
 	Program *create_program(const std::string &);