Properly compute frustum culling for orthographic cameras

[libs/gl.git] / source / resources.cpp

diff --git a/source/resources.cpp b/source/resources.cpp
index c30426633e60746756428951c8e907e82829c690..68b8fd5bdded8aa12489d7bda38c42a301e4c0f0 100644 (file)
--- a/source/resources.cpp
+++ b/source/resources.cpp
@@ -14,6 +14,7 @@
 #include "technique.h"
 #include "texture1d.h"
 #include "texture2d.h"
+#include "texture2darray.h"
 #include "texturecube.h"
 
 using namespace std;
@@ -40,6 +41,7 @@ Resources::Resources():
        add_type<Texture2D>().base<Texture>().suffix(".tex2d").suffix(".png").suffix(".jpg").keyword("texture2d").creator(&Resources::create_texture2d);
        add_type<Texture3D>().base<Texture>().suffix(".tex3d").keyword("texture3d");
        add_type<TextureCube>().base<Texture>().suffix(".texcb").keyword("texture_cube");
+       add_type<Texture2DArray>().base<Texture>().suffix(".tex2da").keyword("texture2d_array");
 }
 
 void Resources::set_default_texture_filter(TextureFilter tf)
@@ -86,8 +88,7 @@ Texture2D *Resources::create_texture2d(const string &name)
 
                RefPtr<GL::Texture2D> tex = new GL::Texture2D(resource_manager);
 
-               if(default_tex_filter==NEAREST_MIPMAP_NEAREST || default_tex_filter==NEAREST_MIPMAP_LINEAR ||
-                       default_tex_filter==LINEAR_MIPMAP_NEAREST || default_tex_filter==LINEAR_MIPMAP_LINEAR)
+               if(is_mipmapped(default_tex_filter))
                {
                        tex->set_generate_mipmap(true);
                        tex->set_mag_filter(LINEAR);