Changeset 3238 in orxonox.OLD for orxonox/branches/nico/src/command_node.cc

Timestamp:

Dec 20, 2004, 2:42:54 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches: updated branches: buerli, nico, sound. And moved bezierTrack to old.bezierTrack. Conflicts resolved in a usefull order.
Conflics mostly resolved in favor of trunk
merge.

File:

• orxonox/branches/nico/src/command_node.cc (modified) (15 diffs)

orxonox/branches/nico/src/command_node.cc

@@ -20 +20 @@
 #include "world_entity.h"
 #include "game_loader.h"
+#include "world.h"
 
 #include <stdio.h>
@@ -33 +34 @@
 CommandNode::CommandNode (int ID)
 {
-  bound = new List();
-  aliases = NULL;
-  netID = ID;
-  bLocalInput = false;
+  this->bound = new tList<WorldEntity>();
+  this->aliases = NULL;
+  this->netID = ID;
+  this->bLocalInput = false;
+  this->bEnabled = true;
+  this->world = NULL;
 }
 
@@ -45 +48 @@
 CommandNode::CommandNode (char* filename = DEFAULT_KEYBIND_FILE)
 {
-  aliases = NULL;
-  bLocalInput = true;
-  netID = 0;
-  bound = new List();
-  load_bindings (filename);
+  this->aliases = NULL;
+  this->bLocalInput = true;
+  this->netID = 0;
+  this->bound = new tList<WorldEntity>();
+  this->bEnabled = true;
+  this->world = NULL;
+  this->loadBindings (filename);
 }
 
@@ -58 +63 @@
 {
   if( aliases != NULL) free (aliases);
-  if( bound != NULL) delete bound;
-}
-
+  if( bound != NULL) delete bound; /* \todo should this delete bound? dangerous FIX */
+}
+
+
+/**
+  \brief this resets the command node
+
+   deleting all data contained in the command node to fill it up again
+
+  \todo coppling to different game-entities
+  \todo reset/destroy has to be redesigned
+*/
 
 void CommandNode::reset()
 {
-  this->bound->clear();
-}
+  this->bound->destroy();
+  //this->bound = NULL; /* \todo this produces a NULLpointer error.. FIX */
+  this->bEnabled = false;
+  this->world = NULL;
+}
+
+void CommandNode::enable(bool bEnabled)
+{
+  this->bEnabled = bEnabled;
+}
+
+
+/**
+  \brief adds Node to a GameWorld
+
+   this is usefull, if you want to catch events in a world class. usualy
+   this is done automaticaly via GameLoader. Reset it via 
+   CommandNode::reset()
+
+*/
+void CommandNode::addToWorld(World* world)
+{
+  this->world = world;
+}
+
 
 /**
@@ -71 +108 @@
    \param filename: The path and name of the file to load the bindings from
 */
-void CommandNode::load_bindings (char* filename)
+void CommandNode::loadBindings (char* filename)
 {
   FILE* stream;
@@ -88 +125 @@
   // create parser
   IniParser parser (filename);
-  if( parser.get_section ("Bindings") == -1)
+  if( parser.getSection ("Bindings") == -1)
     {
       printf("Could not find key bindings in %s\n", filename);
@@ -102 +139 @@
   int* index;
   
-  while( parser.next_var (namebuf, valuebuf) != -1)
-    {
-      index = name_to_index (namebuf);
+  while( parser.nextVar (namebuf, valuebuf) != -1)
+    {
+      index = nameToIndex (namebuf);
       switch( index[0])
         {
         case 0:
-          printf("Key binding %d(%s) set to %s\n", index[1], SDLK_to_keyname( index[1]), valuebuf);
+          printf("Key binding %d(%s) set to %s\n", index[1], SDLKToKeyname( index[1]), valuebuf);
           strcpy (aliases->keys[index[1]], valuebuf);
           break;
         case 1:
-          printf("Button binding %d(%s) set to %s\n", index[1], SDLB_to_buttonname( index[1]), valuebuf);
+          printf("Button binding %d(%s) set to %s\n", index[1], SDLBToButtonname( index[1]), valuebuf);
           strcpy (aliases->buttons[index[1]], valuebuf);
           break;
@@ -141 +178 @@
 }
 
-int* CommandNode::name_to_index (char* name)
+int* CommandNode::nameToIndex (char* name)
 {
   coord[0] = -1;
   coord[1] = -1;
   int c;
-  if( (c = keyname_to_SDLK (name)) != -1)
+  if( (c = keynameToSDLK (name)) != -1)
     {
       coord[1] = c;
       coord[0] = 0;
     }
-  if( (c = buttonname_to_SDLB (name)) != -1)
+  if( (c = buttonnameToSDLB (name)) != -1)
     {
       coord[1] = c;
@@ -164 +201 @@
 void CommandNode::process ()
 {
-  if( bLocalInput) process_local ();
-  else process_network ();
-}
-
-void CommandNode::process_local ()
+  if( this->bEnabled) 
+    {
+      if( bLocalInput) processLocal ();
+      else processNetwork ();
+    }
+}
+
+void CommandNode::processLocal ()
 {
   SDL_Event event;
   Command cmd;
-  
   while( SDL_PollEvent (&event))
     {
@@ -181 +220 @@
           strcpy (cmd.cmd, aliases->keys[event.key.keysym.sym]);
           cmd.bUp = false;
-          if( strlen (cmd.cmd) > 0) relay (&cmd);
+          if( strlen (cmd.cmd) > 0) relay(&cmd);
           break;
         case SDL_KEYUP:
           strcpy( cmd.cmd, aliases->keys[event.key.keysym.sym]);
           cmd.bUp = true;
-          if( strlen (cmd.cmd) > 0) relay (&cmd);
+          if( strlen (cmd.cmd) > 0) relay(&cmd);
           break;
         case SDL_MOUSEMOTION:
@@ -198 +237 @@
           strcpy( cmd.cmd, aliases->buttons[event.button.button]);
           cmd.bUp = true;
-          if( strlen (cmd.cmd) > 0) relay (&cmd);
+          if( strlen (cmd.cmd) > 0) relay(&cmd);
           break;
         case SDL_MOUSEBUTTONDOWN:
           strcpy( cmd.cmd, aliases->buttons[event.button.button]);
           cmd.bUp = false;
-          if( strlen (cmd.cmd) > 0) relay (&cmd);
+          if( strlen (cmd.cmd) > 0) relay(&cmd);
           break;
         case SDL_JOYAXISMOTION:
@@ -213 +252 @@
         default:
           Orxonox *orx = Orxonox::getInstance();
-          orx->event_handler (&event);
-          
+          orx->eventHandler(&event);
           break;
         }
@@ -221 +259 @@
 
 
-void CommandNode::process_network ()
+void CommandNode::processNetwork ()
 {
 
@@ -229 +267 @@
 void CommandNode::relay (Command* cmd)
 {
-  
+
   Orxonox *orx = Orxonox::getInstance();
-  if( orx->system_command (cmd)) return;
+  if( orx->systemCommand (cmd)) return;
+
   GameLoader* gl = GameLoader::getInstance();
-  if(gl->worldCommand(cmd)) return;
-  
-  if( bLocalInput) send_over_network (cmd);
-  
+  if( gl->worldCommand(cmd)) return;
+
+  if( bLocalInput) sendOverNetwork (cmd);
+  
+  if( this->world->command(cmd)) return;
+
   WorldEntity* entity = bound->enumerate();
-  while(  entity != NULL)
+  while( entity != NULL)
     {
       entity->command (cmd);
@@ -250 +291 @@
    \param ID: the new ID to use
 */
-void CommandNode::set_netID (int ID)
+void CommandNode::setNetID (int ID)
 {
   netID = ID;
 }
 
-void CommandNode::send_over_network (Command* cmd)
-{
-}
+void CommandNode::sendOverNetwork (Command* cmd)
+{
+}