diff options
Diffstat (limited to '')
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/frames/loading_frame.cpp | 45 | ||||
| -rw-r--r-- | src/frames/loading_frame.hpp | 43 | ||||
| -rw-r--r-- | src/menu/application.cpp | 4 |
4 files changed, 93 insertions, 1 deletions
@@ -7,7 +7,7 @@ sources:=$(wildcard $(TOP)/src/*/*/*.cpp) $(wildcard $(TOP)/src/*/*.cpp) $(wildc deps:=$(sources:.cpp=.d) -CXXFLAGS:=-Wall -Werror -I$(TOP)/src -I$(TOP)/src/base -I$(TOP)/src/menu -I$(TOP)/src/media -I$(TOP)/src/screens -g +CXXFLAGS:=-Wall -Werror -I$(TOP)/src -I$(TOP)/src/base -I$(TOP)/src/menu -I$(TOP)/src/media -I$(TOP)/src/screens -I$(TOP)/src/frames -g LDFLAGS:=-lsqlite3 -lSDL -llog4cxx -lboost_program_options-mt -lboost_filesystem-mt -lboost_thread-mt -lSDL_image -lSDL_gfx -lcppunit -lGL TARGET:=$(PROJECT) diff --git a/src/frames/loading_frame.cpp b/src/frames/loading_frame.cpp new file mode 100644 index 00000000..cf1f0382 --- /dev/null +++ b/src/frames/loading_frame.cpp @@ -0,0 +1,45 @@ +/* + * 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 "loading_frame.hpp" +#include "frame_background_image.hpp" +#include "frame_background_color.hpp" + +namespace usdx +{ + LoadingFrame::LoadingFrame() : + Frame(NULL) + { +// RgbColor background(100, 100, 100); +// set_background(new FrameBackgroundColor(background)); + set_background(new FrameBackgroundImage(L"game/themes/Deluxe/[bg-load]blue.jpg")); + } + + LoadingFrame::~LoadingFrame() + { + } +}; + diff --git a/src/frames/loading_frame.hpp b/src/frames/loading_frame.hpp new file mode 100644 index 00000000..cf8864e4 --- /dev/null +++ b/src/frames/loading_frame.hpp @@ -0,0 +1,43 @@ +/* + * 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 LOADING_FRAME_HPP +#define LOADING_FRAME_HPP + +#include "frame.hpp" + +namespace usdx +{ + class LoadingFrame : public Frame + { + public: + LoadingFrame(); + virtual ~LoadingFrame(); + }; +}; + + +#endif diff --git a/src/menu/application.cpp b/src/menu/application.cpp index e8cbde1a..089388c0 100644 --- a/src/menu/application.cpp +++ b/src/menu/application.cpp @@ -28,6 +28,7 @@ #include "event_manager.hpp" #include <exception> #include "software_mouse_pointer.hpp" +#include "loading_frame.hpp" #include <GL/gl.h> namespace usdx @@ -109,6 +110,9 @@ namespace usdx boost::thread event_thread(boost::bind(&EventManager::handle_events, &event_manager)); overlays.push_front(new SoftwareMousePointer(NULL, &event_manager)); + LoadingFrame frame; + set_current_frame(&frame); + running = true; while (running) { // repaint everything |