Changeset 5829 in orxonox.OLD for branches

Timestamp:

Nov 30, 2005, 9:43:05 AM (19 years ago)

Author:

patrick

Message:

network: much work on multiplayability, does not yet work

Location:

branches/network/src

Files:

• defs/globals.h (modified) (1 diff)
• lib/network/network_manager.cc (modified) (7 diffs)
• lib/network/network_manager.h (modified) (2 diffs)
• lib/network/network_socket.cc (modified) (1 diff)
• lib/network/network_socket.h (modified) (1 diff)
• lib/network/network_stream.cc (modified) (8 diffs)
• lib/network/network_stream.h (modified) (1 diff)
• lib/network/synchronizeable.cc (modified) (3 diffs)
• lib/network/synchronizeable.h (modified) (1 diff)
• orxonox.cc (modified) (13 diffs)
• orxonox.h (modified) (4 diffs)
• story_entities/world.cc (modified) (3 diffs)
• subprojects/network/Makefile.am (modified) (2 diffs)
• subprojects/network/Makefile.in (modified) (5 diffs)
• subprojects/network/network_unit_test.cc (modified) (11 diffs)
• subprojects/network/read_sync.cc (added)
• subprojects/network/read_sync.h (added)
• subprojects/network/simple_sync.cc (modified) (1 diff)
• subprojects/network/simple_sync.h (modified) (1 diff)
• subprojects/network/write_sync.cc (added)
• subprojects/network/write_sync.h (added)
• world_entities/player.cc (modified) (9 diffs)
• world_entities/player.h (modified) (5 diffs)
• world_entities/world_entity.cc (modified) (1 diff)
• world_entities/world_entity.h (modified) (2 diffs)

branches/network/src/defs/globals.h

@@ -84 +84 @@
 
 #define  ORXONOX_LICENSE_SHORT \
-"orxonox - the future of 3D-vertical-scrollers\n" \
-"\n" \
-"Copyright (C) 2004 orx\n" \
-"\n" \
-"This program is free software; you can redistribute it and/or modify\n" \
-"it under the terms of the GNU General Public License as published by\n" \
-"the Free Software Foundation; either version 2, or (at your option)\n" \
-"any later version.\n"
+    "Orxonox - The Future of 3D-Action-Game\n" \
+    "\n" \
+    "Copyright (C) 2004 orx\n" \
+    "\n" \
+    "This program is free software; you can redistribute it and/or modify\n" \
+    "it under the terms of the GNU General Public License as published by\n" \
+    "the Free Software Foundation; either version 2, or (at your option)\n" \
+    "any later version.\n" \
+    "\n" \
+    "This program is distributed in the hope that it will be useful,\n" \
+    "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"  \
+    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"   \
+    "GNU General Public License for more details.\n" \
+    "\n" \
+    "You should have received a copy of the GNU General Public License\n" \
+    "along with this program; if not, write to the Free Software Foundation,\n" \
+    "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
 

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

@@ -35 +35 @@
 
 
-/************************************
-  What you will see here are the function definitions from the header file (network_manager.h) with doxygen documentation. Here is an example:
-
-
- In file network_manager.h
-
- class NetworkManager
- {
-   int doSomeStuff(float argument, float* pointer);
- }
-
- will be implemented in the source file as follows:
-
- In file network_manager.cc
-
- / **
-  *  this is the short description for this function: it just does some stuff
-  * @param argument: this is the first argument, stuff...
-  * @param pointer:  this is the pointer to nowhereland
-  * return: whatever the function returns: for example an index, number, etc.
-  * /
- int NetworkManager::doSomeStuff(float argument, float* pointer)
- {
-   // whaterver you want to do
- }
-
-
- if you want to make automake compile your files: you will want to add the file names to the local Makefile.am
-
- ************************************/
-
-
+NetworkManager* NetworkManager::singletonRef = NULL;
 
 /**
@@ -79 +48 @@
   this->netStreamList = NULL;
   this->syncList = NULL;
+  this->tmpStream = NULL;
 
   PRINTF(0)("NetworkManager created\n");
@@ -114 +84 @@
  *  creates a connection from one object to a host
  * @param hostName: the name of the destination host
- * @param synchronizeable: reference to the sync object
  */
-NetworkStream& establishConnection(const char& hostName, const Synchronizeable& sync)
-{}
+int NetworkManager::establishConnection(const char* name, unsigned int port)
+{
+  IPaddress ipAddress;
+  int error = SDLNet_ResolveHost(&ipAddress, name, port);
+  if( error == -1) {
+    printf("\n\nerror on address resolution, program inconsistency\n\n");
+    return -1;
+  }
+
+  this->tmpStream = new NetworkStream(ipAddress, NET_CLIENT);
+  return 1;
+}
+
+
+/**
+ *  creates a new NetworkStream of server type
+ * @param port: number of the TCP port
+ */
+int NetworkManager::createServer(unsigned int port)
+{
+  this->tmpStream = new NetworkStream(port, NET_SERVER);
+  SDL_Delay(20);
+  return 1;
+}
 
 
@@ -127 +118 @@
 NetworkStream& NetworkManager::establishConnection(IPaddress& address, Synchronizeable& sync)
 {
-  printf("Establish connection to server %s, on port %u\n", SDLNet_ResolveIP(&address), address.port);
   /* creating a new network stream, it will register itself automaticaly to the class list */
-  NetworkStream* netStream = new NetworkStream(address, sync, NET_CLIENT);
+  this->tmpStream = new NetworkStream(address, sync, NET_CLIENT);
 }
+
 
 /**
@@ -140 +131 @@
   PRINTF(0)("Create a new server socket\n");
   /* creating a new network stream, it will register itself automaticaly to the class list */
-  NetworkStream* netStream = new NetworkStream(port, sync, NET_SERVER);
+  this->tmpStream = new NetworkStream(port, sync, NET_SERVER);
 }
 
@@ -153 +144 @@
 
 
+void NetworkManager::connectSynchronizeable(Synchronizeable& sync)
+{
+  this->tmpStream->connectSynchronizeable(sync);
+}
+
 
 /**
@@ -161 +157 @@
   if (this->netStreamList != NULL || (this->netStreamList = ClassList::getList(CL_NETWORK_STREAM)) != NULL)
   {
+//     tIterator<BaseObject>* iterator = this->netStreamList->getIterator();
+//     NetworkStream* stream = (NetworkStream*)(iterator->firstElement());
+//     while( stream)
+//     {
+//       if(stream->isActive())
+//         stream->processData();
+//       stream = (NetworkStream*)(iterator->nextElement());
+//     }
+//     delete iterator;
     std::list<BaseObject*>::iterator stream;
     for (stream = this->netStreamList->begin(); stream != this->netStreamList->end(); ++stream)
-      static_cast<NetworkStream*>(*stream)->processData();
+      if( static_cast<NetworkStream*>(*stream)->isActive())
+        static_cast<NetworkStream*>(*stream)->processData();
+
   }
 

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

@@ -19 +19 @@
 class NetworkStream;
 class Synchronizeable;
-template<typename> class tList;
+template<typename>
+class tList;
 
 /* and here is the class itsself*/
@@ -25 +26 @@
 {
 
-public:
+  public:
 
-  NetworkManager();
-  ~NetworkManager();
+    inline static NetworkManager* getInstance() { if (!NetworkManager::singletonRef) NetworkManager::singletonRef = new NetworkManager();
+      return NetworkManager::singletonRef; }
+    ~NetworkManager();
 
-  void initialize();
-  void shutdown();
+    void initialize();
+    void shutdown();
 
-  NetworkStream& establishConnection(IPaddress& address, Synchronizeable& sync);
-  NetworkStream& establishConnection(const char& hostName, const Synchronizeable& sync);
-  NetworkStream& createServer(Synchronizeable& sync, unsigned int port);
-  void shutdownConnection();
+    int establishConnection(const char* name, unsigned int port);
+    int createServer(unsigned int port);
 
-  void synchronize();
+    NetworkStream& establishConnection(IPaddress& address, Synchronizeable& sync);
+    NetworkStream& createServer(Synchronizeable& sync, unsigned int port);
+    void shutdownConnection();
 
-private:
-  std::list<BaseObject*>*    netStreamList;            // list with refs to all network streams
-  std::list<BaseObject*>*    syncList;                 // list of synchronizeables
+    void connectSynchronizeable(Synchronizeable& sync);
+
+    void synchronize();
+
+  private:
+    NetworkManager();
+
+
+  private:
+    std::list<BaseObject*>*    netStreamList;            // list with refs to all network streams
+    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
 
 };

branches/network/src/lib/network/network_socket.cc

@@ -313 +313 @@
 
   while (!tempsocket && !self->terminateThread)
+  {
     tempsocket = SDLNet_TCP_Accept(self->tcpSocket);
+    SDL_Delay(_MSECONDS_SLEEP_LISTEN);
+  }
 
   SDL_mutexP(self->socketMutex);

branches/network/src/lib/network/network_socket.h

@@ -18 +18 @@
 //sleep if outgoing buffer is empty
 #define _MSECONDS_SLEEP_EMPTY_BUFFER 10
+//sleep when waiting for connections
+#define _MSECONDS_SLEEP_LISTEN 100
 
 /* contains memmove and memcpy */

branches/network/src/lib/network/network_stream.cc

@@ -40 +40 @@
 
 NetworkStream::NetworkStream()
-  : DataStream()
+    : DataStream()
 {
   this->init();
@@ -50 +50 @@
 }
 
+NetworkStream::NetworkStream(IPaddress& address, NodeType type)
+{
+  this->init();
+  this->networkSocket = new NetworkSocket(address);
+  this->networkProtocol = new NetworkProtocol();
+  this->synchronizeables = NULL;
+  this->connectionMonitor = new ConnectionMonitor();
+}
+
+
+NetworkStream::NetworkStream(unsigned int port, NodeType type)
+{
+  this->init();
+  this->networkSocket = new NetworkSocket();
+  this->networkSocket->listen(port);
+  this->networkProtocol = new NetworkProtocol();
+  this->synchronizeables = NULL;
+  this->connectionMonitor = new ConnectionMonitor();
+}
+
 
 NetworkStream::NetworkStream(IPaddress& address, Synchronizeable& sync, NodeType type)
-  : DataStream()
+    : DataStream()
 {
   this->init();
@@ -59 +79 @@
   this->synchronizeables = &sync;
   this->connectionMonitor = new ConnectionMonitor();
+  this->bActive = true;
 }
 
 
 NetworkStream::NetworkStream(unsigned int port, Synchronizeable& sync, NodeType type)
-  : DataStream()
+    : DataStream()
 {
   this->init();
@@ -71 +92 @@
   this->synchronizeables = &sync;
   this->connectionMonitor = new ConnectionMonitor();
+  this->bActive = true;
 }
 
@@ -79 +101 @@
   this->setClassID(CL_NETWORK_STREAM, "NetworkStream");
   this->state = NET_REC_HEADER;
+  this->bActive = false;
 }
 
@@ -85 +108 @@
 {
 
- networkSocket->disconnectServer();
+  networkSocket->disconnectServer();
 
- if( this->networkSocket)
-   delete networkSocket;
+  if( this->networkSocket)
+    delete networkSocket;
 
- delete connectionMonitor;
- delete networkProtocol;
+  delete connectionMonitor;
+  delete networkProtocol;
 }
+
+
+void NetworkStream::connectSynchronizeable(Synchronizeable& sync)
+{
+  this->synchronizeables = &sync;
+  if( this->networkSocket != NULL)
+    this->bActive = true;
+}
+
 
 void NetworkStream::processData()
@@ -102 +134 @@
   PRINT(0)("============= DOWNSTREAM:===============\n");
   /* first of all read the synchronizeable's data: */
+  //if(this->isServer())
   dataLength = this->synchronizeables->readBytes((byte*)downBuffer);
 
-  /* send the received data to connectionMonitor */
-  this->connectionMonitor->processPacket((byte*)downBuffer, dataLength);
+  if( dataLength > 0)
+  {
+    /* send the received data to connectionMonitor */
+    this->connectionMonitor->processPacket((byte*)downBuffer, dataLength);
 
-  dataLength = this->networkProtocol->createHeader((byte*)downBuffer, dataLength, DATA_STREAM_BUFFER_SIZE,
-      *(this->synchronizeables), 12/* some random number (no real id)*/);
+    dataLength = this->networkProtocol->createHeader((byte*)downBuffer, dataLength, DATA_STREAM_BUFFER_SIZE,
+                 *(this->synchronizeables), 12/* some random number (no real id)*/);
 
-  /* pass the data to the network socket */
-  dataLength = this->networkSocket->writeBytes((byte*)downBuffer, dataLength);
-  /* check if there was an error */
-  if( dataLength == -1) { PRINTF(0)("Error in writing data to the NetworkSocket\n");}
-
+    /* pass the data to the network socket */
+    dataLength = this->networkSocket->writeBytes((byte*)downBuffer, dataLength);
+    /* check if there was an error */
+    if( dataLength == -1)
+    {
+      PRINTF(0)("Error in writing data to the NetworkSocket\n");
+    }
+  }
 
 
@@ -147 +185 @@
       this->connectionMonitor->processPacket((byte*)upBuffer, this->packetHeader.length);
       /* now pass the data to the sync object */
+      //if(!this->isServer())
       this->synchronizeables->writeBytes((byte*)upBuffer, this->packetHeader.length);
 

branches/network/src/lib/network/network_stream.h

@@ -28 +28 @@
 {
 
-public:
-  NetworkStream();
-  NetworkStream(IPaddress& address, Synchronizeable& sync, NodeType type);
-  NetworkStream(unsigned int port, Synchronizeable& sync, NodeType type);
-  ~NetworkStream();
+  public:
+    NetworkStream();
+    NetworkStream(IPaddress& address, NodeType type);
+    NetworkStream(unsigned int port, NodeType type);
 
-  void init();
+    NetworkStream(IPaddress& address, Synchronizeable& sync, NodeType type);
+    NetworkStream(unsigned int port, Synchronizeable& sync, NodeType type);
+    ~NetworkStream();
+    void init();
 
-  inline bool isServer() { return (this->type == NET_SERVER)? true:false; }
-  virtual void processData();
+    void connectSynchronizeable(Synchronizeable& sync);
 
-private:
-   NetworkProtocol* networkProtocol;
-   //NetworkSocket*       networkSockets;
-   ConnectionMonitor*      connectionMonitor;
-   // tList<Synchronizeable>* synchronizeables;
-   Synchronizeable*         synchronizeables;
-   NetworkSocket* networkSocket;
-   int                    type;
-   int                    state;
-   Header                 packetHeader;
+    inline bool isServer() const { return (this->type == NET_SERVER)? true:false; }
+    inline bool isActive() const { return this->bActive; }
+
+    virtual void processData();
+
+  private:
+    NetworkProtocol*       networkProtocol;
+    ConnectionMonitor*     connectionMonitor;
+    Synchronizeable*       synchronizeables;
+    NetworkSocket*         networkSocket;
+    int                    type;
+    int                    state;
+    Header                 packetHeader;
+    bool                   bActive;
 };
 #endif /* _NETWORK_STREAM */
-

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

@@ -18 +18 @@
 #include "netdefs.h"
 
+
+/**
+ *  default constructor
+ */
+Synchronizeable::Synchronizeable()
+{}
+
 /**
  *  default constructor
@@ -25 +32 @@
   this->setName(name);
 }
+
 
 /**
@@ -41 +49 @@
  *  read data from NetworkStream
  */
-int Synchronizeable::readBytes(byte* data) const
+int Synchronizeable::readBytes(byte* data)
 {}
 

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

@@ -15 +15 @@
 
     Synchronizeable(const char* name);
+    Synchronizeable();
     ~Synchronizeable();
 
     virtual void      writeBytes(const byte* data, int length);
-    virtual int       readBytes(byte* data) const;
+    virtual int       readBytes(byte* data);
     virtual void      writeDebug() const;
     virtual void      readDebug() const;

branches/network/src/orxonox.cc

@@ -57 +57 @@
 #include "load_param_description.h"
 
+#include "network_manager.h"
+
 #include <string.h>
 
@@ -79 +81 @@
   this->argc = 0;
   this->argv = NULL;
+
+  /* this way, there is no network enabled: */
+  this->clientName = NULL;
+  this->port = -1;
 
   this->configFileName = NULL;
@@ -118 +124 @@
 
   PRINT(3)
-      (
-      "===================================================\n" \
-      "Thanks for playing orxonox.\n" \
-      "visit: http://www.orxonox.net for new versions.\n" \
-      "===================================================\n" \
-      ORXONOX_LICENSE_SHORT
-      );
+  (
+    "===================================================\n" \
+    "Thanks for playing orxonox.\n" \
+    "visit: http://www.orxonox.net for new versions.\n" \
+    "===================================================\n" \
+    ORXONOX_LICENSE_SHORT
+  );
 
   Orxonox::singletonRef = NULL;
@@ -137 +143 @@
 void Orxonox::restart()
 {
-//   int argc = this->argc;
-//   char** argv = this->argv;
-//
-//   Orxonox *orx = Orxonox::getInstance();
-//
-//   delete orx;
-//
-//   orx = Orxonox::getInstance();
-//
-//   if((*orx).init(argc, argv) == -1)
-//   {
-//     PRINTF(1)("! Orxonox initialization failed\n");
-//     return;
-//   }
-//
-//   printf("finished inizialisation\n");
-//   orx->start();
+  //   int argc = this->argc;
+  //   char** argv = this->argv;
+  //
+  //   Orxonox *orx = Orxonox::getInstance();
+  //
+  //   delete orx;
+  //
+  //   orx = Orxonox::getInstance();
+  //
+  //   if((*orx).init(argc, argv) == -1)
+  //   {
+  //     PRINTF(1)("! Orxonox initialization failed\n");
+  //     return;
+  //   }
+  //
+  //   printf("finished inizialisation\n");
+  //   orx->start();
 }
 
@@ -179 +185 @@
  * initialize Orxonox with command line
  */
-int Orxonox::init (int argc, char** argv)
+int Orxonox::init (int argc, char** argv, const char* name, int port)
 {
   this->argc = argc;
   this->argv = argv;
-  // parse command line
-  // config file
+
+  this->clientName = name;
+  this->port = port;
 
   // initialize the Config-file
   this->getConfigFile();
 
-  // initialize everything
-  SDL_Init(SDL_INIT_TIMER);
   // windows must not write into stdout.txt and stderr.txt
 #ifdef __WIN32__
@@ -197 +202 @@
 #endif
 
-  if( initResources () == -1) return -1;
-  if( initVideo() == -1) return -1;
-  if( initSound() == -1) return -1;
-  if( initInput() == -1) return -1;
-  if( initNetworking () == -1) return -1;
-  if( initMisc () == -1) return -1;
-
-  return 0;
-}
+  // initialize everything
+  SDL_Init(SDL_INIT_TIMER);
+  if( initResources () == -1)
+    return -1;
+  if( initVideo() == -1)
+    return -1;
+  if( initSound() == -1)
+    return -1;
+  if( initInput() == -1)
+    return -1;
+  if( initNetworking () == -1)
+    return -1;
+  if( initMisc () == -1)
+    return -1;
+
+  return 0;
+}
+
 
 /**
  * initializes SDL and OpenGL
-*/
+ */
 int Orxonox::initVideo()
 {
@@ -226 +240 @@
   return 0;
 }
+
 
 /**
@@ -262 +277 @@
   PRINT(3)("> Initializing networking\n");
 
-  printf("  ---Not yet implemented-FIXME--\n");
+  NetworkManager::getInstance();
+
+  if( this->clientName != NULL) // we are a client
+    NetworkManager::getInstance()->establishConnection(this->clientName, port);
+  else if( this->port > 0)      // we are a server
+    NetworkManager::getInstance()->createServer(port);
+
   return 0;
 }
@@ -281 +302 @@
   {
     if (!ResourceManager::getInstance()->setDataDir(dataPath) &&
-         !ResourceManager::getInstance()->verifyDataDir(DEFAULT_DATA_DIR_CHECKFILE))
+        !ResourceManager::getInstance()->verifyDataDir(DEFAULT_DATA_DIR_CHECKFILE))
     {
       PRINTF(1)("Data Could not be located in %s\n", dataPath);
@@ -300 +321 @@
     exit(-1);
   }
-   //! @todo this is a hack and should be loadable
+  //! @todo this is a hack and should be loadable
   char* imageDir = ResourceManager::getInstance()->getFullName("maps");
   ResourceManager::getInstance()->addImageDir(imageDir);
@@ -374 +395 @@
 int main(int argc, char** argv)
 {
-  // here the pre-arguments are loaded, these are needed to go either to orxonx itself, Help, or Benchmark.
   int i;
   for(i = 1; i < argc; ++i)
+  {
+    if(     !strcmp( "--help", argv[i])     || !strcmp("-h", argv[i]))
+      return showHelp(argc, argv);
+    else if(!strcmp( "--gui", argv[i])      || !strcmp("-g", argv[i]))
+      showGui = true;
+    else if(!strcmp( "--client", argv[i])   || !strcmp("-c", argv[i]))
+      return startNetworkOrxonox(argc, argv);
+    else if(!strcmp( "--server", argv[i])   || !strcmp("-s", argv[i]))
+      return startNetworkOrxonox(argc, argv);
+    else if(!strcmp( "--license", argv[i])  || !strcmp("-s", argv[i]))
+      return PRINT(0)(ORXONOX_LICENSE_SHORT);
+  }
+
+  return startOrxonox(argc, argv, NULL, -1);
+}
+
+
+
+int showHelp(int argc, char** argv)
+{
+  PRINT(0)("Orxonox Version %s\n", PACKAGE_VERSION);
+  PRINT(0)(" Starts Orxonox - The most furious 3D Action Game :)\n");
+  PRINT(0)("\n");
+  PRINT(0)("Common options:\n");
+  PRINT(0)(" -g, --gui                        starts the orxonox with the configuration GUI \n");
+  PRINT(0)(" -h, --help                       shows this help\n");
+  PRINT(0)("\n");
+  PRINT(0)("Network options:\n");
+  PRINT(0)(" -s, --server [port]              starts Orxonox and listens on the [port] for players\n");
+  PRINT(0)(" -c, --client [hostname] [port]   starts Orxonox as a Client\n");
+  PRINT(0)(" -c, --client [ip address] [port] starts Orxonox as a Client\n");
+  PRINT(0)("\n");
+  PRINT(0)("Other options:\n");
+  PRINT(0)("     --license     prints the licence and exit\n\n");
+  PRINT(0)("\n");
+
+  //   {
+  //     Gui* gui = new Gui(argc, argv);
+  //     gui->printHelp();
+  //     delete gui;
+  //   }
+}
+
+
+
+
+/**
+ * starts orxonox in network mode
+ * @param argc parameters count given to orxonox
+ * @param argv parameters given to orxonox
+ */
+int startNetworkOrxonox(int argc, char** argv)
+{
+
+  int i;
+  for(i = 0; i < argc; ++i )
+  {
+    if( !strcmp( "--client", argv[i]) || !strcmp("-c", argv[i]))
     {
-      if(! strcmp( "--help", argv[i]) || !strcmp("-h", argv[i])) return startHelp(argc, argv);
-//      else if(!strcmp( "--benchmark", argv[i]) || !strcmp("-b", argv[i])) return startBenchmarks();
-      else if(!strcmp( "--gui", argv[i]) || !strcmp("-g", argv[i])) showGui = true;
-      //      else PRINTF(2)("Orxonox does not understand the arguments %s\n", argv[i]);
+      if( argc <= (i+2))
+      {
+        printf(" Wrong arguments try following notations:\n");
+        printf("   --client [server ip address] [port number]\n");
+        printf("   --client [dns name] [port number]\n");
+        return 0;
+      }
+
+      const char* name = argv[i+1];
+      int port = atoi(argv[i+2]);
+      printf("Starting Orxonox as client: connecting to %s, on port %i\n", name, port);
+
+      startOrxonox(argc, argv, name, port);
     }
-
-  return startOrxonox(argc, argv);
-}
-
-
-
-int startHelp(int argc, char** argv)
-{
-  PRINT(0)("orxonox: starts the orxonox game - rules\n");
-  PRINT(0)("usage: orxonox [arg [arg...]]\n\n");
-  PRINT(0)("valid options:\n");
-  {
-    Gui* gui = new Gui(argc, argv);
-    gui->printHelp();
-    delete gui;
-  }
-  PRINT(0)(" -b|--benchmark:\t\tstarts the orxonox benchmark\n");
-  PRINT(0)(" -h|--help:\t\t\tshows this help\n");
+    else if( !strcmp( "--server", argv[i]) || !strcmp("-s", argv[i]))
+    {
+      if( argc <= (i+1))
+      {
+        printf(" Wrong arguments try following notations:\n");
+        printf("   --server [port number]\n");
+        return 0;
+      }
+
+      int port = atoi(argv[i+1]);
+      printf("Starting Orxonox as server, listening on port %i\n", port);
+
+      startOrxonox(argc, argv, NULL, port);
+    }
+  }
 }
 
@@ -410 +494 @@
  * @param argv parameters given to orxonox
  */
-int startOrxonox(int argc, char** argv)
+int startOrxonox(int argc, char** argv, const char* name, int port)
 {
   // checking for existence of the configuration-files, or if the lock file is still used
   if (showGui || (!ResourceManager::isFile("./orxonox.conf") &&
-      !ResourceManager::isFile(DEFAULT_CONFIG_FILE))
+                  !ResourceManager::isFile(DEFAULT_CONFIG_FILE))
 #if DEBUG < 3 // developers do not need to see the GUI, when orxonox fails
-       || ResourceManager::isFile(DEFAULT_LOCK_FILE)
+      || ResourceManager::isFile(DEFAULT_LOCK_FILE)
 #endif
      )
-    {
-      if (ResourceManager::isFile(DEFAULT_LOCK_FILE))
-        ResourceManager::deleteFile(DEFAULT_LOCK_FILE);
-
-      // starting the GUI
-      Gui* gui = new Gui(argc, argv);
-      gui->startGui();
-
-      if (! gui->startOrxonox)
-        return 0;
-
-      delete gui;
-    }
+  {
+    if (ResourceManager::isFile(DEFAULT_LOCK_FILE))
+      ResourceManager::deleteFile(DEFAULT_LOCK_FILE);
+
+    // starting the GUI
+    Gui* gui = new Gui(argc, argv);
+    gui->startGui();
+
+    if (! gui->startOrxonox)
+      return 0;
+
+    delete gui;
+  }
 
   PRINT(0)(">>> Starting Orxonox <<<\n");
@@ -439 +523 @@
   Orxonox *orx = Orxonox::getInstance();
 
-  if(orx->init(argc, argv) == -1)
-    {
-      PRINTF(1)("! Orxonox initialization failed\n");
-      return -1;
-    }
-
-    printf("finished inizialisation\n");
+  if( orx->init(argc, argv, name, port) == -1)
+  {
+    PRINTF(1)("! Orxonox initialization failed\n");
+    return -1;
+  }
+
+  printf("finished inizialisation\n");
   orx->start();
 

branches/network/src/orxonox.h

@@ -23 +23 @@
   inline static Orxonox* getInstance() { if (!singletonRef) singletonRef = new Orxonox();  return singletonRef; };
 
-  int init (int argc, char** argv);
+  int init(int argc, char** argv, const char* name, int port);
 
   void restart();
 
   void start();
-
-  //void graphicsHandler (SDL_Event* event);
 
  private:
@@ -43 +41 @@
   int initMisc ();
 
-
   const char* getConfigFile ();
 
@@ -55 +52 @@
   unsigned int      argc;                    //!< Count of Arguments of orxonox
   char**            argv;                    //!< Values of th Arguments of orxonox.
+
+  const char*       clientName;              //!< Name of the Orxonox client if == NULL -> server
+  int               port;                    //!< number of the network port of the server/client if == -1 no network
 };
 
@@ -61 +61 @@
 // Start-up functions //
 ////////////////////////
-int startHelp(int argc, char** argv);
-int startOrxonox(int argc, char** argv);
+int showHelp(int argc, char** argv);
+int showLicense();
+int startNetworkOrxonox(int argc, char** argv);
+int startOrxonox(int argc, char** argv, const char* clientName, int port);
 
 #endif /* _ORXONOX_H */

branches/network/src/story_entities/world.cc

@@ -73 +73 @@
 #include "shader.h"
 
+#include "network_manager.h"
+
 SHELL_COMMAND(speed, World, setSpeed);
 SHELL_COMMAND(togglePNodeVisibility, World, togglePNodeVisibility);
@@ -321 +323 @@
             localPlayer = (Player*) created;
             CDEngine::getInstance()->setPlayer(localPlayer);
+            NetworkManager::getInstance()->connectSynchronizeable(*(Synchronizeable*)this->localPlayer);
           }
           if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox")) sky = (SkyBox*) created;
@@ -827 +830 @@
   // Get remote input
   // Update synchronizables
+  NetworkManager::getInstance()->synchronize();
 }
 

branches/network/src/subprojects/network/Makefile.am

@@ -15 +15 @@
 network_SOURCES=  network_unit_test.cc \
                   simple_sync.cc \
+                  read_sync.cc \
+                  write_sync.cc \
                   \
                   \
@@ -26 +28 @@
 
 noinst_HEADERS  =  network_unit_test.h \
-                   simple_sync.h
+                   simple_sync.h \
+                   read_sync.h \
+                   write_sync.h
 

branches/network/src/subprojects/network/Makefile.in

@@ -54 +54 @@
 PROGRAMS = $(bin_PROGRAMS)
 am_network_OBJECTS = network-network_unit_test.$(OBJEXT) \
-        network-simple_sync.$(OBJEXT) network-base_object.$(OBJEXT) \
+        network-simple_sync.$(OBJEXT) network-read_sync.$(OBJEXT) \
+        network-write_sync.$(OBJEXT) network-base_object.$(OBJEXT) \
         network-class_list.$(OBJEXT) network-load_param.$(OBJEXT) \
         network-substring.$(OBJEXT) network-helper_functions.$(OBJEXT)
@@ -193 +194 @@
 network_SOURCES = network_unit_test.cc \
                   simple_sync.cc \
+                  read_sync.cc \
+                  write_sync.cc \
                   \
                   \
@@ -202 +205 @@
 
 noinst_HEADERS = network_unit_test.h \
-                   simple_sync.h
+                   simple_sync.h \
+                   read_sync.h \
+                   write_sync.h
 
 all: all-am
@@ -275 +280 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network-load_param.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network-network_unit_test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network-read_sync.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network-simple_sync.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network-substring.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network-write_sync.Po@am__quote@
 
 .cc.o:
@@ -319 +326 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(network_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network-simple_sync.obj `if test -f 'simple_sync.cc'; then $(CYGPATH_W) 'simple_sync.cc'; else $(CYGPATH_W) '$(srcdir)/simple_sync.cc'; fi`
+
+network-read_sync.o: read_sync.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(network_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network-read_sync.o -MD -MP -MF "$(DEPDIR)/network-read_sync.Tpo" -c -o network-read_sync.o `test -f 'read_sync.cc' || echo '$(srcdir)/'`read_sync.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/network-read_sync.Tpo" "$(DEPDIR)/network-read_sync.Po"; else rm -f "$(DEPDIR)/network-read_sync.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='read_sync.cc' object='network-read_sync.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(network_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network-read_sync.o `test -f 'read_sync.cc' || echo '$(srcdir)/'`read_sync.cc
+
+network-read_sync.obj: read_sync.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(network_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network-read_sync.obj -MD -MP -MF "$(DEPDIR)/network-read_sync.Tpo" -c -o network-read_sync.obj `if test -f 'read_sync.cc'; then $(CYGPATH_W) 'read_sync.cc'; else $(CYGPATH_W) '$(srcdir)/read_sync.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/network-read_sync.Tpo" "$(DEPDIR)/network-read_sync.Po"; else rm -f "$(DEPDIR)/network-read_sync.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='read_sync.cc' object='network-read_sync.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(network_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network-read_sync.obj `if test -f 'read_sync.cc'; then $(CYGPATH_W) 'read_sync.cc'; else $(CYGPATH_W) '$(srcdir)/read_sync.cc'; fi`
+
+network-write_sync.o: write_sync.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(network_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network-write_sync.o -MD -MP -MF "$(DEPDIR)/network-write_sync.Tpo" -c -o network-write_sync.o `test -f 'write_sync.cc' || echo '$(srcdir)/'`write_sync.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/network-write_sync.Tpo" "$(DEPDIR)/network-write_sync.Po"; else rm -f "$(DEPDIR)/network-write_sync.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='write_sync.cc' object='network-write_sync.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(network_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network-write_sync.o `test -f 'write_sync.cc' || echo '$(srcdir)/'`write_sync.cc
+
+network-write_sync.obj: write_sync.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(network_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT network-write_sync.obj -MD -MP -MF "$(DEPDIR)/network-write_sync.Tpo" -c -o network-write_sync.obj `if test -f 'write_sync.cc'; then $(CYGPATH_W) 'write_sync.cc'; else $(CYGPATH_W) '$(srcdir)/write_sync.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/network-write_sync.Tpo" "$(DEPDIR)/network-write_sync.Po"; else rm -f "$(DEPDIR)/network-write_sync.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='write_sync.cc' object='network-write_sync.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(network_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o network-write_sync.obj `if test -f 'write_sync.cc'; then $(CYGPATH_W) 'write_sync.cc'; else $(CYGPATH_W) '$(srcdir)/write_sync.cc'; fi`
 
 network-base_object.o: $(MAINSRCDIR)/lib/lang/base_object.cc

branches/network/src/subprojects/network/network_unit_test.cc

@@ -12 +12 @@
 
 #include "simple_sync.h"
+#include "read_sync.h"
 
 int verbose = 4;
@@ -25 +26 @@
   printf(" --server [port number]     creates a test server\n");
   printf(" --client [address] [port]  connects to a server\n");
+  printf(" --listen [address] [port]  just listens to this connection");
   printf("\n");
 }
@@ -76 +78 @@
 
 #define _N_ELEMENTS 212994
+
   char sendbuf[_N_ELEMENTS+1];
   char recvbuf[_N_ELEMENTS+1];
@@ -131 +134 @@
 
   /* create the network manager */
-  NetworkManager* nm = new NetworkManager();
+  NetworkManager* nm = NetworkManager::getInstance();
 
   /* initialize the network manager */
@@ -143 +146 @@
   int error = SDLNet_ResolveHost(&ip, "127.0.0.1", port);
   //SDLNet_ResolveHost(&ip, "localhost", port);
-  if(error == -1) printf("\n\nerror on address resolution, program inconsistancy\n\n");
+  if(error == -1)
+    printf("\n\nerror on address resolution, program inconsistancy\n\n");
   nm->establishConnection(ip, *clientSync);
   /* adding some break for connection setup */
@@ -149 +153 @@
 
   /* synchronize the data 1 time (increment for longer tests) */
-  for( int i = 0; i < 3; i++) {
+  for( int i = 0; i < 3; i++)
+  {
     nm->synchronize();
     /* simulate the network delay */
@@ -177 +182 @@
 int startServer(int argc, char** argv)
 {
-  if( argc <= 2) {
+  if( argc <= 2)
+  {
     printf(" Wrong arguments try following notations:\n");
     printf("   --server [port number]\n");
@@ -186 +192 @@
   printf("Starting Server on port %i\n", port);
 
-  NetworkManager* netMan = new NetworkManager();
+  NetworkManager* netMan = NetworkManager::getInstance();
   Synchronizeable* ss = new SimpleSync("Server\0");
 
-  //NetworkStream* server = new NetworkStream(port, ss, NET_SERVER);
   netMan->createServer(*ss, port);
   SDL_Delay(20);
 
-  for(;;) {
+  for(;;)
+  {
     netMan->synchronize();
     SDL_Delay(500);
   }
+
+  delete netMan;
+  delete ss;
+
+
   return 0;
 }
@@ -203 +214 @@
 int startClient(int argc, char** argv)
 {
-  if( argc < 3) {
+  if( argc < 3)
+  {
     printf(" Wrong arguments try following notations:\n");
     printf("   --client [server ip] [port number]\n");
-    printf("   --server [server name] [port number]\n");
+    printf("   --client [server name] [port number]\n");
     return 0;
   }
@@ -216 +228 @@
   IPaddress ip;
   int error = SDLNet_ResolveHost(&ip, name, port);
-  //SDLNet_ResolveHost(&ip, "localhost", port);
-  if(error == -1) printf("\n\nerror on address resolution, program inconsistancy\n\n");
-
-  NetworkManager* netMan = new NetworkManager();
+  if(error == -1)
+    printf("\n\nerror on address resolution, program inconsistancy\n\n");
+
+  NetworkManager* netMan = NetworkManager::getInstance();
   Synchronizeable* ss = new SimpleSync("Client\0");
 
   netMan->establishConnection(ip, *ss);
 
-  for(;;) {
+  for(;;)
+  {
     netMan->synchronize();
     SDL_Delay(500);
   }
 
-  //NetworkStream* client = new NetworkStream(ip, ss, NET_CLIENT);
+
+  delete netMan;
+  delete ss;
+
+  return 0;
+}
+
+
+
+int startListen(int argc, char** argv)
+{
+  if( argc < 3)
+  {
+    printf(" Wrong arguments try following notations:\n");
+    printf("   --listen [server ip] [port number]\n");
+    printf("   --listen [server name] [port number]\n");
+    return 0;
+  }
+
+  char* name = argv[2];
+  int port = atoi(argv[3]);
+  printf("Connecting to %s, on port %i\n", name, port);
+
+  IPaddress ip;
+  int error = SDLNet_ResolveHost(&ip, name, port);
+  if(error == -1)
+    printf("\n\nerror on address resolution, program inconsistancy\n\n");
+
+  NetworkManager* netMan = NetworkManager::getInstance();
+  Synchronizeable* ss = new ReadSync("WriteSync\0");
+
+  netMan->establishConnection(ip, *ss);
+
+  for(;;)
+  {
+    netMan->synchronize();
+    SDL_Delay(10);
+  }
 
 
@@ -253 +303 @@
   {
     //else if(!strcmp( "--gui", argv[i]) || !strcmp("-g", argv[i])) showGui = true;
-    if (! strcmp( "--sockettest", argv[i]) || !strcmp("-st", argv[i])) return testSocket(argc, argv);
-    else if (! strcmp( "--frameworktest", argv[i]) || !strcmp("-ft", argv[i])) return testFramework(argc, argv);
-    else if (! strcmp( "--server", argv[i]) || !strcmp("-s", argv[i])) return startServer(argc, argv);
-    else if (! strcmp( "--client", argv[i]) || !strcmp("-c", argv[i])) return startClient(argc, argv);
+    if (! strcmp( "--sockettest", argv[i]) || !strcmp("-st", argv[i]))
+      return testSocket(argc, argv);
+    else if (! strcmp( "--frameworktest", argv[i]) || !strcmp("-ft", argv[i]))
+      return testFramework(argc, argv);
+    else if (! strcmp( "--server", argv[i]) || !strcmp("-s", argv[i]))
+      return startServer(argc, argv);
+    else if (! strcmp( "--client", argv[i]) || !strcmp("-c", argv[i]))
+      return startClient(argc, argv);
+    else if (! strcmp( "--listen", argv[i]) || !strcmp("-l", argv[i]))
+      return startListen(argc, argv);
   }
 

branches/network/src/subprojects/network/simple_sync.cc

@@ -86 +86 @@
  *  read data from Synchronizeable
  */
-int SimpleSync::readBytes(byte* data) const
+int SimpleSync::readBytes(byte* data)
 {
   PRINTF(0)("SimpleSync: sent %i bytes of data\n", this->outLength);

branches/network/src/subprojects/network/simple_sync.h

@@ -17 +17 @@
 
     virtual void writeBytes(const byte* data, int length);
-    virtual int readBytes(byte* data) const;
+    virtual int readBytes(byte* data);
 
 

branches/network/src/world_entities/player.cc

@@ -39 +39 @@
 
 CREATE_FACTORY(Player, CL_PLAYER);
+
+
+
+#define UP    0
+#define DOWN  1
+#define RIGHT 2
+#define LEFT  3
+#define TIME  4
+
 
 /**
@@ -107 +116 @@
   */
   delete this->weaponMan;
+  if( this->outData)
+    delete[] this->outData;
+  if( this->inData)
+    delete[] this->inData;
 }
 
@@ -160 +173 @@
 //   this->weaponMan->setSlotDirection(9, Quaternion(+M_PI, Vector(1,0,0)));:
 
+  this->outBufferLength = 100;
+  this->outLength = 0;
+  this->recLength = 0;
+  this->inBufferLength = 100;
+  this->inLength = 0;
+  this->sentLength = 0;
+  this->outData = new byte[this->outBufferLength];
+  this->inData = new byte[this->inBufferLength];
 }
 
@@ -282 +303 @@
   //orthDirection = orthDirection.cross (direction);
 
+
+  if( this->outLength >= this->outBufferLength) return;
+
+  if( this->bUp || this->bDown || this->bRight || this->bLeft)
+  {
+    this->outData[this->outLength++] = TIME;
+    this->outData[this->outLength++] = (byte)(lround(time * 100.0f));
+
+    PRINTF(0)("Writing TIME = %i, or %f\n", this->outData[this->outLength-1], time);
+  }
+
   if( this->bUp && this->getRelCoor().x < 20)
+  {
     accel += direction;
+    this->outData[this->outLength++] = UP;
+  }
   if( this->bDown && this->getRelCoor().x > -5)
+  {
     accel -= direction;
-
+    this->outData[this->outLength++] = DOWN;
+  }
   if( this->bLeft && TrackManager::getInstance()->getWidth() > -this->getRelCoor().z*2)
   {
@@ -292 +329 @@
     rot +=Vector(1,0,0);
     rotVal -= .4;
+    this->outData[this->outLength++] = LEFT;
   }
   if( this->bRight && TrackManager::getInstance()->getWidth() > this->getRelCoor().z*2)
@@ -298 +336 @@
     rot += Vector(1,0,0);
     rotVal += .4;
+    this->outData[this->outLength++] = RIGHT;
   }
   if (this->bAscend )
@@ -311 +350 @@
     rotVal -= .4;
   }
+
 
   Vector move = accel * time *acceleration;
@@ -322 +362 @@
   this->setRelDirSoft(Quaternion(rotVal, rot), 5);
   this->shiftCoor (move);
+
+
 }
 
@@ -394 +436 @@
   }
 }
+
+
+
+
+/**
+ *  write data to Synchronizeable
+ */
+void Player::writeBytes(const byte* data, int length)
+{
+  PRINTF(0)("Player: got %i bytes of data\n", length);
+  this->inLength = length;
+
+  /*
+   bytes:  | 0  |  1  |
+           CODE  DIST
+
+
+  CODE:
+       0 :   Up
+       1 :   Down
+       2 :   Right
+       3 :   Left
+       4 :   TIME
+
+  DIST:
+      Coordinate diff multiplied by 100 and casted to a byte: byte a = (byte)(x * 100)
+
+  */
+
+  float time = 0.0f;
+
+  Vector accel(0.0, 0.0, 0.0);
+  Vector direction (1.0, 0.0, 0.0);
+  Vector orthDirection (0.0, 0.0, 1.0);
+
+  byte code = 0;
+
+  /* iterate through all bytes */
+  for( int i = 0; i < length; i++)
+  {
+    code = data[i];
+
+    /* is it a time code? */
+    if( code == TIME)
+    {
+      /* is it the first time */
+      if( time > 0.0f )
+      {
+        /* apply movement */
+        Vector move = accel * time;
+
+        if (accel.z < 0)
+          this->setRelDirSoft(Quaternion(-.4, Vector(1,0,0)), 5);
+        else if (accel.z > 0)
+          this->setRelDirSoft(Quaternion(.4, Vector(1,0,0)), 5);
+        else
+          this->setRelDirSoft(Quaternion(0, Vector(1,0,0)), 5);
+        this->shiftCoor (move);
+      }
+      /* read out new movement */
+      time = (float)(data[++i] / 100.0f);
+      PRINTF(0)("Got time: %f msec\n", time);
+    }
+    else if( code == UP && this->getRelCoor().x < 20)
+      accel = accel+(direction*acceleration);
+    else if( code == DOWN && this->getRelCoor().x > -5)
+      accel = accel -(direction*acceleration);
+    else if( code == LEFT && TrackManager::getInstance()->getWidth() > -this->getRelCoor().z*2)
+      accel = accel - (orthDirection*acceleration);
+    else if( code == RIGHT && TrackManager::getInstance()->getWidth() > this->getRelCoor().z*2)
+      accel = accel + (orthDirection*acceleration);
+  }
+
+
+
+
+  /* and debug output */
+  this->writeDebug();
+}
+
+
+/**
+ *  read data from Synchronizeable
+ */
+int Player::readBytes(byte* data)
+{
+  PRINTF(0)("Player: sent %i bytes of data\n", this->sentLength);
+
+  /* copy data */
+  for( int i = 0; i < this->outLength; ++i)
+    data[i] = this->outData[i];
+
+
+
+  /* debug msg */
+  this->readDebug();
+
+  int length = this->outLength;
+  this->outLength = 0;
+  /* return the length of the test */
+  return length;
+}
+
+
+void Player::writeDebug() const
+{
+
+}
+
+
+void Player::readDebug() const
+{
+
+}
+

branches/network/src/world_entities/player.h

@@ -11 +11 @@
 #include "event_listener.h"
 
-template<class T> class tList;
+template<class T>
+class tList;
 class Weapon;
 class WeaponManager;
@@ -25 +26 @@
 class Player : public WorldEntity, public EventListener
 {
-  friend class World;
+    friend class World;
 
   public:
@@ -39 +40 @@
     void removeWeapon(Weapon* weapon);
 
+    /* WorldEntity functions */
     virtual void postSpawn();
     virtual void leftWorld();
@@ -48 +50 @@
     virtual void process(const Event &event);
 
+    /* Synchronizeable functions */
+    virtual void writeBytes(const byte* data, int length);
+    virtual int readBytes(byte* data);
 
   private:
     void move(float time);
     void weaponAction();
+
+    /* Synchronizeable functions */
+    virtual void writeDebug() const;
+    virtual void readDebug() const;
 
     // !! temporary !!
@@ -70 +79 @@
     float                 travelSpeed;        //!< the current speed of the player (to make soft movement)
     float                 acceleration;       //!< the acceleration of the player.
+
+    byte*                 inData;
+    int                   inLength;
+    int                   inBufferLength;
+    int                   recLength;
+    byte*                 outData;
+    int                   outLength;
+    int                   outBufferLength;
+    int                   sentLength;
+
 };
 

branches/network/src/world_entities/world_entity.cc

@@ -41 +41 @@
  */
 WorldEntity::WorldEntity(const TiXmlElement* root)
+  : Synchronizeable()
 {
   this->setClassID(CL_WORLD_ENTITY, "WorldEntity");

branches/network/src/world_entities/world_entity.h

@@ -8 +8 @@
 
 #include "p_node.h"
+#include "synchronizeable.h"
+#include "model.h"
 
 #include "glincl.h"
@@ -21 +23 @@
 
 //! Basis-class all interactive stuff in the world is derived from
-class WorldEntity : public PNode
+class WorldEntity : public PNode, public Synchronizeable
 {
  public: