From e7f4fdd7f9585c2f5f1803bf3264c118251d86db Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Sat, 26 Dec 2009 14:34:53 +0100 Subject: converted UMenuBackgroundColor --- src/menu/UMenuBackgroundColor.pas | 73 --------------------------------------- src/menu/menuBackground.cpp | 14 ++++++++ src/menu/menuBackground.hpp | 9 +++++ 3 files changed, 23 insertions(+), 73 deletions(-) delete mode 100644 src/menu/UMenuBackgroundColor.pas diff --git a/src/menu/UMenuBackgroundColor.pas b/src/menu/UMenuBackgroundColor.pas deleted file mode 100644 index 45b58c1e..00000000 --- a/src/menu/UMenuBackgroundColor.pas +++ /dev/null @@ -1,73 +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$ - *} - -unit UMenuBackgroundColor; - -interface - -{$IFDEF FPC} - {$MODE Delphi} -{$ENDIF} - -{$I switches.inc} - -uses - UThemes, - UMenuBackground; - -//TMenuBackgroundColor - Background Color -//-------- - -type - TMenuBackgroundColor = class (TMenuBackground) - private - Color: TRGB; - public - constructor Create(const ThemedSettings: TThemeBackground); override; - procedure Draw; override; - end; - -implementation -uses - gl, - glext, - UGraphic; - -constructor TMenuBackgroundColor.Create(const ThemedSettings: TThemeBackground); -begin - inherited; - Color := ThemedSettings.Color; -end; - -procedure TMenuBackgroundColor.Draw; -begin - if (ScreenAct = 1) then - begin //just clear once, even when using two screens - glClearColor(Color.R, Color.G, Color.B, 0); - glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT); - end; -end; - -end. \ No newline at end of file diff --git a/src/menu/menuBackground.cpp b/src/menu/menuBackground.cpp index 430ff0d1..819eef5b 100644 --- a/src/menu/menuBackground.cpp +++ b/src/menu/menuBackground.cpp @@ -37,4 +37,18 @@ namespace usdx if (screen_act == 0) glClear(GL_DEPTH_BUFFER_BIT); } + + MenuBackgroundColor::MenuBackgrundColor(RGB &color) + { + this->color = color; + } + + void MenuBackgroundColor::draw(void) + { + // just clear once, even when using two screens + if (screen_act == 1) { + glClearColor(color.r, color.g, color.b, 0); + glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT); + } + } }; diff --git a/src/menu/menuBackground.hpp b/src/menu/menuBackground.hpp index 3e0aa85c..c398b381 100644 --- a/src/menu/menuBackground.hpp +++ b/src/menu/menuBackground.hpp @@ -55,6 +55,15 @@ namespace usdx public: virtual void draw(void); }; + + class MenuBackgroundColor : MenuBackground + { + private: + RGB color; + public: + MenuBackgroundColor(RGB &color); + virtual void draw(void); + }; }; #endif -- cgit v1.2.3