Changed: Renamed a few classes

Changed: Moved most sensible objects into the OpenArena namespace
~g2k
This commit is contained in:
2005-06-29 11:33:11 -04:00
parent f6a191d21d
commit c16a0dae6d
17 changed files with 1818 additions and 1781 deletions

View File

@@ -7,29 +7,31 @@
using namespace std;
class GL_MY_TEXTURE
namespace OpenArena
{
public:
GL_MY_TEXTURE();
~GL_MY_TEXTURE();
string Filename();
GLuint ID();
bool Load(string filename);
bool Load(string filename, GLuint min, GLuint mag);
void Free();
bool Loaded();
bool operator<(const GL_MY_TEXTURE&);
bool operator<=(const GL_MY_TEXTURE&);
bool operator==(const GL_MY_TEXTURE&);
bool operator!=(const GL_MY_TEXTURE&);
bool operator>=(const GL_MY_TEXTURE&);
bool operator>(const GL_MY_TEXTURE&);
private:
GLuint minFilter;
GLuint magFilter;
string filename;
GLuint id;
};
class Texture
{
public:
Texture();
~Texture();
string Filename();
GLuint ID();
bool Load(string filename);
bool Load(string filename, GLuint min, GLuint mag);
void Free();
bool Loaded();
bool operator<(const Texture&);
bool operator<=(const Texture&);
bool operator==(const Texture&);
bool operator!=(const Texture&);
bool operator>=(const Texture&);
bool operator>(const Texture&);
private:
GLuint minFilter;
GLuint magFilter;
string filename;
GLuint id;
};
};
#endif