X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=db01b30badee3eca568eb5e11d5062b03c79670e;hb=b3caa9f93c865a54a5d338af1ef474ad383f8099;hp=8f3b4b8ba29fd3c49d9039d7747f3099ec821d8e;hpb=b2764a3a349b48d7445202faa903383386c09a4c;p=libs%2Fgl.git diff --git a/source/resources.cpp b/source/resources.cpp index 8f3b4b8b..db01b30b 100644 --- a/source/resources.cpp +++ b/source/resources.cpp @@ -1,5 +1,5 @@ +#include #include -#include #include "animation.h" #include "armature.h" #include "font.h" @@ -26,7 +26,7 @@ namespace GL { 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) { @@ -49,7 +49,7 @@ 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;