Changed: Renamed a few classes

Changed: Moved most sensible objects into the OpenArena namespace ~g2k
2005-06-29 11:33:11 -04:00
parent f6a191d21d
commit c16a0dae6d
17 changed files with 1818 additions and 1781 deletions
--- a/src/myglTexture.cpp
+++ b/src/myglTexture.cpp
@@ -1,107 +1,111 @@
 #include "../include/myglTexture.h"
+using namespace OpenArena;

-GL_MY_TEXTURE::GL_MY_TEXTURE()
+namespace OpenArena
 {
-	id=0xFFFFFFFF;
-	filename = "";
-	minFilter = GL_LINEAR;
-	magFilter = GL_LINEAR;
-}
-
-GL_MY_TEXTURE::~GL_MY_TEXTURE()
-{
-	Free();
-}
-
-string GL_MY_TEXTURE::Filename()
-{
-	return filename;
-}
-
-GLuint GL_MY_TEXTURE::ID()
-{
-	return id;
-}
-
-bool GL_MY_TEXTURE::Loaded()
-{
-	return filename != "";
-}
-
-bool GL_MY_TEXTURE::Load(string fn)
-{
-	if(Loaded())
-		Free();
-
-	if(LoadGLTexture(fn.c_str(), id, minFilter, magFilter))
-	{
-		filename = fn;
-		return true;
-	}
-	else
+	Texture::Texture()
 	{
 		id=0xFFFFFFFF;
-		return false;
-	}
-}
-
-bool GL_MY_TEXTURE::Load(string fn, GLuint min, GLuint mag)
-{
-	if(Loaded())
-		Free();
-
-	if(LoadGLTexture(fn.c_str(), id, min, mag))
-	{
-		filename = fn;
-		minFilter = min;
-		magFilter = mag;
-		return true;
-	}
-	else 
-	{
-		id=0xFFFFFFFF;
-		return false;
-	}
-}
-
-void GL_MY_TEXTURE::Free()
-{
-	if(Loaded())
-	{
-		FreeGLTexture(id);
+		filename = "";
 		minFilter = GL_LINEAR;
 		magFilter = GL_LINEAR;
-		filename = "";
-		id = 0xFFFFFFFF;
 	}
-}	
-
-bool GL_MY_TEXTURE::operator<(const GL_MY_TEXTURE& rtOp)
-{
-	return id<rtOp.id;
-}
-
-bool GL_MY_TEXTURE::operator<=(const GL_MY_TEXTURE& rtOp)
-{
-	return id<=rtOp.id;
-}
-
-bool GL_MY_TEXTURE::operator==(const GL_MY_TEXTURE& rtOp)
-{
-	return id==rtOp.id;
-}
-
-bool GL_MY_TEXTURE::operator!=(const GL_MY_TEXTURE& rtOp)
-{
-	return id!=rtOp.id;
-}
-
-bool GL_MY_TEXTURE::operator>=(const GL_MY_TEXTURE& rtOp)
-{
-	return id>=rtOp.id;
-}
-
-bool GL_MY_TEXTURE::operator>(const GL_MY_TEXTURE& rtOp)
-{
-	return id>rtOp.id;
-}
+	
+	Texture::~Texture()
+	{
+		Free();
+	}
+	
+	string Texture::Filename()
+	{
+		return filename;
+	}
+	
+	GLuint Texture::ID()
+	{
+		return id;
+	}
+	
+	bool Texture::Loaded()
+	{
+		return filename != "";
+	}
+	
+	bool Texture::Load(string fn)
+	{
+		if(Loaded())
+			Free();
+	
+		if(LoadGLTexture(fn.c_str(), id, minFilter, magFilter))
+		{
+			filename = fn;
+			return true;
+		}
+		else
+		{
+			id=0xFFFFFFFF;
+			return false;
+		}
+	}
+	
+	bool Texture::Load(string fn, GLuint min, GLuint mag)
+	{
+		if(Loaded())
+			Free();
+	
+		if(LoadGLTexture(fn.c_str(), id, min, mag))
+		{
+			filename = fn;
+			minFilter = min;
+			magFilter = mag;
+			return true;
+		}
+		else 
+		{
+			id=0xFFFFFFFF;
+			return false;
+		}
+	}
+	
+	void Texture::Free()
+	{
+		if(Loaded())
+		{
+			FreeGLTexture(id);
+			minFilter = GL_LINEAR;
+			magFilter = GL_LINEAR;
+			filename = "";
+			id = 0xFFFFFFFF;
+		}
+	}	
+	
+	bool Texture::operator<(const Texture& rtOp)
+	{
+		return id<rtOp.id;
+	}
+	
+	bool Texture::operator<=(const Texture& rtOp)
+	{
+		return id<=rtOp.id;
+	}
+	
+	bool Texture::operator==(const Texture& rtOp)
+	{
+		return id==rtOp.id;
+	}
+	
+	bool Texture::operator!=(const Texture& rtOp)
+	{
+		return id!=rtOp.id;
+	}
+	
+	bool Texture::operator>=(const Texture& rtOp)
+	{
+		return id>=rtOp.id;
+	}
+	
+	bool Texture::operator>(const Texture& rtOp)
+	{
+		return id>rtOp.id;
+	}
+};