[Orxonox-commit 470] r3045 - in branches/netp3/src/network: . packet synchronisable
scheusso at orxonox.net
scheusso at orxonox.net
Sun May 24 23:27:14 CEST 2009
Author: scheusso
Date: 2009-05-24 23:27:14 +0200 (Sun, 24 May 2009)
New Revision: 3045
Modified:
branches/netp3/src/network/Client.cc
branches/netp3/src/network/Client.h
branches/netp3/src/network/ClientConnection.cc
branches/netp3/src/network/ClientConnection.h
branches/netp3/src/network/GamestateManager.cc
branches/netp3/src/network/GamestateManager.h
branches/netp3/src/network/Server.cc
branches/netp3/src/network/Server.h
branches/netp3/src/network/packet/Gamestate.cc
branches/netp3/src/network/packet/Gamestate.h
branches/netp3/src/network/synchronisable/SynchronisableVariable.cc
branches/netp3/src/network/synchronisable/SynchronisableVariable.h
Log:
some cleaning up
Modified: branches/netp3/src/network/Client.cc
===================================================================
--- branches/netp3/src/network/Client.cc 2009-05-24 21:25:55 UTC (rev 3044)
+++ branches/netp3/src/network/Client.cc 2009-05-24 21:27:14 UTC (rev 3045)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Oliver Scheuss, (C) 2007
+ * Oliver Scheuss
* Co-authors:
* ...
*
Modified: branches/netp3/src/network/Client.h
===================================================================
--- branches/netp3/src/network/Client.h 2009-05-24 21:25:55 UTC (rev 3044)
+++ branches/netp3/src/network/Client.h 2009-05-24 21:27:14 UTC (rev 3045)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Oliver Scheuss, (C) 2007
+ * Oliver Scheuss
* Co-authors:
* ...
*
Modified: branches/netp3/src/network/ClientConnection.cc
===================================================================
--- branches/netp3/src/network/ClientConnection.cc 2009-05-24 21:25:55 UTC (rev 3044)
+++ branches/netp3/src/network/ClientConnection.cc 2009-05-24 21:27:14 UTC (rev 3045)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Oliver Scheuss, (C) 2007
+ * Oliver Scheuss
* Co-authors:
* ...
*
Modified: branches/netp3/src/network/ClientConnection.h
===================================================================
--- branches/netp3/src/network/ClientConnection.h 2009-05-24 21:25:55 UTC (rev 3044)
+++ branches/netp3/src/network/ClientConnection.h 2009-05-24 21:27:14 UTC (rev 3045)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Oliver Scheuss, (C) 2007
+ * Oliver Scheuss
* Co-authors:
* ...
*
Modified: branches/netp3/src/network/GamestateManager.cc
===================================================================
--- branches/netp3/src/network/GamestateManager.cc 2009-05-24 21:25:55 UTC (rev 3044)
+++ branches/netp3/src/network/GamestateManager.cc 2009-05-24 21:27:14 UTC (rev 3045)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Oliver Scheuss, (C) 2007
+ * Oliver Scheuss
* Co-authors:
* ...
*
Modified: branches/netp3/src/network/GamestateManager.h
===================================================================
--- branches/netp3/src/network/GamestateManager.h 2009-05-24 21:25:55 UTC (rev 3044)
+++ branches/netp3/src/network/GamestateManager.h 2009-05-24 21:27:14 UTC (rev 3045)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Oliver Scheuss, (C) 2007
+ * Oliver Scheuss
* Co-authors:
* ...
*
Modified: branches/netp3/src/network/Server.cc
===================================================================
--- branches/netp3/src/network/Server.cc 2009-05-24 21:25:55 UTC (rev 3044)
+++ branches/netp3/src/network/Server.cc 2009-05-24 21:27:14 UTC (rev 3045)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Oliver Scheuss, (C) 2007
+ * Oliver Scheuss
* Co-authors:
* ...
*
Modified: branches/netp3/src/network/Server.h
===================================================================
--- branches/netp3/src/network/Server.h 2009-05-24 21:25:55 UTC (rev 3044)
+++ branches/netp3/src/network/Server.h 2009-05-24 21:27:14 UTC (rev 3045)
@@ -20,24 +20,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Oliver Scheuss, (C) 2007
+ * Oliver Scheuss
* Co-authors:
* ...
*
*/
-//
-// C++ Interface: Server
-//
-// Description:
-//
-//
-// Author: Oliver Scheuss, (C) 2007
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-
#ifndef _Server_H__
#define _Server_H__
Modified: branches/netp3/src/network/packet/Gamestate.cc
===================================================================
--- branches/netp3/src/network/packet/Gamestate.cc 2009-05-24 21:25:55 UTC (rev 3044)
+++ branches/netp3/src/network/packet/Gamestate.cc 2009-05-24 21:27:14 UTC (rev 3045)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Oliver Scheuss, (C) 2008
+ * Oliver Scheuss
* Co-authors:
* ...
*
Modified: branches/netp3/src/network/packet/Gamestate.h
===================================================================
--- branches/netp3/src/network/packet/Gamestate.h 2009-05-24 21:25:55 UTC (rev 3044)
+++ branches/netp3/src/network/packet/Gamestate.h 2009-05-24 21:27:14 UTC (rev 3045)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Oliver Scheuss, (C) 2008
+ * Oliver Scheuss
* Co-authors:
* ...
*
Modified: branches/netp3/src/network/synchronisable/SynchronisableVariable.cc
===================================================================
--- branches/netp3/src/network/synchronisable/SynchronisableVariable.cc 2009-05-24 21:25:55 UTC (rev 3044)
+++ branches/netp3/src/network/synchronisable/SynchronisableVariable.cc 2009-05-24 21:27:14 UTC (rev 3045)
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* Author:
- * Oliver Scheuss, (C) 2008
+ * Oliver Scheuss
* Co-authors:
* ...
*
Modified: branches/netp3/src/network/synchronisable/SynchronisableVariable.h
===================================================================
--- branches/netp3/src/network/synchronisable/SynchronisableVariable.h 2009-05-24 21:25:55 UTC (rev 3044)
+++ branches/netp3/src/network/synchronisable/SynchronisableVariable.h 2009-05-24 21:27:14 UTC (rev 3045)
@@ -80,10 +80,6 @@
virtual inline uint32_t getSize(uint8_t mode);
virtual inline void* getReference(){ return (void *)&this->variable_; }
protected:
-// inline bool checkEquality(uint8_t* mem);
-// inline void loadAndIncrease(uint8_t*& mem);
-// inline void saveAndIncrease(uint8_t*& mem);
-// inline uint32_t returnSize();
T& variable_;
uint8_t mode_;
@@ -132,7 +128,6 @@
}
else
return 0;
-// mem += SynchronisableVariable<T>::getSize();
}
template <class T> void SynchronisableVariable<T>::putData(uint8_t*& mem, uint8_t mode, bool forceCallback)
@@ -191,7 +186,6 @@
mem += sizeof(this->varReference_);
// now write the content
saveAndIncrease( this->variable_, mem );
-// mem += SynchronisableVariable<T>::getSize();
return SynchronisableVariableBidirectional::getSize(mode);
}
@@ -203,6 +197,7 @@
// check that the client (source of the data) has a recent version of this variable
if ( *static_cast<uint8_t*>(mem) != this->varReference_ )
{ // wrong reference number, so discard the data
+// COUT(0) << "discharding data" << endl;
mem += getSize( mode ); // SynchronisableVariableBidirectional::getSize returns size of variable + reference
return;
}
@@ -246,7 +241,6 @@
// now do a callback if neccessary
if ( callback )
NetworkCallbackManager::triggerCallback( this->callback_ );
- //this->callback_->call();
}
template <class T> inline uint32_t SynchronisableVariableBidirectional<T>::getSize(uint8_t mode)
@@ -257,6 +251,5 @@
}
-//#include "network/synchronisable/SynchronisableVariableSpecialisations.h"
#endif
More information about the Orxonox-commit
mailing list