X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=b25c346a11ec7882511ee4cee68c0286c28be0ca;hb=e6bd08e977f3138bfcfa3a1b6cc45201c383e016;hp=48e986cea064b2742eadf3d2625f418ccf1cef24;hpb=859015dce969a0d9ba2bc603d6dbb2685159e393;p=libs%2Fgl.git

diff --git a/source/resources.cpp b/source/resources.cpp
index 48e986ce..b25c346a 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -1,9 +1,10 @@
+#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"
 #include "keyframe.h"
+#include "lighting.h"
 #include "material.h"
 #include "mesh.h"
 #include "object.h"
@@ -23,10 +24,10 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-extern const char singlepass_glsl_data[];
+void init_shaderlib(DataFile::BuiltinSource &);
 
 Resources::Resources():
-	default_tex_filter(SGIS_generate_mipmap ? LINEAR_MIPMAP_LINEAR : LINEAR),
+	default_tex_filter(Texture::can_generate_mipmap() ? LINEAR_MIPMAP_LINEAR : LINEAR),
 	srgb_conversion(false),
 	resource_manager(0)
 {
@@ -34,6 +35,7 @@ Resources::Resources():
 	add_type<Armature>().suffix(".arma").keyword("armature");
 	add_type<Font>().keyword("font");
 	add_type<KeyFrame>().suffix(".kframe").keyword("keyframe");
+	add_type<Lighting>().suffix(".lightn").keyword("lighting");
 	add_type<Material>().suffix(".mat").keyword("material");
 	add_type<Mesh>().keyword("mesh").creator(&Resources::create_mesh);
 	add_type<Object>().keyword("object");
@@ -49,14 +51,14 @@ Resources::Resources():
 	add_source(get_builtins());
 }
 
-DataFile::BuiltinSource &Resources::get_builtins()
+const DataFile::CollectionSource &Resources::get_builtins()
 {
 	static DataFile::BuiltinSource builtins;
 	bool init_done = false;
 
 	if(!init_done)
 	{
-		builtins.add_object("singlepass.glsl", singlepass_glsl_data);
+		init_shaderlib(builtins);
 		init_done = true;
 	}
 
@@ -85,7 +87,7 @@ Mesh *Resources::create_mesh(const string &name)
 
 	if(RefPtr<IO::Seekable> io = open_from_sources(name))
 	{
-		RefPtr<GL::Mesh> mesh = new GL::Mesh(resource_manager);
+		RefPtr<Mesh> mesh = new Mesh(resource_manager);
 		resource_manager->set_resource_location(*mesh, *this, name);
 		return mesh.release();
 	}
@@ -105,7 +107,7 @@ Texture2D *Resources::create_texture2d(const string &name)
 		if(!resource_manager)
 			image.load_io(*io);
 
-		RefPtr<GL::Texture2D> tex = new GL::Texture2D(resource_manager);
+		RefPtr<Texture2D> tex = new Texture2D(resource_manager);
 
 		if(is_mipmapped(default_tex_filter))
 		{