Changeset 4410 in orxonox.OLD for orxonox/trunk

Timestamp:

May 31, 2005, 12:43:58 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: prepeared to implement all system wide commands

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (1 diff)
• util/event/key_mapper.cc (modified) (2 diffs)
• util/event/key_mapper.h (modified) (1 diff)
• util/loading/game_loader.cc (modified) (2 diffs)
• util/loading/game_loader.h (modified) (4 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -422 +422 @@
   orx->getLocalInput()->bind (localPlayer);
 
-  this->eventHandler->subscribe(this->localPlayer, ES_ALL, KeyMapper::PEV_UP);
-  this->eventHandler->subscribe(this->localPlayer, ES_ALL, KeyMapper::PEV_DOWN);
-  this->eventHandler->subscribe(this->localPlayer, ES_ALL, KeyMapper::PEV_LEFT);
-  this->eventHandler->subscribe(this->localPlayer, ES_ALL, KeyMapper::PEV_RIGHT);
+  this->eventHandler->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_UP);
+  this->eventHandler->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_DOWN);
+  this->eventHandler->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_LEFT);
+  this->eventHandler->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_RIGHT);
   
   // bind camera

orxonox/trunk/src/util/event/key_mapper.cc

@@ -43 +43 @@
 int KeyMapper::PEV_VIEW3 = -1;
 int KeyMapper::PEV_VIEW4 = -1;
-int KeyMapper::PEV_VIEW5 = -1;
+int KeyMapper::PEV_VIEW5 = -1; 
+
+int KeyMapper::PEV_NEXT_WORLD = -1;
+int KeyMapper::PEV_PREVIOUS_WORLD = -1;
+
+int KeyMapper::PEV_PAUSE = -1;
+int KeyMapper::PEV_QUIT = -1;
+
+
 
 
@@ -62 +70 @@
                         {&KeyMapper::PEV_VIEW3, "view3"},
                         {&KeyMapper::PEV_VIEW4, "view4"},
-                        {&KeyMapper::PEV_VIEW5, "view5"},                       
+                        {&KeyMapper::PEV_VIEW5, "view5"},
+
+                        {&KeyMapper::PEV_NEXT_WORLD, "Next-World"},
+                        {&KeyMapper::PEV_PREVIOUS_WORLD, "Prev-World"},
+
+                        {&KeyMapper::PEV_PAUSE, "Pause"},
+                        {&KeyMapper::PEV_QUIT, "Quit"},
                         {NULL, NULL}};
 

orxonox/trunk/src/util/event/key_mapper.h

@@ -57 +57 @@
   static int PEV_VIEW5;
 
+  static int PEV_NEXT_WORLD;
+  static int PEV_PREVIOUS_WORLD;
+
+  static int PEV_PAUSE;
+  static int PEV_QUIT;
+
  private:
   Sint32 coord[2];

orxonox/trunk/src/util/loading/game_loader.cc

@@ -26 +26 @@
 #include "resource_manager.h"
 #include "factory.h"
+#include "event.h"
+#include "event_handler.h"
 
 #include <string.h>
@@ -256 +258 @@
 
 
+void GameLoader::process(const Event& event)
+{
+  if( event.type == KeyMapper::PEV_NEXT_WORLD)
+    {
+      if( likely(event.bPressed)) 
+        {
+          this->nextLevel();
+        }
+    }
+  else if( event.type == KeyMapper::PEV_PREVIOUS_WORLD)
+    {
+      if( likely(event.bPressed))
+        {
+          this->previousLevel();
+        }
+    }
+  else if( event.type == KeyMapper::PEV_PAUSE)
+    {
+      if( likely(event.bPressed))
+        {
+          if(this->isPaused)
+            this->resume();
+          else
+            this->pause();
+        }
+    }
+  else if( event.type == KeyMapper::PEV_QUIT)
+    {
+      if( event.bPressed) this->stop();
+    }
+}
+
 /*
   \brief this changes to the next level

orxonox/trunk/src/util/loading/game_loader.h

@@ -10 +10 @@
 #include "story_def.h"
 #include "comincl.h"
+#include "event_listener.h"
 
 
@@ -22 +23 @@
 class TiXmlElement;
 class BaseObject;
+class Event;
 
 //! The GameLoader
@@ -35 +37 @@
       world. this is done by callaing those StoryEntity::start()
 */
-class GameLoader 
+class GameLoader : public EventListener
 {
 
@@ -58 +60 @@
   BaseObject* fabricate( TiXmlElement* data);
 
+  void process(const Event &event);
+
  private:
   GameLoader ();