Changeset 6250 in orxonox.OLD

Timestamp:

Dec 21, 2005, 4:29:15 PM (18 years ago)

Author:

patrick

Message:

network: network game manager now sounds good

Location:

branches/network/src

Files:

• lib/network/network_game_manager.cc (modified) (2 diffs)
• lib/network/network_game_manager.h (modified) (2 diffs)
• lib/network/network_manager.cc (modified) (5 diffs)
• lib/network/network_manager.h (modified) (1 diff)
• lib/network/synchronizeable.cc (modified) (2 diffs)
• lib/network/synchronizeable.h (modified) (1 diff)
• story_entities/network_world.cc (modified) (5 diffs)
• util/loading/factory.cc (modified) (1 diff)

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

@@ -38 +38 @@
 NetworkGameManager::NetworkGameManager()
 {
+  PRINTF(0)("START\n");
+
   /* set the class id for the base object */
   this->setClassID(CL_ENTITY_MANAGER, "EntityManager");
@@ -204 +206 @@
 }
 
+
+/*!
+ * Checks whether this is connected to a server or a client
+ * and afterwards creates the needed entity
+ * @param classID: The ID of the class of which an entity should be created
+ */
+BaseObject* NetworkGameManager::createEntity( TiXmlElement* element)
+{
+  if ( this->isServer() )
+  {
+    if ( newUniqueID < 0 )
+    {
+      PRINTF(1)("Cannot create entity! There are no more uniqueIDs left!\n");
+      return NULL;
+    }
+    newUniqueID++;
+
+    BaseObject * b = Factory::fabricate( element );
+
+    if ( !b )
+    {
+      PRINTF(1)("Could not fabricate Object with classID %x\n", element->Value() );
+      return NULL;
+    }
+
+    if ( b->isA(CL_SYNCHRONIZEABLE) )
+    {
+      Synchronizeable * s = dynamic_cast<Synchronizeable*>(b);
+      s->setUniqueID( newUniqueID );
+      s->setOwner( 0 );
+      this->networkStream->connectSynchronizeable( *s );
+      return b;
+    }
+    else
+    {
+      PRINTF(1)("Class %s is not a synchronizeable!\n", b->getClassName() );
+      delete b;
+    }
+  }
+  else
+  {
+    PRINTF(1)("This node is not a server and cannot create id %x\n", element->Value());
+  }
+  return NULL;
+}
+
+
 /*!
  * Checks whether this is connected to a server or a client

branches/network/src/lib/network/network_game_manager.h

@@ -14 +14 @@
 
 
+class TiXmlElement;
 
 /**
@@ -72 +73 @@
 
     void createEntity( ClassID classID, int owner = 0 );
+    BaseObject* createEntity( TiXmlElement* element);
     void removeEntity( int uniqueID );
     void sendYouAre( int uniqueID, int userID );

branches/network/src/lib/network/network_manager.cc

@@ -44 +44 @@
   /* set the class id for the base object */
   this->setClassID(CL_NETWORK_MANAGER, "NetworkManager");
+  PRINTF(0)("START\n");
 
   /* initialize the references */
@@ -49 +50 @@
   this->syncList = NULL;
   this->tmpStream = NULL;
+
   this->hostID = -1;
   this->bGameServer = false;
@@ -107 +109 @@
 int NetworkManager::createServer(unsigned int port)
 {
+  this->hostID = 0;
+  this->bGameServer = true;
   this->tmpStream = new NetworkStream(port);
   this->bGameServer = true;
@@ -124 +128 @@
   this->tmpStream = new NetworkStream(address);
   this->tmpStream->connectSynchronizeable(sync);
-}
-
-
-/**
- *  creates a new NetworkStream of server type
- * @param sync: the listener
- */
-NetworkStream& NetworkManager::createServer(Synchronizeable& sync, unsigned int port)
-{
-  PRINTF(0)("Create a new server socket\n");
-  /* creating a new network stream, it will register itself automaticaly to the class list */
-  this->tmpStream = new NetworkStream(port);
-  this->tmpStream->connectSynchronizeable(sync);
-  this->bGameServer = true;
 }
 
@@ -178 +168 @@
 void NetworkManager::setHostID(int id)
 {
-  this->hostID = id;
+    this->hostID = id;
 }

branches/network/src/lib/network/network_manager.h

@@ -39 +39 @@
 
     NetworkStream& establishConnection(IPaddress& address, Synchronizeable& sync);
-    NetworkStream& createServer(Synchronizeable& sync, unsigned int port);
     void shutdownConnection();
 

branches/network/src/lib/network/synchronizeable.cc

@@ -28 +28 @@
 Synchronizeable::Synchronizeable()
 {
-
+  this->setClassID(CL_SYNCHRONIZEABLE, "Synchronizeable");
   owner = 0;
   hostID = NetworkManager::getInstance()->getHostID();
+  this->setIsServer(this->hostID == 0);
+  PRINTF(0)("sync created,id %i\n", this->hostID);
   uniqueID = -1;
   this->networkStream = NULL;
@@ -37 +39 @@
 }
 
-/**
- *  default constructor
- */
-Synchronizeable::Synchronizeable(const char* name)
-{
-  this->setName(name);
-  this->networkStream = NULL;
-}
 
 

branches/network/src/lib/network/synchronizeable.h

@@ -25 +25 @@
   {
   public:
-
-    Synchronizeable(const char* name);
     Synchronizeable();
     ~Synchronizeable();

branches/network/src/story_entities/network_world.cc

@@ -70 +70 @@
 #include "playable.h"
 #include "network_manager.h"
+#include "network_game_manager.h"
 #include "playable.h"
 
@@ -168 +169 @@
 {
   this->setClassID(CL_WORLD, "NetworkWorld");
+  PRINTF(0)("START\n");
 
   this->setName(name);
@@ -354 +356 @@
       {
 
-        BaseObject* created = Factory::fabricate(element);
+        BaseObject* created = NetworkGameManager::getInstance()->createEntity(element);
         if( created != NULL )
         {
@@ -361 +363 @@
           printf("Created a %s: %s\n", created->getClassName(), created->getName());
         }
+        else
+          PRINTF(1)("NetworkWorld: could not create this entity\n");
 
           // if we load a 'Player' we use it as localPlayer
@@ -442 +446 @@
 //   this->spawn(testEntity);
 
-  for(int i = 0; i < 100; i++)
-  {
-    WorldEntity* tmp = new NPCTest1();
-    char npcChar[10];
-    sprintf (npcChar, "NPC_%d", i);
-        tmp->setName(npcChar);
-    tmp->setAbsCoor(((float)rand()/RAND_MAX) * 5000, 50/*+ (float)rand()/RAND_MAX*20*/, ((float)rand()/RAND_MAX -.5) *30);
-    this->spawn(tmp);
-  }
+//   for(int i = 0; i < 100; i++)
+//   {
+//     WorldEntity* tmp = NetworkGameManager::;
+//     char npcChar[10];
+//     sprintf (npcChar, "NPC_%d", i);
+//         tmp->setName(npcChar);
+//     tmp->setAbsCoor(((float)rand()/RAND_MAX) * 5000, 50/*+ (float)rand()/RAND_MAX*20*/, ((float)rand()/RAND_MAX -.5) *30);
+//     this->spawn(tmp);
+//   }
 
   this->music = NULL;

branches/network/src/util/loading/factory.cc

@@ -155 +155 @@
 }
 
+
 /**
  * Creates a new Object of type classID