Changeset 10114 in orxonox.OLD for trunk/src/lib/network

Timestamp:

Dec 19, 2006, 11:55:26 PM (18 years ago)

Author:

patrick

Message:

merged network back to trunk

Location:

trunk/src/lib/network

Files:

• Makefile.am (modified) (2 diffs)
• handshake.cc (modified) (3 diffs)
• handshake.h (modified) (1 diff)
• message_manager.cc (modified) (1 diff)
• network_game_manager.cc (modified) (1 diff)
• network_stream.cc (modified) (6 diffs)
• peer_info.h (modified) (1 diff)
• player_stats.cc (modified) (1 diff)
• synchronizeable.cc (modified) (4 diffs)
• synchronizeable_var/synchronizeable_classid.cc (copied) (copied from branches/network/src/lib/network/synchronizeable_var/synchronizeable_classid.cc)
• synchronizeable_var/synchronizeable_classid.h (copied) (copied from branches/network/src/lib/network/synchronizeable_var/synchronizeable_classid.h)
• synchronizeable_var/synchronizeable_classid_list.cc (copied) (copied from branches/network/src/lib/network/synchronizeable_var/synchronizeable_classid_list.cc)
• synchronizeable_var/synchronizeable_classid_list.h (copied) (copied from branches/network/src/lib/network/synchronizeable_var/synchronizeable_classid_list.h)

trunk/src/lib/network/Makefile.am

@@ -43 +43 @@
                       synchronizeable_var/synchronizeable_uint.cc \
                       synchronizeable_var/synchronizeable_ip.cc \
+                      synchronizeable_var/synchronizeable_classid.cc \
+                      synchronizeable_var/synchronizeable_classid_list.cc \
                       \
                       ip.cc
@@ -94 +96 @@
                 synchronizeable_var/synchronizeable_uint.h \
                 synchronizeable_var/synchronizeable_ip.h \
+                synchronizeable_var/synchronizeable_classid.h \
+                synchronizeable_var/synchronizeable_classid_list.h \
                 \
                 ip.h

trunk/src/lib/network/handshake.cc

@@ -22 +22 @@
 #include "debug.h"
 
+#include "synchronizeable_var/synchronizeable_classid_list.h"
+
+std::map< std::string, int >* Handshake::classIdList = NULL;
 
 ObjectListDefinition(Handshake);
@@ -32 +35 @@
   this->registerObject(this, Handshake::_objectList);
 
+  if ( !Handshake::classIdList )
+  {
+    //TODO who else?
+    if ( SharedNetworkData::getInstance()->isMasterServer() )
+    {
+      Handshake::classIdList = ObjectListBase::createStrToId();
+    }
+    else
+    {
+      Handshake::classIdList = new std::map< std::string, int >();
+    }
+  }
 
   // register all variable handlers
@@ -52 +67 @@
   registerVar( new SynchronizeableIP( &this->proxy2, &this->proxy2, "proxy server 2", PERMISSION_MASTER_SERVER ) );
   registerVar( new SynchronizeableInt( &this->redirectProxy, &this->redirectProxy, "proxy server redirection flag", PERMISSION_MASTER_SERVER ) );
+  
+  registerVar( new SynchronizeableClassIDList( Handshake::classIdList, Handshake::classIdList, "classId List", PERMISSION_MASTER_SERVER ) );
 
 

trunk/src/lib/network/handshake.h

@@ -113 +113 @@
     int                errorString_handler;                   //!< handshake error string handler
     int                candel_id;                             //!< handshake deletion handler
-    int                nodeType;                              //!, the type of the network node
+    int                nodeType;                              //!< the type of the network node
 
     int                redirectProxy;                         //!< true if the client should reconnect to a proxy server
     IP                 proxy1;                               //!< ip address of the first proxy (0.0.0.0 of not available)
     IP                 proxy2;                               //!< ip address of the second proxy (0.0.0.0 of not available)
+    
+    static std::map< std::string, int >* classIdList;
+  public:
+    std::map< std::string, int >* getClassIdList(){ return classIdList; }
 };
 

trunk/src/lib/network/message_manager.cc

@@ -242 +242 @@
     assert( i + messageLength <= length );
     // make sure there is a message handler for this message type
+    //if ( !( messageHandlerMap.find( (MessageType)messageType ) != messageHandlerMap.end()) )
+    //{
+//          PRINTF(0)("messagetype: %d\n", messageType);
+//          this->objectList().debugAll( 0 );
+//    }
+    
     assert( messageHandlerMap.find( (MessageType)messageType ) != messageHandlerMap.end());
 

trunk/src/lib/network/network_game_manager.cc

@@ -111 +111 @@
   playable.loadMD2Texture( playableTexture );
   playable.setTeam(team);
-  playable.loadModel( playableModel, 100.0f );
+  playable.loadModel( playableModel, playableScale );
   playable.setOwner( userId );
   playable.setUniqueID( SharedNetworkData::getInstance()->getNewUniqueID() );

trunk/src/lib/network/network_stream.cc

@@ -128 +128 @@
 
   this->bRedirect = false;
+  this->bSoftRedirect = false;
 
   this->currentState = 0;
@@ -716 +717 @@
               // init the new message manager
               MessageManager::getInstance()->setUniqueID( it->second.handshake->getMessageManagerId() );
+              ObjectListBase::replaceIDMap( *(it->second.handshake->getClassIdList()) );
             }
 
@@ -966 +968 @@
 
       // if handshake not finished only sync handshake
-      if ( peer->second.handshake && Handshake::staticClassID() != sync.getLeafClassID())
+      if ( peer->second.handshake && Handshake::staticClassID() != sync.getClassID() )
         continue;
 
@@ -972 +974 @@
       if ( ( SharedNetworkData::getInstance()->isMasterServer() ||
              SharedNetworkData::getInstance()->isProxyServerActive() &&  peer->second.isClient())
-             && Handshake::staticClassID() == sync.getLeafClassID() && sync.getUniqueID() != peer->second.userId )
+             && Handshake::staticClassID() == sync.getClassID() && sync.getUniqueID() != peer->second.userId )
         continue;
 
       /* list of synchronizeables that will never be synchronized over the network: */
       // do not sync null parent
-      if ( NullParent::staticClassID() == sync.getLeafClassID())
+      if ( NullParent::staticClassID() == sync.getClassID())
         continue;
 
 
-      assert( sync.getLeafClassID() != 0);
+      assert( sync.getClassID() != 0);
 
       assert( offset + INTSIZE <= UDP_PACKET_SIZE );
@@ -1188 +1190 @@
           if( NullParent::staticClassID() == leafClassId || Synchronizeable::staticClassID() == leafClassId || NetworkGameManager::staticClassID() == leafClassId)
           {
-            PRINTF(1)("Don't create Object with ID %x, ignored!\n", (int)leafClassId);
+            PRINTF(0)("Don't create Object with ID %d, ignored!\n", (int)leafClassId);
             offset += syncDataLength;
             continue;
           }
           else
-            ; /// FIXME CLASS_ID :: b = Factory::fabricate( leafClassId );
-
+                  b = Factory::fabricate( ObjectListBase::retrieveIdentity( leafClassId )  );
+          
           if ( !b )
           {
-            PRINTF(1)("Could not fabricate Object with classID %x\n", leafClassId);
+            PRINTF(1)("Could not fabricate Object with classID %d\n", leafClassId);
             offset += syncDataLength;
             continue;
@@ -1208 +1210 @@
             sync->setSynchronized(true);
 
-            PRINTF(0)("Fabricated %s with id %d\n", sync->getClassCName(), sync->getUniqueID());
+            PRINTF(1)("Fabricated %s with id %d\n", sync->getClassCName(), sync->getUniqueID());
           }
           else
           {
-            PRINTF(1)("Class with ID %x is not a synchronizeable!\n", (int)leafClassId);
+            PRINTF(1)("Class with ID %d is not a synchronizeable!\n", (int)leafClassId);
             delete b;
             offset += syncDataLength;

trunk/src/lib/network/peer_info.h

@@ -36 +36 @@
     int                 userId;                  //!< id of this network node
     int                 nodeType;                //!< type of this network node
-    IP                  ip;                      //!> the ip address of this network node
+    IP                  ip;                      //!< the ip address of this network node
 
     NetworkSocket *     socket;                  //!< socket connecting to this node

trunk/src/lib/network/player_stats.cc

@@ -30 +30 @@
 #include "shell_command.h"
 
-#include "class_id_DEPRECATED.h"
-
-ObjectListDefinitionID(PlayerStats, CL_PLAYER_STATS);
+
+
+ObjectListDefinition(PlayerStats);
 CREATE_FACTORY(PlayerStats);
 

trunk/src/lib/network/synchronizeable.cc

@@ -30 +30 @@
 
 #include "converter.h"
+
+#include "synchronizeable_var/synchronizeable_classid.h"
 
 
@@ -56 +58 @@
   /* make sure loadClassId is first synced var because this is read by networkStream */
   assert( syncVarList.size() == 0 );
-  mLeafClassId = this->registerVarId( new SynchronizeableInt( (int*)&this->getLeafClassID(), (int*)&this->getLeafClassID(), "leafClassId", PERMISSION_MASTER_SERVER) );
+  assert( this->getClassID() == this->objectList().id() );
+  
+  mLeafClassId = this->registerVarId( new SynchronizeableClassID( this, "leafClassId", PERMISSION_MASTER_SERVER) );
 
   this->registerVar( new SynchronizeableInt( &this->owner, &this->owner, "owner", PERMISSION_MASTER_SERVER ) );
@@ -267 +271 @@
 //       PRINTF(0)("sending %s %d\n", (*it)->getName().c_str(), n);
 
-//       if( this->isA(CL_PLAYABLE))
+//       if( this->isA( Playable::staticClassID() ))
 //       {
 //         PRINTF(0)("ms: %i, ps: %i, c: %i, sender: %i, reciever: %i, owner: %i, perm: (ow %i, ms %i, s %i, a %i)\n",
@@ -453 +457 @@
       //(*it)->debug();
 
-//       if( this->isA(CL_PLAYABLE))
+//       if( this->isA(Playable::staticClassID()))
 //       {
 //         PRINTF(0)("ms: %i, ps: %i, c: %i, sender: %i, reciever: %i, owner: %i, perm: (ow %i, ms %i, s %i, a %i)\n",