[Pingus-CVS] r3616 - in trunk/pingus: data/data data/images/core data/images/core/demo src src/gui

[grumbel at BerliOS]

Author: grumbel
Date: 2008-07-02 02:44:08 +0200 (Wed, 02 Jul 2008)
New Revision: 3616

Added:
   trunk/pingus/data/images/core/demo/
   trunk/pingus/data/images/core/demo/fastforward-hover.png
   trunk/pingus/data/images/core/demo/fastforward-pressed.png
   trunk/pingus/data/images/core/demo/fastforward.png
   trunk/pingus/data/images/core/demo/pause-hover.png
   trunk/pingus/data/images/core/demo/pause-pressed.png
   trunk/pingus/data/images/core/demo/pause.png
   trunk/pingus/data/images/core/demo/reload-hover.png
   trunk/pingus/data/images/core/demo/reload-pressed.png
   trunk/pingus/data/images/core/demo/reload.png
Modified:
   trunk/pingus/data/data/core.res
   trunk/pingus/src/demo_session.cpp
   trunk/pingus/src/demo_session.hpp
   trunk/pingus/src/gui/surface_button.hpp
Log:
Added some simple buttons to demo playback

Modified: trunk/pingus/data/data/core.res
===================================================================
--- trunk/pingus/data/data/core.res     2008-07-01 17:14:39 UTC (rev 3615)
+++ trunk/pingus/data/data/core.res     2008-07-02 00:44:08 UTC (rev 3616)
@@ -17,6 +17,39 @@
            )
 
  (section (name "core")
+          (section (name "demo") 
+                   (sprite
+                    (name "fastforward")
+                    (image-file "../images/core/demo/fastforward.png"))
+                   (sprite
+                    (name "fastforward-pressed")
+                    (image-file "../images/core/demo/fastforward-pressed.png"))
+                   (sprite
+                    (name "fastforward-hover")
+                    (image-file "../images/core/demo/fastforward-hover.png"))
+
+                   (sprite
+                    (name "pause")
+                    (image-file "../images/core/demo/pause.png"))
+                   (sprite
+                    (name "pause-pressed")
+                    (image-file "../images/core/demo/pause-pressed.png"))
+                   (sprite
+                    (name "pause-hover")
+                    (image-file "../images/core/demo/pause-hover.png"))
+
+                   (sprite
+                    (name "reload")
+                    (image-file "../images/core/demo/reload.png"))
+                   (sprite
+                    (name "reload-pressed")
+                    (image-file "../images/core/demo/reload-pressed.png"))
+                   (sprite
+                    (name "reload-hover")
+                    (image-file "../images/core/demo/reload-hover.png"))
+
+                   )
+
           (section (name "cursors")
                    (sprite
                     (name "editor")

Added: trunk/pingus/data/images/core/demo/fastforward-hover.png
===================================================================
(Binary files differ)


Property changes on: trunk/pingus/data/images/core/demo/fastforward-hover.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/pingus/data/images/core/demo/fastforward-pressed.png
===================================================================
(Binary files differ)


Property changes on: trunk/pingus/data/images/core/demo/fastforward-pressed.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/pingus/data/images/core/demo/fastforward.png
===================================================================
(Binary files differ)


Property changes on: trunk/pingus/data/images/core/demo/fastforward.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/pingus/data/images/core/demo/pause-hover.png
===================================================================
(Binary files differ)


Property changes on: trunk/pingus/data/images/core/demo/pause-hover.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/pingus/data/images/core/demo/pause-pressed.png
===================================================================
(Binary files differ)


Property changes on: trunk/pingus/data/images/core/demo/pause-pressed.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/pingus/data/images/core/demo/pause.png
===================================================================
(Binary files differ)


Property changes on: trunk/pingus/data/images/core/demo/pause.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/pingus/data/images/core/demo/reload-hover.png
===================================================================
(Binary files differ)


Property changes on: trunk/pingus/data/images/core/demo/reload-hover.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/pingus/data/images/core/demo/reload-pressed.png
===================================================================
(Binary files differ)


Property changes on: trunk/pingus/data/images/core/demo/reload-pressed.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/pingus/data/images/core/demo/reload.png
===================================================================
(Binary files differ)


Property changes on: trunk/pingus/data/images/core/demo/reload.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Modified: trunk/pingus/src/demo_session.cpp
===================================================================
--- trunk/pingus/src/demo_session.cpp   2008-07-01 17:14:39 UTC (rev 3615)
+++ trunk/pingus/src/demo_session.cpp   2008-07-02 00:44:08 UTC (rev 3616)
@@ -17,6 +17,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <boost/function.hpp>
+#include <boost/bind.hpp>
 #include "math.hpp"
 #include "server.hpp"
 #include "pathname.hpp"
@@ -25,12 +27,28 @@
 #include "gui/gui_manager.hpp"
 #include "display/scene_context.hpp"
 #include "pingus_demo.hpp"
+#include "gui/surface_button.hpp"
 #include "components/playfield.hpp"
 #include "components/smallmap.hpp"
 #include "screen/screen_manager.hpp"
 #include "display/display.hpp"
 #include "demo_session.hpp"
 
+class BButton : public GUI::SurfaceButton
+{
+private:
+  boost::function<void(void)> callback;
+public:
+  BButton(int x, int y, const std::string& name, boost::function<void (void)> 
callback_)
+    : SurfaceButton(x, y, name, name + "-pressed", name + "-hover"),
+      callback(callback_)
+  {}
+
+  void on_click() {
+    callback();
+  }
+};
+
 DemoSession::DemoSession(const Pathname& pathname)
   : pause(false),
     fast_forward(false)
@@ -63,6 +81,13 @@
 
   small_map    = new SmallMap(server.get(), playfield);
   gui_manager->add(small_map, true);
+
+  gui_manager->add(new BButton(32+50, 32, "core/demo/fastforward",
+                               
boost::bind(&DemoSession::on_fast_forward_press, this)), true);
+  gui_manager->add(new BButton(32,  32, "core/demo/pause",
+                               boost::bind(&DemoSession::on_pause_press, 
this)), true);
+  gui_manager->add(new BButton(Display::get_width() - 32 - 48, 32, 
"core/demo/reload",
+                               boost::bind(&DemoSession::restart, this)), 
true);
 }
 
 DemoSession::~DemoSession()
@@ -166,5 +191,11 @@
   playfield->scroll(static_cast<int>(-ev.x_delta),
                     static_cast<int>(-ev.y_delta));
 }
+
+void
+DemoSession::restart()
+{
+  std::cout << "DemoSession::restart(): unimplemented" << std::endl;
+}
 
 /* EOF */

Modified: trunk/pingus/src/demo_session.hpp
===================================================================
--- trunk/pingus/src/demo_session.hpp   2008-07-01 17:14:39 UTC (rev 3615)
+++ trunk/pingus/src/demo_session.hpp   2008-07-02 00:44:08 UTC (rev 3616)
@@ -63,6 +63,8 @@
   void on_fast_forward_press ();
   void on_escape_press ();
 
+  void restart();
+  
   void process_scroll_event(const Input::ScrollEvent& ev);
 private:
   DemoSession (const DemoSession&);

Modified: trunk/pingus/src/gui/surface_button.hpp
===================================================================
--- trunk/pingus/src/gui/surface_button.hpp     2008-07-01 17:14:39 UTC (rev 
3615)
+++ trunk/pingus/src/gui/surface_button.hpp     2008-07-02 00:44:08 UTC (rev 
3616)
@@ -41,6 +41,7 @@
 
   bool pressed;
   bool mouse_over;
+
 public:
   SurfaceButton (int x_pos, int y_pos,
                  const ResDescriptor& button_surface,