Remove the deprecated ProgramBuilder class

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

diff --git a/source/resources.cpp b/source/resources.cpp
index dd9a3c68c3543b549f425a863a842ad2d35bcc04..d52dbe34fb61c745e74c4cad108cdd0a604990e7 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -15,6 +15,7 @@
 #include "programcompiler.h"
 #include "resourcemanager.h"
 #include "resources.h"
+#include "sampler.h"
 #include "technique.h"
 #include "texture1d.h"
 #include "texture2d.h"
@@ -46,6 +47,7 @@ Resources::Resources():
        add_type<PipelineTemplate>().suffix(".pipe").keyword("pipeline");
        add_type<Pose>().keyword("pose");
        add_type<Program>().keyword("shader").suffix(".glsl").creator(&Resources::create_program);
+       add_type<Sampler>().suffix(".samp").keyword("sampler");
        add_type<Technique>().suffix(".tech").keyword("technique");
        add_type<Texture1D>().base<Texture>().suffix(".tex1d").keyword("texture1d");
        add_type<Texture2D>().base<Texture>().suffix(".tex2d").suffix(".png").suffix(".jpg").keyword("texture2d").creator(&Resources::create_texture2d);
@@ -121,7 +123,7 @@ Mesh *Resources::create_mesh(const string &name)
 Texture2D *Resources::create_texture2d(const string &name)
 {
        string ext = FS::extpart(name);
-       if(ext==".tex2d")
+       if(ext==".tex2d" && !resource_manager)
                return 0;
 
        if(RefPtr<IO::Seekable> io = open_raw(name))
@@ -132,21 +134,30 @@ Texture2D *Resources::create_texture2d(const string &name)
 
                RefPtr<Texture2D> tex = new Texture2D(resource_manager);
 
-               Sampler &samp = tex->get_default_sampler();
-               if(is_mipmapped(default_tex_filter))
+               if(ext==".tex2d")
                {
-                       tex->set_auto_generate_mipmap(true);
-                       samp.set_mag_filter(LINEAR);
+                       DataFile::Parser parser(*io, name);
+                       Texture2D::Loader ldr(*tex, *this);
+                       ldr.load(parser);
                }
                else
-                       samp.set_mag_filter(default_tex_filter);
-               samp.set_min_filter(default_tex_filter);
-               samp.set_max_anisotropy(default_tex_anisotropy);
+               {
+                       Sampler &samp = tex->get_default_sampler();
+                       if(is_mipmapped(default_tex_filter))
+                       {
+                               tex->set_auto_generate_mipmap(true);
+                               samp.set_mag_filter(LINEAR);
+                       }
+                       else
+                               samp.set_mag_filter(default_tex_filter);
+                       samp.set_min_filter(default_tex_filter);
+                       samp.set_max_anisotropy(default_tex_anisotropy);
+               }
 
                if(resource_manager)
                        resource_manager->set_resource_location(*tex, *this, name);
                else
-                       tex->image(image, srgb_conversion);
+                       tex->image(image);
                return tex.release();
        }