[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4041 - in trunk/pingus: . src src/editor src/engine src/en
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r4041 - in trunk/pingus: . src src/editor src/engine src/engine/display src/engine/display/opengl src/engine/gui src/engine/input src/engine/input/evdev src/engine/input/usbmouse src/engine/input/wiimote src/engine/input/xinput src/engine/input_old src/engine/screen src/engine/sound src/pingus src/pingus/actions src/pingus/components src/pingus/particles src/pingus/worldmap src/pingus/worldobjs |
|
Date: |
Thu, 5 Nov 2009 23:48:47 +0100 |
Author: grumbel
Date: 2009-11-05 23:48:38 +0100 (Thu, 05 Nov 2009)
New Revision: 4041
Added:
trunk/pingus/src/engine/
trunk/pingus/src/engine/display/
trunk/pingus/src/engine/gui/
trunk/pingus/src/engine/input/
trunk/pingus/src/engine/input_old/
trunk/pingus/src/engine/screen/
trunk/pingus/src/engine/sound/
Removed:
trunk/pingus/src/display/
trunk/pingus/src/gui/
trunk/pingus/src/input/
trunk/pingus/src/input_old/
trunk/pingus/src/screen/
trunk/pingus/src/sound/
Modified:
trunk/pingus/SConscript
trunk/pingus/src/editor/action_properties.hpp
trunk/pingus/src/editor/button.hpp
trunk/pingus/src/editor/checkbox.hpp
trunk/pingus/src/editor/combobox.hpp
trunk/pingus/src/editor/editor_screen.cpp
trunk/pingus/src/editor/editor_screen.hpp
trunk/pingus/src/editor/file_dialog.cpp
trunk/pingus/src/editor/file_dialog.hpp
trunk/pingus/src/editor/file_list.hpp
trunk/pingus/src/editor/gui_style.hpp
trunk/pingus/src/editor/inputbox.cpp
trunk/pingus/src/editor/inputbox.hpp
trunk/pingus/src/editor/label.cpp
trunk/pingus/src/editor/label.hpp
trunk/pingus/src/editor/level_objs.cpp
trunk/pingus/src/editor/level_properties.hpp
trunk/pingus/src/editor/minimap.hpp
trunk/pingus/src/editor/object_properties.hpp
trunk/pingus/src/editor/object_selector.cpp
trunk/pingus/src/editor/object_selector.hpp
trunk/pingus/src/editor/object_selector_list.cpp
trunk/pingus/src/editor/object_selector_list.hpp
trunk/pingus/src/editor/panel.cpp
trunk/pingus/src/editor/panel.hpp
trunk/pingus/src/editor/viewport.cpp
trunk/pingus/src/editor/viewport.hpp
trunk/pingus/src/engine/display/delta_framebuffer.cpp
trunk/pingus/src/engine/display/delta_framebuffer.hpp
trunk/pingus/src/engine/display/display.cpp
trunk/pingus/src/engine/display/drawing_context.cpp
trunk/pingus/src/engine/display/drawing_context.hpp
trunk/pingus/src/engine/display/framebuffer.hpp
trunk/pingus/src/engine/display/framebuffer_surface.cpp
trunk/pingus/src/engine/display/null_framebuffer.cpp
trunk/pingus/src/engine/display/null_framebuffer.hpp
trunk/pingus/src/engine/display/opengl/opengl_framebuffer.cpp
trunk/pingus/src/engine/display/opengl/opengl_framebuffer.hpp
trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.cpp
trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp
trunk/pingus/src/engine/display/rect_merger.cpp
trunk/pingus/src/engine/display/scene_context.cpp
trunk/pingus/src/engine/display/scene_context.hpp
trunk/pingus/src/engine/display/sdl_framebuffer.cpp
trunk/pingus/src/engine/display/sdl_framebuffer.hpp
trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.cpp
trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp
trunk/pingus/src/engine/gui/component.cpp
trunk/pingus/src/engine/gui/group_component.cpp
trunk/pingus/src/engine/gui/group_component.hpp
trunk/pingus/src/engine/gui/gui_manager.cpp
trunk/pingus/src/engine/gui/gui_manager.hpp
trunk/pingus/src/engine/gui/rect_component.hpp
trunk/pingus/src/engine/gui/surface_button.cpp
trunk/pingus/src/engine/gui/surface_button.hpp
trunk/pingus/src/engine/input/control.hpp
trunk/pingus/src/engine/input/controller.cpp
trunk/pingus/src/engine/input/controller.hpp
trunk/pingus/src/engine/input/controller_description.cpp
trunk/pingus/src/engine/input/controller_description.hpp
trunk/pingus/src/engine/input/core_driver.cpp
trunk/pingus/src/engine/input/core_driver.hpp
trunk/pingus/src/engine/input/driver.hpp
trunk/pingus/src/engine/input/evdev/evdev_device.cpp
trunk/pingus/src/engine/input/evdev/evdev_device.hpp
trunk/pingus/src/engine/input/evdev/evdev_driver.cpp
trunk/pingus/src/engine/input/evdev/evdev_driver.hpp
trunk/pingus/src/engine/input/manager.cpp
trunk/pingus/src/engine/input/manager.hpp
trunk/pingus/src/engine/input/sdl_driver.cpp
trunk/pingus/src/engine/input/sdl_driver.hpp
trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.cpp
trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.hpp
trunk/pingus/src/engine/input/wiimote/wiimote.cpp
trunk/pingus/src/engine/input/wiimote/wiimote_driver.cpp
trunk/pingus/src/engine/input/wiimote/wiimote_driver.hpp
trunk/pingus/src/engine/input/xinput/xinput_device.cpp
trunk/pingus/src/engine/input/xinput/xinput_driver.cpp
trunk/pingus/src/engine/input/xinput/xinput_driver.hpp
trunk/pingus/src/engine/input_old/controller.cpp
trunk/pingus/src/engine/screen/gui_screen.cpp
trunk/pingus/src/engine/screen/gui_screen.hpp
trunk/pingus/src/engine/screen/screen.cpp
trunk/pingus/src/engine/screen/screen_manager.cpp
trunk/pingus/src/engine/screen/screen_manager_impl.hpp
trunk/pingus/src/engine/sound/sound.cpp
trunk/pingus/src/engine/sound/sound.hpp
trunk/pingus/src/engine/sound/sound_dummy.cpp
trunk/pingus/src/engine/sound/sound_dummy.hpp
trunk/pingus/src/engine/sound/sound_real.cpp
trunk/pingus/src/engine/sound/sound_real.hpp
trunk/pingus/src/engine/sound/sound_res_mgr.cpp
trunk/pingus/src/pingus/actions/angel.cpp
trunk/pingus/src/pingus/actions/basher.cpp
trunk/pingus/src/pingus/actions/blocker.cpp
trunk/pingus/src/pingus/actions/boarder.cpp
trunk/pingus/src/pingus/actions/bomber.cpp
trunk/pingus/src/pingus/actions/bridger.cpp
trunk/pingus/src/pingus/actions/climber.cpp
trunk/pingus/src/pingus/actions/digger.cpp
trunk/pingus/src/pingus/actions/drown.cpp
trunk/pingus/src/pingus/actions/exiter.cpp
trunk/pingus/src/pingus/actions/faller.cpp
trunk/pingus/src/pingus/actions/floater.cpp
trunk/pingus/src/pingus/actions/jumper.cpp
trunk/pingus/src/pingus/actions/laser_kill.cpp
trunk/pingus/src/pingus/actions/miner.cpp
trunk/pingus/src/pingus/actions/rocket_launcher.cpp
trunk/pingus/src/pingus/actions/slider.cpp
trunk/pingus/src/pingus/actions/smashed.cpp
trunk/pingus/src/pingus/actions/splashed.cpp
trunk/pingus/src/pingus/actions/superman.cpp
trunk/pingus/src/pingus/actions/waiter.cpp
trunk/pingus/src/pingus/actions/walker.cpp
trunk/pingus/src/pingus/addon_menu.cpp
trunk/pingus/src/pingus/addon_menu.hpp
trunk/pingus/src/pingus/capture_rectangle.cpp
trunk/pingus/src/pingus/collision_map.cpp
trunk/pingus/src/pingus/components/action_button.cpp
trunk/pingus/src/pingus/components/action_button.hpp
trunk/pingus/src/pingus/components/button_panel.cpp
trunk/pingus/src/pingus/components/button_panel.hpp
trunk/pingus/src/pingus/components/check_box.cpp
trunk/pingus/src/pingus/components/check_box.hpp
trunk/pingus/src/pingus/components/choice_box.cpp
trunk/pingus/src/pingus/components/choice_box.hpp
trunk/pingus/src/pingus/components/label.cpp
trunk/pingus/src/pingus/components/label.hpp
trunk/pingus/src/pingus/components/menu_button.cpp
trunk/pingus/src/pingus/components/menu_button.hpp
trunk/pingus/src/pingus/components/pingus_counter.hpp
trunk/pingus/src/pingus/components/playfield.cpp
trunk/pingus/src/pingus/components/playfield.hpp
trunk/pingus/src/pingus/components/slider_box.cpp
trunk/pingus/src/pingus/components/slider_box.hpp
trunk/pingus/src/pingus/components/smallmap.cpp
trunk/pingus/src/pingus/components/smallmap.hpp
trunk/pingus/src/pingus/components/time_display.cpp
trunk/pingus/src/pingus/components/time_display.hpp
trunk/pingus/src/pingus/config_manager.cpp
trunk/pingus/src/pingus/credits.cpp
trunk/pingus/src/pingus/credits.hpp
trunk/pingus/src/pingus/demo_session.cpp
trunk/pingus/src/pingus/demo_session.hpp
trunk/pingus/src/pingus/font.cpp
trunk/pingus/src/pingus/font_test_screen.cpp
trunk/pingus/src/pingus/font_test_screen.hpp
trunk/pingus/src/pingus/fonts.hpp
trunk/pingus/src/pingus/fps_counter.cpp
trunk/pingus/src/pingus/game_session.cpp
trunk/pingus/src/pingus/game_session.hpp
trunk/pingus/src/pingus/global_event.cpp
trunk/pingus/src/pingus/graphic_context_state.cpp
trunk/pingus/src/pingus/graphic_context_state.hpp
trunk/pingus/src/pingus/ground_map.cpp
trunk/pingus/src/pingus/layer_manager.hpp
trunk/pingus/src/pingus/level_menu.cpp
trunk/pingus/src/pingus/level_menu.hpp
trunk/pingus/src/pingus/option_menu.cpp
trunk/pingus/src/pingus/option_menu.hpp
trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp
trunk/pingus/src/pingus/particles/rain_particle_holder.cpp
trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp
trunk/pingus/src/pingus/particles/snow_particle_holder.cpp
trunk/pingus/src/pingus/pingu.cpp
trunk/pingus/src/pingus/pingus_main.cpp
trunk/pingus/src/pingus/pingus_menu.cpp
trunk/pingus/src/pingus/pingus_menu.hpp
trunk/pingus/src/pingus/result_screen.cpp
trunk/pingus/src/pingus/result_screen.hpp
trunk/pingus/src/pingus/screenshot.cpp
trunk/pingus/src/pingus/sprite_impl.cpp
trunk/pingus/src/pingus/sprite_impl.hpp
trunk/pingus/src/pingus/start_screen.cpp
trunk/pingus/src/pingus/start_screen.hpp
trunk/pingus/src/pingus/story_screen.cpp
trunk/pingus/src/pingus/story_screen.hpp
trunk/pingus/src/pingus/world.cpp
trunk/pingus/src/pingus/worldmap/level_dot.cpp
trunk/pingus/src/pingus/worldmap/path_drawable.cpp
trunk/pingus/src/pingus/worldmap/pingus.cpp
trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp
trunk/pingus/src/pingus/worldmap/worldmap.cpp
trunk/pingus/src/pingus/worldmap/worldmap.hpp
trunk/pingus/src/pingus/worldmap/worldmap_component.cpp
trunk/pingus/src/pingus/worldmap/worldmap_component.hpp
trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp
trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp
trunk/pingus/src/pingus/worldobj.cpp
trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp
trunk/pingus/src/pingus/worldobjs/entrance.cpp
trunk/pingus/src/pingus/worldobjs/exit.cpp
trunk/pingus/src/pingus/worldobjs/fake_exit.cpp
trunk/pingus/src/pingus/worldobjs/guillotine.cpp
trunk/pingus/src/pingus/worldobjs/hammer.cpp
trunk/pingus/src/pingus/worldobjs/hotspot.cpp
trunk/pingus/src/pingus/worldobjs/ice_block.cpp
trunk/pingus/src/pingus/worldobjs/laser_exit.cpp
trunk/pingus/src/pingus/worldobjs/liquid.cpp
trunk/pingus/src/pingus/worldobjs/rain_generator.cpp
trunk/pingus/src/pingus/worldobjs/smasher.cpp
trunk/pingus/src/pingus/worldobjs/solid_color_background.cpp
trunk/pingus/src/pingus/worldobjs/spike.cpp
trunk/pingus/src/pingus/worldobjs/starfield_background_stars.cpp
trunk/pingus/src/pingus/worldobjs/surface_background.cpp
trunk/pingus/src/pingus/worldobjs/switch_door.cpp
trunk/pingus/src/pingus/worldobjs/teleporter.cpp
trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp
trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
trunk/pingus/src/pingus/worldobjs/woodthing.cpp
Log:
Moved:
display -> engine/display/
input -> engine/input/
gui -> engine/gui/
screen -> engine/screen/
sound -> engine/sound/
Modified: trunk/pingus/SConscript
===================================================================
--- trunk/pingus/SConscript 2009-11-05 22:37:35 UTC (rev 4040)
+++ trunk/pingus/SConscript 2009-11-05 22:48:38 UTC (rev 4041)
@@ -25,10 +25,12 @@
pingus_sources = \
Glob('external/binreloc-2.0/*.c') + \
Glob('external/tinygettext/*.cpp') + \
- Glob('src/display/*.cpp') + \
Glob('src/editor/*.cpp') + \
- Glob('src/gui/*.cpp') + \
- Glob('src/input/*.cpp') + \
+ Glob('src/engine/display/*.cpp') + \
+ Glob('src/engine/gui/*.cpp') + \
+ Glob('src/engine/input/*.cpp') + \
+ Glob('src/engine/screen/*.cpp') + \
+ Glob('src/engine/sound/*.cpp') + \
Glob('src/lisp/*.cpp') + \
Glob('src/math/*.cpp') + \
Glob('src/pingus/*.cpp') + \
@@ -39,8 +41,6 @@
Glob('src/pingus/particles/*.cpp') + \
Glob('src/pingus/worldmap/*.cpp') + \
Glob('src/pingus/worldobjs/*.cpp') + \
- Glob('src/screen/*.cpp') + \
- Glob('src/sound/*.cpp') + \
Glob('src/util/*.cpp')
class _SpaceListOptionClass:
@@ -196,23 +196,23 @@
reports += " * OpenGL support: enabled\n"
config_h_defines += [('HAVE_OPENGL', 1)]
env['LIBS'] += ['GL']
- env['optional_sources'] +=
['src/display/opengl/opengl_framebuffer_surface_impl.cpp',
- 'src/display/opengl/opengl_framebuffer.cpp'
]
+ env['optional_sources'] +=
['src/engine/display/opengl/opengl_framebuffer_surface_impl.cpp',
+
'src/engine/display/opengl/opengl_framebuffer.cpp' ]
if not env['with_linuxusbmouse']:
reports += " * Linux USB mouse support: disabled\n"
else:
reports += " * Linux USB mouse support: enabled\n"
config_h_defines += [('HAVE_LINUXUSBMOUSE', 1)]
- env['optional_sources'] += ['src/input/usbmouse/usbmouse_driver.cpp']
+ env['optional_sources'] +=
['src/engine/input/usbmouse/usbmouse_driver.cpp']
if not env['with_linuxevdev']:
reports += " * Linux evdev support: disabled\n"
else:
reports += " * Linux evdev support: ok\n"
config_h_defines += [('HAVE_LINUXEVDEV', 1)]
- env['optional_sources'] += ['src/input/evdev/evdev_driver.cpp',
- 'src/input/evdev/evdev_device.cpp']
+ env['optional_sources'] += ['src/engine/input/evdev/evdev_driver.cpp',
+ 'src/engine/input/evdev/evdev_device.cpp']
if not env['with_wiimote']:
reports += " * Wiimote support: disabled\n"
@@ -220,8 +220,8 @@
reports += " * Wiimote support: yes\n"
config_h_defines += [('HAVE_CWIID', 1)]
env['LIBS'] += ['cwiid']
- env['optional_sources'] += ['src/input/wiimote/wiimote_driver.cpp',
- 'src/input/wiimote/wiimote.cpp']
+ env['optional_sources'] +=
['src/engine/input/wiimote/wiimote_driver.cpp',
+ 'src/engine/input/wiimote/wiimote.cpp']
else:
reports += " * Wiimote support: no (libcwiid or cwiid.h not found)\n"
@@ -233,8 +233,8 @@
reports += " * XInput support: yes\n"
config_h_defines += [('HAVE_XINPUT', 1)]
env['LIBS'] += ['Xi']
- env['optional_sources'] += ['src/input/xinput/xinput_driver.cpp',
- 'src/input/xinput/xinput_device.cpp']
+ env['optional_sources'] +=
['src/engine/input/xinput/xinput_driver.cpp',
+
'src/engine/input/xinput/xinput_device.cpp']
if not config.CheckLibWithHeader('boost_signals', 'boost/signals.hpp',
'c++'):
if not config.CheckLibWithHeader('boost_signals-mt',
'boost/signals.hpp', 'c++'):
Modified: trunk/pingus/src/editor/action_properties.hpp
===================================================================
--- trunk/pingus/src/editor/action_properties.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/editor/action_properties.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -20,7 +20,7 @@
#include <map>
#include "pingus/pingu_enums.hpp"
-#include "gui/group_component.hpp"
+#include "engine/gui/group_component.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/button.hpp
===================================================================
--- trunk/pingus/src/editor/button.hpp 2009-11-05 22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/editor/button.hpp 2009-11-05 22:48:38 UTC (rev 4041)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_EDITOR_BUTTON_HPP
#include <boost/signal.hpp>
-#include "gui/rect_component.hpp"
+#include "engine/gui/rect_component.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/checkbox.hpp
===================================================================
--- trunk/pingus/src/editor/checkbox.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/editor/checkbox.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_EDITOR_CHECKBOX_HPP
#include <boost/signal.hpp>
-#include "gui/rect_component.hpp"
+#include "engine/gui/rect_component.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/combobox.hpp
===================================================================
--- trunk/pingus/src/editor/combobox.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/editor/combobox.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -22,8 +22,8 @@
#include <string>
#include <boost/signal.hpp>
#include "pingus/sprite.hpp"
-#include "gui/component.hpp"
-#include "gui/rect_component.hpp"
+#include "engine/gui/component.hpp"
+#include "engine/gui/rect_component.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/editor_screen.cpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/editor/editor_screen.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -20,12 +20,12 @@
#include <iostream>
#include <boost/bind.hpp>
-#include "display/display.hpp"
+#include "engine/display/display.hpp"
#include "util/system.hpp"
-#include "sound/sound.hpp"
-#include "gui/gui_manager.hpp"
-#include "screen/screen_manager.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/sound/sound.hpp"
+#include "engine/gui/gui_manager.hpp"
+#include "engine/screen/screen_manager.hpp"
+#include "engine/display/drawing_context.hpp"
#include "pingus/res_descriptor.hpp"
#include "pingus/resource.hpp"
#include "pingus/fonts.hpp"
Modified: trunk/pingus/src/editor/editor_screen.hpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/editor/editor_screen.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,7 +18,7 @@
#ifndef HEADER_PINGUS_EDITOR_EDITOR_SCREEN_HPP
#define HEADER_PINGUS_EDITOR_EDITOR_SCREEN_HPP
-#include "screen/gui_screen.hpp"
+#include "engine/screen/gui_screen.hpp"
#include "util/pathname.hpp"
#include "editor/file_dialog.hpp"
Modified: trunk/pingus/src/editor/file_dialog.cpp
===================================================================
--- trunk/pingus/src/editor/file_dialog.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/editor/file_dialog.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -19,8 +19,8 @@
#include <iostream>
#include <boost/bind.hpp>
-#include "display/drawing_context.hpp"
-#include "gui/gui_manager.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "engine/gui/gui_manager.hpp"
#include "editor/editor_screen.hpp"
#include "util/system.hpp"
#include "editor/gui_style.hpp"
Modified: trunk/pingus/src/editor/file_dialog.hpp
===================================================================
--- trunk/pingus/src/editor/file_dialog.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/editor/file_dialog.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_EDITOR_FILE_DIALOG_HPP
#include "editor/file_list.hpp"
-#include "gui/group_component.hpp"
+#include "engine/gui/group_component.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/file_list.hpp
===================================================================
--- trunk/pingus/src/editor/file_list.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/editor/file_list.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -20,7 +20,7 @@
#include <boost/signal.hpp>
#include "pingus/sprite.hpp"
-#include "gui/rect_component.hpp"
+#include "engine/gui/rect_component.hpp"
#include "util/system.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/gui_style.hpp
===================================================================
--- trunk/pingus/src/editor/gui_style.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/editor/gui_style.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_EDITOR_GUI_STYLE_HPP
#include "math/rect.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/inputbox.cpp
===================================================================
--- trunk/pingus/src/editor/inputbox.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/editor/inputbox.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -19,7 +19,7 @@
#include <iostream>
#include "pingus/fonts.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/inputbox.hpp
===================================================================
--- trunk/pingus/src/editor/inputbox.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/editor/inputbox.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_EDITOR_INPUTBOX_HPP
#include <boost/signal.hpp>
-#include "gui/rect_component.hpp"
+#include "engine/gui/rect_component.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/label.cpp
===================================================================
--- trunk/pingus/src/editor/label.cpp 2009-11-05 22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/editor/label.cpp 2009-11-05 22:48:38 UTC (rev 4041)
@@ -16,7 +16,7 @@
#include "editor/label.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
#include "pingus/fonts.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/label.hpp
===================================================================
--- trunk/pingus/src/editor/label.hpp 2009-11-05 22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/editor/label.hpp 2009-11-05 22:48:38 UTC (rev 4041)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_EDITOR_LABEL_HPP
#define HEADER_PINGUS_EDITOR_LABEL_HPP
-#include "gui/rect_component.hpp"
+#include "engine/gui/rect_component.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/level_objs.cpp
===================================================================
--- trunk/pingus/src/editor/level_objs.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/editor/level_objs.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -23,8 +23,8 @@
#include "pingus/blitter.hpp"
#include "pingus/resource.hpp"
#include "pingus/res_descriptor.hpp"
-#include "display/display.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/display.hpp"
+#include "engine/display/drawing_context.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/level_properties.hpp
===================================================================
--- trunk/pingus/src/editor/level_properties.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/editor/level_properties.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_EDITOR_LEVEL_PROPERTIES_HPP
#define HEADER_PINGUS_EDITOR_LEVEL_PROPERTIES_HPP
-#include "gui/group_component.hpp"
+#include "engine/gui/group_component.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/minimap.hpp
===================================================================
--- trunk/pingus/src/editor/minimap.hpp 2009-11-05 22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/editor/minimap.hpp 2009-11-05 22:48:38 UTC (rev 4041)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_EDITOR_MINIMAP_HPP
#define HEADER_PINGUS_EDITOR_MINIMAP_HPP
-#include "gui/rect_component.hpp"
+#include "engine/gui/rect_component.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/object_properties.hpp
===================================================================
--- trunk/pingus/src/editor/object_properties.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/editor/object_properties.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_EDITOR_OBJECT_PROPERTIES_HPP
#define HEADER_PINGUS_EDITOR_OBJECT_PROPERTIES_HPP
-#include "gui/group_component.hpp"
+#include "engine/gui/group_component.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/object_selector.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/editor/object_selector.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -19,13 +19,13 @@
#include <boost/bind.hpp>
#include <iostream>
-#include "display/display.hpp"
+#include "engine/display/display.hpp"
#include "editor/gui_style.hpp"
#include "pingus/sprite.hpp"
#include "pingus/gettext.h"
#include "math/vector2i.hpp"
#include "editor/editor_screen.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
#include "pingus/fonts.hpp"
#include "math/math.hpp"
#include "editor/viewport.hpp"
@@ -33,8 +33,8 @@
#include "editor/object_selector_list.hpp"
#include "editor/object_selector_set.hpp"
#include "editor/level_objs.hpp"
-#include "display/drawing_context.hpp"
-#include "gui/gui_manager.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "engine/gui/gui_manager.hpp"
#include "pingus/resource.hpp"
Modified: trunk/pingus/src/editor/object_selector.hpp
===================================================================
--- trunk/pingus/src/editor/object_selector.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/editor/object_selector.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_EDITOR_OBJECT_SELECTOR_HPP
#define HEADER_PINGUS_EDITOR_OBJECT_SELECTOR_HPP
-#include "gui/component.hpp"
-#include "gui/group_component.hpp"
+#include "engine/gui/component.hpp"
+#include "engine/gui/group_component.hpp"
#include "math/vector2i.hpp"
#include "pingus/res_descriptor.hpp"
Modified: trunk/pingus/src/editor/object_selector_list.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector_list.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/editor/object_selector_list.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -26,7 +26,7 @@
#include "editor/editor_level.hpp"
#include "pingus/groundtype.hpp"
#include "pingus/resource.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/object_selector_list.hpp
===================================================================
--- trunk/pingus/src/editor/object_selector_list.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/editor/object_selector_list.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -20,7 +20,7 @@
#include <vector>
#include "pingus/sprite.hpp"
-#include "gui/rect_component.hpp"
+#include "engine/gui/rect_component.hpp"
class DrawingContext;
Modified: trunk/pingus/src/editor/panel.cpp
===================================================================
--- trunk/pingus/src/editor/panel.cpp 2009-11-05 22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/editor/panel.cpp 2009-11-05 22:48:38 UTC (rev 4041)
@@ -16,10 +16,10 @@
#include "editor/panel.hpp"
-#include "display/display.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/display.hpp"
+#include "engine/display/drawing_context.hpp"
#include "editor/editor_screen.hpp"
-#include "gui/gui_manager.hpp"
+#include "engine/gui/gui_manager.hpp"
#include "math/vector2i.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
Modified: trunk/pingus/src/editor/panel.hpp
===================================================================
--- trunk/pingus/src/editor/panel.hpp 2009-11-05 22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/editor/panel.hpp 2009-11-05 22:48:38 UTC (rev 4041)
@@ -22,7 +22,7 @@
#include "pingus/sprite.hpp"
#include "math/vector2i.hpp"
-#include "gui/component.hpp"
+#include "engine/gui/component.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/viewport.cpp
===================================================================
--- trunk/pingus/src/editor/viewport.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/editor/viewport.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -20,9 +20,9 @@
#include <vector>
#include <string>
#include <iostream>
-#include "gui/gui_manager.hpp"
-#include "display/display.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/gui/gui_manager.hpp"
+#include "engine/display/display.hpp"
+#include "engine/display/drawing_context.hpp"
#include "math/vector3f.hpp"
#include "pingus/graphic_context_state.hpp"
#include "editor/editor_level.hpp"
Modified: trunk/pingus/src/editor/viewport.hpp
===================================================================
--- trunk/pingus/src/editor/viewport.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/editor/viewport.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,7 +18,7 @@
#ifndef HEADER_PINGUS_EDITOR_VIEWPORT_HPP
#define HEADER_PINGUS_EDITOR_VIEWPORT_HPP
-#include "gui/rect_component.hpp"
+#include "engine/gui/rect_component.hpp"
#include "pingus/graphic_context_state.hpp"
#include <boost/signal.hpp>
#include <vector>
Copied: trunk/pingus/src/engine/display (from rev 4037,
trunk/pingus/src/display)
Modified: trunk/pingus/src/engine/display/delta_framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/delta_framebuffer.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/display/delta_framebuffer.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -14,14 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "display/delta_framebuffer.hpp"
+#include "engine/display/delta_framebuffer.hpp"
#include <assert.h>
#include <iostream>
#include "math/math.hpp"
#include "util/memory_pool.hpp"
-#include "display/rect_merger.hpp"
-#include "display/sdl_framebuffer.hpp"
+#include "engine/display/rect_merger.hpp"
+#include "engine/display/sdl_framebuffer.hpp"
enum DrawOpType { SURFACE_DRAWOP, FILLRECT_DRAWOP };
Modified: trunk/pingus/src/engine/display/delta_framebuffer.hpp
===================================================================
--- trunk/pingus/src/display/delta_framebuffer.hpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/display/delta_framebuffer.hpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -20,7 +20,7 @@
#include <memory>
#include <map>
#include "math/vector2i.hpp"
-#include "display/framebuffer.hpp"
+#include "engine/display/framebuffer.hpp"
class SDLFramebuffer;
class DrawOpBuffer;
Modified: trunk/pingus/src/engine/display/display.cpp
===================================================================
--- trunk/pingus/src/display/display.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/display/display.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "display/display.hpp"
+#include "engine/display/display.hpp"
#include <stdexcept>
#include <algorithm>
@@ -27,13 +27,13 @@
#include "math/rect.hpp"
#include "math/color.hpp"
#include "math/math.hpp"
-#include "screen/screen_manager.hpp"
-#include "display/sdl_framebuffer.hpp"
+#include "engine/screen/screen_manager.hpp"
+#include "engine/display/sdl_framebuffer.hpp"
#ifdef HAVE_OPENGL
-# include "display/opengl/opengl_framebuffer.hpp"
+# include "engine/display/opengl/opengl_framebuffer.hpp"
#endif
-#include "display/null_framebuffer.hpp"
-#include "display/delta_framebuffer.hpp"
+#include "engine/display/null_framebuffer.hpp"
+#include "engine/display/delta_framebuffer.hpp"
std::auto_ptr<Framebuffer> Display::framebuffer;
Modified: trunk/pingus/src/engine/display/drawing_context.cpp
===================================================================
--- trunk/pingus/src/display/drawing_context.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/display/drawing_context.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -14,14 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
#include <assert.h>
#include <iostream>
#include <algorithm>
#include "math/math.hpp"
-#include "display/framebuffer.hpp"
-#include "display/display.hpp"
+#include "engine/display/framebuffer.hpp"
+#include "engine/display/display.hpp"
#include "pingus/sprite.hpp"
#include "pingus/font.hpp"
#include "math/origin.hpp"
Modified: trunk/pingus/src/engine/display/drawing_context.hpp
===================================================================
--- trunk/pingus/src/display/drawing_context.hpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/display/drawing_context.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -19,7 +19,7 @@
#include "SDL.h"
#include <vector>
-#include "display/drawing_request.hpp"
+#include "engine/display/drawing_request.hpp"
#include "math/vector3f.hpp"
#include "math/rect.hpp"
#include "math/color.hpp"
Modified: trunk/pingus/src/engine/display/framebuffer.hpp
===================================================================
--- trunk/pingus/src/display/framebuffer.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/display/framebuffer.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -23,7 +23,7 @@
#include "math/vector2i.hpp"
#include "math/size.hpp"
#include "math/rect.hpp"
-#include "display/framebuffer_surface.hpp"
+#include "engine/display/framebuffer_surface.hpp"
class Surface;
Modified: trunk/pingus/src/engine/display/framebuffer_surface.cpp
===================================================================
--- trunk/pingus/src/display/framebuffer_surface.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/display/framebuffer_surface.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "display/framebuffer_surface.hpp"
+#include "engine/display/framebuffer_surface.hpp"
FramebufferSurface::FramebufferSurface() :
Modified: trunk/pingus/src/engine/display/null_framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/null_framebuffer.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/display/null_framebuffer.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "display/null_framebuffer.hpp"
+#include "engine/display/null_framebuffer.hpp"
#include <iostream>
Modified: trunk/pingus/src/engine/display/null_framebuffer.hpp
===================================================================
--- trunk/pingus/src/display/null_framebuffer.hpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/display/null_framebuffer.hpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_DISPLAY_NULL_FRAMEBUFFER_HPP
#define HEADER_PINGUS_DISPLAY_NULL_FRAMEBUFFER_HPP
-#include "display/framebuffer.hpp"
+#include "engine/display/framebuffer.hpp"
/** NullFramebuffer is an empty dummy class for debugging purposes */
class NullFramebuffer : public Framebuffer
Modified: trunk/pingus/src/engine/display/opengl/opengl_framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/opengl/opengl_framebuffer.cpp 2009-11-05
19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/engine/display/opengl/opengl_framebuffer.cpp
2009-11-05 22:48:38 UTC (rev 4041)
@@ -14,13 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "display/opengl/opengl_framebuffer.hpp"
+#include "engine/display/opengl/opengl_framebuffer.hpp"
#include <sstream>
#include <iostream>
#include <stdexcept>
-#include "display/opengl/opengl_framebuffer_surface_impl.hpp"
+#include "engine/display/opengl/opengl_framebuffer_surface_impl.hpp"
#include "math/math.hpp"
#include "pingus/surface.hpp"
Modified: trunk/pingus/src/engine/display/opengl/opengl_framebuffer.hpp
===================================================================
--- trunk/pingus/src/display/opengl/opengl_framebuffer.hpp 2009-11-05
19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/engine/display/opengl/opengl_framebuffer.hpp
2009-11-05 22:48:38 UTC (rev 4041)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_DISPLAY_OPENGL_FRAMEBUFFER_HPP
#define HEADER_PINGUS_DISPLAY_OPENGL_FRAMEBUFFER_HPP
-#include "display/framebuffer.hpp"
+#include "engine/display/framebuffer.hpp"
class OpenGLFramebuffer : public Framebuffer
{
Modified:
trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.cpp
===================================================================
--- trunk/pingus/src/display/opengl/opengl_framebuffer_surface_impl.cpp
2009-11-05 19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.cpp
2009-11-05 22:48:38 UTC (rev 4041)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "display/opengl/opengl_framebuffer_surface_impl.hpp"
+#include "engine/display/opengl/opengl_framebuffer_surface_impl.hpp"
namespace {
Modified:
trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp
===================================================================
--- trunk/pingus/src/display/opengl/opengl_framebuffer_surface_impl.hpp
2009-11-05 19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/engine/display/opengl/opengl_framebuffer_surface_impl.hpp
2009-11-05 22:48:38 UTC (rev 4041)
@@ -29,9 +29,9 @@
#include <GL/gl.h>
#include <GL/glext.h>
#endif
+#include "SDL.h"
-#include "SDL.h"
-#include "display/framebuffer_surface.hpp"
+#include "engine/display/framebuffer_surface.hpp"
class OpenGLFramebufferSurfaceImpl : public FramebufferSurfaceImpl
{
Modified: trunk/pingus/src/engine/display/rect_merger.cpp
===================================================================
--- trunk/pingus/src/display/rect_merger.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/display/rect_merger.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "display/rect_merger.hpp"
+#include "engine/display/rect_merger.hpp"
//#include <ext/algorithm>
#include <algorithm>
Modified: trunk/pingus/src/engine/display/scene_context.cpp
===================================================================
--- trunk/pingus/src/display/scene_context.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/display/scene_context.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -14,9 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
-#include "display/framebuffer.hpp"
+#include "engine/display/framebuffer.hpp"
#define SCALE_FACTOR 8.0f
Modified: trunk/pingus/src/engine/display/scene_context.hpp
===================================================================
--- trunk/pingus/src/display/scene_context.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/display/scene_context.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_DISPLAY_SCENE_CONTEXT_HPP
#include "SDL.h"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
class SceneContextImpl;
Modified: trunk/pingus/src/engine/display/sdl_framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/sdl_framebuffer.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/display/sdl_framebuffer.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -14,13 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "display/sdl_framebuffer.hpp"
+#include "engine/display/sdl_framebuffer.hpp"
#include <iostream>
#include "math/math.hpp"
#include "pingus/surface.hpp"
-#include "display/display.hpp"
-#include "display/sdl_framebuffer_surface_impl.hpp"
+#include "engine/display/display.hpp"
+#include "engine/display/sdl_framebuffer_surface_impl.hpp"
namespace {
Modified: trunk/pingus/src/engine/display/sdl_framebuffer.hpp
===================================================================
--- trunk/pingus/src/display/sdl_framebuffer.hpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/display/sdl_framebuffer.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -22,7 +22,7 @@
#include "math/color.hpp"
#include "math/vector2i.hpp"
#include "math/rect.hpp"
-#include "display/framebuffer.hpp"
+#include "engine/display/framebuffer.hpp"
class SDLFramebuffer : public Framebuffer
{
Modified: trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.cpp
===================================================================
--- trunk/pingus/src/display/sdl_framebuffer_surface_impl.cpp 2009-11-05
19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.cpp
2009-11-05 22:48:38 UTC (rev 4041)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "display/sdl_framebuffer_surface_impl.hpp"
+#include "engine/display/sdl_framebuffer_surface_impl.hpp"
#include <stdexcept>
Modified: trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp
===================================================================
--- trunk/pingus/src/display/sdl_framebuffer_surface_impl.hpp 2009-11-05
19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/engine/display/sdl_framebuffer_surface_impl.hpp
2009-11-05 22:48:38 UTC (rev 4041)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_DISPLAY_SDL_FRAMEBUFFER_SURFACE_IMPL_HPP
#include "SDL.h"
-#include "display/framebuffer_surface.hpp"
+#include "engine/display/framebuffer_surface.hpp"
/** */
class SDLFramebufferSurfaceImpl : public FramebufferSurfaceImpl
Copied: trunk/pingus/src/engine/gui (from rev 4037, trunk/pingus/src/gui)
Modified: trunk/pingus/src/engine/gui/component.cpp
===================================================================
--- trunk/pingus/src/gui/component.cpp 2009-11-05 19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/engine/gui/component.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -14,10 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "gui/component.hpp"
+#include "engine/gui/component.hpp"
#include <assert.h>
-#include "gui/group_component.hpp"
+#include "engine/gui/group_component.hpp"
namespace GUI {
Modified: trunk/pingus/src/engine/gui/group_component.cpp
===================================================================
--- trunk/pingus/src/gui/group_component.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/gui/group_component.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "gui/group_component.hpp"
+#include "engine/gui/group_component.hpp"
#include <assert.h>
#include <iostream>
Modified: trunk/pingus/src/engine/gui/group_component.hpp
===================================================================
--- trunk/pingus/src/gui/group_component.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/gui/group_component.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_GUI_GROUP_COMPONENT_HPP
#define HEADER_PINGUS_GUI_GROUP_COMPONENT_HPP
-#include "display/drawing_context.hpp"
-#include "gui/rect_component.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "engine/gui/rect_component.hpp"
namespace GUI {
Modified: trunk/pingus/src/engine/gui/gui_manager.cpp
===================================================================
--- trunk/pingus/src/gui/gui_manager.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/gui/gui_manager.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -14,13 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "gui/gui_manager.hpp"
+#include "engine/gui/gui_manager.hpp"
#include <algorithm>
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "input/event.hpp"
-#include "display/display.hpp"
+#include "engine/input/event.hpp"
+#include "engine/display/display.hpp"
using namespace Input;
Modified: trunk/pingus/src/engine/gui/gui_manager.hpp
===================================================================
--- trunk/pingus/src/gui/gui_manager.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/gui/gui_manager.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,8 +18,8 @@
#define HEADER_PINGUS_GUI_GUI_MANAGER_HPP
#include <vector>
-#include "input/event.hpp"
-#include "gui/group_component.hpp"
+#include "engine/input/event.hpp"
+#include "engine/gui/group_component.hpp"
class DrawingContext;
class GameDelta;
Modified: trunk/pingus/src/engine/gui/rect_component.hpp
===================================================================
--- trunk/pingus/src/gui/rect_component.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/gui/rect_component.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_GUI_RECT_COMPONENT_HPP
#include "math/rect.hpp"
-#include "gui/component.hpp"
+#include "engine/gui/component.hpp"
namespace GUI {
Modified: trunk/pingus/src/engine/gui/surface_button.cpp
===================================================================
--- trunk/pingus/src/gui/surface_button.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/gui/surface_button.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -14,11 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "gui/surface_button.hpp"
+#include "engine/gui/surface_button.hpp"
#include "pingus/resource.hpp"
#include "math/vector3f.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
namespace GUI {
Modified: trunk/pingus/src/engine/gui/surface_button.hpp
===================================================================
--- trunk/pingus/src/gui/surface_button.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/gui/surface_button.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_GUI_SURFACE_BUTTON_HPP
#include "pingus/sprite.hpp"
-#include "gui/component.hpp"
+#include "engine/gui/component.hpp"
namespace GUI {
Copied: trunk/pingus/src/engine/input (from rev 4037, trunk/pingus/src/input)
Modified: trunk/pingus/src/engine/input/control.hpp
===================================================================
--- trunk/pingus/src/input/control.hpp 2009-11-05 19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/engine/input/control.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -22,8 +22,8 @@
#include "math/math.hpp"
#include "math/vector2f.hpp"
-#include "input/event.hpp"
-#include "input/controller.hpp"
+#include "engine/input/event.hpp"
+#include "engine/input/controller.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/controller.cpp
===================================================================
--- trunk/pingus/src/input/controller.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/input/controller.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -14,10 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "input/controller.hpp"
+#include "engine/input/controller.hpp"
-#include "input/controller_description.hpp"
-#include "input/control.hpp"
+#include "engine/input/controller_description.hpp"
+#include "engine/input/control.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/controller.hpp
===================================================================
--- trunk/pingus/src/input/controller.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/input/controller.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_INPUT_CONTROLLER_HPP
#include <assert.h>
-#include "input/event.hpp"
+#include "engine/input/event.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/controller_description.cpp
===================================================================
--- trunk/pingus/src/input/controller_description.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/input/controller_description.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "input/controller_description.hpp"
+#include "engine/input/controller_description.hpp"
#include <stdexcept>
Modified: trunk/pingus/src/engine/input/controller_description.hpp
===================================================================
--- trunk/pingus/src/input/controller_description.hpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/input/controller_description.hpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -19,7 +19,7 @@
#include <map>
#include <string>
-#include "input/event.hpp"
+#include "engine/input/event.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/core_driver.cpp
===================================================================
--- trunk/pingus/src/input/core_driver.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/input/core_driver.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -14,11 +14,11 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "input/core_driver.hpp"
+#include "engine/input/core_driver.hpp"
#include "math/math.hpp"
-#include "input/manager.hpp"
-#include "display/display.hpp"
+#include "engine/input/manager.hpp"
+#include "engine/display/display.hpp"
#include "pingus/globals.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/core_driver.hpp
===================================================================
--- trunk/pingus/src/input/core_driver.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/input/core_driver.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_INPUT_CORE_DRIVER_HPP
#define HEADER_PINGUS_INPUT_CORE_DRIVER_HPP
-#include "input/driver.hpp"
+#include "engine/input/driver.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/driver.hpp
===================================================================
--- trunk/pingus/src/input/driver.hpp 2009-11-05 19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/engine/input/driver.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_INPUT_DRIVER_HPP
#include "util/file_reader.hpp"
-#include "input/control.hpp"
+#include "engine/input/control.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/evdev/evdev_device.cpp
===================================================================
--- trunk/pingus/src/input/evdev/evdev_device.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/input/evdev/evdev_device.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "input/evdev/evdev_device.hpp"
+#include "engine/input/evdev/evdev_device.hpp"
#include <assert.h>
#include <linux/input.h>
Modified: trunk/pingus/src/engine/input/evdev/evdev_device.hpp
===================================================================
--- trunk/pingus/src/input/evdev/evdev_device.hpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/input/evdev/evdev_device.hpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -21,7 +21,7 @@
#include <string.h>
#include <linux/input.h>
-#include "input/control.hpp"
+#include "engine/input/control.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/evdev/evdev_driver.cpp
===================================================================
--- trunk/pingus/src/input/evdev/evdev_driver.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/input/evdev/evdev_driver.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -14,9 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "input/evdev/evdev_driver.hpp"
+#include "engine/input/evdev/evdev_driver.hpp"
-#include "input/evdev/evdev_device.hpp"
+#include "engine/input/evdev/evdev_device.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/evdev/evdev_driver.hpp
===================================================================
--- trunk/pingus/src/input/evdev/evdev_driver.hpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/input/evdev/evdev_driver.hpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_INPUT_EVDEV_DRIVER_HPP
#define HEADER_PINGUS_INPUT_EVDEV_DRIVER_HPP
-#include "input/driver.hpp"
+#include "engine/input/driver.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/manager.cpp
===================================================================
--- trunk/pingus/src/input/manager.cpp 2009-11-05 19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/engine/input/manager.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "input/manager.hpp"
+#include "engine/input/manager.hpp"
#include "config.h"
@@ -22,19 +22,19 @@
#include "pingus/pingus_error.hpp"
#include "util/pathname.hpp"
#include "pingus/path_manager.hpp"
-#include "input/sdl_driver.hpp"
-#include "input/core_driver.hpp"
+#include "engine/input/sdl_driver.hpp"
+#include "engine/input/core_driver.hpp"
#ifdef HAVE_CWIID
-# include "wiimote/wiimote_driver.hpp"
+# include "engine/input/wiimote/wiimote_driver.hpp"
#endif
#ifdef HAVE_XINPUT
-# include "xinput/xinput_driver.hpp"
+# include "engine/input/xinput/xinput_driver.hpp"
#endif
#ifdef HAVE_LINUXUSBMOUSE
-# include "usbmouse/usbmouse_driver.hpp"
+# include "engine/input/usbmouse/usbmouse_driver.hpp"
#endif
#ifdef HAVE_LINUXEVDEV
-# include "evdev/evdev_driver.hpp"
+# include "engine/input/evdev/evdev_driver.hpp"
#endif
namespace Input {
Modified: trunk/pingus/src/engine/input/manager.hpp
===================================================================
--- trunk/pingus/src/input/manager.hpp 2009-11-05 19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/engine/input/manager.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,9 +18,9 @@
#define HEADER_PINGUS_INPUT_MANAGER_HPP
#include <vector>
-#include "input/controller.hpp"
-#include "input/controller_description.hpp"
-#include "input/driver.hpp"
+#include "engine/input/controller.hpp"
+#include "engine/input/controller_description.hpp"
+#include "engine/input/driver.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/sdl_driver.cpp
===================================================================
--- trunk/pingus/src/input/sdl_driver.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/input/sdl_driver.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -14,13 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "input/sdl_driver.hpp"
+#include "engine/input/sdl_driver.hpp"
#include "pingus/global_event.hpp"
-#include "screen/screen_manager.hpp"
+#include "engine/screen/screen_manager.hpp"
#include "math/size.hpp"
#include "util/file_reader.hpp"
-#include "display/display.hpp"
+#include "engine/display/display.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/sdl_driver.hpp
===================================================================
--- trunk/pingus/src/input/sdl_driver.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/input/sdl_driver.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -21,8 +21,8 @@
#include <vector>
#include "SDL.h"
-#include "input/driver.hpp"
-#include "input/control.hpp"
+#include "engine/input/driver.hpp"
+#include "engine/input/control.hpp"
class FileReader;
Modified: trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.cpp
===================================================================
--- trunk/pingus/src/input/usbmouse/usbmouse_driver.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "input/usbmouse/usbmouse_driver.hpp"
+#include "engine/input/usbmouse/usbmouse_driver.hpp"
#include <stdexcept>
#include <sys/ioctl.h>
@@ -27,7 +27,7 @@
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
#include "math/vector2i.hpp"
-#include "display/display.hpp"
+#include "engine/display/display.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.hpp
===================================================================
--- trunk/pingus/src/input/usbmouse/usbmouse_driver.hpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/input/usbmouse/usbmouse_driver.hpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -18,8 +18,9 @@
#define HEADER_PINGUS_INPUT_USBMOUSE_DRIVER_HPP
#include <vector>
-#include "input/driver.hpp"
+#include "engine/input/driver.hpp"
+
namespace Input {
class USBMouse;
Modified: trunk/pingus/src/engine/input/wiimote/wiimote.cpp
===================================================================
--- trunk/pingus/src/input/wiimote/wiimote.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/input/wiimote/wiimote.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "input/wiimote/wiimote.hpp"
+#include "engine/input/wiimote/wiimote.hpp"
#include <iostream>
#include <assert.h>
Modified: trunk/pingus/src/engine/input/wiimote/wiimote_driver.cpp
===================================================================
--- trunk/pingus/src/input/wiimote/wiimote_driver.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/input/wiimote/wiimote_driver.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -14,9 +14,9 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "input/wiimote/wiimote_driver.hpp"
+#include "engine/input/wiimote/wiimote_driver.hpp"
-#include "input/wiimote/wiimote.hpp"
+#include "engine/input/wiimote/wiimote.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
#include "util/string_util.hpp"
Modified: trunk/pingus/src/engine/input/wiimote/wiimote_driver.hpp
===================================================================
--- trunk/pingus/src/input/wiimote/wiimote_driver.hpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/input/wiimote/wiimote_driver.hpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_INPUT_WIIMOTE_DRIVER_HPP
#define HEADER_PINGUS_INPUT_WIIMOTE_DRIVER_HPP
-#include "input/driver.hpp"
+#include "engine/input/driver.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/xinput/xinput_device.cpp
===================================================================
--- trunk/pingus/src/input/xinput/xinput_device.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/input/xinput/xinput_device.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -14,13 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "input/xinput/xinput_device.hpp"
+#include "engine/input/xinput/xinput_device.hpp"
#include "SDL_syswm.h"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "input/xinput/xinput_driver.hpp"
+#include "engine/input/xinput/xinput_driver.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/xinput/xinput_driver.cpp
===================================================================
--- trunk/pingus/src/input/xinput/xinput_driver.cpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/input/xinput/xinput_driver.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -14,13 +14,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "input/xinput/xinput_driver.hpp"
+#include "engine/input/xinput/xinput_driver.hpp"
#include <iostream>
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "input/xinput/xinput_device.hpp"
+#include "engine/input/xinput/xinput_device.hpp"
namespace Input {
Modified: trunk/pingus/src/engine/input/xinput/xinput_driver.hpp
===================================================================
--- trunk/pingus/src/input/xinput/xinput_driver.hpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/input/xinput/xinput_driver.hpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -21,10 +21,10 @@
#include <X11/Xutil.h>
#include <X11/extensions/XInput.h>
#include <vector>
-
#include "SDL_syswm.h"
-#include "input/driver.hpp"
+#include "engine/input/driver.hpp"
+
namespace Input {
class XInputDevice;
Copied: trunk/pingus/src/engine/input_old (from rev 4037,
trunk/pingus/src/input_old)
Modified: trunk/pingus/src/engine/input_old/controller.cpp
===================================================================
--- trunk/pingus/src/input_old/controller.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/input_old/controller.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "SDL.h"
-#include "screen/screen_manager.hpp"
+#include "engine/screen/screen_manager.hpp"
#include "debug.hpp"
#include "pingus_error.hpp"
Copied: trunk/pingus/src/engine/screen (from rev 4037, trunk/pingus/src/screen)
Modified: trunk/pingus/src/engine/screen/gui_screen.cpp
===================================================================
--- trunk/pingus/src/screen/gui_screen.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/screen/gui_screen.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -14,12 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "screen/gui_screen.hpp"
+#include "engine/screen/gui_screen.hpp"
#include "pingus/globals.hpp"
#include "pingus/debug.hpp"
-#include "display/display.hpp"
-#include "gui/gui_manager.hpp"
+#include "engine/display/display.hpp"
+#include "engine/gui/gui_manager.hpp"
GUIScreen::GUIScreen()
: Screen(Display::get_size()),
Modified: trunk/pingus/src/engine/screen/gui_screen.hpp
===================================================================
--- trunk/pingus/src/screen/gui_screen.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/screen/gui_screen.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_SCREEN_GUI_SCREEN_HPP
#define HEADER_PINGUS_SCREEN_GUI_SCREEN_HPP
-#include "screen/screen.hpp"
+#include "engine/screen/screen.hpp"
namespace GUI {
class GUIManager;
Modified: trunk/pingus/src/engine/screen/screen.cpp
===================================================================
--- trunk/pingus/src/screen/screen.cpp 2009-11-05 19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/engine/screen/screen.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "screen/screen.hpp"
+#include "engine/screen/screen.hpp"
/* EOF */
Modified: trunk/pingus/src/engine/screen/screen_manager.cpp
===================================================================
--- trunk/pingus/src/screen/screen_manager.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/screen/screen_manager.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "screen/screen_manager.hpp"
+#include "engine/screen/screen_manager.hpp"
#include "SDL.h"
#include <iostream>
@@ -23,14 +23,14 @@
#include "pingus/globals.hpp"
#include "math/size.hpp"
#include "util/pathname.hpp"
-#include "display/display.hpp"
-#include "display/framebuffer.hpp"
+#include "engine/display/display.hpp"
+#include "engine/display/framebuffer.hpp"
#include "pingus/path_manager.hpp"
-#include "screen/screen.hpp"
+#include "engine/screen/screen.hpp"
#include "pingus/fps_counter.hpp"
-#include "display/drawing_context.hpp"
-#include "input/controller.hpp"
-#include "input/manager.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "engine/input/controller.hpp"
+#include "engine/input/manager.hpp"
template<class C>
void write(std::ostream& out, C value)
Modified: trunk/pingus/src/engine/screen/screen_manager_impl.hpp
===================================================================
--- trunk/pingus/src/screen/screen_manager_impl.hpp 2009-11-05 19:22:47 UTC
(rev 4037)
+++ trunk/pingus/src/engine/screen/screen_manager_impl.hpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_SCREEN_SCREEN_MANAGER_IMPL_HPP
#define HEADER_PINGUS_SCREEN_SCREEN_MANAGER_IMPL_HPP
-#include "screen/pingus.hpp"
+#include "engine/screen/pingus.hpp"
class ScreenManagerImpl
Copied: trunk/pingus/src/engine/sound (from rev 4037, trunk/pingus/src/sound)
Modified: trunk/pingus/src/engine/sound/sound.cpp
===================================================================
--- trunk/pingus/src/sound/sound.cpp 2009-11-05 19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/engine/sound/sound.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -14,14 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "sound/sound.hpp"
+#include "engine/sound/sound.hpp"
#include <iostream>
#include <assert.h>
#include "pingus/path_manager.hpp"
#include "pingus/globals.hpp"
-#include "sound/sound_dummy.hpp"
-#include "sound/sound_real.hpp"
+#include "engine/sound/sound_dummy.hpp"
+#include "engine/sound/sound_real.hpp"
namespace Sound {
Modified: trunk/pingus/src/engine/sound/sound.hpp
===================================================================
--- trunk/pingus/src/sound/sound.hpp 2009-11-05 19:22:47 UTC (rev 4037)
+++ trunk/pingus/src/engine/sound/sound.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_SOUND_SOUND_HPP
#include <string>
-#include "sound/sound_impl.hpp"
+#include "engine/sound/sound_impl.hpp"
namespace Sound {
Modified: trunk/pingus/src/engine/sound/sound_dummy.cpp
===================================================================
--- trunk/pingus/src/sound/sound_dummy.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/sound/sound_dummy.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "sound/sound_dummy.hpp"
+#include "engine/sound/sound_dummy.hpp"
#include "pingus/globals.hpp"
#include "pingus/debug.hpp"
Modified: trunk/pingus/src/engine/sound/sound_dummy.hpp
===================================================================
--- trunk/pingus/src/sound/sound_dummy.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/sound/sound_dummy.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -17,8 +17,8 @@
#ifndef HEADER_PINGUS_SOUND_SOUND_DUMMY_HPP
#define HEADER_PINGUS_SOUND_SOUND_DUMMY_HPP
-#include "sound/sound_impl.hpp"
-#include "sound/sound.hpp"
+#include "engine/sound/sound_impl.hpp"
+#include "engine/sound/sound.hpp"
namespace Sound {
Modified: trunk/pingus/src/engine/sound/sound_real.cpp
===================================================================
--- trunk/pingus/src/sound/sound_real.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/sound/sound_real.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -14,14 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "sound/sound_real.hpp"
+#include "engine/sound/sound_real.hpp"
#include <stdexcept>
#include "SDL.h"
#include "SDL_mixer.h"
#include "pingus/globals.hpp"
#include "pingus/debug.hpp"
-#include "sound/sound_res_mgr.hpp"
+#include "engine/sound/sound_res_mgr.hpp"
namespace Sound {
Modified: trunk/pingus/src/engine/sound/sound_real.hpp
===================================================================
--- trunk/pingus/src/sound/sound_real.hpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/sound/sound_real.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -20,8 +20,8 @@
#include "SDL_mixer.h"
#include <config.h>
#include <vector>
-#include "sound/sound_impl.hpp"
-#include "sound/sound.hpp"
+#include "engine/sound/sound_impl.hpp"
+#include "engine/sound/sound.hpp"
namespace Sound {
Modified: trunk/pingus/src/engine/sound/sound_res_mgr.cpp
===================================================================
--- trunk/pingus/src/sound/sound_res_mgr.cpp 2009-11-05 19:22:47 UTC (rev
4037)
+++ trunk/pingus/src/engine/sound/sound_res_mgr.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "sound/sound_res_mgr.hpp"
+#include "engine/sound/sound_res_mgr.hpp"
#include "pingus/path_manager.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/actions/angel.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/angel.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/actions/angel.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -16,7 +16,7 @@
#include "pingus/actions/angel.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "math/math.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/actions/basher.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/basher.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/actions/basher.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -16,11 +16,11 @@
#include "pingus/actions/basher.hpp"
-#include "sound/sound.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/ground_map.hpp"
#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/actions/blocker.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/blocker.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/actions/blocker.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -16,7 +16,7 @@
#include "pingus/actions/blocker.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/actions/boarder.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/boarder.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/actions/boarder.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -17,7 +17,7 @@
#include "pingus/actions/boarder.hpp"
#include "math/vector3f.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/bomber.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/bomber.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/actions/bomber.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,7 +18,7 @@
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_enums.hpp"
#include "pingus/ground_map.hpp"
Modified: trunk/pingus/src/pingus/actions/bridger.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/bridger.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/actions/bridger.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -17,10 +17,10 @@
#include "pingus/actions/bridger.hpp"
#include <cassert>
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/ground_map.hpp"
-#include "sound/sound.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/world.hpp"
#include "pingus/worldobj.hpp"
#include "pingus/gettext.h"
Modified: trunk/pingus/src/pingus/actions/climber.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/climber.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/actions/climber.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -16,7 +16,7 @@
#include "pingus/actions/climber.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/groundtype.hpp"
#include "pingus/pingu.hpp"
Modified: trunk/pingus/src/pingus/actions/digger.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/digger.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/actions/digger.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -17,11 +17,11 @@
#include "pingus/actions/digger.hpp"
#include <cstdio>
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/ground_map.hpp"
#include "pingus/world.hpp"
#include "pingus/worldobj.hpp"
-#include "sound/sound.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/drown.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/drown.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/actions/drown.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -17,7 +17,7 @@
#include "pingus/actions/drown.hpp"
#include "math/vector3f.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/exiter.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/exiter.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/actions/exiter.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -17,9 +17,9 @@
#include "pingus/actions/exiter.hpp"
#include "math/vector3f.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
-#include "sound/sound.hpp"
+#include "engine/sound/sound.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/faller.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/faller.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/actions/faller.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -20,7 +20,7 @@
#include "pingus/colliders/pingu_collider.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/movers/linear_mover.hpp"
#include "pingus/pingu.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/actions/floater.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/floater.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/actions/floater.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -17,7 +17,7 @@
#include "pingus/actions/floater.hpp"
#include "pingus/pingu.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/groundtype.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/jumper.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/jumper.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/actions/jumper.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -17,7 +17,7 @@
#include "pingus/actions/jumper.hpp"
#include "math/vector3f.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/laser_kill.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/laser_kill.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/actions/laser_kill.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -17,7 +17,7 @@
#include "pingus/actions/laser_kill.hpp"
#include "math/vector3f.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/miner.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/miner.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/actions/miner.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,9 +18,9 @@
#include "pingus/actions/miner.hpp"
#include "pingus/ground_map.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/world.hpp"
-#include "sound/sound.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/pingu.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/actions/rocket_launcher.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/rocket_launcher.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/actions/rocket_launcher.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -16,7 +16,7 @@
#include "pingus/actions/rocket_launcher.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
//#include "pingus/particles/particle_holder.hpp"
//#include "pingus/particles/explosive_particle.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/actions/slider.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/slider.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/actions/slider.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -16,7 +16,7 @@
#include "pingus/actions/slider.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/groundtype.hpp"
Modified: trunk/pingus/src/pingus/actions/smashed.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/smashed.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/actions/smashed.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -17,7 +17,7 @@
#include "pingus/actions/smashed.hpp"
#include "math/vector3f.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/sprite.hpp"
Modified: trunk/pingus/src/pingus/actions/splashed.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/splashed.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/actions/splashed.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -17,7 +17,7 @@
#include "pingus/actions/splashed.hpp"
#include "math/vector3f.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/world.hpp"
#include "pingus/pingu.hpp"
#include "pingus/worldobj.hpp"
Modified: trunk/pingus/src/pingus/actions/superman.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/superman.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/actions/superman.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -16,7 +16,7 @@
#include "pingus/actions/superman.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/sprite.hpp"
Modified: trunk/pingus/src/pingus/actions/waiter.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/waiter.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/actions/waiter.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -17,7 +17,7 @@
#include "pingus/actions/waiter.hpp"
#include "math/vector3f.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
namespace Actions {
Modified: trunk/pingus/src/pingus/actions/walker.cpp
===================================================================
--- trunk/pingus/src/pingus/actions/walker.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/actions/walker.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -17,7 +17,7 @@
#include "pingus/actions/walker.hpp"
#include "pingus/globals.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/debug.hpp"
#include "pingus/groundtype.hpp"
Modified: trunk/pingus/src/pingus/addon_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/addon_menu.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/addon_menu.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,9 +18,9 @@
#include "pingus/gettext.h"
#include "pingus/resource.hpp"
-#include "screen/screen_manager.hpp"
+#include "engine/screen/screen_manager.hpp"
#include "pingus/fonts.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
#include "pingus/option_menu.hpp"
AddOnMenu::AddOnMenu() :
Modified: trunk/pingus/src/pingus/addon_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/addon_menu.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/addon_menu.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_PINGUS_ADDON_MENU_HPP
#include "pingus/sprite.hpp"
-#include "screen/gui_screen.hpp"
+#include "engine/screen/gui_screen.hpp"
/** */
class AddOnMenu : public GUIScreen
Modified: trunk/pingus/src/pingus/capture_rectangle.cpp
===================================================================
--- trunk/pingus/src/pingus/capture_rectangle.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/capture_rectangle.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -16,7 +16,7 @@
#include "pingus/capture_rectangle.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/fonts.hpp"
#include "pingus/game_session.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/collision_map.cpp
===================================================================
--- trunk/pingus/src/pingus/collision_map.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/collision_map.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,7 +18,7 @@
#include <iostream>
#include "SDL.h"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
#include "pingus/globals.hpp"
#include "pingus/collision_mask.hpp"
#include "pingus/pingus_error.hpp"
Modified: trunk/pingus/src/pingus/components/action_button.cpp
===================================================================
--- trunk/pingus/src/pingus/components/action_button.cpp 2009-11-05
22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/components/action_button.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -20,7 +20,7 @@
#include "pingus/server.hpp"
#include "pingus/game_session.hpp"
#include "pingus/world.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
#include "pingus/fonts.hpp"
#include "util/string_util.hpp"
#include "math/vector3f.hpp"
Modified: trunk/pingus/src/pingus/components/action_button.hpp
===================================================================
--- trunk/pingus/src/pingus/components/action_button.hpp 2009-11-05
22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/components/action_button.hpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -21,8 +21,8 @@
#include "pingus/font.hpp"
#include "pingus/pingu_enums.hpp"
#include "pingus/state_sprite.hpp"
-#include "gui/component.hpp"
-#include "gui/rect_component.hpp"
+#include "engine/gui/component.hpp"
+#include "engine/gui/rect_component.hpp"
class Server;
class GameSession;
Modified: trunk/pingus/src/pingus/components/button_panel.cpp
===================================================================
--- trunk/pingus/src/pingus/components/button_panel.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/components/button_panel.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -25,7 +25,7 @@
#include "pingus/globals.hpp"
#include "pingus/server.hpp"
#include "pingus/game_session.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
using namespace Actions;
Modified: trunk/pingus/src/pingus/components/button_panel.hpp
===================================================================
--- trunk/pingus/src/pingus/components/button_panel.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/components/button_panel.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -19,7 +19,7 @@
#include <vector>
#include "pingus/sprite.hpp"
-#include "gui/rect_component.hpp"
+#include "engine/gui/rect_component.hpp"
#include "pingus/components/action_button.hpp"
class GameSession;
Modified: trunk/pingus/src/pingus/components/check_box.cpp
===================================================================
--- trunk/pingus/src/pingus/components/check_box.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/components/check_box.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -18,7 +18,7 @@
#include "pingus/globals.hpp"
#include "pingus/fonts.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
CheckBox::CheckBox(const Rect& rect_) :
RectComponent(rect_),
Modified: trunk/pingus/src/pingus/components/check_box.hpp
===================================================================
--- trunk/pingus/src/pingus/components/check_box.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/components/check_box.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -19,7 +19,7 @@
#include <boost/signal.hpp>
#include <string>
-#include "gui/rect_component.hpp"
+#include "engine/gui/rect_component.hpp"
/** */
class CheckBox : public GUI::RectComponent
Modified: trunk/pingus/src/pingus/components/choice_box.cpp
===================================================================
--- trunk/pingus/src/pingus/components/choice_box.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/components/choice_box.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -18,7 +18,7 @@
#include "pingus/globals.hpp"
#include "pingus/fonts.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
ChoiceBox::ChoiceBox(const Rect& rect_) :
RectComponent(rect_),
Modified: trunk/pingus/src/pingus/components/choice_box.hpp
===================================================================
--- trunk/pingus/src/pingus/components/choice_box.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/components/choice_box.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -20,7 +20,7 @@
#include <string>
#include <vector>
#include <boost/signal.hpp>
-#include "gui/rect_component.hpp"
+#include "engine/gui/rect_component.hpp"
/** */
class ChoiceBox : public GUI::RectComponent
Modified: trunk/pingus/src/pingus/components/label.cpp
===================================================================
--- trunk/pingus/src/pingus/components/label.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/components/label.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -18,7 +18,7 @@
#include "pingus/globals.hpp"
#include "pingus/fonts.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
Label::Label(const std::string& label_, const Rect& rect_)
: RectComponent(rect_),
Modified: trunk/pingus/src/pingus/components/label.hpp
===================================================================
--- trunk/pingus/src/pingus/components/label.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/components/label.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -19,7 +19,7 @@
#include <string>
#include "pingus/font.hpp"
-#include "gui/rect_component.hpp"
+#include "engine/gui/rect_component.hpp"
/** */
class Label : public GUI::RectComponent
Modified: trunk/pingus/src/pingus/components/menu_button.cpp
===================================================================
--- trunk/pingus/src/pingus/components/menu_button.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/components/menu_button.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -19,7 +19,7 @@
#include "pingus/globals.hpp"
#include "pingus/debug.hpp"
#include "pingus/fonts.hpp"
-#include "sound/sound.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/resource.hpp"
#include "pingus/gettext.h"
#include "pingus/pingus_menu.hpp"
Modified: trunk/pingus/src/pingus/components/menu_button.hpp
===================================================================
--- trunk/pingus/src/pingus/components/menu_button.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/components/menu_button.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -21,7 +21,7 @@
#include "pingus/sprite.hpp"
#include "pingus/font.hpp"
#include "math/vector2i.hpp"
-#include "gui/component.hpp"
+#include "engine/gui/component.hpp"
class PingusMenu;
Modified: trunk/pingus/src/pingus/components/pingus_counter.hpp
===================================================================
--- trunk/pingus/src/pingus/components/pingus_counter.hpp 2009-11-05
22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/components/pingus_counter.hpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_COMPONENTS_PINGUS_COUNTER_HPP
#define HEADER_PINGUS_COMPONENTS_PINGUS_COUNTER_HPP
-#include "gui/component.hpp"
+#include "engine/gui/component.hpp"
#include "pingus/font.hpp"
#include "pingus/sprite.hpp"
Modified: trunk/pingus/src/pingus/components/playfield.cpp
===================================================================
--- trunk/pingus/src/pingus/components/playfield.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/components/playfield.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -20,12 +20,12 @@
#include <iostream>
#include "pingus/globals.hpp"
#include "pingus/pingu_holder.hpp"
-#include "display/drawing_context.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/world.hpp"
#include "pingus/server.hpp"
#include "pingus/pingu.hpp"
-#include "display/display.hpp"
+#include "engine/display/display.hpp"
#include "pingus/game_session.hpp"
Playfield::Playfield(Server* server_, GameSession* session_, const Rect&
rect_) :
Modified: trunk/pingus/src/pingus/components/playfield.hpp
===================================================================
--- trunk/pingus/src/pingus/components/playfield.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/components/playfield.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -19,7 +19,7 @@
#include <memory>
#include "pingus/graphic_context_state.hpp"
-#include "gui/rect_component.hpp"
+#include "engine/gui/rect_component.hpp"
#include "pingus/capture_rectangle.hpp"
class Pingu;
Modified: trunk/pingus/src/pingus/components/slider_box.cpp
===================================================================
--- trunk/pingus/src/pingus/components/slider_box.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/components/slider_box.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -19,7 +19,7 @@
#include "math/math.hpp"
#include "pingus/globals.hpp"
#include "pingus/fonts.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
SliderBox::SliderBox(const Rect& rect_)
: RectComponent(rect_),
Modified: trunk/pingus/src/pingus/components/slider_box.hpp
===================================================================
--- trunk/pingus/src/pingus/components/slider_box.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/components/slider_box.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -19,7 +19,7 @@
#include <string>
#include <boost/signal.hpp>
-#include "gui/rect_component.hpp"
+#include "engine/gui/rect_component.hpp"
/** */
class SliderBox : public GUI::RectComponent
Modified: trunk/pingus/src/pingus/components/smallmap.cpp
===================================================================
--- trunk/pingus/src/pingus/components/smallmap.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/components/smallmap.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -18,8 +18,8 @@
#include "pingus/game_session.hpp"
#include "pingus/pingu_holder.hpp"
-#include "display/display.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/display.hpp"
+#include "engine/display/drawing_context.hpp"
#include "pingus/world.hpp"
#include "pingus/resource.hpp"
#include "pingus/server.hpp"
Modified: trunk/pingus/src/pingus/components/smallmap.hpp
===================================================================
--- trunk/pingus/src/pingus/components/smallmap.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/components/smallmap.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_COMPONENTS_SMALLMAP_HPP
#include "pingus/sprite.hpp"
-#include "gui/rect_component.hpp"
+#include "engine/gui/rect_component.hpp"
class Playfield;
class Server;
Modified: trunk/pingus/src/pingus/components/time_display.cpp
===================================================================
--- trunk/pingus/src/pingus/components/time_display.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/components/time_display.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -19,7 +19,7 @@
#include <assert.h>
#include <stdio.h>
-#include "display/display.hpp"
+#include "engine/display/display.hpp"
#include "pingus/globals.hpp"
#include "pingus/resource.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/components/time_display.hpp
===================================================================
--- trunk/pingus/src/pingus/components/time_display.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/components/time_display.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_COMPONENTS_TIME_DISPLAY_HPP
#define HEADER_PINGUS_COMPONENTS_TIME_DISPLAY_HPP
-#include "gui/component.hpp"
+#include "engine/gui/component.hpp"
#include "pingus/sprite.hpp"
#include "pingus/font.hpp"
Modified: trunk/pingus/src/pingus/config_manager.cpp
===================================================================
--- trunk/pingus/src/pingus/config_manager.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/config_manager.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -22,8 +22,8 @@
#include "pingus/globals.hpp"
#include "util/system.hpp"
#include "pingus/fps_counter.hpp"
-#include "display/display.hpp"
-#include "screen/screen_manager.hpp"
+#include "engine/display/display.hpp"
+#include "engine/screen/screen_manager.hpp"
#include "tinygettext/dictionary_manager.hpp"
#include "util/sexpr_file_reader.hpp"
#include "util/sexpr_file_writer.hpp"
Modified: trunk/pingus/src/pingus/credits.cpp
===================================================================
--- trunk/pingus/src/pingus/credits.cpp 2009-11-05 22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/credits.cpp 2009-11-05 22:48:38 UTC (rev 4041)
@@ -17,16 +17,16 @@
#include "pingus/credits.hpp"
#include <iostream>
-#include "screen/screen_manager.hpp"
-#include "gui/surface_button.hpp"
-#include "gui/gui_manager.hpp"
-#include "sound/sound.hpp"
+#include "engine/screen/screen_manager.hpp"
+#include "engine/gui/surface_button.hpp"
+#include "engine/gui/gui_manager.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/stat_manager.hpp"
#include "pingus/resource.hpp"
#include "pingus/res_descriptor.hpp"
#include "pingus/fonts.hpp"
#include "gettext.h"
-#include "display/display.hpp"
+#include "engine/display/display.hpp"
#include "pingus/blitter.hpp"
class CreditsOkButton
Modified: trunk/pingus/src/pingus/credits.hpp
===================================================================
--- trunk/pingus/src/pingus/credits.hpp 2009-11-05 22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/credits.hpp 2009-11-05 22:48:38 UTC (rev 4041)
@@ -19,9 +19,9 @@
#include <string>
#include <vector>
-#include "screen/gui_screen.hpp"
+#include "engine/screen/gui_screen.hpp"
#include "pingus/font.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/sprite.hpp"
class Credits : public GUIScreen
Modified: trunk/pingus/src/pingus/demo_session.cpp
===================================================================
--- trunk/pingus/src/pingus/demo_session.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/demo_session.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -25,14 +25,14 @@
#include "util/pathname.hpp"
#include "pingus/world.hpp"
#include "pingus/components/pingus_counter.hpp"
-#include "gui/gui_manager.hpp"
-#include "display/scene_context.hpp"
+#include "engine/gui/gui_manager.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingus_demo.hpp"
-#include "gui/surface_button.hpp"
+#include "engine/gui/surface_button.hpp"
#include "pingus/components/playfield.hpp"
#include "pingus/components/smallmap.hpp"
-#include "screen/screen_manager.hpp"
-#include "display/display.hpp"
+#include "engine/screen/screen_manager.hpp"
+#include "engine/display/display.hpp"
#include "pingus/resource.hpp"
static bool false_func() { return false; }
Modified: trunk/pingus/src/pingus/demo_session.hpp
===================================================================
--- trunk/pingus/src/pingus/demo_session.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/demo_session.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -21,7 +21,7 @@
#include <vector>
#include "util/pathname.hpp"
-#include "screen/gui_screen.hpp"
+#include "engine/screen/gui_screen.hpp"
#include "pingus/server_event.hpp"
namespace Input {
Modified: trunk/pingus/src/pingus/font.cpp
===================================================================
--- trunk/pingus/src/pingus/font.cpp 2009-11-05 22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/font.cpp 2009-11-05 22:48:38 UTC (rev 4041)
@@ -25,8 +25,8 @@
#include "pingus/line_iterator.hpp"
#include "util/utf8.hpp"
#include "pingus/font_description.hpp"
-#include "display/framebuffer.hpp"
-#include "display/display.hpp"
+#include "engine/display/framebuffer.hpp"
+#include "engine/display/display.hpp"
class FontImpl
{
Modified: trunk/pingus/src/pingus/font_test_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/font_test_screen.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/font_test_screen.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -18,11 +18,11 @@
#include <iostream>
-#include "input/event.hpp"
+#include "engine/input/event.hpp"
#include "pingus/fonts.hpp"
#include "util/string_util.hpp"
-#include "display/drawing_context.hpp"
-#include "display/display.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "engine/display/display.hpp"
#include "pingus/font_description.hpp"
FontTestScreen::FontTestScreen(const Pathname& fontfile) :
Modified: trunk/pingus/src/pingus/font_test_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/font_test_screen.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/font_test_screen.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_PINGUS_FONT_TEST_SCREEN_HPP
#define HEADER_PINGUS_PINGUS_FONT_TEST_SCREEN_HPP
-#include "screen/screen.hpp"
+#include "engine/screen/screen.hpp"
#include "pingus/font.hpp"
class Pathname;
Modified: trunk/pingus/src/pingus/fonts.hpp
===================================================================
--- trunk/pingus/src/pingus/fonts.hpp 2009-11-05 22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/fonts.hpp 2009-11-05 22:48:38 UTC (rev 4041)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_PINGUS_FONTS_HPP
#define HEADER_PINGUS_PINGUS_FONTS_HPP
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
#include "pingus/font.hpp"
namespace Fonts {
Modified: trunk/pingus/src/pingus/fps_counter.cpp
===================================================================
--- trunk/pingus/src/pingus/fps_counter.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/fps_counter.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -19,7 +19,7 @@
#include <sstream>
#include "pingus/fonts.hpp"
#include "gettext.h"
-#include "display/display.hpp"
+#include "engine/display/display.hpp"
FPSCounter fps_counter;
Modified: trunk/pingus/src/pingus/game_session.cpp
===================================================================
--- trunk/pingus/src/pingus/game_session.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/game_session.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -17,18 +17,18 @@
#include "pingus/game_session.hpp"
#include <iostream>
-#include "screen/screen_manager.hpp"
+#include "engine/screen/screen_manager.hpp"
#include "pingus/server.hpp"
-#include "gui/gui_manager.hpp"
-#include "display/display.hpp"
+#include "engine/gui/gui_manager.hpp"
+#include "engine/display/display.hpp"
#include "pingus/components/button_panel.hpp"
#include "pingus/components/pingus_counter.hpp"
#include "pingus/components/time_display.hpp"
#include "pingus/components/smallmap.hpp"
#include "pingus/components/playfield.hpp"
-#include "input/event.hpp"
-#include "sound/sound.hpp"
+#include "engine/input/event.hpp"
+#include "engine/sound/sound.hpp"
#include "math/math.hpp"
#include "pingus/resource.hpp"
#include "pingus/pingu_holder.hpp"
Modified: trunk/pingus/src/pingus/game_session.hpp
===================================================================
--- trunk/pingus/src/pingus/game_session.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/game_session.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -19,7 +19,7 @@
#include <string>
#include <memory>
-#include "screen/gui_screen.hpp"
+#include "engine/screen/gui_screen.hpp"
#include "pingus/pingus_level.hpp"
#include "pingus/pingu_enums.hpp"
Modified: trunk/pingus/src/pingus/global_event.cpp
===================================================================
--- trunk/pingus/src/pingus/global_event.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/global_event.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -22,7 +22,7 @@
#include <algorithm>
#include "pingus/screenshot.hpp"
#include "pingus/fps_counter.hpp"
-#include "screen/screen_manager.hpp"
+#include "engine/screen/screen_manager.hpp"
#include "pingus/option_menu.hpp"
#include "pingus/level_menu.hpp"
#include "pingus/addon_menu.hpp"
Modified: trunk/pingus/src/pingus/graphic_context_state.cpp
===================================================================
--- trunk/pingus/src/pingus/graphic_context_state.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/graphic_context_state.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -17,7 +17,7 @@
#include "pingus/graphic_context_state.hpp"
#include "math/math.hpp"
-#include "display/display.hpp"
+#include "engine/display/display.hpp"
class GraphicContextStateImpl
{
Modified: trunk/pingus/src/pingus/graphic_context_state.hpp
===================================================================
--- trunk/pingus/src/pingus/graphic_context_state.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/graphic_context_state.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -22,8 +22,8 @@
#include "math/vector3f.hpp"
#include "math/vector2i.hpp"
#include "math/vector2f.hpp"
-#include "display/drawing_context.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "engine/display/scene_context.hpp"
class GraphicContextStateImpl;
Modified: trunk/pingus/src/pingus/ground_map.cpp
===================================================================
--- trunk/pingus/src/pingus/ground_map.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/ground_map.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,7 +18,7 @@
#include <stdio.h>
#include <iostream>
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingus_error.hpp"
#include "pingus/blitter.hpp"
#include "pingus/pingus_level.hpp"
Modified: trunk/pingus/src/pingus/layer_manager.hpp
===================================================================
--- trunk/pingus/src/pingus/layer_manager.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/layer_manager.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -21,8 +21,8 @@
#include "pingus/globals.hpp"
#include "pingus/pingus.hpp"
#include "pingus/sprite.hpp"
-#include "display/display.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/display.hpp"
+#include "engine/display/drawing_context.hpp"
class LayerManager
{
Modified: trunk/pingus/src/pingus/level_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/level_menu.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/level_menu.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -21,19 +21,19 @@
#include <boost/bind.hpp>
#include "gettext.h"
#include "pingus/resource.hpp"
-#include "screen/screen_manager.hpp"
+#include "engine/screen/screen_manager.hpp"
#include "pingus/fonts.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
#include "pingus/option_menu.hpp"
#include "util/system.hpp"
-#include "display/display.hpp"
-#include "gui/rect_component.hpp"
-#include "gui/gui_manager.hpp"
+#include "engine/display/display.hpp"
+#include "engine/gui/rect_component.hpp"
+#include "engine/gui/gui_manager.hpp"
#include "pingus/game_session.hpp"
#include "pingus/start_screen.hpp"
#include "pingus/globals.hpp"
-#include "gui/surface_button.hpp"
-#include "sound/sound.hpp"
+#include "engine/gui/surface_button.hpp"
+#include "engine/sound/sound.hpp"
class LevelMenuAbortButton : public GUI::SurfaceButton
{
Modified: trunk/pingus/src/pingus/level_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/level_menu.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/level_menu.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -19,7 +19,7 @@
#include "pingus/levelset.hpp"
#include "pingus/sprite.hpp"
-#include "screen/gui_screen.hpp"
+#include "engine/screen/gui_screen.hpp"
namespace GUI {
class SurfaceButton;
Modified: trunk/pingus/src/pingus/option_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/option_menu.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/option_menu.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -25,16 +25,16 @@
#include "pingus/globals.hpp"
#include "gettext.h"
#include "pingus/resource.hpp"
-#include "screen/screen_manager.hpp"
+#include "engine/screen/screen_manager.hpp"
#include "pingus/fonts.hpp"
-#include "display/display.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/display.hpp"
+#include "engine/display/drawing_context.hpp"
#include "pingus/components/label.hpp"
#include "pingus/components/check_box.hpp"
#include "pingus/components/slider_box.hpp"
#include "pingus/components/choice_box.hpp"
-#include "gui/gui_manager.hpp"
-#include "sound/sound.hpp"
+#include "engine/gui/gui_manager.hpp"
+#include "engine/sound/sound.hpp"
#include "tinygettext/dictionary_manager.hpp"
#include "tinygettext/language.hpp"
Modified: trunk/pingus/src/pingus/option_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/option_menu.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/option_menu.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -21,10 +21,10 @@
#include <map>
#include <boost/signals.hpp>
#include "pingus/sprite.hpp"
-#include "screen/gui_screen.hpp"
+#include "engine/screen/gui_screen.hpp"
#include "pingus/components/label.hpp"
-#include "gui/rect_component.hpp"
-#include "gui/surface_button.hpp"
+#include "engine/gui/rect_component.hpp"
+#include "engine/gui/surface_button.hpp"
#include "tinygettext/language.hpp"
class CheckBox;
Modified: trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp 2009-11-05
22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/particles/pingu_particle_holder.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -16,7 +16,7 @@
#include "pingus/particles/pingu_particle_holder.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "math/math.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/resource.hpp"
Modified: trunk/pingus/src/pingus/particles/rain_particle_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/rain_particle_holder.cpp 2009-11-05
22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/particles/rain_particle_holder.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -16,7 +16,7 @@
#include "pingus/particles/rain_particle_holder.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "math/math.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp 2009-11-05
22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/particles/smoke_particle_holder.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -17,7 +17,7 @@
#include "pingus/particles/smoke_particle_holder.hpp"
#include "pingus/globals.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/resource.hpp"
namespace Particles {
Modified: trunk/pingus/src/pingus/particles/snow_particle_holder.cpp
===================================================================
--- trunk/pingus/src/pingus/particles/snow_particle_holder.cpp 2009-11-05
22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/particles/snow_particle_holder.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -20,7 +20,7 @@
#include "math/math.hpp"
#include "pingus/collision_map.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/ground_map.hpp"
#include "pingus/resource.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/pingu.cpp
===================================================================
--- trunk/pingus/src/pingus/pingu.cpp 2009-11-05 22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/pingu.cpp 2009-11-05 22:48:38 UTC (rev 4041)
@@ -23,12 +23,12 @@
#include "math/math.hpp"
#include "pingus/globals.hpp"
#include "pingus/world.hpp"
-#include "sound/sound.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/pingu_action.hpp"
#include "gettext.h"
#include "pingus/debug.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/worldobj.hpp"
#include "pingus/resource.hpp"
#include "pingus/fonts.hpp"
Modified: trunk/pingus/src/pingus/pingus_main.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_main.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/pingus_main.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -30,7 +30,7 @@
#include "util/sexpr_file_reader.hpp"
#include "pingus/fonts.hpp"
#include "pingus/config_manager.hpp"
-#include "display/display.hpp"
+#include "engine/display/display.hpp"
#include "pingus/pingus_menu.hpp"
#if defined(__APPLE__)
@@ -59,7 +59,7 @@
#include "tinygettext/log.hpp"
#include "util/command_line.hpp"
-#include "screen/screen_manager.hpp"
+#include "engine/screen/screen_manager.hpp"
#include "pingus/path_manager.hpp"
#include "pingus/globals.hpp"
#include "util/system.hpp"
@@ -75,7 +75,7 @@
#include "pingus/debug.hpp"
#include "pingus/resource.hpp"
#include "pingus/credits.hpp"
-#include "sound/sound.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/worldmap/worldmap_screen.hpp"
#include "pingus/font_test_screen.hpp"
#include "pingus/worldmap/worldmap_screen.hpp"
Modified: trunk/pingus/src/pingus/pingus_menu.cpp
===================================================================
--- trunk/pingus/src/pingus/pingus_menu.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/pingus_menu.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -22,15 +22,15 @@
#include "pingus/resource.hpp"
#include "pingus/debug.hpp"
#include "pingus/globals.hpp"
-#include "sound/sound.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/level_menu.hpp"
#include "pingus/stat_manager.hpp"
#include "pingus/start_screen.hpp"
#include "pingus/story_screen.hpp"
#include "pingus/worldmap/worldmap.hpp"
#include "pingus/worldmap/worldmap_screen.hpp"
-#include "screen/screen_manager.hpp"
-#include "gui/gui_manager.hpp"
+#include "engine/screen/screen_manager.hpp"
+#include "engine/gui/gui_manager.hpp"
#include "pingus/plf_res_mgr.hpp"
#include "pingus/path_manager.hpp"
#include "util/pathname.hpp"
Modified: trunk/pingus/src/pingus/pingus_menu.hpp
===================================================================
--- trunk/pingus/src/pingus/pingus_menu.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/pingus_menu.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -22,7 +22,7 @@
#include "pingus/fonts.hpp"
#include "pingus/sprite.hpp"
-#include "screen/gui_screen.hpp"
+#include "engine/screen/gui_screen.hpp"
namespace GUI {
class GUIManager;
Modified: trunk/pingus/src/pingus/result_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/result_screen.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/result_screen.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,10 +18,10 @@
#include <iostream>
#include "gettext.h"
-#include "display/display.hpp"
-#include "gui/surface_button.hpp"
-#include "gui/gui_manager.hpp"
-#include "screen/screen_manager.hpp"
+#include "engine/display/display.hpp"
+#include "engine/gui/surface_button.hpp"
+#include "engine/gui/gui_manager.hpp"
+#include "engine/screen/screen_manager.hpp"
#include "pingus/blitter.hpp"
#include "pingus/res_descriptor.hpp"
#include "pingus/resource.hpp"
@@ -29,7 +29,7 @@
#include "pingus/game_session.hpp"
#include "util/system.hpp"
#include "util/string_util.hpp"
-#include "sound/sound.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/game_time.hpp"
class ResultScreenComponent : public GUI::Component
Modified: trunk/pingus/src/pingus/result_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/result_screen.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/result_screen.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_PINGUS_RESULT_SCREEN_HPP
#include "pingus/result.hpp"
-#include "screen/gui_screen.hpp"
+#include "engine/screen/gui_screen.hpp"
namespace GUI {
class SurfaceButton;
Modified: trunk/pingus/src/pingus/screenshot.cpp
===================================================================
--- trunk/pingus/src/pingus/screenshot.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/screenshot.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -23,8 +23,8 @@
#include <fstream>
#include <iostream>
-#include "display/display.hpp"
-#include "display/framebuffer.hpp"
+#include "engine/display/display.hpp"
+#include "engine/display/framebuffer.hpp"
#include "util/system.hpp"
#include "gettext.h"
#include "png.h"
Modified: trunk/pingus/src/pingus/sprite_impl.cpp
===================================================================
--- trunk/pingus/src/pingus/sprite_impl.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/sprite_impl.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -17,8 +17,8 @@
#include "pingus/sprite_impl.hpp"
#include <map>
-#include "display/framebuffer.hpp"
-#include "display/display.hpp"
+#include "engine/display/framebuffer.hpp"
+#include "engine/display/display.hpp"
#include "pingus/sprite_description.hpp"
typedef std::map<std::string, FramebufferSurface> SurfaceCache;
Modified: trunk/pingus/src/pingus/sprite_impl.hpp
===================================================================
--- trunk/pingus/src/pingus/sprite_impl.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/sprite_impl.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_PINGUS_SPRITE_IMPL_HPP
#include "pingus/surface.hpp"
-#include "display/framebuffer_surface.hpp"
+#include "engine/display/framebuffer_surface.hpp"
#include "math/vector2i.hpp"
class SpriteDescription;
Modified: trunk/pingus/src/pingus/start_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/start_screen.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/start_screen.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -17,10 +17,10 @@
#include "pingus/start_screen.hpp"
#include <iostream>
-#include "gui/gui_manager.hpp"
-#include "gui/surface_button.hpp"
-#include "gui/component.hpp"
-#include "screen/screen_manager.hpp"
+#include "engine/gui/gui_manager.hpp"
+#include "engine/gui/surface_button.hpp"
+#include "engine/gui/component.hpp"
+#include "engine/screen/screen_manager.hpp"
#include "pingus/blitter.hpp"
#include "gettext.h"
#include "pingus/game_session.hpp"
@@ -29,10 +29,10 @@
#include "pingus/fonts.hpp"
#include "pingus/resource.hpp"
#include "pingus/game_time.hpp"
-#include "sound/sound.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/pingus_level.hpp"
#include "pingus/string_format.hpp"
-#include "display/display.hpp"
+#include "engine/display/display.hpp"
#include "util/string_util.hpp"
class StartScreenComponent : public GUI::Component
Modified: trunk/pingus/src/pingus/start_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/start_screen.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/start_screen.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,7 +18,7 @@
#define HEADER_PINGUS_PINGUS_START_SCREEN_HPP
#include "pingus/pingus_level.hpp"
-#include "screen/gui_screen.hpp"
+#include "engine/screen/gui_screen.hpp"
namespace GUI {
class SurfaceButton;
Modified: trunk/pingus/src/pingus/story_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/story_screen.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/story_screen.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -21,10 +21,10 @@
#include "gettext.h"
#include "pingus/globals.hpp"
#include "pingus/resource.hpp"
-#include "gui/gui_manager.hpp"
-#include "gui/surface_button.hpp"
-#include "screen/screen_manager.hpp"
-#include "gui/component.hpp"
+#include "engine/gui/gui_manager.hpp"
+#include "engine/gui/surface_button.hpp"
+#include "engine/screen/screen_manager.hpp"
+#include "engine/gui/component.hpp"
#include "math/math.hpp"
#include "pingus/fonts.hpp"
#include "pingus/res_descriptor.hpp"
@@ -33,9 +33,9 @@
#include "pingus/worldmap/worldmap_story.hpp"
#include "pingus/stat_manager.hpp"
#include "pingus/credits.hpp"
-#include "display/display.hpp"
+#include "engine/display/display.hpp"
#include "util/utf8.hpp"
-#include "sound/sound.hpp"
+#include "engine/sound/sound.hpp"
class StoryScreenComponent : public GUI::Component
{
Modified: trunk/pingus/src/pingus/story_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/story_screen.hpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/story_screen.hpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -20,7 +20,7 @@
#include <string>
#include <memory>
#include "pingus/res_descriptor.hpp"
-#include "screen/gui_screen.hpp"
+#include "engine/screen/gui_screen.hpp"
#include "pingus/worldmap/worldmap_story.hpp"
class StoryScreenComponent;
Modified: trunk/pingus/src/pingus/world.cpp
===================================================================
--- trunk/pingus/src/pingus/world.cpp 2009-11-05 22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/world.cpp 2009-11-05 22:48:38 UTC (rev 4041)
@@ -22,15 +22,15 @@
#include <typeinfo>
#include "pingus/pingu_holder.hpp"
#include "pingus/worldobjs/entrance.hpp"
-#include "sound/sound.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/ground_map.hpp"
#include "pingus/particles/pingu_particle_holder.hpp"
#include "pingus/particles/rain_particle_holder.hpp"
#include "pingus/particles/smoke_particle_holder.hpp"
#include "pingus/particles/snow_particle_holder.hpp"
-#include "display/display.hpp"
+#include "engine/display/display.hpp"
#include "pingus/pingu.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingus_level.hpp"
#include "pingus/worldobj_factory.hpp"
#include "pingus/collision_map.hpp"
Modified: trunk/pingus/src/pingus/worldmap/level_dot.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/level_dot.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/worldmap/level_dot.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -19,9 +19,9 @@
#include <iostream>
-#include "display/drawing_context.hpp"
-#include "input/control.hpp"
-#include "input/controller.hpp"
+#include "engine/display/drawing_context.hpp"
+#include "engine/input/control.hpp"
+#include "engine/input/controller.hpp"
#include "pingus/font.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
@@ -31,7 +31,7 @@
#include "pingus/resource.hpp"
#include "pingus/savegame_manager.hpp"
#include "pingus/start_screen.hpp"
-#include "screen/screen_manager.hpp"
+#include "engine/screen/screen_manager.hpp"
#include "util/file_reader.hpp"
#include "util/system.hpp"
Modified: trunk/pingus/src/pingus/worldmap/path_drawable.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path_drawable.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/worldmap/path_drawable.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -18,7 +18,7 @@
#include <iostream>
#include "math/color.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/pingus.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pingus.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/worldmap/pingus.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -20,7 +20,7 @@
#include "math/math.hpp"
#include "math/vector3f.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
#include "pingus/worldmap/dot.hpp"
#include "pingus/direction.hpp"
#include "pingus/resource.hpp"
Modified: trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp 2009-11-05
22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -19,7 +19,7 @@
#include <iostream>
#include "pingus/resource.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
#include "pingus/worldmap/worldmap_screen.hpp"
#include "pingus/worldmap/worldmap.hpp"
#include "pingus/worldmap/pingus.hpp"
Modified: trunk/pingus/src/pingus/worldmap/worldmap.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/worldmap/worldmap.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -18,7 +18,7 @@
#include <assert.h>
#include <iostream>
-#include "display/display.hpp"
+#include "engine/display/display.hpp"
#include "pingus/fonts.hpp"
#include "pingus/path_manager.hpp"
#include "pingus/stat_manager.hpp"
@@ -26,7 +26,7 @@
#include "util/system.hpp"
#include "pingus/resource.hpp"
#include "pingus/globals.hpp"
-#include "sound/sound.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/pingus_error.hpp"
#include "pingus/gettext.h"
#include "pingus/globals.hpp"
@@ -46,7 +46,7 @@
#include "pingus/stat_manager.hpp"
#include "pingus/story_screen.hpp"
-#include "screen/screen_manager.hpp"
+#include "engine/screen/screen_manager.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/pingus/worldmap/worldmap.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap.hpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/worldmap/worldmap.hpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -20,7 +20,7 @@
#include <vector>
#include "pingus/sprite.hpp"
#include "util/file_reader.hpp"
-#include "display/drawing_context.hpp"
+#include "engine/display/drawing_context.hpp"
#include "pingus/graphic_context_state.hpp"
#include "pingus/worldmap/pingus_worldmap.hpp"
Modified: trunk/pingus/src/pingus/worldmap/worldmap_component.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_component.cpp 2009-11-05
22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/worldmap/worldmap_component.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -16,8 +16,8 @@
#include "pingus/worldmap/worldmap_component.hpp"
-#include "display/display.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/display.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/worldmap/worldmap_screen.hpp"
#include "pingus/worldmap/worldmap.hpp"
Modified: trunk/pingus/src/pingus/worldmap/worldmap_component.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_component.hpp 2009-11-05
22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/worldmap/worldmap_component.hpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -19,7 +19,7 @@
#include <string>
#include <memory>
-#include "gui/gui_manager.hpp"
+#include "engine/gui/gui_manager.hpp"
class SceneContext;
Modified: trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp 2009-11-05
22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/worldmap/worldmap_screen.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -19,9 +19,9 @@
#include <iostream>
-#include "display/display.hpp"
-#include "display/scene_context.hpp"
-#include "gui/surface_button.hpp"
+#include "engine/display/display.hpp"
+#include "engine/display/scene_context.hpp"
+#include "engine/gui/surface_button.hpp"
#include "math/math.hpp"
#include "pingus/fonts.hpp"
#include "pingus/gettext.h"
@@ -30,8 +30,8 @@
#include "pingus/resource.hpp"
#include "pingus/stat_manager.hpp"
#include "pingus/story_screen.hpp"
-#include "screen/screen_manager.hpp"
-#include "sound/sound.hpp"
+#include "engine/screen/screen_manager.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/worldmap/pingus.hpp"
#include "pingus/worldmap/worldmap.hpp"
#include "pingus/worldmap/worldmap_component.hpp"
Modified: trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp 2009-11-05
22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/worldmap/worldmap_screen.hpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -20,8 +20,8 @@
#include <string>
#include <memory>
#include "pingus/sprite.hpp"
-#include "gui/gui_manager.hpp"
-#include "screen/gui_screen.hpp"
+#include "engine/gui/gui_manager.hpp"
+#include "engine/screen/gui_screen.hpp"
namespace GUI {
class SurfaceButton;
Modified: trunk/pingus/src/pingus/worldobj.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobj.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/worldobj.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -18,7 +18,7 @@
#include <typeinfo>
#include <iostream>
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
World* WorldObj::world;
Modified: trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/conveyor_belt.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -17,7 +17,7 @@
#include "pingus/worldobjs/conveyor_belt.hpp"
#include "pingus/collision_map.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/resource.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/entrance.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/entrance.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/entrance.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -17,7 +17,7 @@
#include "pingus/worldobjs/entrance.hpp"
#include <iostream>
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/world.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/exit.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/exit.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/worldobjs/exit.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -17,7 +17,7 @@
#include "pingus/worldobjs/exit.hpp"
#include <iostream>
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/collision_map.hpp"
#include "pingus/world.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/fake_exit.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/fake_exit.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/fake_exit.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -16,7 +16,7 @@
#include "pingus/worldobjs/fake_exit.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/guillotine.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/guillotine.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/guillotine.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -16,7 +16,7 @@
#include "pingus/worldobjs/guillotine.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/hammer.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/hammer.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/hammer.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -16,7 +16,7 @@
#include "pingus/worldobjs/hammer.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/hotspot.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/hotspot.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/hotspot.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -18,7 +18,7 @@
#include <iostream>
#include "pingus/globals.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/resource.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/ice_block.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/ice_block.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/ice_block.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -17,7 +17,7 @@
#include "pingus/worldobjs/ice_block.hpp"
#include "pingus/collision_map.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/ground_map.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/laser_exit.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/laser_exit.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/laser_exit.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -16,7 +16,7 @@
#include "pingus/worldobjs/laser_exit.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/liquid.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/liquid.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/liquid.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -18,7 +18,7 @@
#include <iostream>
#include "pingus/collision_map.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/resource.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/rain_generator.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/rain_generator.cpp 2009-11-05
22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/rain_generator.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -18,9 +18,9 @@
#include <iostream>
#include "pingus/particles/rain_particle_holder.hpp"
-#include "sound/sound.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/world.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/smasher.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/smasher.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/smasher.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -20,12 +20,12 @@
#include "math/math.hpp"
#include "pingus/collision_map.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/particles/smoke_particle_holder.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/resource.hpp"
-#include "sound/sound.hpp"
+#include "engine/sound/sound.hpp"
#include "pingus/world.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/solid_color_background.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/solid_color_background.cpp
2009-11-05 22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/solid_color_background.cpp
2009-11-05 22:48:38 UTC (rev 4041)
@@ -16,8 +16,8 @@
#include "pingus/worldobjs/solid_color_background.hpp"
-#include "display/display.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/display.hpp"
+#include "engine/display/scene_context.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/spike.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/spike.cpp 2009-11-05 22:37:35 UTC (rev
4040)
+++ trunk/pingus/src/pingus/worldobjs/spike.cpp 2009-11-05 22:48:38 UTC (rev
4041)
@@ -16,7 +16,7 @@
#include "pingus/worldobjs/spike.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/starfield_background_stars.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/starfield_background_stars.cpp
2009-11-05 22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/starfield_background_stars.cpp
2009-11-05 22:48:38 UTC (rev 4041)
@@ -16,7 +16,7 @@
#include "pingus/worldobjs/starfield_background_stars.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/world.hpp"
#include "pingus/resource.hpp"
#include "pingus/globals.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/surface_background.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/surface_background.cpp 2009-11-05
22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/surface_background.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -18,12 +18,12 @@
#include <iostream>
#include "pingus/globals.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/world.hpp"
#include "pingus/resource.hpp"
#include "pingus/globals.hpp"
#include "pingus/blitter.hpp"
-#include "display/display.hpp"
+#include "engine/display/display.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/switch_door.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/switch_door.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/switch_door.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -17,7 +17,7 @@
#include "pingus/worldobjs/switch_door.hpp"
#include "pingus/collision_map.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/teleporter.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/teleporter.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/teleporter.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -17,7 +17,7 @@
#include "pingus/worldobjs/teleporter.hpp"
#include <iostream>
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp 2009-11-05
22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/teleporter_target.cpp 2009-11-05
22:48:38 UTC (rev 4041)
@@ -17,7 +17,7 @@
#include "pingus/worldobjs/teleporter_target.hpp"
#include <iostream>
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/pingu.hpp"
#include "pingus/pingu_holder.hpp"
#include "pingus/world.hpp"
Modified: trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
2009-11-05 22:37:35 UTC (rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/thunderstorm_background.cpp
2009-11-05 22:48:38 UTC (rev 4041)
@@ -17,7 +17,7 @@
#include "pingus/worldobjs/thunderstorm_background.hpp"
#include "pingus/resource.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
namespace WorldObjs {
Modified: trunk/pingus/src/pingus/worldobjs/woodthing.cpp
===================================================================
--- trunk/pingus/src/pingus/worldobjs/woodthing.cpp 2009-11-05 22:37:35 UTC
(rev 4040)
+++ trunk/pingus/src/pingus/worldobjs/woodthing.cpp 2009-11-05 22:48:38 UTC
(rev 4041)
@@ -17,7 +17,7 @@
#include "pingus/worldobjs/woodthing.hpp"
#include "math/math.hpp"
-#include "display/scene_context.hpp"
+#include "engine/display/scene_context.hpp"
#include "pingus/particles/smoke_particle_holder.hpp"
#include "pingus/resource.hpp"
#include "pingus/world.hpp"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4041 - in trunk/pingus: . src src/editor src/engine src/engine/display src/engine/display/opengl src/engine/gui src/engine/input src/engine/input/evdev src/engine/input/usbmouse src/engine/input/wiimote src/engine/input/xinput src/engine/input_old src/engine/screen src/engine/sound src/pingus src/pingus/actions src/pingus/components src/pingus/particles src/pingus/worldmap src/pingus/worldobjs,
grumbel at BerliOS <=