From 1feb5dd5ceb44e2647abc52a13d05f62bf4c903c Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Sun, 4 Apr 2010 13:40:12 +0200 Subject: renamed texture_plain to texture --- src/base/texture.cpp | 32 +++++++++++++++++++++ src/base/texture.hpp | 62 ++++++++++++++++++++++++++++++++++++++++ src/base/texture_plain.cpp | 32 --------------------- src/base/texture_plain.hpp | 62 ---------------------------------------- src/base/texture_transparent.hpp | 6 ++-- 5 files changed, 97 insertions(+), 97 deletions(-) create mode 100644 src/base/texture.cpp create mode 100644 src/base/texture.hpp delete mode 100644 src/base/texture_plain.cpp delete mode 100644 src/base/texture_plain.hpp diff --git a/src/base/texture.cpp b/src/base/texture.cpp new file mode 100644 index 00000000..ace2857f --- /dev/null +++ b/src/base/texture.cpp @@ -0,0 +1,32 @@ +/* + * UltraStar Deluxe - Karaoke Game + * + * UltraStar Deluxe is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + */ + +#include "texture.hpp" + +namespace usdx +{ + +}; diff --git a/src/base/texture.hpp b/src/base/texture.hpp new file mode 100644 index 00000000..016bb307 --- /dev/null +++ b/src/base/texture.hpp @@ -0,0 +1,62 @@ +/* + * UltraStar Deluxe - Karaoke Game + * + * UltraStar Deluxe is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + */ + +#ifndef TEXTURE_HPP +#define TEXTURE_HPP + +#include +#include +#include "utils/point_3d.hpp" +#include "utils/dimension.hpp" +#include "utils/rectangle.hpp" + +namespace usdx +{ + class Texture + { + private: + GLuint tex_num; + Point3D position; + Dimension size; + + Dimension scale; ///< for dynamic scaling + float rotation; ///< radiant (0 - 2*pi) + + Dimension tex; ///< percentage of size to use [0..1] + Rectangle tex_rect; + + boost::filesystem::wpath filename; ///< experimental for + ///handling cache + ///images. maybe it's useful + ///for dynamic skins + + public: + Texture(); + virtual ~Texture(); + }; +}; + +#endif diff --git a/src/base/texture_plain.cpp b/src/base/texture_plain.cpp deleted file mode 100644 index 262ff766..00000000 --- a/src/base/texture_plain.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* - * UltraStar Deluxe - Karaoke Game - * - * UltraStar Deluxe is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - */ - -#include "texture_plain.hpp" - -namespace usdx -{ - -}; diff --git a/src/base/texture_plain.hpp b/src/base/texture_plain.hpp deleted file mode 100644 index 3fc76072..00000000 --- a/src/base/texture_plain.hpp +++ /dev/null @@ -1,62 +0,0 @@ -/* - * UltraStar Deluxe - Karaoke Game - * - * UltraStar Deluxe is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - * - * $URL$ - * $Id$ - */ - -#ifndef TEXTURE_PLAIN_HPP -#define TEXTURE_PLAIN_HPP - -#include -#include -#include "utils/point_3d.hpp" -#include "utils/dimension.hpp" -#include "utils/rectangle.hpp" - -namespace usdx -{ - class TexturePlain - { - private: - GLuint tex_num; - Point3D position; - Dimension size; - - Dimension scale; ///< for dynamic scaling - float rotation; ///< radiant (0 - 2*pi) - - Dimension tex; ///< percentage of size to use [0..1] - Rectangle tex_rect; - - boost::filesystem::wpath filename; ///< experimental for - ///handling cache - ///images. maybe it's useful - ///for dynamic skins - - public: - TexturePlain(); - virtual ~TexturePlain(); - }; -}; - -#endif 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; -- cgit v1.2.3