X-Git-Url: http://git.tdb.fi/?p=libs%2Fdemoscene.git;a=blobdiff_plain;f=source%2Fresources.cpp;h=c70e0a11308aee38929e053983bfa285ab51c04c;hp=f44d8c1985d05ef1e45c3651bcaa0a8b77cb4d1f;hb=08fa4d11a07a52e62eb4e30730d2a2b9cdcb568d;hpb=94151737f2983ca7cade5be0e20c98fbc6f11eea diff --git a/source/resources.cpp b/source/resources.cpp index f44d8c1..c70e0a1 100644 --- a/source/resources.cpp +++ b/source/resources.cpp @@ -12,16 +12,17 @@ void init_data(DataFile::BuiltinSource &); Resources::Resources() { - add_source(get_builtin_source()); + init(); } -Resources::Resources(const string &pack_name): - ui_font(0), - ui_text_technique(0) +Resources::Resources(const string &pack_name) { - set_default_texture_anisotropy(8); - set_srgb_conversion(true); + init(); + init_sources(pack_name); +} +void Resources::init_sources(const string &pack_name) +{ FS::Path data_dir = "data"; if(FS::exists(data_dir)) { @@ -35,6 +36,15 @@ Resources::Resources(const string &pack_name): pack_source.add_pack_file(pack_name); add_source(pack_source); } +} + +void Resources::init() +{ + ui_font = 0; + ui_text_technique = 0; + + set_default_texture_anisotropy(8); + set_srgb_conversion(true); add_source(get_builtin_source()); }