X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources%2Fresources.h;h=0743f763f306406920f175d541d1714429e09990;hb=HEAD;hp=f1aec26b283b2d6cb871f551e84456ffcc8e6b1e;hpb=be92396630a2065e43c21d9d1904e97014844cff;p=libs%2Fgl.git

diff --git a/source/resources/resources.h b/source/resources/resources.h
index f1aec26b..0743f763 100644
--- a/source/resources/resources.h
+++ b/source/resources/resources.h
@@ -16,8 +16,44 @@ class Scene;
 class Texture2D;
 
 /**
-A collection class for GL resources.  Most useful as a base class for an
-application-specific collection.
+A collection class for GL resources.
+
+The following types of objects can be loaded:
+Animation                          .anim
+Armature                           .arma
+BasicMaterial (Material)           .mat
+Camera                             .camera
+DirectionalLight (Light)           .light
+Font                               .font
+KeyFrame                           .kframe
+Lighting                           .lightn
+Mesh                               .mesh
+Module                             .glsl .spv
+Object (Renderable)                .object
+OccludedScene (Scene, Renderable)  .scene
+OrderedScene (Scene, Renderable)   .scene
+PbrMaterial (Material)             .mat
+PointLight (Light)                 .light
+SequenceTemplate                   .seq
+Pose                               .pose
+Program                            .shader
+Sampler                            .samp
+SimpleScene (Scene, Renderable)    .scene
+Technique                          .tech
+Texture1D (Texture)                .tex
+Texture2D (Texture)                .tex .png .jpg
+Texture3D (Texture)                .tex
+TextureCube (Texture)              .tex
+Texture2DArray (Texture)           .tex
+UnlitMaterial (Material)           .mat
+ZSortedScene (Scene, Renderable)   .scene
+
+This class is normally used by deriving from it and adding any necessary data
+sources in the derived class.
+
+A ResourceManager can be set to manage objects derived from Resource.  Bulk
+data for those objects will then be loaded in the background, without blocking
+the main thread.
 */
 class Resources: virtual public DataFile::Collection
 {
@@ -46,7 +82,6 @@ private:
 		virtual void type(const DataFile::Symbol &);
 	};
 
-	bool srgb_conversion;
 	ResourceManager *resource_manager;
 
 	static Resources *global_resources;
@@ -58,12 +93,6 @@ public:
 	static Resources &get_global();
 	static const DataFile::CollectionSource &get_builtins();
 
-	/** Enables or disables sRGB conversion.  If enabled, textures and material
-	colors are converted from sRGB to linear color space when loaded. */
-	DEPRECATED void set_srgb_conversion(bool);
-
-	DEPRECATED bool get_srgb_conversion() const { return srgb_conversion; }
-
 	void set_resource_manager(ResourceManager *);
 
 protected: