Changeset 5833 in orxonox.OLD for branches/network/src

Timestamp:

Nov 30, 2005, 11:09:18 AM (19 years ago)

Author:

patrick

Message:

network: server/client orxonox now works

Location:

branches/network/src

Files:

• defs/debug.h (modified) (1 diff)
• lib/network/network_stream.cc (modified) (7 diffs)
• world_entities/player.cc (modified) (4 diffs)

branches/network/src/defs/debug.h

@@ -107 +107 @@
 #endif
 #ifndef NO_SHELL
-#define PRINT_EXEC       ShellBuffer::addBufferLineStatic
+#define PRINT_EXEC       printf //ShellBuffer::addBufferLineStatic
 #else /* NO_SHELL */
 #define PRINT_EXEC       printf

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

@@ -44 +44 @@
   this->init();
   /* initialize the references */
+  this->type = NET_CLIENT;
   this->networkSocket = new NetworkSocket();
   this->networkProtocol = new NetworkProtocol();
@@ -52 +53 @@
 NetworkStream::NetworkStream(IPaddress& address, NodeType type)
 {
+  this->type = type;
   this->init();
   this->networkSocket = new NetworkSocket(address);
@@ -62 +64 @@
 NetworkStream::NetworkStream(unsigned int port, NodeType type)
 {
+  this->type = type;
   this->init();
   this->networkSocket = new NetworkSocket();
@@ -74 +77 @@
     : DataStream()
 {
+  this->type = type;
   this->init();
   this->networkSocket = new NetworkSocket(address);
@@ -86 +90 @@
     : DataStream()
 {
+  this->type = type;
   this->init();
   this->networkSocket = new NetworkSocket();
@@ -134 +139 @@
   PRINT(0)("============= DOWNSTREAM:===============\n");
   /* first of all read the synchronizeable's data: */
-  //if(this->isServer())
-  dataLength = this->synchronizeables->readBytes((byte*)downBuffer);
+  if( this->isServer())
+    dataLength = this->synchronizeables->readBytes((byte*)downBuffer);
 
   if( dataLength > 0)
@@ -181 +186 @@
     if( dataLength == this->packetHeader.length)
     {
-      printf("NetworkStream::processData() - Got Data: \n");
+      printf("NetworkStream::processData() - Got Data: %i bytes\n", dataLength);
       /* send the received data to connectionMonitor */
       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);
+      if( !this->isServer())
+        this->synchronizeables->writeBytes((byte*)upBuffer, this->packetHeader.length);
 
       this->state = NET_REC_HEADER;

branches/network/src/world_entities/player.cc

@@ -445 +445 @@
 void Player::writeBytes(const byte* data, int length)
 {
-  PRINTF(0)("Player: got %i bytes of data\n", length);
+ // PRINTF(0)("Player: got %i bytes of data\n", length);
   this->inLength = length;
 
@@ -476 +476 @@
   for( int i = 0; i < length; i++)
   {
+    
     code = data[i];
 
+    //PRINTF(0)("got byte: %u\n", 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);
+      //PRINTF(0)("Got time: %f msec\n", time);
     }
+    
     else if( code == UP && this->getRelCoor().x < 20)
       accel = accel+(direction*acceleration);
@@ -507 +498 @@
     else if( code == RIGHT && TrackManager::getInstance()->getWidth() > this->getRelCoor().z*2)
       accel = accel + (orthDirection*acceleration);
-  }
-
+  
+    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);
+    }
+
+  }
+
+  
 
 
@@ -522 +529 @@
 int Player::readBytes(byte* data)
 {
-  PRINTF(0)("Player: sent %i bytes of data\n", this->sentLength);
+ // PRINTF(0)("Player: sent %i bytes of data\n", this->sentLength);
 
   /* copy data */