X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=bba69315de900890e5c365a1c7a325e356394e63;hb=ba97b71564cadd322fe1bf3d8afe556b38ef0647;hp=afb84b27ae8689612ea068a9289cbb61a92910b6;hpb=7d7a8f9e77a526fd5f2920b9005805e56a4b686c;p=libs%2Fgl.git

diff --git a/source/resources.cpp b/source/resources.cpp
index afb84b27..bba69315 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -9,10 +9,13 @@
 #include "object.h"
 #include "pose.h"
 #include "program.h"
+#include "programcompiler.h"
 #include "resourcemanager.h"
 #include "resources.h"
 #include "technique.h"
+#include "texture1d.h"
 #include "texture2d.h"
+#include "texture2darray.h"
 #include "texturecube.h"
 
 using namespace std;
@@ -33,10 +36,13 @@ Resources::Resources():
 	add_type<Mesh>().keyword("mesh").creator(&Resources::create_mesh);
 	add_type<Object>().keyword("object");
 	add_type<Pose>().keyword("pose");
-	add_type<Program>().keyword("shader");
+	add_type<Program>().keyword("shader").suffix(".glsl").creator(&Resources::create_program);
 	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);
+	add_type<Texture3D>().base<Texture>().suffix(".tex3d").keyword("texture3d");
 	add_type<TextureCube>().base<Texture>().suffix(".texcb").keyword("texture_cube");
+	add_type<Texture2DArray>().base<Texture>().suffix(".tex2da").keyword("texture2d_array");
 }
 
 void Resources::set_default_texture_filter(TextureFilter tf)
@@ -83,8 +89,7 @@ Texture2D *Resources::create_texture2d(const string &name)
 
 		RefPtr<GL::Texture2D> tex = new GL::Texture2D(resource_manager);
 
-		if(default_tex_filter==NEAREST_MIPMAP_NEAREST || default_tex_filter==NEAREST_MIPMAP_LINEAR ||
-			default_tex_filter==LINEAR_MIPMAP_NEAREST || default_tex_filter==LINEAR_MIPMAP_LINEAR)
+		if(is_mipmapped(default_tex_filter))
 		{
 			tex->set_generate_mipmap(true);
 			tex->set_mag_filter(LINEAR);
@@ -93,7 +98,6 @@ Texture2D *Resources::create_texture2d(const string &name)
 			tex->set_mag_filter(default_tex_filter);
 		tex->set_min_filter(default_tex_filter);
 
-		// TODO Somehow pass the srgb flag if a resource manager is in use
 		if(resource_manager)
 			resource_manager->set_resource_location(*tex, *this, name);
 		else
@@ -104,5 +108,24 @@ Texture2D *Resources::create_texture2d(const string &name)
 	return 0;
 }
 
+Program *Resources::create_program(const string &name)
+{
+	string ext = FS::extpart(name);
+	if(ext==".shader")
+		return 0;
+
+	if(RefPtr<IO::Seekable> io = open_from_sources(name))
+	{
+		ProgramCompiler compiler;
+		compiler.compile(*io);
+		RefPtr<Program> program = new Program;
+		compiler.add_shaders(*program);
+		program->link();
+		return program.release();
+	}
+
+	return 0;
+}
+
 } // namespace GL
 } // namespace Msp