Use std::unique_ptr for managing memory

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

diff --git a/source/resources.cpp b/source/resources.cpp
index 045096e52dea7c31a55c872211cd781e276d3449..dc678a9480d74aa276039d65b5b0b5cf1c0ed8d5 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -1,4 +1,6 @@
 #include <msp/fs/utils.h>
+#include <msp/strings/regex.h>
+#include <msp/strings/utils.h>
 #include "resources.h"
 
 using namespace std;
@@ -6,15 +8,27 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Resources::Resources():
-       default_font(0)
+Resources::Resources()
 {
        add_type<Graphic>().keyword("graphic");
-       add_type<GL::Texture2D>().keyword("texture").creator(&Resources::create_texture);
+       add_type<GL::Module>().creator([this](const string &n){ return create_module(n); });
+       add_type<GL::Sampler>().creator([this](const string &n){ return create_sampler(n); });
+       add_type<GL::Program>().creator([this](const string &n){ return create_program(n); });
+       add_type<GL::Texture2D>().keyword("texture").creator([this](const string &n){ return create_texture(n); });
        add_type<GL::Font>().keyword("font");
        add_type<Style>().keyword("style");
 }
 
+Resources::Resources(const FS::Path &fn):
+       Resources()
+{
+       dir_src = make_unique<DataFile::DirectorySource>();
+       dir_src->add_directory(FS::dirname(fn));
+       add_source(*dir_src);
+
+       DataFile::load(*this, fn.str());
+}
+
 const GL::Font &Resources::get_default_font() const
 {
        if(!default_font)
@@ -23,21 +37,63 @@ const GL::Font &Resources::get_default_font() const
        return *default_font;
 }
 
+GL::Module *Resources::create_module(const string &name)
+{
+       if(name!="ui.glsl")
+               return nullptr;
+
+       unique_ptr<GL::Module> mod;
+       if(GL::get_backend_api()==GL::VULKAN)
+               mod = make_unique<GL::SpirVModule>();
+       else
+               mod = make_unique<GL::GlslModule>();
+
+       mod->set_source("import msp_interface; import common;\n"
+               "uniform sampler2D ui_tex;\n"
+               "#pragma MSP stage(fragment)\n"
+               "void main() { frag_color = texture(ui_tex, texcoord.xy)*color; }\n");
+
+       return mod.release();
+}
+
+GL::Program *Resources::create_program(const string &name)
+{
+       if(name!="ui.shader")
+               return nullptr;
+
+       return new GL::Program(get<GL::Module>("ui.glsl"));
+}
+
+GL::Sampler *Resources::create_sampler(const string &name)
+{
+       static const Regex r_name("^(linear|nearest)_clamp.samp$");
+       if(RegMatch m = r_name.match(name))
+       {
+               unique_ptr<GL::Sampler> sampler = make_unique<GL::Sampler>();
+               sampler->set_filter(lexical_cast<GL::TextureFilter>(toupper(m.group(1).str)));
+               sampler->set_wrap(GL::CLAMP_TO_EDGE);
+               return sampler.release();
+       }
+
+       return nullptr;
+}
+
 GL::Texture2D *Resources::create_texture(const string &name)
 {
        string ext = FS::extpart(name);
        if(ext==".png" || ext==".jpg")
-       {
-               IO::Seekable *io = open_from_sources(name);
-               Graphics::Image image;
-               image.load_io(*io);
-               GL::Texture2D *tex = new GL::Texture2D;
-               tex->set_min_filter(GL::LINEAR);
-               tex->image(image);
-               return tex;
-       }
-       else
-               return 0;
+               if(auto io = unique_ptr<IO::Seekable>(open_raw(name)))
+               {
+                       Graphics::Image image;
+                       image.load_io(*io);
+                       io.reset();
+
+                       unique_ptr<GL::Texture2D> tex = make_unique<GL::Texture2D>();
+                       tex->image(image);
+                       return tex.release();
+               }
+
+       return nullptr;
 }
 
 
@@ -56,7 +112,7 @@ void Resources::Loader::default_font(const string &name)
 
 void Resources::Loader::font(const string &name)
 {
-       RefPtr<GL::Font> fnt = new GL::Font;
+       unique_ptr<GL::Font> fnt = make_unique<GL::Font>();
        load_sub(*fnt, res);
        res.add(name, fnt.get());
        if(!res.default_font)