[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/editor action_window.cxx, 1.16, 1.17
|
From: |
Ingo Ruhnke |
|
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/editor action_window.cxx, 1.16, 1.17 action_window.hxx, 1.9, 1.10 editor.cxx, 1.54, 1.55 editor.hxx, 1.25, 1.26 editor_event.cxx, 1.62, 1.63 editor_event.hxx, 1.19, 1.20 editor_help_screen.cxx, 1.13, 1.14 editor_help_screen.hxx, 1.6, 1.7 editor_view.cxx, 1.10, 1.11 editor_view.hxx, 1.9, 1.10 editorobj.cxx, 1.7, 1.8 editorobj.hxx, 1.19, 1.20 editorobj_group.cxx, 1.10, 1.11 editorobj_group.hxx, 1.16, 1.17 editorobj_mgr.hxx, 1.2, 1.3 generic_property_frame.cxx, 1.7, 1.8 generic_property_frame.hxx, 1.3, 1.4 level_property_window.cxx, 1.13, 1.14 level_property_window.hxx, 1.11, 1.12 level_resizer.cxx, 1.5, 1.6 level_resizer.hxx, 1.4, 1.5 object_manager.cxx, 1.48, 1.49 object_manager.hxx, 1.28, 1.29 object_selector.cxx, 1.42, 1.43 object_selector.hxx, 1.15, 1.16 object_selector_window.cxx, 1.3, 1.4 object_selector_window.hxx, 1.3, 1.4 panel.cxx, 1.8, 1.9 panel.hxx, 1.9, 1.10 panel_icons.cxx, 1.12, 1.13 panel_icons.hxx, 1.9, 1.10 property_frame.cxx, 1.2, 1.3 property_frame.hxx, 1.9, 1.10 property_window.cxx, 1.16, 1.17 property_window.hxx, 1.11, 1.12 rect_editorobj.cxx, 1.9, 1.10 rect_editorobj.hxx, 1.8, 1.9 scroll_map.cxx, 1.7, 1.8 scroll_map.hxx, 1.7, 1.8 selection.cxx, 1.19, 1.20 selection.hxx, 1.15, 1.16 sprite_editorobj.cxx, 1.10, 1.11 sprite_editorobj.hxx, 1.10, 1.11 start_pos.cxx, 1.8, 1.9 start_pos.hxx, 1.11, 1.12 status_line.cxx, 1.11, 1.12 status_line.hxx, 1.11, 1.12 string_reader.cxx, 1.9, 1.10 string_reader.hxx, 1.7, 1.8 surface_selector.cxx, 1.9, 1.10 surface_selector.hxx, 1.8, 1.9 thumb_cache.cxx, 1.14, 1.15 thumb_cache.hxx, 1.9, 1.10 weather_obj.cxx, 1.12, 1.13 weather_obj.hxx, 1.12, 1.13 |
|
Date: |
Sun, 19 Oct 2003 01:17:31 +0200 |
Update of /var/lib/cvs/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv4053/editor
Modified Files:
action_window.cxx action_window.hxx editor.cxx editor.hxx
editor_event.cxx editor_event.hxx editor_help_screen.cxx
editor_help_screen.hxx editor_view.cxx editor_view.hxx
editorobj.cxx editorobj.hxx editorobj_group.cxx
editorobj_group.hxx editorobj_mgr.hxx
generic_property_frame.cxx generic_property_frame.hxx
level_property_window.cxx level_property_window.hxx
level_resizer.cxx level_resizer.hxx object_manager.cxx
object_manager.hxx object_selector.cxx object_selector.hxx
object_selector_window.cxx object_selector_window.hxx
panel.cxx panel.hxx panel_icons.cxx panel_icons.hxx
property_frame.cxx property_frame.hxx property_window.cxx
property_window.hxx rect_editorobj.cxx rect_editorobj.hxx
scroll_map.cxx scroll_map.hxx selection.cxx selection.hxx
sprite_editorobj.cxx sprite_editorobj.hxx start_pos.cxx
start_pos.hxx status_line.cxx status_line.hxx
string_reader.cxx string_reader.hxx surface_selector.cxx
surface_selector.hxx thumb_cache.cxx thumb_cache.hxx
weather_obj.cxx weather_obj.hxx
Log Message:
- bunch of little fixes for CL0.7, some parts are compilable, but still a bit
more todo
Index: action_window.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/action_window.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- action_window.cxx 19 Apr 2003 10:23:18 -0000 1.16
+++ action_window.cxx 18 Oct 2003 23:17:27 -0000 1.17
@@ -39,6 +39,8 @@
// FIXME: [+][-] buttons are missing, need an own widget, anybody
// FIXME: wants to write that?
+namespace Pingus {
+
using namespace Actions;
namespace EditorNS {
@@ -175,5 +177,6 @@
}
} // namespace EditorNS
+} // namespace Pingus
/* EOF */
Index: action_window.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/action_window.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- action_window.hxx 19 Apr 2003 10:23:18 -0000 1.9
+++ action_window.hxx 18 Oct 2003 23:17:27 -0000 1.10
@@ -30,13 +30,14 @@
class CL_InputBox;
class CL_Component;
+namespace Pingus {
namespace EditorNS {
class ActionWindow
{
private:
CL_Component* parent;
- std::vector<ActionData>* actions;
+ std::vector<Pingus::ActionData>* actions;
CL_Window* window;
std::vector<CL_CheckBox*> checkboxes;
std::vector<CL_InputBox*> inputs;
@@ -63,6 +64,7 @@
};
} // namespace EditorNS
+} // namespace Pingus
#endif
Index: editor.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor.cxx,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- editor.cxx 22 Aug 2003 10:19:48 -0000 1.54
+++ editor.cxx 18 Oct 2003 23:17:27 -0000 1.55
@@ -18,15 +18,10 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <ClanLib/Core/System/system.h>
-#include <ClanLib/Display/Display/display.h>
-#include <ClanLib/Display/Input/input.h>
-#include <ClanLib/Display/Display/mousecursor_provider.h>
-#include <ClanLib/Display/Input/mouse.h>
-#include <ClanLib/Display/Font/font.h>
-#include <ClanLib/Display/Input/inputbuffer.h>
-#include <ClanLib/Display/Input/keyboard.h>
-#include <ClanLib/GUI/gui_manager.h>
-#include <ClanLib/GUI/stylemanager_default.h>
+#include <ClanLib/display.h>
+#include <ClanLib/guistylesilver.h>
+#include <ClanLib/core.h>
+#include <ClanLib/gui.h>
#include "../globals.hxx"
#include "../gui/display.hxx"
@@ -49,8 +44,9 @@
#include "../fonts.hxx"
#include "editor_view.hxx"
-#include <cstdio>
+#include <stdio.h>
+namespace Pingus {
namespace EditorNS {
Editor* Editor::instance_ = 0;
@@ -95,8 +91,8 @@
// FIXME: Should use PingusResource, Memleak
CL_ResourceManager* gui_resources = new
CL_ResourceManager(path_manager.complete("data/gui.scr"), false);
- style_manager = new CL_StyleManager_Default (gui_resources);
- gui = new CL_GUIManager (style_manager);
+ style_manager = new CL_StyleManager_Silver(gui_resources);
+ gui = new CL_GUIManager(style_manager);
action_window = new ActionWindow (gui, object_manager->get_actions ());
property_window = new PropertyWindow (this);
@@ -186,7 +182,7 @@
void
Editor::draw ()
{
- CL_Display::clear_display();
+ CL_Display::clear();
object_manager->draw(view);
selection->draw (view);
@@ -265,15 +261,15 @@
str = default_str;
}
- CL_Display::clear_display();
- font->print_left(20, 20, prefix.c_str());
- font->print_left(20, 40, str.c_str());
- font->print_left(20, 400, "For information about the editor, have a look at
the info pages.");
- font->print_left(20, 420, "$ info pingus");
+ CL_Display::clear();
+ font.draw(20, 20, prefix.c_str());
+ font.draw(20, 40, str.c_str());
+ font.draw(20, 400, "For information about the editor, have a look at the
info pages.");
+ font.draw(20, 420, "$ info pingus");
Display::flip_display();
CL_Display::sync_buffers();
- CL_Key key;
+ CL_InputEvent event;
CL_InputBuffer* keys = new CL_InputBuffer;
bool finished = false;
@@ -281,13 +277,13 @@
{
CL_System::keep_alive();
- if (keys->peek_key().state != CL_Key::NoKey)
+ if (keys->peek_key().type != CL_InputEvent::no_key)
{
- key = keys->get_key();
+ event = keys->get_key();
- if (key.state == CL_Key::Pressed)
+ if (event.type == CL_InputEvent::pressed)
{
- switch (key.id)
+ switch (event.id)
{
case CL_KEY_ENTER:
finished = true;
@@ -310,14 +306,13 @@
break;
default:
- if (key.ascii > 0)
- str += key.ascii;
+ str += event.str;
break;
}
}
- CL_Display::clear_display();
- font->print_left(20, 20, prefix.c_str());
- font->print_left(20, 40, str.c_str());
+ CL_Display::clear();
+ font.draw(20, 20, prefix.c_str());
+ font.draw(20, 40, str.c_str());
Display::flip_display();
}
}
@@ -366,13 +361,13 @@
{
CL_System::keep_alive();
- if (CL_Mouse::left_pressed () && !mouse_down)
+ if (CL_Mouse::get_keycode(CL_MOUSE_LEFT) && !mouse_down)
{
mouse_down = true;
- rect.x1 = CL_Mouse::get_x ();
- rect.y1 = CL_Mouse::get_y ();
+ rect.left = CL_Mouse::get_x ();
+ rect.top = CL_Mouse::get_y ();
}
- else if (!CL_Mouse::left_pressed () && mouse_down)
+ else if (!CL_Mouse::get_keycode(CL_MOUSE_LEFT) && mouse_down)
{
break;
}
@@ -381,14 +376,14 @@
if (mouse_down)
{
- rect.x2 = CL_Mouse::get_x ();
- rect.y2 = CL_Mouse::get_y ();
+ rect.right = CL_Mouse::get_x ();
+ rect.bottom = CL_Mouse::get_y ();
- CL_Display::draw_rect (rect.x1, rect.y1, rect.x2, rect.y2,
+ CL_Display::draw_rect (rect.left, rect.top, rect.right, rect.bottom,
1.0, 1.0, 0.0, 1.0);
}
- mouse_cursor.put_screen (CL_Mouse::get_x (), CL_Mouse::get_y ());
+ mouse_cursor.draw(CL_Mouse::get_x (), CL_Mouse::get_y ());
Display::flip_display(true);
}
@@ -404,7 +399,7 @@
CL_Mouse::get_y ());
Vector end_pos;
- while (CL_Mouse::middle_pressed())
+ while (CL_Mouse::get_keycode(CL_MOUSE_MIDDLE))
{
CL_System::keep_alive();
@@ -412,7 +407,7 @@
CL_Mouse::get_y ());
// Draw the screen
- CL_Display::clear_display();
+ CL_Display::clear();
object_manager->draw(view);
selection->draw (view);
@@ -484,7 +479,7 @@
selection->drag ();
Vector old_pos (view->screen_to_world(Vector(CL_Mouse::get_x(),
CL_Mouse::get_y())));
- while (CL_Mouse::left_pressed())
+ while (CL_Mouse::get_keycode(CL_MOUSE_LEFT))
{
Vector new_pos (view->screen_to_world(Vector(CL_Mouse::get_x(),
CL_Mouse::get_y())));
@@ -574,5 +569,6 @@
}
} // namespace EditorNS
+} // namespace Pingus
/* EOF */
Index: editor.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor.hxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- editor.hxx 19 Apr 2003 10:23:18 -0000 1.25
+++ editor.hxx 18 Oct 2003 23:17:27 -0000 1.26
@@ -27,13 +27,13 @@
#include "../gui/screen.hxx"
#include "editor_help_screen.hxx"
-class CL_StyleManager_Default;
+class CL_StyleManager_Silver;
class CL_GUIManager;
-class EditorObj;
-
+namespace Pingus {
namespace EditorNS {
+class EditorObj;
class EditorView;
class EditorEvent;
class Panel;
@@ -57,7 +57,7 @@
int event_handler_ref_counter;
- CL_Font* font;
+ CL_Font font;
int move_x;
int move_y;
@@ -77,7 +77,7 @@
ObjectSelector* object_selector;
// GUI Stuff
- CL_StyleManager_Default* style_manager;
+ CL_StyleManager_Silver* style_manager;
CL_GUIManager* gui;
ActionWindow* action_window;
@@ -138,11 +138,8 @@
};
} // namespace EditorNS
+} // namespace Pingus
#endif
/* EOF */
-
-
-
-
Index: editor_event.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor_event.cxx,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- editor_event.cxx 22 Aug 2003 10:19:48 -0000 1.62
+++ editor_event.cxx 18 Oct 2003 23:17:27 -0000 1.63
@@ -22,37 +22,38 @@
#include <fstream>
#include <ClanLib/GUI/gui_manager.h>
#include <ClanLib/Core/System/error.h>
-#include <ClanLib/Display/Input/input.h>
-#include <ClanLib/Display/Input/keyboard.h>
-#include <ClanLib/Display/Display/display.h>
-#include <ClanLib/Display/Input/mouse.h>
+#include <ClanLib/Display/input_event.h>
+#include <ClanLib/Display/keyboard.h>
+#include <ClanLib/Display/display.h>
+#include <ClanLib/Display/mouse.h>
+
+#include "object_manager.hxx"
+#include "string_reader.hxx"
+#include "scroll_map.hxx"
+#include "editor_event.hxx"
-#include "../debug.hxx"
#include "../game_session.hxx"
+#include "../gettext.h"
#include "../globals.hxx"
#include "../gui/screen_manager.hxx"
#include "../html_browser.hxx"
#include "../loading.hxx"
-#include "../gettext.h"
#include "../pingus_error.hxx"
-#include "../pingus_resource.hxx"
#include "../plf_res_mgr.hxx"
#include "../system.hxx"
+#include "../vector.hxx"
#include "action_window.hxx"
#include "editor.hxx"
-#include "editor_event.hxx"
#include "editor_view.hxx"
#include "editorobj_group.hxx"
#include "level_property_window.hxx"
#include "level_resizer.hxx"
#include "object_selector.hxx"
-#include "object_selector_window.hxx"
#include "panel.hxx"
#include "property_window.hxx"
-#include "scroll_map.hxx"
#include "selection.hxx"
-#include "string_reader.hxx"
+namespace Pingus {
namespace EditorNS {
EditorEvent::EditorEvent()
@@ -72,7 +73,6 @@
EditorEvent::~EditorEvent()
{
-
}
void
@@ -105,16 +105,16 @@
}
void
-EditorEvent::on_button_press(CL_InputDevice *device, const CL_Key& key)
+EditorEvent::on_button_press(const CL_InputEvent& event)
{
//std::cout << "EditorEvent::on_button_press: " << is_enabled << std::endl;
if (!accept_input ())
return;
- if (device == CL_Input::keyboards[0])
+ if (event.device.get_type() == CL_InputDevice::keyboard)
{
- switch (key.id)
+ switch (event.id)
{
case CL_KEY_R:
if (CL_Keyboard::get_keycode(CL_KEY_RSHIFT)
@@ -243,27 +243,27 @@
break;
// Lower all object in the current selection
- case CL_KEY_PAGEDOWN:
+ case CL_KEY_PRIOR:
selection->lower();
if (CL_Keyboard::get_keycode(CL_KEY_RSHIFT))
{
selection->move(Vector(0, 0, -50));
}
- else if (CL_Keyboard::get_keycode(CL_KEY_RCTRL))
+ else if (CL_Keyboard::get_keycode(CL_KEY_RCONTROL))
{
selection->move(Vector(0, 0, -1));
}
break;
// Raise all objects in the current selection.
- case CL_KEY_PAGEUP:
+ case CL_KEY_NEXT:
selection->raise();
if (CL_Keyboard::get_keycode(CL_KEY_RSHIFT))
{
selection->move(Vector(0, 0, 50));
}
- else if (CL_Keyboard::get_keycode(CL_KEY_RCTRL))
+ else if (CL_Keyboard::get_keycode(CL_KEY_RCONTROL))
{
selection->move(Vector(0, 0, 1));
}
@@ -324,10 +324,10 @@
default:
if (verbose)
- std::cout << "EditorEvent: Unknown key pressed: id=" << key.id << "
ascii=" << key.ascii << std::endl;
+ std::cout << "EditorEvent: Unknown key pressed: id=" << event.id <<
" ascii=" << event.str << std::endl;
}
}
- else if (device == CL_Input::pointers[0])
+ else if (event.device.get_type() == CL_InputDevice::mouse)
{
if (0)
{
@@ -336,32 +336,32 @@
<< std::endl;
}
- switch (key.id)
+ switch (event.id)
{
- case CL_MOUSE_LEFTBUTTON:
- if (editor->panel->mouse_over((int) key.x, (int)key.y))
+ case CL_MOUSE_LEFT:
+ if (editor->panel->mouse_over((int)event.mouse_pos.x,
(int)event.mouse_pos.y))
editor->panel->on_click();
- else if (editor->scroll_map->mouse_over ((int)key.x, (int)key.y))
- editor->scroll_map->on_button_press(device, key);
+ else if (editor->scroll_map->mouse_over ((int)event.mouse_pos.x,
(int)event.mouse_pos.y))
+ editor->scroll_map->on_button_press(event);
else
editor_mark_or_move_object();
break;
- case CL_MOUSE_MIDDLEBUTTON:
+ case CL_MOUSE_MIDDLE:
editor->rect_get_current_objs();
break;
- case CL_MOUSE_WHEELDOWN:
- editor_zoom_out(static_cast<int>(key.x),
- static_cast<int>(key.y));
+ case CL_MOUSE_WHEEL_DOWN:
+ editor_zoom_out(static_cast<int>(event.mouse_pos.x),
+ static_cast<int>(event.mouse_pos.y));
break;
- case CL_MOUSE_WHEELUP:
- editor_zoom_in(static_cast<int>(key.x),
- static_cast<int>(key.y));
+ case CL_MOUSE_WHEEL_UP:
+ editor_zoom_in(static_cast<int>(event.mouse_pos.x),
+ static_cast<int>(event.mouse_pos.y));
break;
- case CL_MOUSE_RIGHTBUTTON:
+ case CL_MOUSE_RIGHT:
editor->scroll();
break;
}
@@ -376,19 +376,19 @@
}
void
-EditorEvent::on_button_release(CL_InputDevice *device, const CL_Key &key)
+EditorEvent::on_button_release(const CL_InputEvent& event)
{
//std::cout << "EditorEvent::on_button_release: " << is_enabled << std::endl;
if (!accept_input ())
return;
- if (device == CL_Input::keyboards[0])
+ if (event.device.get_type() == CL_InputDevice::keyboard)
{
}
- else if (device == CL_Input::pointers[0])
+ else if (event.device.get_type() == CL_InputDevice::mouse)
{
- if (key.id == CL_MOUSE_LEFTBUTTON)
+ if (event.id == CL_MOUSE_LEFT)
editor->panel->on_release();
}
else
@@ -703,7 +703,7 @@
int y = CL_Mouse::get_y();
bool move_selection = false;
- while (CL_Mouse::left_pressed() && move_selection == false)
+ while (CL_Mouse::get_keycode(CL_MOUSE_LEFT) && move_selection == false)
{
if ((abs(x - CL_Mouse::get_x()) > 3)
|| (abs(y - CL_Mouse::get_y()) > 3))
@@ -738,8 +738,6 @@
void
EditorEvent::editor_display_help()
{
- /* CL_Display::clear_display();
- font->print_center(CL_Display::get_width() / 2, 20, "Help Screen");*/
}
void
@@ -855,5 +853,6 @@
}
} // namespace EditorNS
+} // namespace Pingus
/* EOF */
Index: editor_event.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor_event.hxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- editor_event.hxx 22 Aug 2003 10:19:48 -0000 1.19
+++ editor_event.hxx 18 Oct 2003 23:17:27 -0000 1.20
@@ -21,23 +21,25 @@
#define HEADER_PINGUS_EDITOR_EDITOR_EVENT_HXX
#include <vector>
+#include <ClanLib/Display/font.h>
#include "../color.hxx"
class CL_Key;
class CL_Font;
-class CL_InputDevice;
+class CL_InputEvent;
+namespace Pingus {
namespace EditorNS {
class ObjectManager;
class Selection;
class Editor;
-class EditorEvent //: public CL_Event_ButtonPress, public
CL_Event_ButtonRelease
+class EditorEvent
{
private:
bool is_enabled;
- CL_Font* font;
+ CL_Font font;
std::vector<Color> background_colors;
@@ -49,8 +51,8 @@
ObjectManager* object_manager;
Selection* selection;
- virtual void on_button_press(CL_InputDevice *device, const CL_Key &key);
- virtual void on_button_release(CL_InputDevice *device, const CL_Key &key);
+ virtual void on_button_press(const CL_InputEvent& event);
+ virtual void on_button_release(const CL_InputEvent& event);
void enable();
void disable();
@@ -118,6 +120,7 @@
};
} // namespace EditorNS
+} // namespace Pingus
#endif
Index: editor_help_screen.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor_help_screen.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- editor_help_screen.cxx 19 Aug 2003 19:56:55 -0000 1.13
+++ editor_help_screen.cxx 18 Oct 2003 23:17:27 -0000 1.14
@@ -17,13 +17,16 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include <ClanLib/Display/Display/display.h>
-#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/display.h>
+#include <ClanLib/core.h>
#include "../gettext.h"
#include "../pingus_resource.hxx"
#include "../fonts.hxx"
#include "editor_help_screen.hxx"
+namespace Pingus {
+namespace EditorNS {
+
EditorHelpScreen::EditorHelpScreen ()
: font (Fonts::pingus_small),
large_font (Fonts::pingus_large)
@@ -34,56 +37,58 @@
void
EditorHelpScreen::draw ()
{
- CL_Display::fill_rect (25,0, CL_Display::get_width (),
CL_Display::get_height (),
- 0.0f, 0.0f, 0.0f, 1.0f);
- large_font->print_center (CL_Display::get_width ()/2, 32, _("Editor
Helpscreen (hide with F1)"));
+ CL_Display::fill_rect (CL_Rect(25,0, CL_Display::get_width (),
CL_Display::get_height ()),
+ CL_Color(0, 0, 0, 255));
+ large_font.set_alignment(origin_center);
+ large_font.draw(CL_Display::get_width ()/2, 32, _("Editor Helpscreen (hide
with F1)"));
int x_pos;
int y_pos;
x_pos = 64;
y_pos = 100;
- font->print_left (x_pos, y_pos + 0, _("F1 - show/hide this help screen"));
- font->print_left (x_pos, y_pos + 20, _("F2 - launch level building
tutorial"));
- font->print_left (x_pos, y_pos + 40, _("F3 - toggle background color"));
- font->print_left (x_pos, y_pos + 60, _("F4 - play/test the level"));
- font->print_left (x_pos, y_pos + 80, _("F5 - load a level"));
- font->print_left (x_pos, y_pos + 100, _("F6 - save this level"));
- font->print_left (x_pos, y_pos + 120, _("F7 - [unset]"));
- font->print_left (x_pos, y_pos + 140, _("F8 - quick save/backup save?!"));
- font->print_left (x_pos, y_pos + 160, _("F9 - change level width and
height"));
- font->print_left (x_pos, y_pos + 180, _("F10 - [unset]"));
- font->print_left (x_pos, y_pos + 200, _("F11 - toggle fps counter"));
- font->print_left (x_pos, y_pos + 220, _("F12 - make screenshot"));
+ large_font.set_alignment(origin_bottom_left);
+ font.draw(x_pos, y_pos + 0, _("F1 - show/hide this help screen"));
+ font.draw(x_pos, y_pos + 20, _("F2 - launch level building tutorial"));
+ font.draw(x_pos, y_pos + 40, _("F3 - toggle background color"));
+ font.draw(x_pos, y_pos + 60, _("F4 - play/test the level"));
+ font.draw(x_pos, y_pos + 80, _("F5 - load a level"));
+ font.draw(x_pos, y_pos + 100, _("F6 - save this level"));
+ font.draw(x_pos, y_pos + 120, _("F7 - [unset]"));
+ font.draw(x_pos, y_pos + 140, _("F8 - quick save/backup save?!"));
+ font.draw(x_pos, y_pos + 160, _("F9 - change level width and height"));
+ font.draw(x_pos, y_pos + 180, _("F10 - [unset]"));
+ font.draw(x_pos, y_pos + 200, _("F11 - toggle fps counter"));
+ font.draw(x_pos, y_pos + 220, _("F12 - make screenshot"));
x_pos = CL_Display::get_width()/2 - 32;
y_pos = 100;
- font->print_left (x_pos, y_pos + 0, _("Home - increase object size"));
- font->print_left (x_pos, y_pos + 20, _("End - decrease object size"));
- font->print_left (x_pos, y_pos + 40, _("Cursor Keys - Move object"));
- font->print_left (x_pos, y_pos + 60, _("Shift 'Cursor Keys' - Move objects
fast "));
- font->print_left (x_pos, y_pos + 80, _("PageUp - level object up"));
- font->print_left (x_pos, y_pos + 100, _("PageDown - level object down"));
- font->print_left (x_pos, y_pos + 120, _("Shift PageUp - increase objects
z-pos by 50"));
- font->print_left (x_pos, y_pos + 140, _("Shift PageDown - decrease objects
z-pos by 50"));
- font->print_left (x_pos, y_pos + 160, _("Enter - Set default zoom (1:1)"));
- font->print_left (x_pos, y_pos + 180, _("d - duplicate object"));
- font->print_left (x_pos, y_pos + 200, _("a - mark all objects"));
- font->print_left (x_pos, y_pos + 220, _("shift leftmouseclick - add object
to selection"));
- font->print_left (x_pos, y_pos + 240, _("leftmouseclick - select object"));
- font->print_left (x_pos, y_pos + 260, _("Insert - insert new object"));
- font->print_left (x_pos, y_pos + 280, _("Remove - remove selected object"));
- font->print_left (x_pos, y_pos + 300, _("g - ungroup/group current
selection"));
- font->print_left (x_pos, y_pos + 320, _("Ctrl PageUp - increase objects
z-pos by 1"));
- font->print_left (x_pos, y_pos + 340, _("Ctrl PageDown - decrease objects
z-pos by 1"));
- //font->print_left (x_pos, y_pos + 320, _(""));
- //font->print_left (x_pos, y_pos + 340, _(""));
+ font.draw(x_pos, y_pos + 0, _("Home - increase object size"));
+ font.draw(x_pos, y_pos + 20, _("End - decrease object size"));
+ font.draw(x_pos, y_pos + 40, _("Cursor Keys - Move object"));
+ font.draw(x_pos, y_pos + 60, _("Shift 'Cursor Keys' - Move objects fast "));
+ font.draw(x_pos, y_pos + 80, _("PageUp - level object up"));
+ font.draw(x_pos, y_pos + 100, _("PageDown - level object down"));
+ font.draw(x_pos, y_pos + 120, _("Shift PageUp - increase objects z-pos by
50"));
+ font.draw(x_pos, y_pos + 140, _("Shift PageDown - decrease objects z-pos by
50"));
+ font.draw(x_pos, y_pos + 160, _("Enter - Set default zoom (1:1)"));
+ font.draw(x_pos, y_pos + 180, _("d - duplicate object"));
+ font.draw(x_pos, y_pos + 200, _("a - mark all objects"));
+ font.draw(x_pos, y_pos + 220, _("shift leftmouseclick - add object to
selection"));
+ font.draw(x_pos, y_pos + 240, _("leftmouseclick - select object"));
+ font.draw(x_pos, y_pos + 260, _("Insert - insert new object"));
+ font.draw(x_pos, y_pos + 280, _("Remove - remove selected object"));
+ font.draw(x_pos, y_pos + 300, _("g - ungroup/group current selection"));
+ font.draw(x_pos, y_pos + 320, _("Ctrl PageUp - increase objects z-pos by
1"));
+ font.draw(x_pos, y_pos + 340, _("Ctrl PageDown - decrease objects z-pos by
1"));
+ //font.draw(x_pos, y_pos + 320, _(""));
+ //font.draw(x_pos, y_pos + 340, _(""));
x_pos = 64;
y_pos = 500;
- font->print_left (x_pos, y_pos + 0, _("Naming Convention:
<LEVELNAME><NUMBER>-<CREATOR>.plf"));
+ font.draw(x_pos, y_pos + 0, _("Naming Convention:
<LEVELNAME><NUMBER>-<CREATOR>.plf"));
- font->print_left (x_pos, y_pos + 30, _("When you have created a level and
want to have it in the next Pingus release,\n"
+ font.draw(x_pos, y_pos + 30, _("When you have created a level and want to
have it in the next Pingus release,\n"
"please mail it to address@hidden"));
}
@@ -92,4 +97,7 @@
{
}
+} // namespace EditorNS
+} // namespace Pingus
+
/* EOF */
Index: editor_help_screen.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor_help_screen.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- editor_help_screen.hxx 19 Apr 2003 10:23:18 -0000 1.6
+++ editor_help_screen.hxx 18 Oct 2003 23:17:27 -0000 1.7
@@ -21,14 +21,16 @@
#define HEADER_PINGUS_EDITOR_EDITOR_HELP_SCREEN_HXX
#include "../pingus.hxx"
+#include <ClanLib/Display/font.h>
-class CL_Font;
+namespace Pingus {
+namespace EditorNS {
class EditorHelpScreen
{
private:
- CL_Font* font;
- CL_Font* large_font;
+ CL_Font font;
+ CL_Font large_font;
public:
EditorHelpScreen ();
void draw ();
@@ -39,6 +41,9 @@
EditorHelpScreen& operator= (const EditorHelpScreen&);
};
+} // namespace EditorNS
+} // namespace Pingus
+
#endif
/* EOF */
Index: editor_view.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor_view.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- editor_view.cxx 22 Aug 2003 10:19:48 -0000 1.10
+++ editor_view.cxx 18 Oct 2003 23:17:27 -0000 1.11
@@ -19,11 +19,13 @@
#include <iostream>
#include <ClanLib/Core/Math/rect.h>
-#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/display.h>
#include "../sprite.hxx"
+#include "../gui/display.hxx"
#include "editor_view.hxx"
#include "../math.hxx"
+namespace Pingus {
namespace EditorNS {
EditorView::EditorView (int x1_, int y1_, int x2_, int y2_,
@@ -31,7 +33,7 @@
: x1(x1_), y1(y1_), x2(x2_), y2(y2_), offset(-(x2_ - x1_)/2.0f,
-(y2_-x1_)/2.0f, 1.0f)
{
center = Vector ((x2 - x1)/2.0f + x1,
- (y2 - y1)/2.0f + y1);
+ (y2 - y1)/2.0f + y1);
//std::cout << "View: " << x1 << ", " << y1 << ", " << x2 << ", " << y2
//<< std::endl;
UNUSED_ARG(x_offset);
@@ -89,13 +91,13 @@
{
CL_Rect rect;
- rect.x1 = Math::min(arg_rect.x1, arg_rect.x2);
- rect.x2 = Math::max(arg_rect.x1, arg_rect.x2);
- rect.y1 = Math::min(arg_rect.y1, arg_rect.y2);
- rect.y2 = Math::max(arg_rect.y1, arg_rect.y2);
+ rect.left = Math::min(arg_rect.left, arg_rect.right);
+ rect.right = Math::max(arg_rect.left, arg_rect.right);
+ rect.top = Math::min(arg_rect.top, arg_rect.bottom);
+ rect.bottom = Math::max(arg_rect.top, arg_rect.bottom);
- Vector pos1 = screen_to_world (Vector(rect.x1, rect.y1));
- Vector pos2 = screen_to_world (Vector(rect.x2, rect.y2));
+ Vector pos1 = screen_to_world (Vector(rect.left, rect.top));
+ Vector pos2 = screen_to_world (Vector(rect.right, rect.bottom));
Vector center_ = (pos2 + pos1) * 0.5f;
offset = -center_;
@@ -185,14 +187,14 @@
{
if (offset.z == 1.0)
{
- sur.put_screen (int(pos.x + get_x_offset () + center.x),
- int(pos.y + get_y_offset () + center.y));
+ sur.draw(int(pos.x + get_x_offset () + center.x),
+ int(pos.y + get_y_offset () + center.y));
}
else
{
- sur.put_screen (int((pos.x + get_x_offset ()) * offset.z + center.x),
- int((pos.y + get_y_offset ()) * offset.z + center.y),
- offset.z, offset.z);
+ sur.draw(int((pos.x + get_x_offset ()) * offset.z + center.x),
+ int((pos.y + get_y_offset ()) * offset.z + center.y),
+ offset.z, offset.z);
}
//CL_Display::draw_line (x1, y1, x2, y2, 1.0, 1.0, 0.0);
//CL_Display::draw_line (x1, y2, x2, y1, 1.0, 1.0, 0.0);
@@ -209,14 +211,14 @@
{
if (offset.z == 1.0)
{
- sur.put_screen (int(x_pos + get_x_offset () + center.x),
- int(y_pos + get_y_offset () + center.y));
+ sur.draw(int(x_pos + get_x_offset () + center.x),
+ int(y_pos + get_y_offset () + center.y));
}
else
{
- sur.put_screen (int((x_pos + get_x_offset ()) * offset.z + center.x),
- int((y_pos + get_y_offset ()) * offset.z + center.y),
- offset.z, offset.z);
+ sur.draw(int((x_pos + get_x_offset ()) * offset.z + center.x),
+ int((y_pos + get_y_offset ()) * offset.z + center.y),
+ offset.z, offset.z);
}
}
@@ -225,27 +227,27 @@
{
if (offset.z == 1.0)
{
- sur.put_screen (int(x_pos + get_x_offset () + center.x),
- int(y_pos + get_y_offset () + center.y),
- frame);
+ sur.draw(int(x_pos + get_x_offset () + center.x),
+ int(y_pos + get_y_offset () + center.y),
+ frame);
}
else
{
- sur.put_screen (int((x_pos + get_x_offset ()) * offset.z + center.x),
- int((y_pos + get_y_offset ()) * offset.z + center.y),
- offset.z, offset.z,
- frame);
+ sur.draw(int((x_pos + get_x_offset ()) * offset.z + center.x),
+ int((y_pos + get_y_offset ()) * offset.z + center.y),
+ offset.z, offset.z,
+ frame);
}
}
void
EditorView::draw (CL_Surface& sur, int x_pos, int y_pos,
- float size_x, float size_y, int frame)
+ float size_x, float size_y, int frame)
{
- sur.put_screen (int(x_pos + get_x_offset () + center.x),
- int(y_pos + get_y_offset () + center.y),
- size_x * offset.z,
- size_y * offset.z, frame);
+ sur.draw(int(x_pos + get_x_offset () + center.x),
+ int(y_pos + get_y_offset () + center.y),
+ size_x * offset.z,
+ size_y * offset.z, frame);
}
void
@@ -263,34 +265,34 @@
static_cast<int>((y1_ + get_y_offset()) * offset.z +
center.y),
static_cast<int>((x2_ + get_x_offset()) * offset.z +
center.x),
static_cast<int>((y2_ + get_y_offset()) * offset.z +
center.y),
- r, g, b, a);
+ Display::to_color(r, g, b, a));
}
void
EditorView::draw_fillrect (int x1_, int y1_, int x2_, int y2_,
float r, float g, float b, float a)
{
- CL_Display::fill_rect (static_cast<int>((x1_ + get_x_offset()) * offset.z +
center.x),
- static_cast<int>((y1_ + get_y_offset()) * offset.z +
center.y),
- static_cast<int>((x2_ + get_x_offset()) * offset.z +
center.x),
- static_cast<int>((y2_ + get_y_offset()) * offset.z +
center.y),
- r, g, b, a);
+ CL_Display::fill_rect(CL_Rect(static_cast<int>((x1_ + get_x_offset()) *
offset.z + center.x),
+ static_cast<int>((y1_ + get_y_offset()) *
offset.z + center.y),
+ static_cast<int>((x2_ + get_x_offset()) *
offset.z + center.x),
+ static_cast<int>((y2_ + get_y_offset()) *
offset.z + center.y)),
+ Display::to_color(r, g, b, a));
}
void
EditorView::draw_rect (int x1_, int y1_, int x2_, int y2_,
float r, float g, float b, float a)
{
- CL_Display::draw_rect(static_cast<int>((x1_ + get_x_offset()) * offset.z +
center.x),
- static_cast<int>((y1_ + get_y_offset()) * offset.z +
center.y),
- static_cast<int>((x2_ + get_x_offset()) * offset.z +
center.x),
- static_cast<int>((y2_ + get_y_offset()) * offset.z +
center.y),
- r, g, b, a);
+ CL_Display::draw_rect(CL_Rect(static_cast<int>((x1_ + get_x_offset()) *
offset.z + center.x),
+ static_cast<int>((y1_ + get_y_offset()) *
offset.z + center.y),
+ static_cast<int>((x2_ + get_x_offset()) *
offset.z + center.x),
+ static_cast<int>((y2_ + get_y_offset()) *
offset.z + center.y)),
+ Display::to_color(r, g, b, a));
}
void
EditorView::draw_pixel (int /*x_pos*/, int /*y_pos*/,
- float /*r*/, float /*g*/, float /*b*/, float /*a*/)
+ float /*r*/, float /*g*/, float /*b*/, float /*a*/)
{
//CL_Display::put_pixel (x1 + get_x_offset (),
// y1 + get_y_offset (), r, g, b, a);
@@ -299,7 +301,7 @@
void
EditorView::draw_circle (int x_pos, int y_pos, int radius,
- float r, float g, float b, float a)
+ float r, float g, float b, float a)
{
// FIXME: Probally not the fast circle draw algo on this world...
const float pi = 3.1415927f * 2.0f;
@@ -318,5 +320,6 @@
}
} // namespace EditorNS
+} // namespace Pingus
/* EOF */
Index: editor_view.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editor_view.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- editor_view.hxx 22 Aug 2003 10:19:48 -0000 1.9
+++ editor_view.hxx 18 Oct 2003 23:17:27 -0000 1.10
@@ -23,10 +23,13 @@
#include "../pingus.hxx"
#include "../vector.hxx"
-class Sprite;
class CL_Rect;
class CL_Surface;
+namespace Pingus {
+
+class Sprite;
+
namespace EditorNS {
/** The EdtiorView is basically the graphic context to which the
@@ -106,6 +109,7 @@
};
} // namespace EditorNS
+} // namespace Pingus
#endif
Index: editorobj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editorobj.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- editorobj.cxx 19 Apr 2003 10:23:18 -0000 1.7
+++ editorobj.cxx 18 Oct 2003 23:17:27 -0000 1.8
@@ -19,6 +19,9 @@
#include "editorobj.hxx"
+namespace Pingus {
+namespace EditorNS {
+
EditorNS::Editor* EditorObj::editor = 0;
EditorObj::EditorObj ()
@@ -35,4 +38,7 @@
return "EditorObj::status_line(): Not implemented";
}
+} // namespace EditorNS
+} // namespace Pingus
+
/* EOF */
Index: editorobj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editorobj.hxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- editorobj.hxx 19 Apr 2003 10:23:18 -0000 1.19
+++ editorobj.hxx 18 Oct 2003 23:17:27 -0000 1.20
@@ -26,18 +26,17 @@
#include <vector>
class CL_Rect;
-class Vector;
class CL_Component;
-class EditorObj;
+namespace Pingus {
-typedef std::vector<EditorObj*> EditorObjLst;
+class Vector;
namespace EditorNS {
+
class PropertyFrame;
class Editor;
class EditorView;
-} // namespace EditorNS
/** Interface for all objects which can be shown in the editor */
class EditorObj
@@ -125,6 +124,11 @@
EditorObj& operator= (const EditorObj&) { return *this; }
};
+typedef std::vector<EditorObj*> EditorObjLst;
+
+} // namespace EditorNS
+} // namespace Pingus
+
#endif
/* EOF */
Index: editorobj_group.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editorobj_group.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- editorobj_group.cxx 19 Apr 2003 10:23:18 -0000 1.10
+++ editorobj_group.cxx 18 Oct 2003 23:17:27 -0000 1.11
@@ -20,9 +20,8 @@
#include <iostream>
#include "editorobj_group.hxx"
-/******************/
-/* EditorObjGroup */
-/******************/
+namespace Pingus {
+namespace EditorNS {
EditorObjGroup::EditorObjGroup()
{
@@ -254,4 +253,7 @@
}
}
+} // namespace EditorNS
+} // namespace Pingus
+
/* EOF */
Index: editorobj_group.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editorobj_group.hxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- editorobj_group.hxx 19 Apr 2003 10:23:18 -0000 1.16
+++ editorobj_group.hxx 18 Oct 2003 23:17:27 -0000 1.17
@@ -25,9 +25,12 @@
#include "editorobj.hxx"
#include "editorobj_mgr.hxx"
+namespace Pingus {
+namespace EditorNS {
+
class EditorObjGroup
: public EditorObj,
- public EditorNS::EditorObjMgr
+ public EditorObjMgr
{
private:
std::vector<EditorObj*> objs;
@@ -74,6 +77,9 @@
EditorObjGroup& operator= (const EditorObjGroup&);
};
+} // namespace EditorNS
+} // namespace Pingus
+
#endif
/* EOF */
Index: editorobj_mgr.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/editorobj_mgr.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- editorobj_mgr.hxx 19 Apr 2003 10:23:18 -0000 1.2
+++ editorobj_mgr.hxx 18 Oct 2003 23:17:27 -0000 1.3
@@ -20,8 +20,11 @@
#ifndef HEADER_PINGUS_EDITORNS_EDITOROBJ_MGR_HXX
#define HEADER_PINGUS_EDITORNS_EDITOROBJ_MGR_HXX
+namespace Pingus {
namespace EditorNS {
+class EditorObj;
+
/** Abstrakt class to allow the creation of EditorObjs from
WorldObjData */
class EditorObjMgr
@@ -32,6 +35,7 @@
};
} // namespace EditorNS
+} // namespace Pingus
#endif
Index: generic_property_frame.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/generic_property_frame.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- generic_property_frame.cxx 19 Aug 2003 19:56:55 -0000 1.7
+++ generic_property_frame.cxx 18 Oct 2003 23:17:27 -0000 1.8
@@ -27,6 +27,7 @@
#include "../string_converter.hxx"
#include "generic_property_frame.hxx"
+namespace Pingus {
namespace EditorNS {
class IntegerDataBox : public DataBox
@@ -301,5 +302,6 @@
}
} // namespace EditorNS
+} // namespace Pingus
/* EOF */
Index: generic_property_frame.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/generic_property_frame.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- generic_property_frame.hxx 19 Apr 2003 10:23:18 -0000 1.3
+++ generic_property_frame.hxx 18 Oct 2003 23:17:27 -0000 1.4
@@ -27,6 +27,7 @@
class CL_Component;
+namespace Pingus {
namespace EditorNS {
/** Interface for holding data pointers */
@@ -118,6 +119,7 @@
};
} // namespace EditorNS
+} // namespace Pingus
#endif
Index: level_property_window.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/level_property_window.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- level_property_window.cxx 19 Apr 2003 10:23:18 -0000 1.13
+++ level_property_window.cxx 18 Oct 2003 23:17:27 -0000 1.14
@@ -44,6 +44,7 @@
[ OK ] [Cancel]
*********************/
+namespace Pingus {
namespace EditorNS {
LevelPropertyWindow::LevelPropertyWindow (CL_Component* parent, ObjectManager*
manager_)
@@ -173,5 +174,6 @@
}
} // namespace EditorNS
+} // namespace Pingus
/* EOF */
Index: level_property_window.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/level_property_window.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- level_property_window.hxx 19 Apr 2003 10:23:18 -0000 1.11
+++ level_property_window.hxx 18 Oct 2003 23:17:27 -0000 1.12
@@ -26,6 +26,8 @@
#include <ClanLib/GUI/checkbox.h>
#include <ClanLib/GUI/inputbox.h>
+namespace Pingus {
+
class ObjectManager;
namespace EditorNS {
@@ -89,6 +91,7 @@
};
} // namespace EditorNS
+} // namespace Pingus
#endif
Index: level_resizer.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/level_resizer.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- level_resizer.cxx 19 Apr 2003 10:23:18 -0000 1.5
+++ level_resizer.cxx 18 Oct 2003 23:17:27 -0000 1.6
@@ -18,11 +18,12 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <stdio.h>
-#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/Display/font.h>
#include "../fonts.hxx"
#include "object_manager.hxx"
#include "level_resizer.hxx"
+namespace Pingus {
namespace EditorNS {
LevelResizer::LevelResizer(ObjectManager* m)
@@ -51,7 +52,7 @@
{
char str[64];
snprintf(str, 64, "Level Size: %4dx%4d", obj_manager->get_width(),
obj_manager->get_height());
- Fonts::pingus_small->print_left( 300, 200, str);
+ Fonts::pingus_small.draw(300, 200, str);
}
}
@@ -74,5 +75,6 @@
}
} // namespace EditorNS
+} // namespace Pingus
/* EOF */
Index: level_resizer.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/level_resizer.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- level_resizer.hxx 19 Apr 2003 10:23:18 -0000 1.4
+++ level_resizer.hxx 18 Oct 2003 23:17:27 -0000 1.5
@@ -23,6 +23,7 @@
#include "../vector.hxx"
#include "sprite_editorobj.hxx"
+namespace Pingus {
namespace EditorNS {
class ObjectManager;
@@ -60,6 +61,7 @@
};
} // namespace EditorNS
+} // namespace Pingus
#endif
Index: object_manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/object_manager.cxx,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- object_manager.cxx 19 Apr 2003 10:23:18 -0000 1.48
+++ object_manager.cxx 18 Oct 2003 23:17:27 -0000 1.49
@@ -36,6 +36,8 @@
#include "object_manager.hxx"
#include "editor_view.hxx"
+namespace Pingus {
+
using namespace Actions;
using namespace WorldObjsData;
@@ -415,5 +417,6 @@
}
} // namespace EditorNS
+} // namespace Pingus
/* EOF */
Index: object_manager.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/object_manager.hxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- object_manager.hxx 19 Apr 2003 10:23:18 -0000 1.28
+++ object_manager.hxx 18 Oct 2003 23:17:27 -0000 1.29
@@ -26,6 +26,7 @@
#include "editorobj.hxx"
#include "editorobj_mgr.hxx"
+namespace Pingus {
namespace EditorNS {
class EditorView;
@@ -169,6 +170,7 @@
};
} // namespace EditorNS
+} // namespace Pingus
#endif
Index: object_selector.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/object_selector.cxx,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- object_selector.cxx 24 Apr 2003 15:18:19 -0000 1.42
+++ object_selector.cxx 18 Oct 2003 23:17:27 -0000 1.43
@@ -17,13 +17,9 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include <ClanLib/Core/IOData/directory_scanner.h>
-#include <ClanLib/Core/Resources/resource_manager.h>
-#include <ClanLib/Core/System/system.h>
-#include <ClanLib/Display/Display/display.h>
-#include <ClanLib/Display/Font/font.h>
-#include <ClanLib/Display/Input/inputbuffer.h>
-#include <ClanLib/Display/Input/mouse.h>
+#include <ClanLib/core.h>
+#include <ClanLib/display.h>
+
#include "../console.hxx"
#include "../globals.hxx"
#include "../loading.hxx"
@@ -32,7 +28,6 @@
#include "../pingus_resource.hxx"
#include "../string_converter.hxx"
#include "../system.hxx"
-#include "object_selector.hxx"
#include "object_manager.hxx"
#include "string_reader.hxx"
#include "thumb_cache.hxx"
@@ -66,6 +61,10 @@
#include "../editorobjs/teleporter_obj.hxx"
#include "../fonts.hxx"
+#include "object_selector.hxx"
+
+namespace Pingus {
+
using namespace EditorObjs;
using namespace WorldObjsData;
@@ -103,14 +102,14 @@
void
ObjectSelector::get_trap ()
{
- CL_Display::clear_display();
- font->print_left(20, 20, _("1 - guillotine"));
- font->print_left(20, 50, _("2 - hammer"));
- font->print_left(20, 80, _("3 - spike"));
- font->print_left(20,110, _("4 - laser_exit"));
- font->print_left(20,140, _("5 - fake_exit"));
- font->print_left(20,170, _("6 - smasher"));
- font->print_left(20,200, _("7 - bumper"));
+ CL_Display::clear();
+ font.draw(20, 20, _("1 - guillotine"));
+ font.draw(20, 50, _("2 - hammer"));
+ font.draw(20, 80, _("3 - spike"));
+ font.draw(20,110, _("4 - laser_exit"));
+ font.draw(20,140, _("5 - fake_exit"));
+ font.draw(20,170, _("6 - smasher"));
+ font.draw(20,200, _("7 - bumper"));
Display::flip_display();
while (true)
@@ -183,14 +182,14 @@
void
ObjectSelector::get_worldobj ()
{
- CL_Display::clear_display();
- font->print_left(20, 20, _("Select a WorldObj"));
- font->print_left(20, 50, _("1 - teleporter"));
- font->print_left(20, 70, _("2 - switch and door"));
- font->print_left(20, 90, _("3 - ConveyorBelt"));
- font->print_left(20, 110, _("4 - IceBlock"));
- font->print_left(20, 130, _("5 - InfoBox"));
- //font->print_left(20, 110, _("5 - Liquid"));
+ CL_Display::clear();
+ font.draw(20, 20, _("Select a WorldObj"));
+ font.draw(20, 50, _("1 - teleporter"));
+ font.draw(20, 70, _("2 - switch and door"));
+ font.draw(20, 90, _("3 - ConveyorBelt"));
+ font.draw(20, 110, _("4 - IceBlock"));
+ font.draw(20, 130, _("5 - InfoBox"));
+ //font.draw(20, 110, _("5 - Liquid"));
Display::flip_display();
while (true)
@@ -229,10 +228,10 @@
std::string type;
bool done = false;
- CL_Display::clear_display();
- font->print_left(20, 20, _("Select a weather"));
- font->print_left(20, 50, _("1 - snow"));
- font->print_left(20, 70, _("2 - rain"));
+ CL_Display::clear();
+ font.draw(20, 20, _("Select a weather"));
+ font.draw(20, 50, _("1 - snow"));
+ font.draw(20, 70, _("2 - rain"));
Display::flip_display();
while (!done)
@@ -262,12 +261,12 @@
bool have_name = false;
entrance.pos = pos;
- CL_Display::clear_display();
- font->print_left(20, 20, _("Select an entrance"));
- font->print_left(20, 50, _("1 - generic"));
- font->print_left(20, 70, _("2 - woodthing"));
- font->print_left(20, 90, _("3 - cloud"));
- font->print_left(20, 120, _("h - entrance surface (hotspot)"));
+ CL_Display::clear();
+ font.draw(20, 20, _("Select an entrance"));
+ font.draw(20, 50, _("1 - generic"));
+ font.draw(20, 70, _("2 - woodthing"));
+ font.draw(20, 90, _("3 - cloud"));
+ font.draw(20, 120, _("h - entrance surface (hotspot)"));
Display::flip_display();
while (!have_name)
@@ -340,10 +339,10 @@
void
ObjectSelector::get_from_file ()
{
- CL_Display::clear_display();
- font->print_left(20, 20, _("What object type do you want?"));
- font->print_left(20, 50, _("h - Hotspot"));
- font->print_left(20, 70, _("g - Groundpiece (ground) [not implemented]"));
+ CL_Display::clear();
+ font.draw(20, 20, _("What object type do you want?"));
+ font.draw(20, 50, _("h - Hotspot"));
+ font.draw(20, 70, _("g - Groundpiece (ground) [not implemented]"));
Display::flip_display();
while (true)
@@ -391,23 +390,23 @@
void
ObjectSelector::select_obj_type ()
{
- CL_Display::clear_display();
- font->print_left(20, 20, _("Which object do you want?"));
- font->print_left(20, 70, _("g - Groundpiece (ground)"));
- font->print_left(20, 90, _("s - Groundpiece (solid)"));
- font->print_left(20,110, _("b - Groundpiece (bridge)"));
- font->print_left(20,130, _("n - Groundpiece (transparent)"));
- font->print_left(20,150, _("r - Groundpiece (remove)"));
- font->print_left(20,170, _("h - Hotspot"));
- font->print_left(20,190, _("e - Entrance"));
- font->print_left(20,210, _("x - Exit"));
- font->print_left(20,230, _("l - Liquid"));
- font->print_left(20,250, _("w - Weather"));
- font->print_left(20,270, _("t - Traps"));
- font->print_left(20,290, _("o - WorldObject"));
- font->print_left(20,310, _("z - Background"));
- font->print_left(20,330, _("p - Prefab (ObjectGroup)"));
- font->print_left(20,350, _("f - something from file (~/.pingus/images/)"));
+ CL_Display::clear();
+ font.draw(20, 20, _("Which object do you want?"));
+ font.draw(20, 70, _("g - Groundpiece (ground)"));
+ font.draw(20, 90, _("s - Groundpiece (solid)"));
+ font.draw(20,110, _("b - Groundpiece (bridge)"));
+ font.draw(20,130, _("n - Groundpiece (transparent)"));
+ font.draw(20,150, _("r - Groundpiece (remove)"));
+ font.draw(20,170, _("h - Hotspot"));
+ font.draw(20,190, _("e - Entrance"));
+ font.draw(20,210, _("x - Exit"));
+ font.draw(20,230, _("l - Liquid"));
+ font.draw(20,250, _("w - Weather"));
+ font.draw(20,270, _("t - Traps"));
+ font.draw(20,290, _("o - WorldObject"));
+ font.draw(20,310, _("z - Background"));
+ font.draw(20,330, _("p - Prefab (ObjectGroup)"));
+ font.draw(20,350, _("f - something from file (~/.pingus/images/)"));
Display::flip_display();
while (1)
@@ -495,12 +494,12 @@
}
}
- CL_Display::clear_display();
- font->print_left(20, 20, _("Which prefab do you want?"));
+ CL_Display::clear();
+ font.draw(20, 20, _("Which prefab do you want?"));
for (std::vector<std::string>::size_type i = 0; i < dir_lst.size (); ++i)
{
- font->print_left(20, 60 + i * 30, to_string(i + 1) + " - " + dir_lst[i]);
+ font.draw(20, 60 + i * 30, to_string(i + 1) + " - " + dir_lst[i]);
}
Display::flip_display();
@@ -559,12 +558,12 @@
void
ObjectSelector::get_background ()
{
- CL_Display::clear_display();
- font->print_left(20, 20, _("Which object do you want?"));
- font->print_left(20, 50, _("1 - Surface Background"));
- font->print_left(20, 70, _("2 - Solid Color Background"));
- font->print_left(20, 90, _("3 - Starfield Background"));
- font->print_left(20,110, _("4 - Thunderstorm Background"));
+ CL_Display::clear();
+ font.draw(20, 20, _("Which object do you want?"));
+ font.draw(20, 50, _("1 - Surface Background"));
+ font.draw(20, 70, _("2 - Solid Color Background"));
+ font.draw(20, 90, _("3 - Starfield Background"));
+ font.draw(20,110, _("4 - Thunderstorm Background"));
Display::flip_display();
while (1)
@@ -647,7 +646,7 @@
ObjectSelector::read_key ()
{
CL_InputBuffer keys;
- CL_Key key;
+ CL_InputEvent event;
keys.clear();
@@ -655,10 +654,9 @@
{
CL_System::keep_alive();
- if (keys.peek_key().state != CL_Key::NoKey)
+ if (keys.peek_key().type != CL_InputEvent::no_key)
{
- key = keys.get_key();
- //std::cout << "key: " << key.ascii << std::endl;
+ event = keys.pop_key();
return key.id;
}
}
@@ -673,5 +671,6 @@
}
} // namespace EditorNS
+} // namespace Pingus
/* EOF */
Index: object_selector.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/object_selector.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- object_selector.hxx 19 Apr 2003 10:23:18 -0000 1.15
+++ object_selector.hxx 18 Oct 2003 23:17:27 -0000 1.16
@@ -30,6 +30,7 @@
class EditorObj;
+namespace Pingus {
namespace EditorNS {
class ObjectManager;
@@ -40,7 +41,7 @@
class ObjectSelector
{
private:
- CL_Font* font;
+ ::CL_Font font;
int x_offset;
int y_offset;
@@ -82,9 +83,8 @@
};
} // namespace EditorNS
+} // namespace Pingus
#endif
/* EOF */
-
-
Index: object_selector_window.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/object_selector_window.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- object_selector_window.cxx 4 Mar 2003 12:53:47 -0000 1.3
+++ object_selector_window.cxx 18 Oct 2003 23:17:27 -0000 1.4
@@ -23,6 +23,8 @@
#include "../groundtype.hxx"
#include "object_selector_window.hxx"
+namespace Pingus {
+
using namespace EditorNS;
ObjectSelectorWindow::ObjectSelectorWindow(CL_Component* parent)
@@ -47,7 +49,7 @@
y_pos += 10;
add_button("Close",
&ObjectSelectorWindow::on_close_press);
- set_client_size(200, y_pos + 10);
+ set_size(200, y_pos + 10);
}
ObjectSelectorWindow::~ObjectSelectorWindow()
@@ -146,4 +148,6 @@
{
}
+} // namespace Pingus
+
/* EOF */
Index: object_selector_window.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/object_selector_window.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- object_selector_window.hxx 19 Apr 2003 10:23:18 -0000 1.3
+++ object_selector_window.hxx 18 Oct 2003 23:17:27 -0000 1.4
@@ -25,6 +25,9 @@
#include <ClanLib/GUI/window.h>
#include <ClanLib/GUI/button.h>
+namespace Pingus {
+namespace EditorNS {
+
/** A Little window that lets you select an object type to insert */
class ObjectSelectorWindow : public CL_Window
{
@@ -88,6 +91,9 @@
ObjectSelectorWindow& operator= (const ObjectSelectorWindow&);
};
+} // namespace EditorNS
+} // namespace Pingus
+
#endif
/* EOF */
Index: panel.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/panel.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- panel.cxx 22 Apr 2003 16:40:41 -0000 1.8
+++ panel.cxx 18 Oct 2003 23:17:27 -0000 1.9
@@ -19,14 +19,15 @@
#include <iostream>
#include <ClanLib/Core/System/system.h>
-#include <ClanLib/Display/Input/mouse.h>
-#include <ClanLib/Display/Display/display.h>
-#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/Display/mouse.h>
+#include <ClanLib/Display/display.h>
+#include <ClanLib/Display/font.h>
#include "../globals.hxx"
#include "../pingus_resource.hxx"
#include "../fonts.hxx"
#include "panel_icons.hxx"
+namespace Pingus {
namespace EditorNS {
Editor* PanelIcon::editor;
@@ -48,33 +49,33 @@
}
void
-PanelIcon::put_screen(int /*x*/, int y)
+PanelIcon::draw(int /*x*/, int y)
{
if (CL_Mouse::get_x() < 25 && CL_Mouse::get_y() > y && CL_Mouse::get_y() < y
+ 25)
{
- if (CL_Mouse::left_pressed())
+ if (CL_Mouse::get_keycode(CL_MOUSE_LEFT))
{
- button_pressed.put_screen(0, y);
+ button_pressed.draw(0, y);
}
else
{
- button.put_screen(0, y);
+ button.draw(0, y);
}
if (mouse_over_time == 0)
mouse_over_time = CL_System::get_time ();
if (CL_System::get_time () - mouse_over_time > 5) {
- int width = font->get_text_width (tooltip.c_str ());
- CL_Display::fill_rect (28, y + 6 - 2, 32 + width, y + font->get_height
() + 6 + 2,
- 0.4f, 0.4f, 0.0f);
- font->print_left (30, y + 6, tooltip.c_str ());
+ int width = font.bounding_rect(0, 0, tooltip.c_str()).get_width();
+ CL_Display::fill_rect(CL_Rect(28, y + 6 - 2, 32 + width, y +
font.get_height () + 6 + 2),
+ CL_Color(100, 100, 0));
+ font.draw(30, y + 6, tooltip.c_str ());
}
}
else
{
mouse_over_time = 0;
}
- sur.put_screen(0, y);
+ sur.draw(0, y);
}
void
@@ -99,14 +100,14 @@
{
int y = 0;
- CL_Display::fill_rect(0, 0, 25, CL_Display::get_height(),
- 0.75, 0.75, 0.75, 1.0);
+ CL_Display::fill_rect(CL_Rect(0, 0, 25, CL_Display::get_height()),
+ CL_Color(190, 190, 190, 1));
- logo.put_screen(0, CL_Display::get_height() - logo.get_height());
+ logo.draw(0, CL_Display::get_height() - logo.get_height());
for (std::vector<PanelIcon*>::iterator i = buttons.begin(); i !=
buttons.end(); ++i)
{
- (*i)->put_screen(0, y);
+ (*i)->draw(0, y);
y += 25;
}
}
@@ -199,5 +200,6 @@
}
} // namespace EditorNS
+} // namespace Pingus
/* EOF */
Index: panel.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/panel.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- panel.hxx 19 Apr 2003 10:23:18 -0000 1.9
+++ panel.hxx 18 Oct 2003 23:17:27 -0000 1.10
@@ -22,10 +22,12 @@
#include "../pingus.hxx"
#include <vector>
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/Display/surface.h>
+#include <ClanLib/Display/font.h>
class CL_Font;
+namespace Pingus {
namespace EditorNS {
class Editor;
@@ -34,7 +36,7 @@
class PanelIcon
{
protected:
- CL_Font* font;
+ CL_Font font;
CL_Surface sur;
CL_Surface button;
CL_Surface button_pressed;
@@ -46,7 +48,7 @@
virtual ~PanelIcon();
void start();
- void put_screen(int x, int y);
+ void draw(int x, int y);
virtual void on_click();
private:
@@ -61,7 +63,7 @@
std::vector<PanelIcon*> buttons;
std::vector<PanelIcon*>::iterator pressed_button;
Editor* editor;
- CL_Surface logo;
+ ::CL_Surface logo;
public:
Panel();
@@ -80,6 +82,7 @@
};
} // namespace EditorNS
+} // namespace Pingus
#endif
Index: panel_icons.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/panel_icons.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- panel_icons.cxx 22 Aug 2003 10:19:48 -0000 1.12
+++ panel_icons.cxx 18 Oct 2003 23:17:27 -0000 1.13
@@ -18,13 +18,14 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
-#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/display.h>
#include "../gettext.h"
#include "../pingus_resource.hxx"
#include "panel_icons.hxx"
#include "editor.hxx"
#include "editor_event.hxx"
+namespace Pingus {
namespace EditorNS {
PanelIconLoad::PanelIconLoad()
@@ -211,5 +212,6 @@
}
} // namespace EditorNS
+} // namespace Pingus
/* EOF */
Index: panel_icons.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/panel_icons.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- panel_icons.hxx 19 Apr 2003 10:23:18 -0000 1.9
+++ panel_icons.hxx 18 Oct 2003 23:17:27 -0000 1.10
@@ -22,6 +22,7 @@
#include "panel.hxx"
+namespace Pingus {
namespace EditorNS {
class PanelIconNew : public PanelIcon
@@ -202,6 +203,7 @@
};
} // namespace EditorNS
+} // namespace Pingus
#endif
Index: property_frame.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/property_frame.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- property_frame.cxx 11 Sep 2002 12:45:58 -0000 1.2
+++ property_frame.cxx 18 Oct 2003 23:17:27 -0000 1.3
@@ -19,6 +19,7 @@
#include "property_frame.hxx"
+namespace Pingus {
namespace EditorNS {
PropertyFrame::PropertyFrame (int width, int height, CL_Component* parent)
@@ -27,5 +28,6 @@
}
} // namespace EditorNS
+} // namespace Pingus
/* EOF */
Index: property_frame.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/property_frame.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- property_frame.hxx 19 Apr 2003 10:23:18 -0000 1.9
+++ property_frame.hxx 18 Oct 2003 23:17:27 -0000 1.10
@@ -25,6 +25,7 @@
class CL_Component;
+namespace Pingus {
namespace EditorNS {
/** Class for things that should be placed in the PropertyWindow, it
@@ -43,6 +44,7 @@
};
} // namespace EditorNS
+} // namespace Pingus
#endif
Index: property_window.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/property_window.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- property_window.cxx 19 Apr 2003 10:23:18 -0000 1.16
+++ property_window.cxx 18 Oct 2003 23:17:27 -0000 1.17
@@ -18,13 +18,14 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <iostream>
-#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/display.h>
#include <ClanLib/GUI/gui_manager.h>
#include "editor.hxx"
#include "editorobj.hxx"
#include "property_frame.hxx"
#include "property_window.hxx"
+namespace Pingus {
namespace EditorNS {
PropertyWindow::PropertyWindow (Editor* parent)
@@ -36,7 +37,7 @@
{
close_button_slot = close_button.sig_clicked().connect(this,
&PropertyWindow::on_close_click);
label.show (true);
- set_client_size (200, 50);
+ set_size (200, 50);
show (false);
set_position(CL_Display::get_width() - get_width() - 50,
@@ -80,5 +81,6 @@
}
} // namespace EditorNS
+} // namespace Pingus
/* EOF */
Index: property_window.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/property_window.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- property_window.hxx 19 Apr 2003 10:23:18 -0000 1.11
+++ property_window.hxx 18 Oct 2003 23:17:27 -0000 1.12
@@ -29,6 +29,7 @@
class CL_Component;
class PropertyFrame;
+namespace Pingus {
namespace EditorNS {
class Editor;
@@ -62,6 +63,7 @@
};
} // namespace EditorNS
+} // namespace Pingus
#endif
Index: rect_editorobj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/rect_editorobj.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rect_editorobj.cxx 19 Apr 2003 10:23:18 -0000 1.9
+++ rect_editorobj.cxx 18 Oct 2003 23:17:27 -0000 1.10
@@ -21,6 +21,9 @@
#include "editor_view.hxx"
#include "rect_editorobj.hxx"
+namespace Pingus {
+namespace EditorNS {
+
RectEditorObj::RectEditorObj()
{
}
@@ -65,8 +68,11 @@
Vector pos(get_upper_left_corner());
// FIXME: Simple, stupid and wrong,... but works good =;-)
- return ( pos.x >= rect.x1 && pos.x < rect.x2
- && pos.y >= rect.y1 && pos.y < rect.y2);
+ return ( pos.x >= rect.left && pos.x < rect.right
+ && pos.y >= rect.top && pos.y < rect.bottom);
}
+} // namespace EditorNS
+} // namespace Pingus
+
/* EOF */
Index: rect_editorobj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/rect_editorobj.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rect_editorobj.hxx 19 Apr 2003 10:23:18 -0000 1.8
+++ rect_editorobj.hxx 18 Oct 2003 23:17:27 -0000 1.9
@@ -22,6 +22,9 @@
#include "editorobj.hxx"
+namespace Pingus {
+namespace EditorNS {
+
/** Abstract class which can be used for all objects which have a
rectangular shape. */
class RectEditorObj : public EditorObj
@@ -38,20 +41,23 @@
virtual int get_height () =0;
/** Draw the caputre rectangle around the object */
- virtual void draw_mark (EditorNS::EditorView * view);
+ virtual void draw_mark(EditorView * view);
/** Return true when the object is under the given coordinates */
- virtual bool is_over (const Vector&);
+ virtual bool is_over(const Vector&);
/** Return true if the current object is inside the current
selection rectangle */
- virtual bool is_in_rect (const CL_Rect&);
+ virtual bool is_in_rect(const CL_Rect&);
protected:
- RectEditorObj (const RectEditorObj& old);
- RectEditorObj& operator= (const RectEditorObj& old);
+ RectEditorObj(const RectEditorObj& old);
+ RectEditorObj& operator=(const RectEditorObj& old);
};
+} // namespace EditorNS
+} // namespace Pingus
+
#endif
/* EOF */
Index: scroll_map.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/scroll_map.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- scroll_map.cxx 19 Apr 2003 10:23:18 -0000 1.7
+++ scroll_map.cxx 18 Oct 2003 23:17:27 -0000 1.8
@@ -17,12 +17,13 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/display.h>
#include "editor.hxx"
#include "editor_view.hxx"
#include "object_manager.hxx"
#include "scroll_map.hxx"
+namespace Pingus {
namespace EditorNS {
EditorEvent* ScrollMap::editor_event;
@@ -44,14 +45,14 @@
///
void
-ScrollMap::on_button_release(CL_InputDevice * /*device*/, const CL_Key&
/*key*/)
+ScrollMap::on_button_release(const CL_InputEvent& event)
{
}
///
void
-ScrollMap::on_button_press(CL_InputDevice * /*device*/, const CL_Key& /*key*/)
+ScrollMap::on_button_press(const CL_InputEvent& event)
{
//int click_x_pos = (int) key.x - x_pos;
//int click_y_pos = (int) key.y - y_pos;
@@ -76,8 +77,8 @@
void
ScrollMap::draw()
{
- CL_Display::fill_rect (x_pos, y_pos, x_pos + width, y_pos + height,
- 0.4f, 0.4f, 0.0f);
+ CL_Display::fill_rect (CL_Rect(x_pos, y_pos, x_pos + width, y_pos + height),
+ CL_Color(100, 100, 0));
Editor::instance()->get_object_manager()->draw(view);
/*
int viewarea_width = (CL_Display::get_width() * width
@@ -115,6 +116,7 @@
}
} // namespace EditorNS
+} // namespace Pingus
/* EOF */
Index: scroll_map.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/scroll_map.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- scroll_map.hxx 19 Apr 2003 10:23:18 -0000 1.7
+++ scroll_map.hxx 18 Oct 2003 23:17:27 -0000 1.8
@@ -22,10 +22,11 @@
class CL_Key;
class CL_InputDevice;
-class EditorView;
+namespace Pingus {
namespace EditorNS {
+class EditorView;
class EditorEvent;
class ScrollMap
@@ -43,8 +44,8 @@
void draw();
- void on_button_press(CL_InputDevice *device, const CL_Key& key);
- void on_button_release(CL_InputDevice *device, const CL_Key& key);
+ void on_button_press(const CL_InputEvent& event);
+ void on_button_release(const CL_InputEvent& event);
bool mouse_over(int x, int y);
private:
@@ -53,6 +54,7 @@
};
} // namespace EditorNS
+} // namespace Pingus
#endif
Index: selection.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/selection.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- selection.cxx 19 Apr 2003 10:23:18 -0000 1.19
+++ selection.cxx 18 Oct 2003 23:17:27 -0000 1.20
@@ -19,11 +19,12 @@
#include <algorithm>
#include "../vector.hxx"
-#include <ClanLib/Display/Input/keyboard.h>
-#include <ClanLib/Display/Input/key.h>
+#include <ClanLib/Display/keyboard.h>
+#include <ClanLib/Display/keys.h>
#include "selection.hxx"
#include "../math.hxx"
+namespace Pingus {
namespace EditorNS {
void
@@ -161,5 +162,6 @@
}
} // namespace EditorNS
+} // namespace Pingus
/* EOF */
Index: selection.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/selection.hxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- selection.hxx 19 Apr 2003 10:23:18 -0000 1.15
+++ selection.hxx 18 Oct 2003 23:17:27 -0000 1.16
@@ -22,10 +22,13 @@
#include "object_manager.hxx"
+namespace Pingus {
+
class Vector;
namespace EditorNS {
+class EditorObj;
class EditorView;
class Selection
@@ -33,7 +36,7 @@
private:
std::vector<EditorObj*> obj_list;
- ObjectManager* object_manager;
+ ObjectManager* object_manager;
public:
@@ -81,6 +84,7 @@
};
} // namespace EditorNS
+} // namespace Pingus
#endif
Index: sprite_editorobj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/sprite_editorobj.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sprite_editorobj.cxx 19 Apr 2003 10:23:18 -0000 1.10
+++ sprite_editorobj.cxx 18 Oct 2003 23:17:27 -0000 1.11
@@ -19,11 +19,14 @@
#include <iostream>
#include <assert.h>
-#include <ClanLib/Display/Display/surfaceprovider.h>
+#include <ClanLib/Display/pixel_buffer.h>
#include "../math.hxx"
#include "editor_view.hxx"
#include "sprite_editorobj.hxx"
+namespace Pingus {
+namespace EditorNS {
+
SpriteEditorObj::SpriteEditorObj ()
: pos_ref (0)
{
@@ -106,8 +109,8 @@
// FIXME: We don't handle animated objects special (do we need to?)
if (RectEditorObj::is_over (pos))
{
-#if 1 // EDITOR_PIXEL_PERFECT_IS_OVER
- CL_SurfaceProvider* provider = sprite.get_surface ().get_provider ();
+#if 0 // EDITOR_PIXEL_PERFECT_IS_OVER
+ CL_PixelBuffer* provider = sprite.get_surface ().get_provider ();
if (provider)
{
// Position relative to the surface, not world
@@ -142,4 +145,7 @@
}
}
+} // namespace EditorNS
+} // namespace Pingus
+
/* EOF */
Index: sprite_editorobj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/sprite_editorobj.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sprite_editorobj.hxx 19 Apr 2003 10:23:18 -0000 1.10
+++ sprite_editorobj.hxx 18 Oct 2003 23:17:27 -0000 1.11
@@ -23,8 +23,12 @@
#include "../sprite.hxx"
#include "rect_editorobj.hxx"
+namespace Pingus {
+
class Vector;
+namespace EditorNS {
+
class SpriteEditorObj : public RectEditorObj
{
protected:
@@ -58,7 +62,7 @@
virtual Vector get_upper_left_corner ();
- virtual void draw (EditorNS::EditorView *);
+ virtual void draw(EditorView*);
virtual void set_position_offset (const Vector& offset);
@@ -71,6 +75,9 @@
SpriteEditorObj& operator= (const SpriteEditorObj& old);
};
+} // namespace EditorNS
+} // namespace Pingus
+
#endif
/* EOF */
Index: start_pos.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/start_pos.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- start_pos.cxx 19 Apr 2003 10:23:18 -0000 1.8
+++ start_pos.cxx 18 Oct 2003 23:17:27 -0000 1.9
@@ -21,6 +21,9 @@
#include "../xml_helper.hxx"
#include "start_pos.hxx"
+namespace Pingus {
+namespace EditorNS {
+
StartPos::StartPos (int arg_x_pos, int arg_y_pos)
: SpriteEditorObj("editor/start_pos", "core")
{
@@ -46,4 +49,7 @@
return 0;
}
+} // namespace EditorNS
+} // namespace Pingus
+
/* EOF */
Index: start_pos.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/start_pos.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- start_pos.hxx 19 Apr 2003 10:23:18 -0000 1.11
+++ start_pos.hxx 18 Oct 2003 23:17:27 -0000 1.12
@@ -23,6 +23,9 @@
#include "../vector.hxx"
#include "sprite_editorobj.hxx"
+namespace Pingus {
+namespace EditorNS {
+
/** */
class StartPos : public SpriteEditorObj
{
@@ -36,11 +39,15 @@
EditorObj* duplicate();
EditorNS::PropertyFrame* get_gui_dialog(EditorNS::Editor*) { return 0; }
+
private:
StartPos (const StartPos&);
StartPos& operator= (const StartPos&);
};
+} // namespace EditorNS
+} // namespace Pingus
+
#endif
/* EOF */
Index: status_line.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/status_line.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- status_line.cxx 22 Apr 2003 16:40:41 -0000 1.11
+++ status_line.cxx 18 Oct 2003 23:17:27 -0000 1.12
@@ -19,15 +19,16 @@
#include <stdio.h>
-#include <ClanLib/Display/Font/font.h>
-#include <ClanLib/Display/Input/mouse.h>
-#include <ClanLib/Display/Display/display.h>
+#include <ClanLib/Display/font.h>
+#include <ClanLib/Display/mouse.h>
+#include <ClanLib/Display/display.h>
#include "../pingus_resource.hxx"
#include "../fonts.hxx"
#include "editor_view.hxx"
#include "status_line.hxx"
#include "editorobj.hxx"
+namespace Pingus {
namespace EditorNS {
StatusLine::StatusLine()
@@ -61,12 +62,12 @@
}
}
- font->print_left(50, 5, status_line_text.c_str());
+ font.draw(50, 5, status_line_text.c_str());
Vector pos = view->screen_to_world(Vector (CL_Mouse::get_x(),
CL_Mouse::get_y ()));
snprintf(mouse_co, 256, "X:%-3d Y:%-3d", static_cast<int>(pos.x),
static_cast<int>(pos.y));
- font->print_left(CL_Display::get_width() - 100, 5, mouse_co);
+ font.draw(CL_Display::get_width() - 100, 5, mouse_co);
}
void
@@ -76,6 +77,7 @@
}
} // namespace EditorNS
+} // namespace Pingus
/* EOF */
Index: status_line.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/status_line.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- status_line.hxx 19 Apr 2003 10:23:18 -0000 1.11
+++ status_line.hxx 18 Oct 2003 23:17:27 -0000 1.12
@@ -25,16 +25,17 @@
class CL_Font;
-class EditorObj;
+namespace Pingus {
namespace EditorNS {
+class EditorObj;
class EditorView;
class StatusLine
{
private:
- CL_Font* font;
+ CL_Font font;
const std::vector<EditorObj*>* current_objs;
public:
@@ -50,9 +51,8 @@
};
} // namespace EditorNS
+} // namespace Pingus
#endif
/* EOF */
-
-
Index: string_reader.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/string_reader.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- string_reader.cxx 22 Apr 2003 16:40:41 -0000 1.9
+++ string_reader.cxx 18 Oct 2003 23:17:27 -0000 1.10
@@ -18,14 +18,15 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <ClanLib/Core/System/system.h>
-#include <ClanLib/Display/Input/inputbuffer.h>
-#include <ClanLib/Display/Display/display.h>
-#include <ClanLib/Display/Font/font.h>
+#include <ClanLib/display.h>
#include "../console.hxx"
#include "../pingus_resource.hxx"
#include "../fonts.hxx"
#include "string_reader.hxx"
+namespace Pingus {
+namespace EditorNS {
+
StringReader::StringReader()
{
strings = 0;
@@ -55,7 +56,7 @@
{
finished = false;
CL_InputBuffer keys;
- CL_Key key;
+ CL_InputEvent event;
CL_System::keep_alive();
@@ -70,13 +71,13 @@
{
CL_System::keep_alive();
- if (keys.peek_key().state != CL_Key::NoKey)
+ if (keys.peek_key().type != CL_InputEvent::no_key)
{
- key = keys.get_key();
+ event = keys.pop_key();
- if (key.state == CL_Key::Pressed)
+ if (event.type == CL_InputEvent::pressed)
{
- switch (key.id)
+ switch (event.id)
{
case CL_KEY_ENTER:
finished = true;
@@ -95,8 +96,8 @@
complete_string();
break;
default:
- if (key.ascii > 0)
- current_string += key.ascii;
+ if (!event.str.empty())
+ current_string += event.str;
}
draw();
}
@@ -168,11 +169,13 @@
void
StringReader::draw()
{
- CL_Display::clear_display();
- font->print_left(20, 20, description.c_str());
- font->print_left(20, 40, current_string.c_str());
+ CL_Display::clear();
+ font.draw(20, 20, description.c_str());
+ font.draw(20, 40, current_string.c_str());
Display::flip_display();
}
+} // namespace EditorNS
+} // namespace Pingus
/* EOF */
Index: string_reader.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/string_reader.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- string_reader.hxx 19 Apr 2003 10:23:18 -0000 1.7
+++ string_reader.hxx 18 Oct 2003 23:17:27 -0000 1.8
@@ -23,8 +23,10 @@
#include "../pingus.hxx"
#include <list>
#include <string>
+#include <ClanLib/display.h>
-class CL_Font;
+namespace Pingus {
+namespace EditorNS {
class StringReader
{
@@ -35,7 +37,7 @@
std::string default_string;
bool finished;
std::string description;
- CL_Font* font;
+ CL_Font font;
public:
StringReader ();
@@ -54,6 +56,9 @@
StringReader& operator= (const StringReader&);
};
+} // namespace EditorNS
+} // namespace Pingus
+
#endif
/* EOF */
Index: surface_selector.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/surface_selector.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- surface_selector.cxx 22 Apr 2003 16:40:41 -0000 1.9
+++ surface_selector.cxx 18 Oct 2003 23:17:27 -0000 1.10
@@ -19,13 +19,16 @@
#include <iostream>
#include <ClanLib/Core/System/system.h>
-#include <ClanLib/Display/Display/display.h>
-#include <ClanLib/Display/Input/mouse.h>
+#include <ClanLib/Display/display.h>
+#include <ClanLib/Display/mouse.h>
#include "../gui/display.hxx"
#include "../fonts.hxx"
#include "../pingus_resource.hxx"
#include "surface_selector.hxx"
+namespace Pingus {
+namespace EditorNS {
+
SurfaceSelector::SurfaceSelector (std::vector<surface_obj>* s)
: font(Fonts::courier_small),
sur_list(s),
@@ -90,19 +93,19 @@
CL_System::keep_alive();
- CL_Display::clear_display();
+ CL_Display::clear();
// Draw all surfaces
for(std::vector<surface_obj>::iterator i = sur_list->begin(); i !=
sur_list->end(); ++i)
{
if (i->thumbnail.get_width() <= 50 && i->thumbnail.get_height() <= 50)
{
- i->thumbnail.put_screen(x + 25 - (i->thumbnail.get_width() / 2),
+ i->thumbnail.draw(x + 25 - (i->thumbnail.get_width() / 2),
y + 25 - (i->thumbnail.get_height() / 2));
}
else
{
- i->thumbnail.put_screen(x, y);
+ i->thumbnail.draw(x, y);
}
if (i == c_obj)
@@ -125,8 +128,7 @@
// Draw the current object in the bottom/left corner when the
// surface is selected for more then 1sec
if (c_obj != std::vector<surface_obj>::iterator()
- && (c_obj->display_time + 350 < CL_System::get_time ()
- || c_obj->large_sur))
+ && (c_obj->display_time + 350 < CL_System::get_time() ||
c_obj->large_sur))
{
if (!c_obj->large_sur)
{
@@ -137,7 +139,7 @@
CL_Display::fill_rect(0, CL_Display::get_height() -
c_obj->large_sur.get_height(),
c_obj->large_sur.get_width(),
CL_Display::get_height(),
0.5f, 0.5f, 0.5f, 0.8f);
- c_obj->large_sur.put_screen(0, CL_Display::get_height() -
c_obj->large_sur.get_height());
+ c_obj->large_sur.draw(0, CL_Display::get_height() -
c_obj->large_sur.get_height());
}
Display::flip_display();
}
@@ -167,7 +169,7 @@
std::string str;
std::vector<surface_obj>::iterator iter;
- while (!CL_Mouse::left_pressed())
+ while (!CL_Mouse::get_keycode(CL_MOUSE_LEFT))
{
draw();
@@ -212,4 +214,7 @@
return *this;
}
+} // namespace EditorNS
+} // namespace Pingus
+
/* EOF */
Index: surface_selector.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/surface_selector.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- surface_selector.hxx 19 Apr 2003 10:23:18 -0000 1.8
+++ surface_selector.hxx 18 Oct 2003 23:17:27 -0000 1.9
@@ -23,17 +23,19 @@
#include "../pingus.hxx"
#include <string>
#include <vector>
-#include <ClanLib/Display/Display/surface.h>
+#include <ClanLib/display.h>
class CL_Font;
+namespace Pingus {
+
struct surface_obj
{
/** Thumbnail of the surface */
- CL_Surface thumbnail;
+ ::CL_Surface thumbnail;
/** The real surface */
- CL_Surface large_sur;
+ ::CL_Surface large_sur;
/** Resource ID */
std::string name;
@@ -53,7 +55,7 @@
class SurfaceSelector
{
private:
- CL_Font* font;
+ ::CL_Font font;
std::vector<surface_obj>* sur_list;
int y_of;
int width;
@@ -76,6 +78,7 @@
SurfaceSelector& operator= (const SurfaceSelector&);
};
+} // namespace Pingus
#endif
Index: thumb_cache.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/thumb_cache.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- thumb_cache.cxx 18 Oct 2003 12:11:30 -0000 1.14
+++ thumb_cache.cxx 18 Oct 2003 23:17:27 -0000 1.15
@@ -30,6 +30,7 @@
#include "../math.hxx"
#include "thumb_cache.hxx"
+namespace Pingus {
namespace EditorNS {
const unsigned int thumbcache_version = 3;
@@ -193,5 +194,6 @@
}
} // namespace EditorNS
+} // namespace Pingus
/* EOF */
Index: thumb_cache.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/thumb_cache.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- thumb_cache.hxx 19 Apr 2003 10:23:18 -0000 1.9
+++ thumb_cache.hxx 18 Oct 2003 23:17:27 -0000 1.10
@@ -25,6 +25,7 @@
class CL_Surface;
+namespace Pingus {
namespace EditorNS {
/** This class is used inside the SurfaceSelector to load thumbnails
@@ -50,7 +51,7 @@
};
} // namespace EditorNS
-
+} // namespace Pingus
#endif
/* EOF */
Index: weather_obj.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/weather_obj.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- weather_obj.cxx 19 Apr 2003 10:23:18 -0000 1.12
+++ weather_obj.cxx 18 Oct 2003 23:17:27 -0000 1.13
@@ -22,6 +22,9 @@
#include "editor_view.hxx"
#include "weather_obj.hxx"
+namespace Pingus {
+namespace EditorNS {
+
WeatherObj::WeatherObj(const std::string& type_)
: type(type_),
pos(0,0,200)
@@ -104,4 +107,7 @@
/sprite.get_height ()) * sprite.get_height ();
}
+} // namespace EditorNS
+} // namespace Pingus
+
/* EOF */
Index: weather_obj.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/editor/weather_obj.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- weather_obj.hxx 19 Apr 2003 10:23:18 -0000 1.12
+++ weather_obj.hxx 18 Oct 2003 23:17:27 -0000 1.13
@@ -23,6 +23,9 @@
#include "../vector.hxx"
#include "sprite_editorobj.hxx"
+namespace Pingus {
+namespace EditorNS {
+
class WeatherObj : public SpriteEditorObj
{
private:
@@ -47,6 +50,9 @@
WeatherObj& operator= (const WeatherObj&);
};
+} // namespace EditorNS
+} // namespace Pingus
+
#endif
/* EOF */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/editor action_window.cxx, 1.16, 1.17 action_window.hxx, 1.9, 1.10 editor.cxx, 1.54, 1.55 editor.hxx, 1.25, 1.26 editor_event.cxx, 1.62, 1.63 editor_event.hxx, 1.19, 1.20 editor_help_screen.cxx, 1.13, 1.14 editor_help_screen.hxx, 1.6, 1.7 editor_view.cxx, 1.10, 1.11 editor_view.hxx, 1.9, 1.10 editorobj.cxx, 1.7, 1.8 editorobj.hxx, 1.19, 1.20 editorobj_group.cxx, 1.10, 1.11 editorobj_group.hxx, 1.16, 1.17 editorobj_mgr.hxx, 1.2, 1.3 generic_property_frame.cxx, 1.7, 1.8 generic_property_frame.hxx, 1.3, 1.4 level_property_window.cxx, 1.13, 1.14 level_property_window.hxx, 1.11, 1.12 level_resizer.cxx, 1.5, 1.6 level_resizer.hxx, 1.4, 1.5 object_manager.cxx, 1.48, 1.49 object_manager.hxx, 1.28, 1.29 object_selector.cxx, 1.42, 1.43 object_selector.hxx, 1.15, 1.16 object_selector_window.cxx, 1.3, 1.4 object_selector_window.hxx, 1.3, 1.4 panel.cxx, 1.8, 1.9 panel.hxx, 1.9, 1.10 panel_icons.cxx, 1.12, 1.13 panel_icons.hxx, 1.9, 1.10 property_frame.cxx, 1.2, 1.3 property_frame.hxx, 1.9, 1.10 property_window.cxx, 1.16, 1.17 property_window.hxx, 1.11, 1.12 rect_editorobj.cxx, 1.9, 1.10 rect_editorobj.hxx, 1.8, 1.9 scroll_map.cxx, 1.7, 1.8 scroll_map.hxx, 1.7, 1.8 selection.cxx, 1.19, 1.20 selection.hxx, 1.15, 1.16 sprite_editorobj.cxx, 1.10, 1.11 sprite_editorobj.hxx, 1.10, 1.11 start_pos.cxx, 1.8, 1.9 start_pos.hxx, 1.11, 1.12 status_line.cxx, 1.11, 1.12 status_line.hxx, 1.11, 1.12 string_reader.cxx, 1.9, 1.10 string_reader.hxx, 1.7, 1.8 surface_selector.cxx, 1.9, 1.10 surface_selector.hxx, 1.8, 1.9 thumb_cache.cxx, 1.14, 1.15 thumb_cache.hxx, 1.9, 1.10 weather_obj.cxx, 1.12, 1.13 weather_obj.hxx, 1.12, 1.13,
Ingo Ruhnke <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/sound sound_dummy.cxx, 1.2, 1.3 sound_res_mgr.hxx, 1.3, 1.4
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx, 1.55, 1.56 editor_event.cxx, 1.63, 1.64 editor_view.cxx, 1.11, 1.12 editor_view.hxx, 1.10, 1.11 object_selector.cxx, 1.43, 1.44 property_window.cxx, 1.17, 1.18 string_reader.cxx, 1.10, 1.11 string_reader.hxx, 1.8, 1.9 thumb_cache.cxx, 1.15, 1.16
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/sound sound_dummy.cxx, 1.2, 1.3 sound_res_mgr.hxx, 1.3, 1.4
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/editor editor.cxx, 1.55, 1.56 editor_event.cxx, 1.63, 1.64 editor_view.cxx, 1.11, 1.12 editor_view.hxx, 1.10, 1.11 object_selector.cxx, 1.43, 1.44 property_window.cxx, 1.17, 1.18 string_reader.cxx, 1.10, 1.11 string_reader.hxx, 1.8, 1.9 thumb_cache.cxx, 1.15, 1.16
- Index(es):