diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-04-04 13:40:12 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-05 17:17:47 +0100 |
| commit | 1feb5dd5ceb44e2647abc52a13d05f62bf4c903c (patch) | |
| tree | 1dad0fc227a27de388112968bb14e0da5bce4946 | |
| parent | c3f80439a841120d7e17108da11cc343d5168b8c (diff) | |
| download | usdx-1feb5dd5ceb44e2647abc52a13d05f62bf4c903c.tar.gz usdx-1feb5dd5ceb44e2647abc52a13d05f62bf4c903c.tar.xz usdx-1feb5dd5ceb44e2647abc52a13d05f62bf4c903c.zip | |
renamed texture_plain to texture
| -rw-r--r-- | src/base/texture.cpp (renamed from src/base/texture_plain.cpp) | 2 | ||||
| -rw-r--r-- | src/base/texture.hpp (renamed from src/base/texture_plain.hpp) | 10 | ||||
| -rw-r--r-- | src/base/texture_transparent.hpp | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/base/texture_plain.cpp b/src/base/texture.cpp index 262ff766..ace2857f 100644 --- a/src/base/texture_plain.cpp +++ b/src/base/texture.cpp @@ -24,7 +24,7 @@ * $Id$ */ -#include "texture_plain.hpp" +#include "texture.hpp" namespace usdx { diff --git a/src/base/texture_plain.hpp b/src/base/texture.hpp index 3fc76072..016bb307 100644 --- a/src/base/texture_plain.hpp +++ b/src/base/texture.hpp @@ -24,8 +24,8 @@ * $Id$ */ -#ifndef TEXTURE_PLAIN_HPP -#define TEXTURE_PLAIN_HPP +#ifndef TEXTURE_HPP +#define TEXTURE_HPP #include <boost/filesystem.hpp> #include <GL/gl.h> @@ -35,7 +35,7 @@ namespace usdx { - class TexturePlain + class Texture { private: GLuint tex_num; @@ -54,8 +54,8 @@ namespace usdx ///for dynamic skins public: - TexturePlain(); - virtual ~TexturePlain(); + Texture(); + virtual ~Texture(); }; }; diff --git a/src/base/texture_transparent.hpp b/src/base/texture_transparent.hpp index 9cb8bba4..dae69d44 100644 --- a/src/base/texture_transparent.hpp +++ b/src/base/texture_transparent.hpp @@ -27,16 +27,16 @@ #ifndef TEXTURE_TRANSPARENT_HPP #define TEXTURE_TRANSPARENT_HPP -#include "texture_plain.hpp" +#include "texture.hpp" namespace usdx { /** * This class represents a texture like TexturePlain but with the * ability to set a alpha value to paint this texture transparent. - * @see: TexturePlain + * @see: Texture */ - class TextureTransparent : public TexturePlain + class TextureTransparent : public Texture { private: float alpha; |