Remove the deprecated ProgramBuilder class

[libs/gl.git] / source / resources.h

diff --git a/source/resources.h b/source/resources.h
index 838b022989b69eb9ea73c31c5cb57a6da4ab62bd..6f04a26088b1a4d0768185440d1c1ef98ad9b850 100644 (file)
--- a/source/resources.h
+++ b/source/resources.h
@@ -1,13 +1,13 @@
 #ifndef MSP_GL_RESOURCES_H_
 #define MSP_GL_RESOURCES_H_
 
-#include <msp/datafile/builtinsource.h>
 #include <msp/datafile/collection.h>
 #include "texture.h"
 
 namespace Msp {
 namespace GL {
 
+class Material;
 class Mesh;
 class Program;
 class ResourceManager;
@@ -21,27 +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();
 
-private:
-       static DataFile::BuiltinSource &get_builtins();
+       static const DataFile::CollectionSource &get_builtins();
 
-public:
        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 &);