Move texture sampler state to a separate object

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

diff --git a/source/resources.cpp b/source/resources.cpp
index 03e10e2dccac03e46b1fa0b904cef0b821c8db17..dd9a3c68c3543b549f425a863a842ad2d35bcc04 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -40,7 +40,7 @@ Resources::Resources():
        add_type<Font>().keyword("font");
        add_type<KeyFrame>().suffix(".kframe").keyword("keyframe");
        add_type<Lighting>().suffix(".lightn").keyword("lighting");
-       add_type<Material>().suffix(".mat").keyword("material");
+       add_type<Material>().suffix(".mat").creator(&Resources::create_material);
        add_type<Mesh>().keyword("mesh").creator(&Resources::create_mesh);
        add_type<Object>().keyword("object");
        add_type<PipelineTemplate>().suffix(".pipe").keyword("pipeline");
@@ -90,6 +90,19 @@ void Resources::set_resource_manager(ResourceManager *m)
        resource_manager = m;
 }
 
+Material *Resources::create_material(const string &name)
+{
+       if(RefPtr<IO::Seekable> io = open_raw(name))
+       {
+               DataFile::Parser parser(*io, name);
+               Material::GenericLoader ldr(this);
+               ldr.load(parser);
+               return ldr.get_material();
+       }
+
+       return 0;
+}
+
 Mesh *Resources::create_mesh(const string &name)
 {
        if(!resource_manager)
@@ -119,15 +132,16 @@ 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))
                {
-                       tex->set_generate_mipmap(true);
-                       tex->set_mag_filter(LINEAR);
+                       tex->set_auto_generate_mipmap(true);
+                       samp.set_mag_filter(LINEAR);
                }
                else
-                       tex->set_mag_filter(default_tex_filter);
-               tex->set_min_filter(default_tex_filter);
-               tex->set_max_anisotropy(default_tex_anisotropy);
+                       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);