X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources.cpp;h=68b8fd5bdded8aa12489d7bda38c42a301e4c0f0;hb=a36992487d018d8801ead6980b362b00a2f5f5c5;hp=c30426633e60746756428951c8e907e82829c690;hpb=d2efbd8a32efa2a3ee8542efc846277af19d63e0;p=libs%2Fgl.git

diff --git a/source/resources.cpp b/source/resources.cpp
index c3042663..68b8fd5b 100644
--- 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);