Changeset 3216 in orxonox.OLD for orxonox/trunk/src/world.cc

Timestamp:

Dec 18, 2004, 5:14:08 AM (21 years ago)

Author:

patrick

Message:

orxonox/trunk: a first redesign of the CommandNode and its cmd passing system - others will follow.

File:

• orxonox/trunk/src/world.cc (modified) (6 diffs)

orxonox/trunk/src/world.cc

@@ -64 +64 @@
 {
   this->bPause = false;
-  Orxonox::getInstance()->get_localinput()->enable(true);
+  CommandNode* cn = Orxonox::getInstance()->get_localinput();
+  cn->addToWorld(this);
+  cn->enable(true);
 }
 
@@ -78 +80 @@
   this->localPlayer->destroy();
   this->localCamera->destroy();
-
 
   WorldEntity* entity = entities->enumerate();  
@@ -610 +611 @@
 {
   // localinput
-  Orxonox::getInstance()->get_localinput()->process();
+  CommandNode* cn = Orxonox::getInstance()->get_localinput();
+  cn->process();
   // remoteinput
 }
@@ -643 +645 @@
 }
 
+
 /**
    \brief compute collision detection
@@ -651 +654 @@
 }
 
-/**
-   \brief handle keyboard commands that are not meant for WorldEntities
-   \param cmd: the command to handle
-   \return true if the command was handled by the system or false if it may be passed to the WorldEntities
-*/
-bool World::system_command (Command* cmd)
-{
-  if( !strcmp( cmd->cmd, "quit"))
-    {
-      if( !cmd->bUp) this->bQuitOrxonox = true;
-      {
-        printf("World::system_command() - rescv quit command\n");
-        return true;
-      }
-    }
-  return false;
-}
 
 /**
@@ -750 +736 @@
   //return entity;
 }
+
+
+bool World::command(Command* cmd)
+{
+  if( !strcmp( cmd->cmd, "quit"))
+    {
+      if( !cmd->bUp) this->stop();
+      return true;
+    }
+  return false;
+}