Changeset 5829 in orxonox.OLD for branches/network/src/world_entities

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/world_entities

Files:

• player.cc (modified) (9 diffs)
• player.h (modified) (5 diffs)
• world_entity.cc (modified) (1 diff)
• world_entity.h (modified) (2 diffs)

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: