[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r2504 - in trunk/src: . editor
From: |
jave27 |
Subject: |
[Pingus-CVS] r2504 - in trunk/src: . editor |
Date: |
Tue, 15 Nov 2005 15:00:11 +0100 |
Author: jave27
Date: 2005-11-15 15:00:02 +0100 (Tue, 15 Nov 2005)
New Revision: 2504
Modified:
trunk/src/client.cxx
trunk/src/editor/editor_panel.cxx
trunk/src/editor/panel_buttons.cxx
trunk/src/editor/panel_buttons.hxx
Log:
A little more stuff for the editor and some clean up.
Modified: trunk/src/client.cxx
===================================================================
--- trunk/src/client.cxx 2005-11-15 03:10:40 UTC (rev 2503)
+++ trunk/src/client.cxx 2005-11-15 14:00:02 UTC (rev 2504)
@@ -122,8 +122,7 @@
break;
case Input::PointerEventType:
- // Ignore, is handled in GUIScreen
- //process_pointer_event (dynamic_cast<class Input::PointerEvent*
const>(*i));
+ // Ignore, is handled in GUIScreen
break;
case Input::AxisEventType:
@@ -183,118 +182,7 @@
server->set_finished();
}
-#if 0
void
-Client::on_keyboard_button_press(const CL_Key& /*key*/)
-{
- if (CL_Keyboard::get_keycode(CL_KEY_LSHIFT)
- || CL_Keyboard::get_keycode(CL_KEY_RSHIFT))
- {
- playfield->scroll_speed = 50;
- }
- else
- {
- playfield->scroll_speed = 15;
- }
-}
-
-void
-Client::on_keyboard_button_release(const CL_Key& key)
-{
- std::cout << "Keyboard pressed: " << key.id << std::endl;
- switch (key.id)
- {
- case CL_KEY_O:
- enabled = false;
- Display::hide_cursor();
- option_menu.display ();
- Display::show_cursor();
- enabled = true;
- break;
-
- // Playfield scrolling
- case CL_KEY_LEFT:
-
playfield->view[playfield->current_view]->set_x_offset(playfield->view[playfield->current_view]->get_x_offset()
+ playfield->scroll_speed);
- break;
-
- case CL_KEY_RIGHT:
-
playfield->view[playfield->current_view]->set_x_offset(playfield->view[playfield->current_view]->get_x_offset()
- playfield->scroll_speed);
- break;
-
- case CL_KEY_UP:
-
playfield->view[playfield->current_view]->set_y_offset(playfield->view[playfield->current_view]->get_y_offset()
+ playfield->scroll_speed);
- break;
-
- case CL_KEY_DOWN:
-
playfield->view[playfield->current_view]->set_y_offset(playfield->view[playfield->current_view]->get_y_offset()
- playfield->scroll_speed);
- break;
-
- // Playfield zooming
- case CL_KEY_PAGEDOWN:
-
playfield->view[playfield->current_view]->set_zoom(playfield->view[playfield->current_view]->get_zoom()
/ 1.05);
- break;
-
- case CL_KEY_PAGEUP:
-
playfield->view[playfield->current_view]->set_zoom(playfield->view[playfield->current_view]->get_zoom()
/ 0.95);
- break;
-
- case CL_KEY_END:
- playfield->view[playfield->current_view]->set_zoom(1.0);
- break;
-
- // Misc
- case CL_KEY_P:
- pause = !pause;
- server->set_pause(pause);
- break;
-
- case CL_KEY_A:
- server->send_armageddon_event();
- break;
-
- case CL_KEY_R:
- do_restart();
- break;
-
- case CL_KEY_SPACE:
- set_fast_forward(!get_fast_forward());
- break;
-
- case CL_KEY_ESCAPE:
- server->set_finished();
- break;
-
- case CL_KEY_F1:
- button_panel->set_button(0);
- break;
- case CL_KEY_F2:
- button_panel->set_button(1);
- break;
- case CL_KEY_F3:
- button_panel->set_button(2);
- break;
- case CL_KEY_F4:
- button_panel->set_button(3);
- break;
- case CL_KEY_F5:
- button_panel->set_button(4);
- break;
- case CL_KEY_F6:
- button_panel->set_button(5);
- break;
- case CL_KEY_F7:
- button_panel->set_button(6);
- break;
- case CL_KEY_F8:
- button_panel->set_button(7);
- break;
- default:
- if (verbose > 1) std::cout << "Client: Got unknown button: ID=" <<
key.id << " ASCII=" << char(key.ascii) << std::endl;
- }
-}
-#endif
-
-void
Client:: on_escape_press ()
{
server->set_finished();
Modified: trunk/src/editor/editor_panel.cxx
===================================================================
--- trunk/src/editor/editor_panel.cxx 2005-11-15 03:10:40 UTC (rev 2503)
+++ trunk/src/editor/editor_panel.cxx 2005-11-15 14:00:02 UTC (rev 2504)
@@ -56,6 +56,7 @@
{
// Create exit button
add((PanelButton*)(new PanelButtonExit(this)));
+ add((PanelButton*)(new PanelButtonLoad(this)));
// Create groundpiece Combobox (FIXME: Temporary testing)
combo_groundpieces = new GUI::Combobox(Vector(500, 30));
@@ -89,8 +90,8 @@
if (panel_buttons.empty())
new_pos = Vector(0.0f, 0.0f, 0.0f);
else
- new_pos = Vector((*panel_buttons.end())->get_pos() +
- Vector((float)(5 +
(*panel_buttons.end())->get_width()), 0.0f));
+ new_pos = Vector(panel_buttons.back()->get_pos() +
+ Vector((float)(5 + panel_buttons.back()->get_width()),
0.0f));
// Add button to collection of buttons
panel_buttons.push_back(button);
Modified: trunk/src/editor/panel_buttons.cxx
===================================================================
--- trunk/src/editor/panel_buttons.cxx 2005-11-15 03:10:40 UTC (rev 2503)
+++ trunk/src/editor/panel_buttons.cxx 2005-11-15 14:00:02 UTC (rev 2504)
@@ -90,5 +90,21 @@
panel->get_screen()->on_escape_press();
}
+// Standard Load button
+PanelButtonLoad::PanelButtonLoad(EditorPanel *p) :
+ PanelButton(p)
+{
+ tooltip = "Load existing level";
+ sur = Resource::load_sprite("core/editor/open");
+}
+
+// When clicked, close the EditorScreen
+void
+PanelButtonLoad::on_primary_button_click(int x, int y)
+{
+ // TODO: Open a file dialog box to load a level.
+ std::cout << "Load a level" << std::endl;
+}
+
} // Editor namespace
} // Pingus namespace
Modified: trunk/src/editor/panel_buttons.hxx
===================================================================
--- trunk/src/editor/panel_buttons.hxx 2005-11-15 03:10:40 UTC (rev 2503)
+++ trunk/src/editor/panel_buttons.hxx 2005-11-15 14:00:02 UTC (rev 2504)
@@ -113,6 +113,23 @@
PanelButtonExit& operator= (const PanelButtonExit&);
}; // PanelButtonExit class
+/** Standard load button */
+class PanelButtonLoad : PanelButton
+{
+public:
+ /** Constructor
+ @param p the EditorPanel to which this button belongs */
+ PanelButtonLoad (EditorPanel* p);
+
+ /** This function is called by the gui_manager when the button is
clicked */
+ void on_primary_button_click (int x, int y);
+
+private:
+ PanelButtonLoad ();
+ PanelButtonLoad (const PanelButtonLoad&);
+ PanelButtonLoad& operator= (const PanelButtonLoad&);
+}; // PanelButtonLoad class
+
} // Editor namespace
} // Pingus namespace
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r2504 - in trunk/src: . editor,
jave27 <=