Changeset 4326 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

May 27, 2005, 3:06:16 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: working on an alternativ flight mode and a new event handlig system at the same time. crazy…

Location:

orxonox/trunk/src/story_entities

Files:

• world.cc (modified) (6 diffs)
• world.h (modified) (2 diffs)

orxonox/trunk/src/story_entities/world.cc ¶

@@ -25 +25 @@
 #include "null_parent.h"
 #include "helper_parent.h"
+#include "pilot_node.h"
 #include "track_node.h"
 #include "world_entity.h"
@@ -473 +474 @@
 
 
+/**
+   \brief loads the debug world: only for experimental stuff
+*/
 void World::loadDebugWorld(int worldID)
 {
@@ -555 +559 @@
 
 
-        // create a player
         this->localPlayer = new Player ();
         this->localPlayer->setName ("player");
         this->spawn (this->localPlayer);
         /*monitor progress*/
-        //this->glmis->step();
         this->glmis->step();
 
-        // bind input
-        Orxonox *orx = Orxonox::getInstance ();
-        orx->getLocalInput()->bind (this->localPlayer);
-            
         // bind camera
         this->localCamera = new Camera();
         this->localCamera->setName ("camera");
-            
         /*monitor progress*/
         this->glmis->step();
@@ -591 +588 @@
         this->glmis->step();
 
+        this->pilotNode = new PilotNode();
+        this->pilotNode->addChild(this->localPlayer);
+        this->pilotNode->addChild(this->localCamera);
+        // bind input
+        Orxonox *orx = Orxonox::getInstance ();
+        //orx->getLocalInput()->bind (this->pilotNode);     
+        
+        /*
         PNode* tn = trackManager->getTrackNode();
         tn->addChild(this->localPlayer);
         this->localCamera->lookAt(tn);
-
-
+        
         tn->addChild(this->localCamera);
         this->localPlayer->setMode(PNODE_ALL);
         trackManager->condition(2, LEFTRIGHT, this->localPlayer);
+        */
         this->glmis->step();
         break;
@@ -628 +633 @@
 {
   this->bPause = false;
+  this->pilotNode = NULL;
   CommandNode* cn = Orxonox::getInstance()->getLocalInput();
   cn->addToWorld(this);
@@ -1099 +1105 @@
   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;
 }

orxonox/trunk/src/story_entities/world.h ¶

@@ -24 +24 @@
 class Text;
 class TiXmlElement;
+class PilotNode;
 
 //! The game world Interface
@@ -120 +121 @@
   tList<WorldEntity>* entities;       //!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.
   WorldEntity* localPlayer;           //!< The Player, you fly through the level.
+  PilotNode* pilotNode;               //!< THe pilot node to fly with the mouse
 
   GarbageCollector* garbageCollector; //!< reference to the garbage  collector