Changeset 6654 in orxonox.OLD for branches/network/src/lib

Timestamp:

Jan 23, 2006, 12:08:34 PM (18 years ago)

Author:

patrick

Message:

network: synchronizeable and network manager start of new concept implementation

Location:

branches/network/src/lib

Files:

• graphics/importer/vertex_array_model.cc (modified) (3 diffs)
• network/network_manager.cc (modified) (5 diffs)
• network/network_manager.h (modified) (2 diffs)
• network/synchronizeable.h (modified) (2 diffs)

branches/network/src/lib/graphics/importer/vertex_array_model.cc

@@ -305 +305 @@
     this->addColor(.125,.436,.246); ///FIXME
   }
+
   for (unsigned int loopNumber = 0; loopNumber <= loops; ++loopNumber)
   {
@@ -326 +327 @@
     }
   }
+
   for (unsigned int loopSegmentNumber = 0; loopSegmentNumber < segmentsPerLoop; ++loopSegmentNumber)
   {
@@ -331 +333 @@
     this->addIndice(segmentsPerLoop + loopSegmentNumber);
   }
+
   for (unsigned int loopNumber = 0; loopNumber < loops; ++loopNumber)
   {

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

@@ -49 +49 @@
   this->netStreamList = NULL;
   this->syncList = NULL;
-  this->tmpStream = NULL;
+  this->defaultSyncStream = NULL;
 
   this->hostID = -1;
@@ -98 +98 @@
   }
 
-  this->tmpStream = new NetworkStream(ipAddress);
+  this->defaultSyncStream = new NetworkStream(ipAddress);
   return 1;
 }
@@ -111 +111 @@
   this->hostID = 0;
   this->bGameServer = true;
-  this->tmpStream = new NetworkStream(port);
+  this->defaultSyncStream = new NetworkStream(port);
   this->bGameServer = true;
   SDL_Delay(20);
@@ -126 +126 @@
 {
   /* creating a new network stream, it will register itself automaticaly to the class list */
-  this->tmpStream = new NetworkStream(address);
-  this->tmpStream->connectSynchronizeable(sync);
+  this->defaultSyncStream = new NetworkStream(address);
+  this->defaultSyncStream->connectSynchronizeable(sync);
 }
 
@@ -142 +142 @@
 void NetworkManager::connectSynchronizeable(Synchronizeable& sync)
 {
-  this->tmpStream->connectSynchronizeable(sync);
+  this->defaultSyncStream->connectSynchronizeable(sync);
 }
 

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

@@ -51 +51 @@
     void synchronize();
 
+    inline NetworkStream* getDefaultSyncStream() { return this->defaultSyncStream; }
+
+
   private:
     NetworkManager();
@@ -59 +62 @@
     const std::list<BaseObject*>*    syncList;                // list of synchronizeables
     static NetworkManager*           singletonRef;            //!< Pointer to the only instance of this Class
-    NetworkStream*                   tmpStream;               //!< FIXME: this is only for testing purposes
+    NetworkStream*                   defaultSyncStream;       //!< FIXME: this is only for testing purposes
     int                              hostID;                  //!< The Host-ID of the Manager
     bool                             bGameServer;             //!< true if it is a server

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

@@ -163 +163 @@
 
 class Synchronizeable : virtual public BaseObject
-  {
+{
+
   public:
     Synchronizeable();
@@ -179 +180 @@
     bool isOutOfSync();
     bool requestedSync();
+
     inline void setUniqueID( int id ){ uniqueID = id; }
-    inline int  getUniqueID() const { return uniqueID; };
+    inline int  getUniqueID() const { return uniqueID; }
+    inline int getHostID() { return this->hostID; }
+
+    inline int getOwner(){ return owner; }
+    inline void setOwner(int owner){ this->owner = owner; }
+
+    /** @returns true if this Synchronizeable has to be synchronized over network */
+    inline bool beSynchronized() { return this->bSynchronize; }
+    /** @param bSynchronize sets the Synchronizeable to be sunchronized or not */
+    inline void setSynchronized(bool bSynchronize) { this->bSynchronize = bSynchronize; }
+
     inline void requestSync( int hostID ){ this->synchronizeRequests.push_back( hostID ); }
     inline int getRequestSync( void ){ if ( this->synchronizeRequests.size()>0 ){ int n = *(synchronizeRequests.begin()); synchronizeRequests.pop_front(); return n; } else { return -1; } };
-    inline int getHostID() { return this->hostID; }
-
-    inline int getOwner(){ return owner; }
-    inline void setOwner(int owner){ this->owner = owner; }
 
     inline void setNetworkStream(NetworkStream* stream) { this->networkStream = stream; }
 
+
+  protected:
+    NetworkStream*    networkStream;
+    int               state;
+
+
   private:
-
     int               uniqueID;
-
-
-
-    //static std::vector<Synchronizeable*> classList;
-    int owner;
-    int hostID;
+    int               owner;
+    int               hostID;
+    bool              bSynchronize;
 
     std::list<int> synchronizeRequests;
 
-  protected:
-    NetworkStream* networkStream;
-    int state;
-
-  };
+};
 #endif /* _SYNCHRONIZEABLE_H */