Delete TextureType enum

src/TextureResource.cpp

@@ -4,13 +4,18 @@
 namespace crown
 {
 
-TextureResource* TextureResource::load(Stream* stream)
+//-----------------------------------------------------------------------------
+TextureResource* TextureResource::load(ResourceArchive* archive, uint32_t name)
 {
-	assert(stream != NULL);
+	assert(archive != NULL);
+	
+	// TODO
 }
 
+//-----------------------------------------------------------------------------
 void TextureResource::unload(TextureResource* resource)
 {
+	// TODO
 }
 	
 } // namespace crown

src/TextureResource.h

@@ -29,21 +29,11 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "Color4.h"
 #include "Resource.h"
 #include "Image.h"
+#include "ResourceArchive.h"
 
 namespace crown
 {
 
-/// Enumerates the type of a texture
-enum TextureType
-{
-	TT_1D		= 0,
-	TT_2D		= 1,
-	TT_3D		= 2,
-	TT_CUBEMAP	= 3,
-	TT_COUNT
-};
-
-///
 enum TextureMode
 {
 	TM_MODULATE	= 0,	// Multiplies texel color by the geometry color after lighting
@@ -83,7 +73,7 @@ class TextureResource
 {
 public:
 
-	static TextureResource*		load(Stream* stream);
+	static TextureResource*		load(ResourceArchive* archive, uint32_t name);
 	static void					unload(TextureResource* texture);
 
 private:

src/renderers/gl/GLUtils.cpp

@@ -71,15 +71,6 @@ const GLenum GL::BLEND_EQUATION_TABLE[BE_COUNT] =
 	GL_MAX
 };
 
-//-----------------------------------------------------------------------------
-const GLenum GL::TEXTURE_TARGET_TABLE[TT_COUNT] =
-{
-	GL_TEXTURE_1D,
-	GL_TEXTURE_2D,
-	GL_TEXTURE_3D,
-	GL_TEXTURE_CUBE_MAP
-};
-
 //-----------------------------------------------------------------------------
 const GLenum GL::TEXTURE_MODE_TABLE[TM_COUNT] =
 {

src/renderers/gl/GLUtils.h

@@ -53,7 +53,6 @@ public:
 	static GLenum			GetCompareFunction(CompareFunction function);
 	static GLenum			GetBlendFunction(BlendFunction function);
 	static GLenum			GetBlendEquation(BlendEquation equation);
-	static GLenum			GetTextureTarget(TextureType type);
 	static GLenum			GetTextureMode(TextureMode mode);
 	static GLenum			GetTextureWrap(TextureWrap wrap);
 	static void				GetTextureFilter(TextureFilter filter, GLint& minFilter, GLint& magFilter);
@@ -67,7 +66,6 @@ private:
 	static const GLenum		COMPARE_FUNCTION_TABLE[CF_COUNT];
 	static const GLenum		BLEND_FUNCTION_TABLE[BF_COUNT];
 	static const GLenum		BLEND_EQUATION_TABLE[BE_COUNT];
-	static const GLenum		TEXTURE_TARGET_TABLE[TT_COUNT];
 	static const GLenum		TEXTURE_MODE_TABLE[TM_COUNT];
 	static const GLenum		TEXTURE_WRAP_TABLE[TW_COUNT];
 	static const GLenum		TEXTURE_MIN_FILTER_TABLE[TF_COUNT];
@@ -103,14 +101,6 @@ inline GLenum GL::GetBlendEquation(BlendEquation equation)
 	return BLEND_EQUATION_TABLE[equation];
 }
 
-//-----------------------------------------------------------------------------
-inline GLenum GL::GetTextureTarget(TextureType type)
-{
-	assert(type < TT_COUNT);
-
-	return TEXTURE_TARGET_TABLE[type];
-}
-
 //-----------------------------------------------------------------------------
 inline GLenum GL::GetTextureMode(TextureMode mode)
 {