aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--Makefile42
-rw-r--r--log4cxx.xml42
-rw-r--r--src/main.cpp36
-rw-r--r--src/menu/application.cpp139
-rw-r--r--src/menu/application.hpp79
6 files changed, 341 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index daa63a09..e38a2894 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,10 +15,12 @@ Thumbs.db
*.bdsproj.local
*.bak
*~
-Makefile
config.log
config.status
__history
aclocal.m4
autom4te.cache/
coverage/
+usdx
+test/
+debug.log
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..9d5c27a7
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,42 @@
+PROJECT:=usdx
+TOP:=.
+
+headers:=$(wildcard $(TOP)/src/*/*/*.hpp) $(wildcard $(TOP)/src/*/*.hpp) $(wildcard $(TOP)/src/*.hpp)
+
+sources:=$(wildcard $(TOP)/src/*/*/*.cpp) $(wildcard $(TOP)/src/*/*.cpp) $(wildcard $(TOP)/src/*.cpp)
+
+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
+LDFLAGS:=-lsqlite3 -lSDL -llog4cxx -lboost_program_options-mt -lboost_filesystem-mt -lSDL_image -lSDL_gfx -lcppunit -lGL
+TARGET:=$(PROJECT)
+
+objects:=$(sources:.cpp=.o)
+
+##############################################################################
+
+.PHONY: all clean run
+
+all: $(TARGET)
+
+clean:
+ -$(RM) -r $(TARGET) $(TARGET-COVERAGE) $(objects) $(deps) $(coverage)
+
+run: $(TARGET)
+ ./$(TARGET)
+
+ifneq ($(MAKECMDGOALS),clean)
+-include $(deps)
+endif
+
+##############################################################################
+# normal build
+
+$(TARGET): $(objects) $(deps)
+ $(CXX) $(LDFLAGS) -o $(TARGET) $(objects)
+
+%.o: %.cpp
+ $(CXX) $(CXXFLAGS) -MMD -c $< -o $@
+
+%.d: %.cpp
+ $(CXX) $(CXXFLAGS) -MM -c $< -MF $@
diff --git a/log4cxx.xml b/log4cxx.xml
new file mode 100644
index 00000000..75daba46
--- /dev/null
+++ b/log4cxx.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+
+ <appender name="Roll" class="org.apache.log4j.rolling.RollingFileAppender">
+ <triggeringPolicy class="org.apache.log4j.rolling.SizeBasedTriggeringPolicy">
+ <param name="MaxFileSize" value="400KB" />
+ </triggeringPolicy>
+
+ <rollingPolicy class="org.apache.log4j.rolling.FixedWindowRollingPolicy">
+ <param name="MaxIndex" value="4" />
+ <param name="FileNamePattern" value="debug.%i.log" />
+ </rollingPolicy>
+
+ <param name="FileName" value="debug.log" />
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-6r [%-5p] %F:%L - %M - %m%n" />
+ </layout>
+ </appender>
+
+
+ <appender name="Console" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%-6r [%-5p] %F:%-3L - %m%n" />
+ </layout>
+
+ <filter class="org.apache.log4j.filter.LevelRangeFilter">
+ <param name="LevelMin" value="ERROR" />
+ </filter>
+ </appender>
+
+
+ <root>
+ <priority value ="ALL" />
+ <appender-ref ref="Console" />
+ <appender-ref ref="Roll"/>
+ </root>
+
+</log4j:configuration>
diff --git a/src/main.cpp b/src/main.cpp
new file mode 100644
index 00000000..83fa8298
--- /dev/null
+++ b/src/main.cpp
@@ -0,0 +1,36 @@
+/*
+ * 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 "application.hpp"
+#include <cstdlib>
+
+int main (int argc, char** argv)
+{
+ usdx::Application::get_instance()->run();
+ delete usdx::Application::get_instance();
+
+ return EXIT_SUCCESS;
+}
diff --git a/src/menu/application.cpp b/src/menu/application.cpp
new file mode 100644
index 00000000..d36e10b3
--- /dev/null
+++ b/src/menu/application.cpp
@@ -0,0 +1,139 @@
+/*
+ * 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 "application.hpp"
+#include <exception>
+
+namespace usdx
+{
+ log4cxx::LoggerPtr Application::log =
+ log4cxx::Logger::getLogger("usdx.menu.application");
+
+ Application* Application::instance = NULL;
+
+ Application::Application(Control* parent)
+ : DrawableControl(parent), display(NULL), frame(NULL),
+ running(false), display_width(800), display_height(600)
+ {
+ SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO);
+
+ fps_manager = new FPSmanager();
+ }
+
+ Application::~Application()
+ {
+ if (fps_manager) {
+ delete fps_manager;
+ fps_manager = NULL;
+ }
+
+ SDL_Quit();
+ }
+
+ Application* Application::get_instance(void)
+ {
+ if (! instance) {
+ instance = new Application(NULL);
+ }
+
+ return instance;
+ }
+
+ void Application::draw(SDL_Surface* screen) const
+ {
+ if (frame) {
+ frame->repaint(screen);
+ }
+ }
+
+ const Frame *Application::get_current_frame(void) const
+ {
+ return frame;
+ }
+
+ void Application::set_current_frame(Frame* new_frame)
+ {
+ frame = new_frame;
+ repaint(display);
+ }
+
+ void Application::main_loop(SDL_Surface* display)
+ {
+ SDL_Event event;
+
+ running = true;
+ while (running) {
+ // repaint everything
+ repaint(display);
+ SDL_Flip(display);
+
+ LOG4CXX_ERROR(log, L"repaint");
+
+ // poll current events
+ while (SDL_PollEvent(&event)) {
+ switch (event.type) {
+ case SDL_QUIT:
+ running = false;
+ return;
+ }
+ }
+
+ // limit frames
+ SDL_framerateDelay(fps_manager);
+ }
+ }
+
+ void Application::run(void)
+ {
+ if (! display) {
+ display = SDL_SetVideoMode(display_width,
+ display_height,
+ 24,
+ SDL_SWSURFACE |
+ SDL_DOUBLEBUF);
+ }
+
+ if (! display) {
+ LOG4CXX_ERROR(log, L"SDL_SetVideoMode failed.");
+ throw new std::exception();
+ }
+
+ SDL_initFramerate(fps_manager);
+ SDL_setFramerate(fps_manager, 50);
+
+ main_loop(display);
+ }
+
+ const int Application::get_display_width(void) const
+ {
+ return display_width;
+ }
+
+ const int Application::get_display_height(void) const
+ {
+ return display_height;
+ }
+};
diff --git a/src/menu/application.hpp b/src/menu/application.hpp
new file mode 100644
index 00000000..b750241a
--- /dev/null
+++ b/src/menu/application.hpp
@@ -0,0 +1,79 @@
+/*
+ * 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 APPLICATION_HPP
+#define APPLICATION_HPP
+
+#include <SDL/SDL.h>
+#include <SDL/SDL_framerate.h>
+#include <log4cxx/logger.h>
+
+#include "drawable_control.hpp"
+#include "frame.hpp"
+
+namespace usdx
+{
+ class Application : public DrawableControl
+ {
+ private:
+ static log4cxx::LoggerPtr log;
+ static Application* instance;
+
+ SDL_Surface* display;
+ Frame* frame;
+ FPSmanager* fps_manager;
+
+ bool running;
+
+ int display_width;
+ int display_height;
+
+ /**
+ * This is the main loop.
+ */
+ void main_loop(SDL_Surface* display);
+
+ protected:
+ Application(Control* parent);
+
+ void draw(SDL_Surface* screen) const;
+
+ public:
+ virtual ~Application();
+
+ static Application* get_instance(void);
+
+ void run(void);
+
+ const Frame* get_current_frame(void) const;
+ void set_current_frame(Frame* new_frame);
+
+ const int get_display_width(void) const;
+ const int get_display_height(void) const;
+ };
+};
+
+#endif