X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fresources.cpp;h=06fa44cf0c502867a1ecb255bea5de9251cc6314;hb=6deafc9f236b90175a303944815f7c0eac1c95c1;hp=e14934de03e89e94fe077452513a5ac542dcb07f;hpb=999cd0294889e5eecd61df18a697d2c55ed6c0d6;p=libs%2Fgltk.git

diff --git a/source/resources.cpp b/source/resources.cpp
index e14934d..06fa44c 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;
@@ -27,7 +29,10 @@ void Resources::init()
 	default_font = 0;
 	dir_src = 0;
 	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");
 }
@@ -45,6 +50,47 @@ const GL::Font &Resources::get_default_font() const
 	return *default_font;
 }
 
+GL::Module *Resources::create_module(const string &name)
+{
+	if(name!="ui.glsl")
+		return 0;
+
+	GL::Module *mod = 0;
+	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 0;
+
+	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 0;
+}
+
 GL::Texture2D *Resources::create_texture(const string &name)
 {
 	string ext = FS::extpart(name);
@@ -56,7 +102,6 @@ GL::Texture2D *Resources::create_texture(const string &name)
 			delete io;
 
 			GL::Texture2D *tex = new GL::Texture2D;
-			tex->set_min_filter(GL::LINEAR);
 			tex->image(image);
 			return tex;
 		}