X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=6f5b0712c1e4a2a403e39b9823ed6577afadc0d8;hb=0ab875bdc9fbf84ecfce883b188410bb45882447;hp=79c5e85fbe47764e0cca300f15c8acb3ff350450;hpb=9d696772b2194b67d8e3e4da11169900eab58c0d;p=libs%2Fgl.git

diff --git a/source/resources.cpp b/source/resources.cpp
index 79c5e85f..6f5b0712 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -1,4 +1,6 @@
+#include <msp/datafile/builtinsource.h>
 #include <msp/fs/utils.h>
+#include <msp/gl/extensions/sgis_generate_mipmap.h>
 #include "animation.h"
 #include "armature.h"
 #include "font.h"
@@ -8,10 +10,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;
@@ -19,8 +24,10 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+void init_shaderlib(DataFile::BuiltinSource &);
+
 Resources::Resources():
-	default_tex_filter(LINEAR_MIPMAP_LINEAR),
+	default_tex_filter(SGIS_generate_mipmap ? LINEAR_MIPMAP_LINEAR : LINEAR),
 	srgb_conversion(false),
 	resource_manager(0)
 {
@@ -29,13 +36,32 @@ Resources::Resources():
 	add_type<Font>().keyword("font");
 	add_type<KeyFrame>().suffix(".kframe").keyword("keyframe");
 	add_type<Material>().suffix(".mat").keyword("material");
-	add_type<Mesh>().keyword("mesh");
+	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");
+
+	add_source(get_builtins());
+}
+
+const DataFile::CollectionSource &Resources::get_builtins()
+{
+	static DataFile::BuiltinSource builtins;
+	bool init_done = false;
+
+	if(!init_done)
+	{
+		init_shaderlib(builtins);
+		init_done = true;
+	}
+
+	return builtins;
 }
 
 void Resources::set_default_texture_filter(TextureFilter tf)
@@ -53,6 +79,21 @@ void Resources::set_resource_manager(ResourceManager *m)
 	resource_manager = m;
 }
 
+Mesh *Resources::create_mesh(const string &name)
+{
+	if(!resource_manager)
+		return 0;
+
+	if(RefPtr<IO::Seekable> io = open_from_sources(name))
+	{
+		RefPtr<GL::Mesh> mesh = new GL::Mesh(resource_manager);
+		resource_manager->set_resource_location(*mesh, *this, name);
+		return mesh.release();
+	}
+
+	return 0;
+}
+
 Texture2D *Resources::create_texture2d(const string &name)
 {
 	string ext = FS::extpart(name);
@@ -67,8 +108,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);
@@ -77,7 +117,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
@@ -88,5 +127,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, this);
+		RefPtr<Program> program = new Program;
+		compiler.add_shaders(*program);
+		program->link();
+		return program.release();
+	}
+
+	return 0;
+}
+
 } // namespace GL
 } // namespace Msp