[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r4004 - in trunk/pingus: . src src/actions src/components s
|
From: |
grumbel at BerliOS |
|
Subject: |
[Pingus-CVS] r4004 - in trunk/pingus: . src src/actions src/components src/display src/editor src/input src/math src/particles src/screen src/util src/worldmap src/worldobjs |
|
Date: |
Wed, 4 Nov 2009 01:59:22 +0100 |
Author: grumbel
Date: 2009-11-04 01:59:16 +0100 (Wed, 04 Nov 2009)
New Revision: 4004
Added:
trunk/pingus/src/math/math.cpp
trunk/pingus/src/math/math.hpp
trunk/pingus/src/util/memory_pool.hpp
trunk/pingus/src/util/pathname.cpp
trunk/pingus/src/util/pathname.hpp
trunk/pingus/test/
Removed:
trunk/pingus/src/math.cpp
trunk/pingus/src/math.hpp
trunk/pingus/src/memory_pool.hpp
trunk/pingus/src/pathname.cpp
trunk/pingus/src/pathname.hpp
Modified:
trunk/pingus/SConstruct
trunk/pingus/src/actions/angel.cpp
trunk/pingus/src/actions/faller.cpp
trunk/pingus/src/blitter.cpp
trunk/pingus/src/collision_map.cpp
trunk/pingus/src/components/button_panel.cpp
trunk/pingus/src/components/slider_box.cpp
trunk/pingus/src/components/smallmap.cpp
trunk/pingus/src/demo_session.cpp
trunk/pingus/src/display/delta_framebuffer.cpp
trunk/pingus/src/display/display.cpp
trunk/pingus/src/display/drawing_context.cpp
trunk/pingus/src/display/opengl_framebuffer.cpp
trunk/pingus/src/display/sdl_framebuffer.cpp
trunk/pingus/src/editor/combobox.cpp
trunk/pingus/src/editor/editor_level.cpp
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_list.cpp
trunk/pingus/src/editor/object_selector.cpp
trunk/pingus/src/editor/object_selector_list.cpp
trunk/pingus/src/font_description.hpp
trunk/pingus/src/game_session.cpp
trunk/pingus/src/graphic_context_state.cpp
trunk/pingus/src/ground_map.cpp
trunk/pingus/src/input/control.hpp
trunk/pingus/src/input/core_driver.cpp
trunk/pingus/src/input/manager.cpp
trunk/pingus/src/layer_manager.cpp
trunk/pingus/src/layer_manager.hpp
trunk/pingus/src/levelset.cpp
trunk/pingus/src/levelset.hpp
trunk/pingus/src/particles/pingu_particle_holder.cpp
trunk/pingus/src/particles/rain_particle_holder.cpp
trunk/pingus/src/particles/snow_particle_holder.cpp
trunk/pingus/src/pingu.cpp
trunk/pingus/src/pingu_action.cpp
trunk/pingus/src/pingus_demo.cpp
trunk/pingus/src/pingus_level.cpp
trunk/pingus/src/pingus_main.hpp
trunk/pingus/src/pingus_menu.cpp
trunk/pingus/src/pingus_options.hpp
trunk/pingus/src/plf_res_mgr.cpp
trunk/pingus/src/screen/screen_manager.cpp
trunk/pingus/src/server_event.cpp
trunk/pingus/src/sprite.cpp
trunk/pingus/src/sprite_description.hpp
trunk/pingus/src/story_screen.cpp
trunk/pingus/src/surface.hpp
trunk/pingus/src/worldmap/path_graph.cpp
trunk/pingus/src/worldmap/pingus.cpp
trunk/pingus/src/worldmap/pingus_worldmap.hpp
trunk/pingus/src/worldmap/worldmap.cpp
trunk/pingus/src/worldmap/worldmap_screen.cpp
trunk/pingus/src/worldobjs/smasher.cpp
trunk/pingus/src/worldobjs/snow_generator.cpp
trunk/pingus/src/worldobjs/woodthing.cpp
Log:
Move utility classes to util/ directory, math stuff to math/
Modified: trunk/pingus/SConstruct
===================================================================
--- trunk/pingus/SConstruct 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/SConstruct 2009-11-04 00:59:16 UTC (rev 4004)
@@ -57,11 +57,11 @@
'src/level_menu.cpp',
'src/levelset.cpp',
'src/line_iterator.cpp',
-'src/math.cpp',
+'src/math/math.cpp',
'src/mover.cpp',
'src/option_menu.cpp',
'src/path_manager.cpp',
-'src/pathname.cpp',
+'src/util/pathname.cpp',
'src/pingu.cpp',
'src/pingu_action.cpp',
'src/pingu_enums.cpp',
Modified: trunk/pingus/src/actions/angel.cpp
===================================================================
--- trunk/pingus/src/actions/angel.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/actions/angel.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -16,7 +16,7 @@
#include "../display/scene_context.hpp"
#include "../pingu.hpp"
-#include "../math.hpp"
+#include "math/math.hpp"
#include "../globals.hpp"
#include "angel.hpp"
Modified: trunk/pingus/src/actions/faller.cpp
===================================================================
--- trunk/pingus/src/actions/faller.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/actions/faller.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -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 "../math.hpp"
+#include "math/math.hpp"
#include "../colliders/pingu_collider.hpp"
#include "../debug.hpp"
#include "../globals.hpp"
Modified: trunk/pingus/src/blitter.cpp
===================================================================
--- trunk/pingus/src/blitter.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/blitter.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -22,7 +22,7 @@
#include "util/string_util.hpp"
#include "pingus_error.hpp"
#include "globals.hpp"
-#include "math.hpp"
+#include "math/math.hpp"
#include "blitter.hpp"
#include "debug.hpp"
#include "blitter_impl.hpp"
Modified: trunk/pingus/src/collision_map.cpp
===================================================================
--- trunk/pingus/src/collision_map.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/collision_map.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -21,7 +21,7 @@
#include "collision_map.hpp"
#include "collision_mask.hpp"
#include "pingus_error.hpp"
-#include "math.hpp"
+#include "math/math.hpp"
#include "gettext.h"
#include "sprite.hpp"
Modified: trunk/pingus/src/components/button_panel.cpp
===================================================================
--- trunk/pingus/src/components/button_panel.cpp 2009-11-04 00:33:25 UTC
(rev 4003)
+++ trunk/pingus/src/components/button_panel.cpp 2009-11-04 00:59:16 UTC
(rev 4004)
@@ -16,7 +16,8 @@
#include <iostream>
#include <algorithm>
-#include "../math.hpp"
+
+#include "math/math.hpp"
#include "../fonts.hpp"
#include "util/string_util.hpp"
#include "../globals.hpp"
Modified: trunk/pingus/src/components/slider_box.cpp
===================================================================
--- trunk/pingus/src/components/slider_box.cpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/components/slider_box.cpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -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 "math.hpp"
+#include "math/math.hpp"
#include "globals.hpp"
#include "fonts.hpp"
#include "display/drawing_context.hpp"
Modified: trunk/pingus/src/components/smallmap.cpp
===================================================================
--- trunk/pingus/src/components/smallmap.cpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/components/smallmap.cpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -23,7 +23,7 @@
#include "../server.hpp"
#include "../smallmap_image.hpp"
#include "../pingu.hpp"
-#include "../math.hpp"
+#include "math/math.hpp"
#include "../math/vector3f.hpp"
#include "../globals.hpp"
#include "playfield.hpp"
Modified: trunk/pingus/src/demo_session.cpp
===================================================================
--- trunk/pingus/src/demo_session.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/demo_session.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -18,9 +18,9 @@
#include <boost/bind.hpp>
#include <iostream>
-#include "math.hpp"
+#include "math/math.hpp"
#include "server.hpp"
-#include "pathname.hpp"
+#include "util/pathname.hpp"
#include "world.hpp"
#include "components/pingus_counter.hpp"
#include "gui/gui_manager.hpp"
Modified: trunk/pingus/src/display/delta_framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/delta_framebuffer.cpp 2009-11-04 00:33:25 UTC
(rev 4003)
+++ trunk/pingus/src/display/delta_framebuffer.cpp 2009-11-04 00:59:16 UTC
(rev 4004)
@@ -16,8 +16,8 @@
#include <assert.h>
#include <iostream>
-#include "../math.hpp"
-#include "../memory_pool.hpp"
+#include "math/math.hpp"
+#include "util/memory_pool.hpp"
#include "rect_merger.hpp"
#include "sdl_framebuffer.hpp"
#include "delta_framebuffer.hpp"
Modified: trunk/pingus/src/display/display.cpp
===================================================================
--- trunk/pingus/src/display/display.cpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/display/display.cpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -18,12 +18,13 @@
#include <algorithm>
#include <stdio.h>
#include <iostream>
+
#include "../../config.h"
#include "../globals.hpp"
#include "../math/vector2i.hpp"
#include "../math/rect.hpp"
#include "../math/color.hpp"
-#include "../math.hpp"
+#include "math/math.hpp"
#include "../screen/screen_manager.hpp"
#include "sdl_framebuffer.hpp"
#ifdef HAVE_OPENGL
Modified: trunk/pingus/src/display/drawing_context.cpp
===================================================================
--- trunk/pingus/src/display/drawing_context.cpp 2009-11-04 00:33:25 UTC
(rev 4003)
+++ trunk/pingus/src/display/drawing_context.cpp 2009-11-04 00:59:16 UTC
(rev 4004)
@@ -18,7 +18,7 @@
#include <iostream>
#include <algorithm>
#include "drawing_context.hpp"
-#include "math.hpp"
+#include "math/math.hpp"
#include "framebuffer.hpp"
#include "display/display.hpp"
#include "../sprite.hpp"
Modified: trunk/pingus/src/display/opengl_framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/opengl_framebuffer.cpp 2009-11-04 00:33:25 UTC
(rev 4003)
+++ trunk/pingus/src/display/opengl_framebuffer.cpp 2009-11-04 00:59:16 UTC
(rev 4004)
@@ -17,7 +17,8 @@
#include <sstream>
#include <iostream>
#include <stdexcept>
-#include "math.hpp"
+
+#include "math/math.hpp"
#include "surface.hpp"
#include "opengl_framebuffer_surface_impl.hpp"
#include "opengl_framebuffer.hpp"
Modified: trunk/pingus/src/display/sdl_framebuffer.cpp
===================================================================
--- trunk/pingus/src/display/sdl_framebuffer.cpp 2009-11-04 00:33:25 UTC
(rev 4003)
+++ trunk/pingus/src/display/sdl_framebuffer.cpp 2009-11-04 00:59:16 UTC
(rev 4004)
@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../math.hpp"
+#include "math/math.hpp"
#include "../surface.hpp"
#include "display.hpp"
#include "sdl_framebuffer.hpp"
Modified: trunk/pingus/src/editor/combobox.cpp
===================================================================
--- trunk/pingus/src/editor/combobox.cpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/editor/combobox.cpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -17,9 +17,10 @@
#include <iostream>
#include <vector>
#include <string>
+
#include "resource.hpp"
#include "combobox.hpp"
-#include "math.hpp"
+#include "math/math.hpp"
#include "../fonts.hpp"
#include "../math/vector2i.hpp"
Modified: trunk/pingus/src/editor/editor_level.cpp
===================================================================
--- trunk/pingus/src/editor/editor_level.cpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/editor/editor_level.cpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -19,13 +19,14 @@
#include <iostream>
#include <string>
#include <fstream>
-#include "viewport.hpp"
+
+#include "../pingus_level.hpp"
#include "editor_level.hpp"
#include "level_impl.hpp"
#include "level_objs.hpp"
-#include "pathname.hpp"
-#include "../pingus_level.hpp"
+#include "util/pathname.hpp"
#include "util/sexpr_file_writer.hpp"
+#include "viewport.hpp"
namespace Editor {
Modified: trunk/pingus/src/editor/editor_screen.cpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.cpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/editor/editor_screen.cpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -30,7 +30,7 @@
#include "gettext.h"
#include "file_dialog.hpp"
#include "../path_manager.hpp"
-#include "../pathname.hpp"
+#include "util/pathname.hpp"
#include "game_session.hpp"
#include "editor_level.hpp"
#include "panel.hpp"
Modified: trunk/pingus/src/editor/editor_screen.hpp
===================================================================
--- trunk/pingus/src/editor/editor_screen.hpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/editor/editor_screen.hpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -19,7 +19,7 @@
#define HEADER_PINGUS_EDITOR_SCREEN_HPP
#include "../screen/gui_screen.hpp"
-#include "pathname.hpp"
+#include "util/pathname.hpp"
#include "file_dialog.hpp"
class DrawingContext;
Modified: trunk/pingus/src/editor/file_dialog.cpp
===================================================================
--- trunk/pingus/src/editor/file_dialog.cpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/editor/file_dialog.cpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -26,7 +26,7 @@
#include "gettext.h"
#include "label.hpp"
#include "inputbox.hpp"
-#include "pathname.hpp"
+#include "util/pathname.hpp"
#include "button.hpp"
#include "file_dialog.hpp"
Modified: trunk/pingus/src/editor/file_list.cpp
===================================================================
--- trunk/pingus/src/editor/file_list.cpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/editor/file_list.cpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -15,7 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "math.hpp"
+
+#include "math/math.hpp"
#include "fonts.hpp"
#include "file_list.hpp"
#include "gui_style.hpp"
Modified: trunk/pingus/src/editor/object_selector.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector.cpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/editor/object_selector.cpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -25,7 +25,7 @@
#include "editor_screen.hpp"
#include "display/drawing_context.hpp"
#include "fonts.hpp"
-#include "math.hpp"
+#include "math/math.hpp"
#include "viewport.hpp"
#include "editor_level.hpp"
#include "object_selector_list.hpp"
Modified: trunk/pingus/src/editor/object_selector_list.cpp
===================================================================
--- trunk/pingus/src/editor/object_selector_list.cpp 2009-11-04 00:33:25 UTC
(rev 4003)
+++ trunk/pingus/src/editor/object_selector_list.cpp 2009-11-04 00:59:16 UTC
(rev 4004)
@@ -15,7 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "math.hpp"
+
+#include "math/math.hpp"
#include "editor_screen.hpp"
#include "object_selector_set.hpp"
#include "object_selector.hpp"
Modified: trunk/pingus/src/font_description.hpp
===================================================================
--- trunk/pingus/src/font_description.hpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/font_description.hpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -20,7 +20,7 @@
#include <string>
#include "math/vector2i.hpp"
#include "math/rect.hpp"
-#include "pathname.hpp"
+#include "util/pathname.hpp"
class FileReader;
Modified: trunk/pingus/src/game_session.cpp
===================================================================
--- trunk/pingus/src/game_session.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/game_session.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -27,7 +27,7 @@
#include "components/playfield.hpp"
#include "input/event.hpp"
#include "sound/sound.hpp"
-#include "math.hpp"
+#include "math/math.hpp"
#include "game_session.hpp"
#include "resource.hpp"
#include "pingu_holder.hpp"
Modified: trunk/pingus/src/graphic_context_state.cpp
===================================================================
--- trunk/pingus/src/graphic_context_state.cpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/graphic_context_state.cpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -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 "math.hpp"
+#include "math/math.hpp"
#include "display/display.hpp"
#include "graphic_context_state.hpp"
Modified: trunk/pingus/src/ground_map.cpp
===================================================================
--- trunk/pingus/src/ground_map.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/ground_map.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -23,7 +23,7 @@
#include "pingus_level.hpp"
#include "gettext.h"
#include "collision_map.hpp"
-#include "math.hpp"
+#include "math/math.hpp"
#include "SDL.h"
class MapTile
Modified: trunk/pingus/src/input/control.hpp
===================================================================
--- trunk/pingus/src/input/control.hpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/input/control.hpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -20,7 +20,7 @@
#include <iostream>
#include <vector>
-#include "math.hpp"
+#include "math/math.hpp"
#include "math/vector2f.hpp"
#include "event.hpp"
#include "controller.hpp"
Modified: trunk/pingus/src/input/core_driver.cpp
===================================================================
--- trunk/pingus/src/input/core_driver.cpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/input/core_driver.cpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -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 "math.hpp"
+#include "math/math.hpp"
#include "manager.hpp"
#include "core_driver.hpp"
#include "../display/display.hpp"
Modified: trunk/pingus/src/input/manager.cpp
===================================================================
--- trunk/pingus/src/input/manager.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/input/manager.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -18,7 +18,7 @@
#include "util/string_util.hpp"
#include "pingus_error.hpp"
-#include "pathname.hpp"
+#include "util/pathname.hpp"
#include "path_manager.hpp"
#include "sdl_driver.hpp"
#include "core_driver.hpp"
Modified: trunk/pingus/src/layer_manager.cpp
===================================================================
--- trunk/pingus/src/layer_manager.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/layer_manager.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -15,6 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
+
#include "layer_manager.hpp"
Modified: trunk/pingus/src/layer_manager.hpp
===================================================================
--- trunk/pingus/src/layer_manager.hpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/layer_manager.hpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -17,7 +17,7 @@
#ifndef HEADER_PINGUS_LAYER_MANAGER_HPP
#define HEADER_PINGUS_LAYER_MANAGER_HPP
-#include "math.hpp"
+#include "math/math.hpp"
#include "globals.hpp"
#include "pingus.hpp"
#include "sprite.hpp"
Modified: trunk/pingus/src/levelset.cpp
===================================================================
--- trunk/pingus/src/levelset.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/levelset.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -21,7 +21,7 @@
#include "plf_res_mgr.hpp"
#include "savegame_manager.hpp"
#include "resource.hpp"
-#include "math.hpp"
+#include "math/math.hpp"
Levelset::Levelset(const Pathname& pathname)
: completion(0)
Modified: trunk/pingus/src/levelset.hpp
===================================================================
--- trunk/pingus/src/levelset.hpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/levelset.hpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -20,7 +20,7 @@
#include <string>
#include <vector>
#include "pingus_level.hpp"
-#include "pathname.hpp"
+#include "util/pathname.hpp"
#include "sprite.hpp"
/** */
Copied: trunk/pingus/src/math/math.cpp (from rev 4002,
trunk/pingus/src/math.cpp)
Copied: trunk/pingus/src/math/math.hpp (from rev 4002,
trunk/pingus/src/math.hpp)
Deleted: trunk/pingus/src/math.cpp
===================================================================
--- trunk/pingus/src/math.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/math.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -1,98 +0,0 @@
-// Pingus - A free Lemmings clone
-// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-#include <math.h>
-#include "math.hpp"
-
-namespace Math {
-
-float abs(float v)
-{
- return ::fabs(v);
-}
-
-float sin(float a)
-{
- return ::sinf(a);
-}
-
-float cos(float a)
-{
- return ::cosf(a);
-}
-
-float sqrt(float a)
-{
- return ::sqrt(a);
-}
-
-float mod(float x, float y)
-{
- return ::fmodf(x, y);
-}
-
-float floor(float x)
-{
- return ::floorf(x);
-}
-
-float atan2(float x, float y)
-{
- return ::atan2(x, y);
-}
-
-static char num2hex[] = "0123456789abcdef";
-
-std::string float2string(float value)
-{
- std::string str(2*sizeof(float), '0');
-
- for(size_t i = 0; i < sizeof(float); ++i)
- {
- char v = reinterpret_cast<char*>(&value)[i];
- str[2*i + 0] = num2hex[(v & 0xf0) >> 4];
- str[2*i + 1] = num2hex[v & 0x0f];
- }
- return str;
-}
-
-static char hex2int(char c)
-{
- if (c >= '0' && c <= '9')
- return c - '0';
- else if (c >= 'a' && c <= 'f')
- return c - 'a' + 0xa;
- else
- return 0;
-}
-
-float string2float(const std::string& str)
-{
- assert(str.size() == 2*sizeof(float));
-
- float value;
- for(size_t i = 0; i < sizeof(float); ++i)
- {
- char& v = reinterpret_cast<char*>(&value)[i];
- v = (hex2int(str[2*i+0]) << 4) | hex2int(str[2*i+1]);
- }
-
- return value;
-}
-
-} // namespace Math
-
-/* EOF */
Deleted: trunk/pingus/src/math.hpp
===================================================================
--- trunk/pingus/src/math.hpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/math.hpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -1,106 +0,0 @@
-// Pingus - A free Lemmings clone
-// Copyright (C) 2000 Ingo Ruhnke <address@hidden>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef HEADER_PINGUS_MATH_HPP
-#define HEADER_PINGUS_MATH_HPP
-
-#include <assert.h>
-#include <stdlib.h>
-#include <string>
-#include "pingus.hpp"
-
-/** A collection of small math helper functions, some of them might be
- equal in functionality to standard STL functions, but provided
- here for portability and broken STL implementations
-
- @brief A collection of mathematical helper functions */
-namespace Math {
-
-const float pi = 3.14159265358979323846f; /* pi */
-const float pi_2 = 1.57079632679489661923f; /* pi/2 */
-
-// Win32 defines these are defines already, so we have to undef them
-#ifdef min
-#undef min
-#endif
-#ifdef max
-#undef max
-#endif
-
-template<class T>
-T min (const T& a, const T& b)
-{
- if (a < b)
- return a;
- else
- return b;
-}
-
-template<class T>
-T max (const T& a, const T& b)
-{
- if (a > b)
- return a;
- else
- return b;
-}
-
-template<class T>
-T clamp (const T& low, const T& v, const T& high)
-{
- assert(low <= high);
- return max((low), min((v), (high)));
-}
-
-inline
-float frand()
-{
- return rand() / (RAND_MAX + 1.0f);
-}
-
-inline
-bool rand_bool()
-{
- return rand()%2 == 0;
-}
-
-inline int round (float f)
-{
- if (f >= 0.0f)
- return int(f + 0.5f);
- else
- return int(f - 0.5f);
-}
-
-float abs(float v);
-float sin(float a);
-float cos(float a);
-float sqrt(float a);
-float mod(float x, float y);
-float floor(float x);
-float atan2(float x, float y);
-
-/** Write out the raw bits of a float as hex */
-std::string float2string(float value);
-
-/** Restore the raw bits of a float from a string */
-float string2float(const std::string& str);
-
-} // namespace Math
-
-#endif
-
-/* EOF */
Deleted: trunk/pingus/src/memory_pool.hpp
===================================================================
--- trunk/pingus/src/memory_pool.hpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/memory_pool.hpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -1,111 +0,0 @@
-// Pingus - A free Lemmings clone
-// Copyright (C) 1999 Ingo Ruhnke <address@hidden>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef HEADER_MEMORY_POOL_HPP
-#define HEADER_MEMORY_POOL_HPP
-
-#include <assert.h>
-#include <vector>
-
-/** MemoryPool allows the allocation of small objects on a previous
- allocated chunk of memeroy, thus reducing the amount of new/delete
- calls that have do be done and providing a speed up. */
-template<class T>
-class MemoryPool
-{
-private:
- typedef std::vector<T*> Objects;
- Objects objects;
-
- typedef std::vector<char*> Chunks;
- Chunks chunks;
-
- size_t chunk_size;
- int next_free;
-
- char* allocate(size_t size)
- {
- assert(size <= chunk_size);
-
- if (chunks.empty() ||
- (next_free + size) > chunk_size)
- {
- char* chunk = new char[chunk_size];
- chunks.push_back(chunk);
- next_free = 0;
- }
-
- char* ptr = chunks.back() + next_free;
- next_free += size;
- return ptr;
- }
-
- T* keep(T* t)
- {
- objects.push_back(t);
- return t;
- }
-
-public:
- MemoryPool(size_t chunk_size_ = 16384)
- : chunk_size(chunk_size_),
- next_free(0)
- {
-
- }
-
- ~MemoryPool()
- {
- clear();
- }
-
- void clear()
- {
- for(typename Objects::reverse_iterator i = objects.rbegin(); i !=
objects.rend(); ++i)
- (*i)->~T();
- objects.clear();
-
- // FIXME: We don't have to delete the chunks, instead we should
- // just reset the pointer to start and reuse them
- for(typename Chunks::reverse_iterator i = chunks.rbegin(); i !=
chunks.rend(); ++i)
- {
- delete[] *i;
- }
- chunks.clear();
-
- next_free = 0;
- }
-
- template<class C>
- T* create() { return keep(new (allocate(sizeof(C))) C()); }
- template<class C, class Arg1>
- T* create(const Arg1& arg1) { return keep(new (allocate(sizeof(C)))
C(arg1)); }
- template<class C, class Arg1, class Arg2>
- T* create(const Arg1& arg1, const Arg2& arg2) { return keep(new
(allocate(sizeof(C))) C(arg1, arg2)); }
- template<class C, class Arg1, class Arg2, class Arg3>
- T* create(const Arg1& arg1, const Arg2& arg2, const Arg3& arg3) { return
keep(new (allocate(sizeof(C))) C(arg1, arg2, arg3)); }
- template<class C, class Arg1, class Arg2, class Arg3, class Arg4>
- T* create(const Arg1& arg1, const Arg2& arg2, const Arg3& arg3, const Arg4&
arg4) { return keep(new (allocate(sizeof(C))) C(arg1, arg2, arg3, arg4)); }
-
-private:
- MemoryPool (const MemoryPool&);
- MemoryPool& operator= (const MemoryPool&);
-};
-
-
-#endif
-
-/* EOF */
Modified: trunk/pingus/src/particles/pingu_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/pingu_particle_holder.cpp 2009-11-04
00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/particles/pingu_particle_holder.cpp 2009-11-04
00:59:16 UTC (rev 4004)
@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../display/scene_context.hpp"
-#include "../math.hpp"
+#include "math/math.hpp"
#include "../collision_map.hpp"
#include "../resource.hpp"
#include "../world.hpp"
Modified: trunk/pingus/src/particles/rain_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/rain_particle_holder.cpp 2009-11-04 00:33:25 UTC
(rev 4003)
+++ trunk/pingus/src/particles/rain_particle_holder.cpp 2009-11-04 00:59:16 UTC
(rev 4004)
@@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "../display/scene_context.hpp"
-#include "../math.hpp"
+#include "math/math.hpp"
#include "../collision_map.hpp"
#include "../globals.hpp"
#include "../resource.hpp"
Modified: trunk/pingus/src/particles/snow_particle_holder.cpp
===================================================================
--- trunk/pingus/src/particles/snow_particle_holder.cpp 2009-11-04 00:33:25 UTC
(rev 4003)
+++ trunk/pingus/src/particles/snow_particle_holder.cpp 2009-11-04 00:59:16 UTC
(rev 4004)
@@ -15,7 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <assert.h>
-#include "../math.hpp"
+
+#include "math/math.hpp"
#include "../collision_map.hpp"
#include "../display/scene_context.hpp"
#include "../ground_map.hpp"
Deleted: trunk/pingus/src/pathname.cpp
===================================================================
--- trunk/pingus/src/pathname.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/pathname.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -1,128 +0,0 @@
-// Pingus - A free Lemmings clone
-// Copyright (C) 2007 Ingo Ruhnke <address@hidden>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-#include <assert.h>
-#include <iostream>
-#include "util/system.hpp"
-#include "path_manager.hpp"
-#include "pathname.hpp"
-
-Pathname Pathname::tmpfile(const std::string& prefix)
-{
- assert(!"Unimplemented");
- return Pathname();
-}
-
-Pathname::Pathname()
- : type(INVALID)
-{
-}
-
-Pathname::Pathname(const std::string& pathname_, Type type_)
- : pathname(pathname_), type(type_)
-{
-}
-
-std::string
-Pathname::get_sys_path() const
-{
- switch(type)
- {
- case SYSTEM_PATH:
- return pathname;
-
- case DATA_PATH:
- return path_manager.complete(pathname);
-
- case INVALID:
- return "";
-
- default:
- assert(!"Never reached");
- }
- return "";
-}
-
-std::string
-Pathname::get_raw_path() const
-{
- return pathname;
-}
-
-Pathname::Type
-Pathname::get_type() const
-{
- return type;
-}
-
-bool
-Pathname::empty() const
-{
- return (type == INVALID);
-}
-
-bool
-Pathname::exist() const
-{
- return System::exist(get_sys_path());
-}
-
-uint64_t
-Pathname::mtime() const
-{
- return System::get_mtime(get_sys_path());
-}
-
-std::string
-Pathname::str() const
-{
- switch(type)
- {
- case Pathname::INVALID:
- return "invalid://" + pathname;
-
- case Pathname::DATA_PATH:
- return "datadir://" + pathname;
-
- case Pathname::SYSTEM_PATH:
- return "system://" + pathname;
-
- default:
- assert(!"never reached");
- }
- return std::string();
-}
-
-std::ostream& operator<< (std::ostream& os, const Pathname& p)
-{
- switch(p.get_type())
- {
- case Pathname::INVALID:
- return os << "invalid://" << p.get_raw_path();
-
- case Pathname::DATA_PATH:
- return os << "datadir://" << p.get_raw_path();
-
- case Pathname::SYSTEM_PATH:
- return os << "system://" << p.get_raw_path();
-
- default:
- assert(!"never reached");
- }
- return os;
-}
-
-/* EOF */
Deleted: trunk/pingus/src/pathname.hpp
===================================================================
--- trunk/pingus/src/pathname.hpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/pathname.hpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -1,75 +0,0 @@
-// Pingus - A free Lemmings clone
-// Copyright (C) 2007 Ingo Ruhnke <address@hidden>
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef HEADER_PATHNAME_HPP
-#define HEADER_PATHNAME_HPP
-
-#include <iosfwd>
-#include <string>
-#include "SDL.h"
-
-/** Simple class to allow a distinction of paths that refer to the
- * filesystem and paths that refer to the datadir, it also hides
- * path_manager from the rest of the code. */
-class Pathname
-{
-public:
- /** Generate a temporary filename suitable for temporary files */
- static Pathname tmpfile(const std::string& prefix = "");
-
- enum Type {
- // The given pathname refers to the native file system
- SYSTEM_PATH,
-
- // The given pathname refers to a file in the datadir
- DATA_PATH,
-
- INVALID
- };
-
-private:
- std::string pathname;
- Type type;
-
-public:
- Pathname();
- explicit Pathname(const std::string& pathname, Type type = DATA_PATH);
-
- /** Return the pathname in a form suitable for the native file
- system (i.e. can be passed to ifstream and friends */
- std::string get_sys_path() const;
-
- /** Return the pathname as is */
- std::string get_raw_path() const;
-
- Type get_type() const;
-
- /** Converts the Pathname into human readable form, usefull for
- debugging output, but nothing else */
- std::string str() const;
-
- bool empty() const;
-
- bool exist() const;
-
- uint64_t mtime() const;
-};
-
-std::ostream& operator<< (std::ostream& os, const Pathname& p);
-
-#endif
-
-/* EOF */
Modified: trunk/pingus/src/pingu.cpp
===================================================================
--- trunk/pingus/src/pingu.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/pingu.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -17,7 +17,8 @@
#include <sstream>
#include <assert.h>
#include <stdio.h>
-#include "math.hpp"
+
+#include "math/math.hpp"
#include "globals.hpp"
#include "world.hpp"
#include "sound/sound.hpp"
Modified: trunk/pingus/src/pingu_action.cpp
===================================================================
--- trunk/pingus/src/pingu_action.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/pingu_action.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -15,7 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <assert.h>
-#include "math.hpp"
+
+#include "math/math.hpp"
#include "math/vector3f.hpp"
#include "collision_map.hpp"
#include "world.hpp"
Modified: trunk/pingus/src/pingus_demo.cpp
===================================================================
--- trunk/pingus/src/pingus_demo.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/pingus_demo.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -16,7 +16,8 @@
#include <stdexcept>
#include <fstream>
-#include "pathname.hpp"
+
+#include "util/pathname.hpp"
#include "util/file_reader.hpp"
#include "server_event.hpp"
#include "pingus_error.hpp"
Modified: trunk/pingus/src/pingus_level.cpp
===================================================================
--- trunk/pingus/src/pingus_level.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/pingus_level.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -21,7 +21,7 @@
#include "pingus_error.hpp"
#include "pingus_level_impl.hpp"
#include "globals.hpp"
-#include "pathname.hpp"
+#include "util/pathname.hpp"
#include "debug.hpp"
PingusLevel::PingusLevel()
Modified: trunk/pingus/src/pingus_main.hpp
===================================================================
--- trunk/pingus/src/pingus_main.hpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/pingus_main.hpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -20,8 +20,9 @@
#include <string>
#include "pingus.hpp"
#include "SDL.h"
+
#include "pingus_options.hpp"
-#include "pathname.hpp"
+#include "util/pathname.hpp"
void segfault_handler(int);
Modified: trunk/pingus/src/pingus_menu.cpp
===================================================================
--- trunk/pingus/src/pingus_menu.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/pingus_menu.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -31,7 +31,7 @@
#include "gui/gui_manager.hpp"
#include "plf_res_mgr.hpp"
#include "path_manager.hpp"
-#include "pathname.hpp"
+#include "util/pathname.hpp"
#include "editor/editor_screen.hpp"
#include "credits.hpp"
#include "layer_manager.hpp"
Modified: trunk/pingus/src/pingus_options.hpp
===================================================================
--- trunk/pingus/src/pingus_options.hpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/pingus_options.hpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -18,8 +18,9 @@
#define HEADER_OPTIONS_HPP
#include <string>
+
#include "math/size.hpp"
-#include "pathname.hpp"
+#include "util/pathname.hpp"
template<class T>
class Value
Modified: trunk/pingus/src/plf_res_mgr.cpp
===================================================================
--- trunk/pingus/src/plf_res_mgr.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/plf_res_mgr.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -17,7 +17,7 @@
#include "globals.hpp"
#include "debug.hpp"
#include "util/system.hpp"
-#include "pathname.hpp"
+#include "util/pathname.hpp"
#include "plf_res_mgr.hpp"
PLFResMgr::PLFMap PLFResMgr::plf_map;
Modified: trunk/pingus/src/screen/screen_manager.cpp
===================================================================
--- trunk/pingus/src/screen/screen_manager.cpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/screen/screen_manager.cpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -17,9 +17,10 @@
#include "SDL.h"
#include <iostream>
#include <fstream>
+
#include "../globals.hpp"
#include "math/size.hpp"
-#include "pathname.hpp"
+#include "util/pathname.hpp"
#include "display/display.hpp"
#include "display/framebuffer.hpp"
#include "screen_manager.hpp"
Modified: trunk/pingus/src/server_event.cpp
===================================================================
--- trunk/pingus/src/server_event.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/server_event.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -18,7 +18,7 @@
#include <iostream>
#include <boost/format.hpp>
-#include "math.hpp"
+#include "math/math.hpp"
#include "pingus_error.hpp"
#include "server.hpp"
#include "world.hpp"
Modified: trunk/pingus/src/sprite.cpp
===================================================================
--- trunk/pingus/src/sprite.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/sprite.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -18,13 +18,14 @@
#include <sstream>
#include <assert.h>
#include "SDL.h"
+
#include "math/origin.hpp"
#include "math/vector2i.hpp"
#include "SDL_image.h"
#include "sprite.hpp"
#include "blitter.hpp"
#include "surface.hpp"
-#include "pathname.hpp"
+#include "util/pathname.hpp"
#include "resource.hpp"
#include "sprite_impl.hpp"
#include "sprite_description.hpp"
Modified: trunk/pingus/src/sprite_description.hpp
===================================================================
--- trunk/pingus/src/sprite_description.hpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/sprite_description.hpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -22,7 +22,7 @@
#include "math/size.hpp"
#include "math/origin.hpp"
#include "util/file_reader.hpp"
-#include "pathname.hpp"
+#include "util/pathname.hpp"
/** */
class SpriteDescription
Modified: trunk/pingus/src/story_screen.cpp
===================================================================
--- trunk/pingus/src/story_screen.cpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/story_screen.cpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -23,7 +23,7 @@
#include "gui/surface_button.hpp"
#include "screen/screen_manager.hpp"
#include "gui/component.hpp"
-#include "math.hpp"
+#include "math/math.hpp"
#include "fonts.hpp"
#include "story_screen.hpp"
#include "res_descriptor.hpp"
Modified: trunk/pingus/src/surface.hpp
===================================================================
--- trunk/pingus/src/surface.hpp 2009-11-04 00:33:25 UTC (rev 4003)
+++ trunk/pingus/src/surface.hpp 2009-11-04 00:59:16 UTC (rev 4004)
@@ -22,7 +22,7 @@
#include <boost/shared_ptr.hpp>
#include "math/size.hpp"
#include "resource_modifier.hpp"
-#include "pathname.hpp"
+#include "util/pathname.hpp"
#include "math/color.hpp"
class Rect;
Copied: trunk/pingus/src/util/memory_pool.hpp (from rev 4002,
trunk/pingus/src/memory_pool.hpp)
Copied: trunk/pingus/src/util/pathname.cpp (from rev 4003,
trunk/pingus/src/pathname.cpp)
Copied: trunk/pingus/src/util/pathname.hpp (from rev 4002,
trunk/pingus/src/pathname.hpp)
Modified: trunk/pingus/src/worldmap/path_graph.cpp
===================================================================
--- trunk/pingus/src/worldmap/path_graph.cpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/worldmap/path_graph.cpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -15,7 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../math.hpp"
+
+#include "math/math.hpp"
#include "util/file_reader.hpp"
#include "../pingus_error.hpp"
#include "dot.hpp"
Modified: trunk/pingus/src/worldmap/pingus.cpp
===================================================================
--- trunk/pingus/src/worldmap/pingus.cpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/worldmap/pingus.cpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -15,13 +15,13 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../math.hpp"
-#include "../math/vector3f.hpp"
-#include "../display/drawing_context.hpp"
+
+#include "math/math.hpp"
+#include "math/vector3f.hpp"
+#include "display/drawing_context.hpp"
#include "dot.hpp"
-#include "../math.hpp"
-#include "../direction.hpp"
-#include "../resource.hpp"
+#include "direction.hpp"
+#include "resource.hpp"
#include "pingus.hpp"
namespace WorldmapNS {
Modified: trunk/pingus/src/worldmap/pingus_worldmap.hpp
===================================================================
--- trunk/pingus/src/worldmap/pingus_worldmap.hpp 2009-11-04 00:33:25 UTC
(rev 4003)
+++ trunk/pingus/src/worldmap/pingus_worldmap.hpp 2009-11-04 00:59:16 UTC
(rev 4004)
@@ -18,9 +18,10 @@
#define HEADER_PINGUS_WORLDMAP_HPP
#include <boost/smart_ptr.hpp>
+
#include "worldmap_story.hpp"
#include "path_graph.hpp"
-#include "../pathname.hpp"
+#include "util/pathname.hpp"
class PingusWorldmapImpl;
Modified: trunk/pingus/src/worldmap/worldmap.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap.cpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/worldmap/worldmap.cpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -41,7 +41,7 @@
#include "dot.hpp"
#include "level_dot.hpp"
#include "path_graph.hpp"
-#include "../math.hpp"
+#include "math/math.hpp"
#include "../stat_manager.hpp"
#include "../story_screen.hpp"
Modified: trunk/pingus/src/worldmap/worldmap_screen.cpp
===================================================================
--- trunk/pingus/src/worldmap/worldmap_screen.cpp 2009-11-04 00:33:25 UTC
(rev 4003)
+++ trunk/pingus/src/worldmap/worldmap_screen.cpp 2009-11-04 00:59:16 UTC
(rev 4004)
@@ -25,7 +25,7 @@
#include "../sound/sound.hpp"
#include "../stat_manager.hpp"
#include "../display/scene_context.hpp"
-#include "../math.hpp"
+#include "math/math.hpp"
#include "worldmap.hpp"
#include "worldmap_component.hpp"
#include "resource.hpp"
Modified: trunk/pingus/src/worldobjs/smasher.cpp
===================================================================
--- trunk/pingus/src/worldobjs/smasher.cpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/worldobjs/smasher.cpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -15,7 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../math.hpp"
+
+#include "math/math.hpp"
#include "../collision_map.hpp"
#include "../display/scene_context.hpp"
#include "../particles/smoke_particle_holder.hpp"
Modified: trunk/pingus/src/worldobjs/snow_generator.cpp
===================================================================
--- trunk/pingus/src/worldobjs/snow_generator.cpp 2009-11-04 00:33:25 UTC
(rev 4003)
+++ trunk/pingus/src/worldobjs/snow_generator.cpp 2009-11-04 00:59:16 UTC
(rev 4004)
@@ -15,7 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <iostream>
-#include "../math.hpp"
+
+#include "math/math.hpp"
#include "../world.hpp"
#include "../particles/snow_particle_holder.hpp"
#include "snow_generator.hpp"
Modified: trunk/pingus/src/worldobjs/woodthing.cpp
===================================================================
--- trunk/pingus/src/worldobjs/woodthing.cpp 2009-11-04 00:33:25 UTC (rev
4003)
+++ trunk/pingus/src/worldobjs/woodthing.cpp 2009-11-04 00:59:16 UTC (rev
4004)
@@ -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 "../math.hpp"
+#include "math/math.hpp"
#include "../display/scene_context.hpp"
#include "../particles/smoke_particle_holder.hpp"
#include "../resource.hpp"
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r4004 - in trunk/pingus: . src src/actions src/components src/display src/editor src/input src/math src/particles src/screen src/util src/worldmap src/worldobjs,
grumbel at BerliOS <=