X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=8aecb933cadc3ce2585799b31c9ce14bca5ae70a;hb=3500f13f51dabadd2e7f06b81820936520cc8115;hp=c34139b25e139e1b53e588c732715afc30a7ce62;hpb=18240e2bb031551e9c72a55c7d974904d209760a;p=libs%2Fgl.git diff --git a/source/resources.cpp b/source/resources.cpp index c34139b2..8aecb933 100644 --- a/source/resources.cpp +++ b/source/resources.cpp @@ -2,6 +2,7 @@ #include #include "animation.h" #include "armature.h" +#include "camera.h" #include "font.h" #include "keyframe.h" #include "lighting.h" @@ -29,15 +30,17 @@ void init_shaderlib(DataFile::BuiltinSource &); Resources::Resources(): default_tex_filter(Texture::can_generate_mipmap() ? LINEAR_MIPMAP_LINEAR : LINEAR), + default_tex_anisotropy(1.0f), srgb_conversion(false), resource_manager(0) { add_type().suffix(".anim").keyword("animation"); add_type().suffix(".arma").keyword("armature"); + add_type().keyword("camera"); add_type().keyword("font"); add_type().suffix(".kframe").keyword("keyframe"); add_type().suffix(".lightn").keyword("lighting"); - add_type().suffix(".mat").keyword("material"); + add_type().suffix(".mat").creator(&Resources::create_material); add_type().keyword("mesh").creator(&Resources::create_mesh); add_type().keyword("object"); add_type().suffix(".pipe").keyword("pipeline"); @@ -72,6 +75,11 @@ void Resources::set_default_texture_filter(TextureFilter tf) default_tex_filter = tf; } +void Resources::set_default_texture_anisotropy(float a) +{ + default_tex_anisotropy = a; +} + void Resources::set_srgb_conversion(bool c) { srgb_conversion = c; @@ -82,12 +90,25 @@ void Resources::set_resource_manager(ResourceManager *m) resource_manager = m; } +Material *Resources::create_material(const string &name) +{ + if(RefPtr io = open_raw(name)) + { + DataFile::Parser parser(*io, name); + Material::GenericLoader ldr(this); + ldr.load(parser); + return ldr.get_material(); + } + + return 0; +} + Mesh *Resources::create_mesh(const string &name) { if(!resource_manager) return 0; - if(RefPtr io = open_from_sources(name)) + if(RefPtr io = open_raw(name)) { RefPtr mesh = new Mesh(resource_manager); resource_manager->set_resource_location(*mesh, *this, name); @@ -103,7 +124,7 @@ Texture2D *Resources::create_texture2d(const string &name) if(ext==".tex2d") return 0; - if(RefPtr io = open_from_sources(name)) + if(RefPtr io = open_raw(name)) { Graphics::Image image; if(!resource_manager) @@ -113,12 +134,13 @@ Texture2D *Resources::create_texture2d(const string &name) if(is_mipmapped(default_tex_filter)) { - tex->set_generate_mipmap(true); + tex->set_auto_generate_mipmap(true); tex->set_mag_filter(LINEAR); } else tex->set_mag_filter(default_tex_filter); tex->set_min_filter(default_tex_filter); + tex->set_max_anisotropy(default_tex_anisotropy); if(resource_manager) resource_manager->set_resource_location(*tex, *this, name); @@ -136,10 +158,10 @@ Program *Resources::create_program(const string &name) if(ext==".shader") return 0; - if(RefPtr io = open_from_sources(name)) + if(RefPtr io = open_raw(name)) { ProgramCompiler compiler; - compiler.compile(*io, this); + compiler.compile(*io, this, name); RefPtr program = new Program; compiler.add_shaders(*program); program->link();