X-Git-Url: http://git.tdb.fi/?p=libs%2Fgltk.git;a=blobdiff_plain;f=source%2Fresources.cpp;fp=source%2Fresources.cpp;h=3cfd8306275cb5e0ae47268e4dd013749531d310;hp=06fa44cf0c502867a1ecb255bea5de9251cc6314;hb=9f38197854e699a6093a906ab43f4238f3cd2388;hpb=b4a3d651f57c46507aaa99a71a14fea15f0e430d

diff --git a/source/resources.cpp b/source/resources.cpp
index 06fa44c..3cfd830 100644
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -10,13 +10,18 @@ namespace GLtk {
 
 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)
+Resources::Resources(const FS::Path &fn):
+	Resources()
 {
-	init();
-
 	dir_src = new DataFile::DirectorySource;
 	dir_src->add_directory(FS::dirname(fn));
 	add_source(*dir_src);
@@ -24,19 +29,6 @@ Resources::Resources(const FS::Path &fn)
 	DataFile::load(*this, fn.str());
 }
 
-void Resources::init()
-{
-	default_font = 0;
-	dir_src = 0;
-	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()
 {
 	delete dir_src;