Changeset 4423 in orxonox.OLD

Timestamp:

May 31, 2005, 7:10:01 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: space craft can be controled via keys, nothing new yet

Location:

orxonox/trunk/src

Files:

• lib/coord/pilot_node.cc (modified) (3 diffs)
• lib/coord/pilot_node.h (modified) (1 diff)
• story_entities/world.cc (modified) (3 diffs)

orxonox/trunk/src/lib/coord/pilot_node.cc

@@ -19 +19 @@
 #include "pilot_node.h"
 #include "command_node.h"
+#include "event_handler.h"
 #include "event.h"
 
@@ -33 +34 @@
    this->setClassID(CL_PILOT_PARENT, "PilotNode");
 
-   
+   travelSpeed = 60.0;
+   velocity = new Vector();
+   bUp = bDown = bLeft = bRight = false;
 }
 
@@ -48 +51 @@
 
 
-void PilotNode::command(Command* cmd)
+void PilotNode::tick(float time)
 {
-
-
-  //this->setAbsDir(Quaternion(M_PI * 0.4, Vector(1, 0, 0)));
+  this->move(time);
 }
 
 
+/**
+   \brief action if player moves
+   \param time the timeslice since the last frame
+*/
+void PilotNode::move (float time)
+{
+  Vector accel(0.0, 0.0, 0.0);
+  /* FIXME: calculating the direction and orthDirection every timeSlice is redundant! save it somewhere */
+  /* calculate the direction in which the craft is heading  */
+  Vector direction (1.0, 0.0, 0.0);
+  //direction = this->absDirection.apply (direction);
+  Vector orthDirection (0.0, 0.0, 1.0);
+  //orthDirection = orthDirection.cross (direction);
+
+  if( this->bUp)
+    accel = accel+(direction*acceleration);
+  if( this->bDown)
+    accel = accel -(direction*acceleration);
+  if( this->bLeft)
+    accel = accel - (orthDirection*acceleration); 
+  if( this->bRight)
+    accel = accel + (orthDirection*acceleration);
+
+  Vector move = accel * time;
+  this->shiftCoor (move);
+}
+
 void PilotNode::process( const Event &event)
 {
-  PRINTF(0)("Mouse moved by %d,%d to (%d,%d)\n", event.xRel, event.yRel,
-         event.x, event.y);
+  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->bRight= event.bPressed;
+    }
+  else if( event.type == KeyMapper::PEV_LEFT)
+    {
+      this->bLeft = event.bPressed;
+    }
+  else if( event.type == EV_MOUSE_MOTION)
+    {
+      PRINTF(0)("Mouse moved by %d,%d to (%d,%d)\n", event.xRel, event.yRel,
+            event.x, event.y);
+    }
 }

orxonox/trunk/src/lib/coord/pilot_node.h

@@ -9 +9 @@
 
 #include "comincl.h"
-#include "p_node.h"
+#include "world_entity.h"
 #include "event_listener.h"
 
 class Event;
 
-class PilotNode : public PNode, public EventListener {
+class PilotNode : public WorldEntity, public EventListener {
 
  public:
   PilotNode ();
   virtual ~PilotNode ();
-  
-  void command(Command* cmd);
+
+  void tick(float time);
 
   void process(const Event &event);
+
+ private:
+  void move(float time);
+
+ private:
+  bool bUp;              //!< up button pressed.
+  bool bDown;            //!< down button pressed.
+  bool bLeft;            //!< left button pressed.
+  bool bRight;           //!< right button pressed.
+
+  Vector* velocity;       //!< the velocity of the player.
+  float travelSpeed;     //!< the current speed of the player (to make soft movement)
+  float acceleration;    //!< the acceleration of the player.
+
 
 };

orxonox/trunk/src/story_entities/world.cc

@@ -601 +601 @@
 
 
-        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);
         this->eventHandler->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_FIRE1);
         this->eventHandler->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_NEXT_WEAPON);
@@ -639 +635 @@
 
         this->pilotNode = new PilotNode();
+        this->spawn(this->pilotNode);
+        this->pilotNode->setAbsCoor(Vector(150, -35, 5));
         this->pilotNode->addChild(this->localPlayer);
         this->pilotNode->addChild(this->localCamera);
-        this->localCamera->lookAt(this->localPlayer);
-
+        this->localCamera->lookAt(this->pilotNode);
+
+        this->eventHandler->subscribe(this->pilotNode, ES_GAME, KeyMapper::PEV_UP);
+        this->eventHandler->subscribe(this->pilotNode, ES_GAME, KeyMapper::PEV_DOWN);
+        this->eventHandler->subscribe(this->pilotNode, ES_GAME, KeyMapper::PEV_LEFT);
+        this->eventHandler->subscribe(this->pilotNode, ES_GAME, KeyMapper::PEV_RIGHT);
         this->eventHandler->subscribe(this->pilotNode, ES_GAME, EV_MOUSE_MOTION);
 
@@ -1164 +1166 @@
   else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW4)) this->localCamera->setViewMode(VIEW_RIGHT);
   else if( !strcmp( cmd->cmd, CONFIG_NAME_VIEW5)) this->localCamera->setViewMode(VIEW_TOP);
-  else if(this->pilotNode != NULL) if( !strcmp( cmd->cmd, "cursor")) this->pilotNode->command(cmd);
   return false;
 }