Changeset 6463 in orxonox.OLD

Timestamp:

Jan 10, 2006, 1:56:38 PM (18 years ago)

Author:

patrick

Message:

network: implemented a better debug function

Location:

branches/network/src

Files:

• lib/network/network_game_manager.cc (modified) (1 diff)
• story_entities/multi_player_world.cc (modified) (3 diffs)
• story_entities/multi_player_world.h (modified) (1 diff)
• story_entities/multi_player_world_data.cc (modified) (2 diffs)
• story_entities/multi_player_world_data.h (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)

branches/network/src/lib/network/network_game_manager.cc

@@ -478 +478 @@
     PRINTF(0)("Fabricated %s with id %d\n", s->getClassName(), s->getUniqueID());
 
-
-    if( !strcmp( s->getClassName(), "SkyBox"))
-    {
-      PRINTF(0)("==> Created the Sky!\n");
-      (dynamic_cast<GameWorld*>(State::getCurrentStoryEntity()))->setSky( dynamic_cast<WorldEntity*>(s) );
-    }
-//       this->sky = dynamic_cast<WorldEntity*>(created);
-    if( !strcmp( s->getClassName(), "Terrain"))
-    {
-      PRINTF(0)("==> Created the Terrain\n");
-//       this->terrain = dynamic_cast<Terrain*>(created);
-//       CDEngine::getInstance()->setTerrain(terrain);
-    }
-
     return b;
   }

branches/network/src/story_entities/multi_player_world.cc

@@ -21 +21 @@
 #include "factory.h"
 #include "load_param.h"
+#include "shell_command.h"
 
 #include "network_manager.h"
@@ -26 +27 @@
 
 using namespace std;
+
+
+//! Register a command to print some multiplayer world infos
+SHELL_COMMAND(debug, MultiPlayerWorld, debug);
 
 
@@ -79 +84 @@
 }
 
+
+/**
+ * some debug ouptut - shell command
+ */
+void MultiPlayerWorld::debug()
+{
+  ((MultiPlayerWorldData*)this->dataTank)->debug();
+}

branches/network/src/story_entities/multi_player_world.h

@@ -27 +27 @@
   void loadParams(const TiXmlElement* root);
 
+  void debug();
+
   protected:
     virtual void synchronize();

branches/network/src/story_entities/multi_player_world_data.cc

@@ -187 +187 @@
     }
 
-    /* some debug output */
-    PRINT(0)("==================================================\n");
-    std::list<BaseObject*>::const_iterator entity;
-    for (entity = playableList->begin(); entity != playableList->end(); entity++)
-    {
-      PRINTF(0)("Got a playable, class: %s, name: %s\n", (*entity)->getClassName(), (*entity)->getName());
-    }
-
-
-    PNode* cam = State::getCameraTarget();
-    PRINT(0)("Camera has target - class: %s, name: %s, uid: %i\n", cam->getClassName(), cam->getName(), cam->getUniqueID());
-
-
-    PRINT(0)("==================================================\n");
-
-
     /* init the pnode tree */
     PNode::getNullParent()->init();
@@ -239 +223 @@
 }
 
+
+/**
+ * some debug output
+ */
+void MultiPlayerWorldData::debug()
+{
+  PRINT(0)("==================================================\n");
+  Playable* playable;
+  const std::list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
+  assert(playableList != NULL);
+  std::list<BaseObject*>::const_iterator entity;
+  for (entity = playableList->begin(); entity != playableList->end(); entity++)
+  {
+    Playable* p = dynamic_cast<Playable*>(*entity);
+    PRINTF(0)("Got a playable, class: %s, name: %s, uid: %i\n", (*entity)->getClassName(), (*entity)->getName(), p->getUniqueID());
+  }
+
+  PNode* cam = State::getCameraTarget();
+  PRINT(0)("Camera has target - class: %s, name: %s, uid: %i\n", cam->getClassName(), cam->getName(), cam->getUniqueID());
+
+  PRINT(0)("==================================================\n");
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

branches/network/src/story_entities/multi_player_world_data.h

@@ -24 +24 @@
     virtual ErrorMessage init();
 
+    void debug();
+
 
   protected:

branches/network/src/world_entities/space_ships/space_ship.cc

@@ -211 +211 @@
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
   this->attachCamera();
-
-
 }
 
@@ -315 +313 @@
 
   //readjust
-  
+
   /*
     In the game "Yager" the spaceship gets readjusted when the player moves the mouse.
     I (bknecht) go and check it out how they do it, we could probably use this also in Orxonox.
   */
-  //if (xMouse != 0 && yMouse != 0) 
-  
+  //if (xMouse != 0 && yMouse != 0)
+
   //if (this->getAbsDirZ().y > 0.1) this->shiftDir(Quaternion(time*0.3, Vector(1,0,0)));
   //else if (this->getAbsDirZ().y < -0.1) this->shiftDir(Quaternion(-time*0.3, Vector(1,0,0)));