X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=078b58b71696559b16b12267f0e39c8759852373;hb=103ceeace366c6d80fce323438b31b9bbc167915;hp=869885fecd97e77ae3719399c8fd53d6690baef7;hpb=c1faa54a3218b53757b8b55de0ff8aa64412253b;p=libs%2Fgltk.git

diff --git a/source/resources.cpp b/source/resources.cpp
index 869885f..078b58b 100644
--- 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,36 +8,30 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Resources::Resources():
-	path("."),
-	default_font(0)
+Resources::Resources()
 {
-	init();
+	add_type<Graphic>().keyword("graphic");
+	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):
-	path(FS::dirname(fn)),
-	default_font(0)
+	Resources()
 {
-	init();
+	dir_src = new DataFile::DirectorySource;
+	dir_src->add_directory(FS::dirname(fn));
+	add_source(*dir_src);
 
 	DataFile::load(*this, fn.str());
 }
 
-void Resources::init()
+Resources::~Resources()
 {
-	add_keyword<Graphic>("graphic");
-	add_keyword<GL::Texture2D>("texture");
-
-	add_creator(&Resources::create_font);
-	add_creator(&Resources::create_texture);
-}
-
-void Resources::set_path(const FS::Path &p)
-{
-	/* XXX bad, should change Collection API to allow creators to form paths
-	relative to the datafile location */
-	path = p;
+	delete dir_src;
 }
 
 const GL::Font &Resources::get_default_font() const
@@ -46,21 +42,63 @@ const GL::Font &Resources::get_default_font() const
 	return *default_font;
 }
 
-GL::Font *Resources::create_font(const string &name)
+GL::Module *Resources::create_module(const string &name)
 {
-	RefPtr<GL::Font> fnt = new GL::Font;
-	DataFile::load(*fnt, (path/name).str(), *this);
-	if(!default_font)
-		default_font = fnt.get();
-	return fnt.release();
+	if(name!="ui.glsl")
+		return nullptr;
+
+	GL::Module *mod = nullptr;
+	if(GL::get_backend_api()==GL::VULKAN)
+		mod = new GL::SpirVModule;
+	else
+		mod = new 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;
+}
+
+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))
+	{
+		GL::Sampler *sampler = new GL::Sampler;
+		sampler->set_filter(lexical_cast<GL::TextureFilter>(toupper(m.group(1).str)));
+		sampler->set_wrap(GL::CLAMP_TO_EDGE);
+		return sampler;
+	}
+
+	return nullptr;
 }
 
 GL::Texture2D *Resources::create_texture(const string &name)
 {
-	RefPtr<GL::Texture2D> tex = new GL::Texture2D;
-	tex->load_image((path/name).str());
-	tex->set_min_filter(GL::LINEAR);
-	return tex.release();
+	string ext = FS::extpart(name);
+	if(ext==".png" || ext==".jpg")
+		if(IO::Seekable *io = open_raw(name))
+		{
+			Graphics::Image image;
+			image.load_io(*io);
+			delete io;
+
+			GL::Texture2D *tex = new GL::Texture2D;
+			tex->image(image);
+			return tex;
+		}
+
+	return nullptr;
 }
 
 
@@ -70,12 +108,11 @@ Resources::Loader::Loader(Resources &r):
 {
 	add("default_font", &Loader::default_font);
 	add("font", &Loader::font);
-	add("style", &Loader::style);
 }
 
 void Resources::Loader::default_font(const string &name)
 {
-	res.default_font = res.get<GL::Font>(name);
+	res.default_font = &res.get<GL::Font>(name);
 }
 
 void Resources::Loader::font(const string &name)
@@ -88,13 +125,5 @@ void Resources::Loader::font(const string &name)
 	fnt.release();
 }
 
-void Resources::Loader::style(const string &name)
-{
-	RefPtr<Style> stl = new Style(res);
-	load_sub(*stl, res);
-	res.add(name, stl.get());
-	stl.release();
-}
-
 } // namespace GLtk
 } // namespace Msp