Changeset 3213 in orxonox.OLD

Timestamp:

Dec 18, 2004, 2:54:59 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: enhanced the CommandNode - cleaning up garbage doing the wash etc

Location:

orxonox/trunk/src

Files:

• camera.cc (modified) (3 diffs)
• camera.h (modified) (1 diff)
• command_node.cc (modified) (7 diffs)
• command_node.h (modified) (2 diffs)
• list.cc (modified) (1 diff)
• orxonox.cc (modified) (2 diffs)
• world.cc (modified) (3 diffs)

orxonox/trunk/src/camera.cc

@@ -279 +279 @@
   \param entity: The enitity to bind the camera to
         
-        This sets the focus of the camera to the given entity. This means that it will use the given WorldEntity's
-        Location and get_lookat() to determine the viewpoint the camera will render from.
-        Note that you cannot bind a camera to a free entity.
+  This sets the focus of the camera to the given entity. This means that it will use the given WorldEntity's
+  Location and get_lookat() to determine the viewpoint the camera will render from.
+  Note that you cannot bind a camera to a free entity.
 */
 void Camera::bind (WorldEntity* entity)
@@ -287 +287 @@
   if( entity != NULL)
     {
-      if( entity->isFree ()) printf("Cannot bind camera to free entity");
+      if( entity->isFree()) printf("Cannot bind camera to free entity");
       else 
         {
-          bound = entity;
+          this->bound = entity;
         }
     } 
@@ -300 +300 @@
   this->world = world;
 }
+
+
+/**
+   \brief destroy, reset the camera so that it doesn't perform anything anymore
+
+*/
+void Camera::destroy()
+{
+  this->bound = NULL;
+  this->world = NULL;
+}

orxonox/trunk/src/camera.h

@@ -64 +64 @@
   void bind (WorldEntity* entity);
   void jump (Placement* plc);
+  void destroy();
 
   void setWorld(World* world);  

orxonox/trunk/src/command_node.cc

@@ -33 +33 @@
 CommandNode::CommandNode (int ID)
 {
-  bound = new List();
-  aliases = NULL;
-  netID = ID;
-  bLocalInput = false;
+  this->bound = new List();
+  this->aliases = NULL;
+  this->netID = ID;
+  this->bLocalInput = false;
+  this->bEnabled = true;
 }
 
@@ -45 +46 @@
 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 List();
+  this->bEnabled = true;
+  this->load_bindings (filename);
 }
 
@@ -58 +60 @@
 {
   if( aliases != NULL) free (aliases);
-  if( bound != NULL) delete bound;
+  if( bound != NULL) delete bound; /* \todo should this delete bound? dangerous FIX */
 }
 
@@ -74 +76 @@
 {
   this->bound->destroy();
+  //this->bound = NULL; /* \todo this produces a NULLpointer error.. FIX */
+  this->bEnabled = false;
+}
+
+void CommandNode::enable(bool bEnabled)
+{
+  this->bEnabled = bEnabled;
 }
 
@@ -173 +182 @@
 void CommandNode::process ()
 {
-  if( bLocalInput) process_local ();
-  else process_network ();
+  if( this->bEnabled) 
+    {
+      if( bLocalInput) process_local ();
+      else process_network ();
+    }
 }
 
@@ -181 +193 @@
   SDL_Event event;
   Command cmd;
-  
   while( SDL_PollEvent (&event))
     {
@@ -223 +234 @@
           Orxonox *orx = Orxonox::getInstance();
           orx->event_handler (&event);
-          
           break;
         }

orxonox/trunk/src/command_node.h

@@ -39 +39 @@
  private:
   bool bLocalInput;     //!< Identifies the CommandNode that processes local input
+  bool bEnabled;
   int netID;    //!< Unique identifier that is used to determine between remote CommandNodes
   KeyBindings* aliases;
@@ -56 +57 @@
   ~CommandNode ();
 
-  void reset();  
+  void reset();
+  void enable(bool bEnabled);
   void load_bindings (char* filename);
   void bind (WorldEntity* entity);

orxonox/trunk/src/list.cc

@@ -81 +81 @@
   printf("List::clear() - clearing all world objects, releasing mem\n");
   this->currentEl = this->first;
+  listElement* le = NULL;
   while(this->currentEl != NULL)
     {
-      listElement* le = this->currentEl->next;
+      le = this->currentEl->next;
       delete this->currentEl->curr;
       delete this->currentEl;

orxonox/trunk/src/orxonox.cc

@@ -171 +171 @@
   
   // create camera
-  localcamera = new Camera(world);
+  //localcamera = new Camera(world); /* \todo camera/input node not used anymore*/
   
   return 0;
@@ -304 +304 @@
 {
   // localinput
-  localinput->process();
+  //localinput->process();
   // remoteinput
 }

orxonox/trunk/src/world.cc

@@ -64 +64 @@
 {
   this->bPause = false;
+  Orxonox::getInstance()->get_localinput()->enable(true);
 }
 
@@ -75 +76 @@
   this->bQuitCurrentGame = true;
   this->localCamera->setWorld(NULL);
+  this->localCamera->destroy();
+
+
   WorldEntity* entity = entities->enumerate();  
   while( entity != NULL ) 
@@ -581 +585 @@
   
       for(int i = 0; i < 10000000; i++) {}
-
     }
   printf("World|Exiting the main loop\n");