Changeset 4409 in orxonox.OLD for orxonox/trunk

Timestamp:

May 31, 2005, 12:24:50 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: space ship control works again, now working on system commands

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (2 diffs)
• story_entities/world.h (modified) (2 diffs)
• world_entities/player.cc (modified) (2 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -278 +278 @@
   this->garbageCollector = GarbageCollector::getInstance();
 
+  this->eventHandler = EventHandler::getInstance();
+
   this->particleEngine = ParticleEngine::getInstance();
   this->trackManager = TrackManager::getInstance();
@@ -420 +422 @@
   orx->getLocalInput()->bind (localPlayer);
 
-  EventHandler::getInstance()->subscribe(this->localPlayer, ES_ALL, KeyMapper::PEV_UP);
+  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);
   
   // bind camera

orxonox/trunk/src/story_entities/world.h

@@ -26 +26 @@
 class TiXmlElement;
 class PilotNode;
+class EventHandler;
 
 //! The game world Interface
@@ -128 +129 @@
 
   GarbageCollector* garbageCollector; //!< reference to the garbage  collector
+  EventHandler* eventHandler;
 
   /* function for main-loop */

orxonox/trunk/src/world_entities/player.cc

@@ -236 +236 @@
     accel = accel-(direction*acceleration);
   if( this->bLeft &&  TrackManager::getInstance()->getWidth() > -this->getRelCoor().z*2)
-    accel = accel - (orthDirection*acceleration); 
+    accel = accel + (orthDirection*acceleration); 
   if( this->bRight &&  TrackManager::getInstance()->getWidth() > this->getRelCoor().z*2)
-    accel = accel + (orthDirection*acceleration);
+    accel = accel - (orthDirection*acceleration);
   if( this->bAscend )
   if( this->bDescend) {/* FIXME */} /* \todo up and down player movement */
@@ -284 +284 @@
 void Player::process(const Event &event)
 {
-
-}
+  if( event.type == KeyMapper::PEV_UP)
+    {
+      this->bUp = event.bPressed;
+    }
+  else if( event.type == KeyMapper::PEV_DOWN)
+    {
+      this->bDown = event.bPressed;
+    }
+  else if( event.type == KeyMapper::PEV_RIGHT)
+    {
+      this->bLeft = event.bPressed;
+    }
+  else if( event.type == KeyMapper::PEV_LEFT)
+    {
+      this->bRight = event.bPressed;
+    }
+
+}