Changeset 6654 in orxonox.OLD for branches/network/src/lib
- Timestamp:
- Jan 23, 2006, 12:08:34 PM (19 years ago)
- Location:
- branches/network/src/lib
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/network/src/lib/graphics/importer/vertex_array_model.cc
r6519 r6654 305 305 this->addColor(.125,.436,.246); ///FIXME 306 306 } 307 307 308 for (unsigned int loopNumber = 0; loopNumber <= loops; ++loopNumber) 308 309 { … … 326 327 } 327 328 } 329 328 330 for (unsigned int loopSegmentNumber = 0; loopSegmentNumber < segmentsPerLoop; ++loopSegmentNumber) 329 331 { … … 331 333 this->addIndice(segmentsPerLoop + loopSegmentNumber); 332 334 } 335 333 336 for (unsigned int loopNumber = 0; loopNumber < loops; ++loopNumber) 334 337 { -
branches/network/src/lib/network/network_manager.cc
r6341 r6654 49 49 this->netStreamList = NULL; 50 50 this->syncList = NULL; 51 this-> tmpStream = NULL;51 this->defaultSyncStream = NULL; 52 52 53 53 this->hostID = -1; … … 98 98 } 99 99 100 this-> tmpStream = new NetworkStream(ipAddress);100 this->defaultSyncStream = new NetworkStream(ipAddress); 101 101 return 1; 102 102 } … … 111 111 this->hostID = 0; 112 112 this->bGameServer = true; 113 this-> tmpStream = new NetworkStream(port);113 this->defaultSyncStream = new NetworkStream(port); 114 114 this->bGameServer = true; 115 115 SDL_Delay(20); … … 126 126 { 127 127 /* creating a new network stream, it will register itself automaticaly to the class list */ 128 this-> tmpStream = new NetworkStream(address);129 this-> tmpStream->connectSynchronizeable(sync);128 this->defaultSyncStream = new NetworkStream(address); 129 this->defaultSyncStream->connectSynchronizeable(sync); 130 130 } 131 131 … … 142 142 void NetworkManager::connectSynchronizeable(Synchronizeable& sync) 143 143 { 144 this-> tmpStream->connectSynchronizeable(sync);144 this->defaultSyncStream->connectSynchronizeable(sync); 145 145 } 146 146 -
branches/network/src/lib/network/network_manager.h
r6341 r6654 51 51 void synchronize(); 52 52 53 inline NetworkStream* getDefaultSyncStream() { return this->defaultSyncStream; } 54 55 53 56 private: 54 57 NetworkManager(); … … 59 62 const std::list<BaseObject*>* syncList; // list of synchronizeables 60 63 static NetworkManager* singletonRef; //!< Pointer to the only instance of this Class 61 NetworkStream* tmpStream;//!< FIXME: this is only for testing purposes64 NetworkStream* defaultSyncStream; //!< FIXME: this is only for testing purposes 62 65 int hostID; //!< The Host-ID of the Manager 63 66 bool bGameServer; //!< true if it is a server -
branches/network/src/lib/network/synchronizeable.h
r6341 r6654 163 163 164 164 class Synchronizeable : virtual public BaseObject 165 { 165 { 166 166 167 public: 167 168 Synchronizeable(); … … 179 180 bool isOutOfSync(); 180 181 bool requestedSync(); 182 181 183 inline void setUniqueID( int id ){ uniqueID = id; } 182 inline int getUniqueID() const { return uniqueID; }; 184 inline int getUniqueID() const { return uniqueID; } 185 inline int getHostID() { return this->hostID; } 186 187 inline int getOwner(){ return owner; } 188 inline void setOwner(int owner){ this->owner = owner; } 189 190 /** @returns true if this Synchronizeable has to be synchronized over network */ 191 inline bool beSynchronized() { return this->bSynchronize; } 192 /** @param bSynchronize sets the Synchronizeable to be sunchronized or not */ 193 inline void setSynchronized(bool bSynchronize) { this->bSynchronize = bSynchronize; } 194 183 195 inline void requestSync( int hostID ){ this->synchronizeRequests.push_back( hostID ); } 184 196 inline int getRequestSync( void ){ if ( this->synchronizeRequests.size()>0 ){ int n = *(synchronizeRequests.begin()); synchronizeRequests.pop_front(); return n; } else { return -1; } }; 185 inline int getHostID() { return this->hostID; }186 187 inline int getOwner(){ return owner; }188 inline void setOwner(int owner){ this->owner = owner; }189 197 190 198 inline void setNetworkStream(NetworkStream* stream) { this->networkStream = stream; } 191 199 200 201 protected: 202 NetworkStream* networkStream; 203 int state; 204 205 192 206 private: 193 194 207 int uniqueID; 195 196 197 198 //static std::vector<Synchronizeable*> classList; 199 int owner; 200 int hostID; 208 int owner; 209 int hostID; 210 bool bSynchronize; 201 211 202 212 std::list<int> synchronizeRequests; 203 213 204 protected: 205 NetworkStream* networkStream; 206 int state; 207 208 }; 214 }; 209 215 #endif /* _SYNCHRONIZEABLE_H */
Note: See TracChangeset
for help on using the changeset viewer.