Changeset 6815 in orxonox.OLD

Timestamp:

Jan 28, 2006, 5:11:51 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/network back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6774:HEAD

no conflicts…
thats what i call orthogonal work

Location:

trunk/src

Files:

• defs/class_id.h (modified) (2 diffs)
• lib/coord/p_node.cc (modified) (12 diffs)
• lib/coord/p_node.h (modified) (1 diff)
• lib/graphics/Makefile.am (modified) (2 diffs)
• lib/graphics/effects/fog_effect.cc (modified) (3 diffs)
• lib/graphics/effects/graphics_effect.cc (modified) (1 diff)
• lib/graphics/effects/graphics_effect.h (modified) (1 diff)
• lib/graphics/effects/lense_flare.cc (copied) (copied from branches/network/src/lib/graphics/effects/lense_flare.cc)
• lib/graphics/effects/lense_flare.h (copied) (copied from branches/network/src/lib/graphics/effects/lense_flare.h)
• lib/graphics/graphics_engine.cc (modified) (6 diffs)
• lib/graphics/graphics_engine.h (modified) (3 diffs)
• lib/graphics/render2D/billboard.cc (copied) (copied from branches/network/src/lib/graphics/render2D/billboard.cc)
• lib/graphics/render2D/billboard.h (copied) (copied from branches/network/src/lib/graphics/render2D/billboard.h)
• lib/lang/base_object.cc (modified) (2 diffs)
• lib/network/handshake.cc (modified) (3 diffs)
• lib/network/network_game_manager.cc (modified) (1 diff)
• lib/network/synchronizeable.h (modified) (12 diffs)
• story_entities/game_world_data.cc (modified) (1 diff)
• world_entities/environments/water.cc (modified) (7 diffs)
• world_entities/image_entity.cc (modified) (3 diffs)
• world_entities/image_entity.h (modified) (2 diffs)
• world_entities/npcs/ground_turret.cc (modified) (2 diffs)
• world_entities/power_ups/laser_power_up.cc (modified) (2 diffs)
• world_entities/power_ups/param_power_up.cc (modified) (2 diffs)
• world_entities/power_ups/power_up.cc (modified) (3 diffs)
• world_entities/power_ups/turret_power_up.cc (modified) (2 diffs)
• world_entities/power_ups/weapon_power_up.cc (modified) (2 diffs)
• world_entities/skybox.cc (modified) (3 diffs)
• world_entities/space_ships/space_ship.cc (modified) (6 diffs)
• world_entities/space_ships/space_ship.h (modified) (2 diffs)
• world_entities/terrain.cc (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (3 diffs)

trunk/src/defs/class_id.h

@@ -118 +118 @@
   CL_VERTEX_ARRAY_MODEL         =    0x00004000,
 
+
+  CL_BILLBOARD                  =    0x10000001,
 
   // subsuper-classes derivations taken : 1, 2, 5, a, b, c.     << THIS IS A LIST OF ALL THE DCL_MASK_SUBSUPERCLASS_ID's taken
@@ -264 +266 @@
   CL_SHADER                     =    0x00000822,
   CL_FOG_EFFECT                 =    0x70000001,
+  CL_LENSE_FLARE                =    0x70000002,
 
   // GL-GUI

trunk/src/lib/coord/p_node.cc

@@ -1077 +1077 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( BaseObject::writeState );
+  SYNCHELP_READ_FKT( BaseObject::writeState, NWT_PN_BO_WRITESTATE );
 
 //   char * parentName = NULL;
@@ -1094 +1094 @@
 
   int parentMode;
-  SYNCHELP_READ_INT( parentMode );
+  SYNCHELP_READ_INT( parentMode, NWT_PN_PARENTMODE );
   this->setParentMode((PARENT_MODE)parentMode);
 
   float f1, f2, f3, f4;
 
-  SYNCHELP_READ_FLOAT( f1 );
-  SYNCHELP_READ_FLOAT( f2 );
-  SYNCHELP_READ_FLOAT( f3 );
+  SYNCHELP_READ_FLOAT( f1, NWT_PN_COORX );
+  SYNCHELP_READ_FLOAT( f2, NWT_PN_COORY );
+  SYNCHELP_READ_FLOAT( f3, NWT_PN_COORZ );
   this->setRelCoor( f1, f2, f3 );
 
 
-  SYNCHELP_READ_FLOAT( f1 );
-  SYNCHELP_READ_FLOAT( f2 );
-  SYNCHELP_READ_FLOAT( f3 );
-  SYNCHELP_READ_FLOAT( f4 );
+  SYNCHELP_READ_FLOAT( f1, NWT_PN_ROTV );
+  SYNCHELP_READ_FLOAT( f2, NWT_PN_ROTX );
+  SYNCHELP_READ_FLOAT( f3, NWT_PN_ROTY );
+  SYNCHELP_READ_FLOAT( f4, NWT_PN_ROTZ );
   this->setRelDir( Quaternion( Vector(f2, f3, f4), f1 ) );
 
@@ -1140 +1140 @@
   SYNCHELP_WRITE_BEGIN();
 
-  SYNCHELP_WRITE_FKT( BaseObject::readState );
+  SYNCHELP_WRITE_FKT( BaseObject::readState, NWT_PN_BO_WRITESTATE );
 
 //   if ( this->parent )
@@ -1151 +1151 @@
 //   }
 
-  SYNCHELP_WRITE_INT( this->parentMode );
-
-  SYNCHELP_WRITE_FLOAT( this->relCoordinate.x );
-  SYNCHELP_WRITE_FLOAT( this->relCoordinate.y );
-  SYNCHELP_WRITE_FLOAT( this->relCoordinate.z );
-
-  SYNCHELP_WRITE_FLOAT( this->relDirection.w );
-  SYNCHELP_WRITE_FLOAT( this->relDirection.v.x );
-  SYNCHELP_WRITE_FLOAT( this->relDirection.v.y );
-  SYNCHELP_WRITE_FLOAT( this->relDirection.v.z );
+  SYNCHELP_WRITE_INT( this->parentMode, NWT_PN_PARENTMODE );
+
+  SYNCHELP_WRITE_FLOAT( this->relCoordinate.x, NWT_PN_COORX );
+  SYNCHELP_WRITE_FLOAT( this->relCoordinate.y, NWT_PN_COORY );
+  SYNCHELP_WRITE_FLOAT( this->relCoordinate.z, NWT_PN_COORZ );
+
+  SYNCHELP_WRITE_FLOAT( this->relDirection.w, NWT_PN_ROTV );
+  SYNCHELP_WRITE_FLOAT( this->relDirection.v.x, NWT_PN_ROTX );
+  SYNCHELP_WRITE_FLOAT( this->relDirection.v.y, NWT_PN_ROTY );
+  SYNCHELP_WRITE_FLOAT( this->relDirection.v.z, NWT_PN_ROTZ );
 
 //   int n = children.size();
@@ -1209 +1209 @@
 
   byte flags = 0;
-  SYNCHELP_READ_BYTE( flags );
+  SYNCHELP_READ_BYTE( flags, NWT_PN_FLAGS );
   //PRINTF(0)("%s::FLAGS = %d\n", this->getName(), flags);
 
@@ -1216 +1216 @@
   if ( flags & __FLAG_COOR )
   {
-    SYNCHELP_READ_FLOAT( f1 );
-    SYNCHELP_READ_FLOAT( f2 );
-    SYNCHELP_READ_FLOAT( f3 );
+    SYNCHELP_READ_FLOAT( f1, NWT_PN_SCOORX );
+    SYNCHELP_READ_FLOAT( f2, NWT_PN_SCOORY );
+    SYNCHELP_READ_FLOAT( f3, NWT_PN_SCOORZ );
     PRINTF(0)("RCVD COOR: %f %f %f\n", f1, f2, f3);
     this->setRelCoor( f1, f2, f3 );
@@ -1225 +1225 @@
   if ( flags & __FLAG_ROT )
   {
-    SYNCHELP_READ_FLOAT( f1 );
-    SYNCHELP_READ_FLOAT( f2 );
-    SYNCHELP_READ_FLOAT( f3 );
-    SYNCHELP_READ_FLOAT( f4 );
+    SYNCHELP_READ_FLOAT( f1, NWT_PN_SROTV );
+    SYNCHELP_READ_FLOAT( f2, NWT_PN_SROTX );
+    SYNCHELP_READ_FLOAT( f3, NWT_PN_SROTY );
+    SYNCHELP_READ_FLOAT( f4, NWT_PN_SROTZ );
     PRINTF(0)("RCVD QUAT: %f %f %f %f\n", f1, f2, f3, f4);
     //this->setRelDir( Quaternion( Vector(f2, f3, f4), f1 ) );
@@ -1250 +1250 @@
 int PNode::readSync( byte * data, int maxLength )
 {
+  //WARNING: if you change this file make sure you also change needsReadSync
   SYNCHELP_WRITE_BEGIN();
 
@@ -1270 +1271 @@
 
 
-  SYNCHELP_WRITE_BYTE( flags );
+  SYNCHELP_WRITE_BYTE( flags, NWT_PN_FLAGS );
   //PRINTF(0)("FLAGS = %d\n", flags);
 
@@ -1276 +1277 @@
   {
 
-    PRINTF(0)("SEND COOR: %f %f %f\n", this->relCoordinate.x, this->relCoordinate.y, this->relCoordinate.z);
-
-    SYNCHELP_WRITE_FLOAT( this->relCoordinate.x );
-    SYNCHELP_WRITE_FLOAT( this->relCoordinate.y );
-    SYNCHELP_WRITE_FLOAT( this->relCoordinate.z );
+    //PRINTF(0)("SEND COOR: %f %f %f\n", this->relCoordinate.x, this->relCoordinate.y, this->relCoordinate.z);
+
+    SYNCHELP_WRITE_FLOAT( this->relCoordinate.x, NWT_PN_SCOORX );
+    SYNCHELP_WRITE_FLOAT( this->relCoordinate.y, NWT_PN_SCOORY );
+    SYNCHELP_WRITE_FLOAT( this->relCoordinate.z, NWT_PN_SCOORZ );
 
     coorx = relCoordinate.x;
@@ -1290 +1291 @@
   {
 
-    PRINTF(0)("SEND QUAT: %f %f %f %f\n", this->absDirection.w, this->absDirection.v.x, this->absDirection.v.y, this->absDirection.v.z);
-
-    SYNCHELP_WRITE_FLOAT( this->absDirection.w );
-    SYNCHELP_WRITE_FLOAT( this->absDirection.v.x );
-    SYNCHELP_WRITE_FLOAT( this->absDirection.v.y );
-    SYNCHELP_WRITE_FLOAT( this->absDirection.v.z );
+    //PRINTF(0)("SEND QUAT: %f %f %f %f\n", this->absDirection.w, this->absDirection.v.x, this->absDirection.v.y, this->absDirection.v.z);
+
+    SYNCHELP_WRITE_FLOAT( this->absDirection.w, NWT_PN_SROTV );
+    SYNCHELP_WRITE_FLOAT( this->absDirection.v.x, NWT_PN_SROTX );
+    SYNCHELP_WRITE_FLOAT( this->absDirection.v.y, NWT_PN_SROTY );
+    SYNCHELP_WRITE_FLOAT( this->absDirection.v.z, NWT_PN_SROTZ );
 
     rotw = absDirection.w;
@@ -1305 +1306 @@
   return SYNCHELP_WRITE_N;
 }
+
+bool PNode::needsReadSync( )
+{
+  if ( fabs( coorx - relCoordinate.x ) > __OFFSET_POS ||
+       fabs( coory - relCoordinate.y ) > __OFFSET_POS ||
+       fabs( coorz - relCoordinate.z ) > __OFFSET_POS )
+    return true;
+
+  if ( fabs( rotw - absDirection.w ) > __OFFSET_ROT ||
+       fabs( rotx - absDirection.v.x ) > __OFFSET_ROT ||
+       fabs( roty - absDirection.v.y ) > __OFFSET_ROT ||
+       fabs( rotz - absDirection.v.z ) > __OFFSET_ROT )
+    return true;
+  
+  return false;
+}

trunk/src/lib/coord/p_node.h

@@ -190 +190 @@
   int       writeSync(const byte* data, int length, int sender);
   int       readSync(byte* data, int maxLength );
+  bool      needsReadSync();
 
  private:

trunk/src/lib/graphics/Makefile.am

@@ -9 +9 @@
                            render2D/render_2d.cc \
                            render2D/element_2d.cc \
+                           render2D/billboard.cc \
                            text_engine/text_engine.cc \
                            text_engine/text.cc \
                            text_engine/font.cc \
                            effects/graphics_effect.cc \
-                           effects/fog_effect.cc
+                           effects/fog_effect.cc \
+                           effects/lense_flare.cc
+
 
 noinst_HEADERS = graphics_engine.h \
@@ -20 +23 @@
                  render2D/render_2d.h \
                  render2D/element_2d.h \
+                 render2D/billboard.h \
                  text_engine/text_engine.h \
                  text_engine/text.h \
                  text_engine/font.h \
                  effects/graphics_effect.h \
-                 effects/fog_effect.h
+                 effects/fog_effect.h \
+                 effects/lense_flare.h
 
 

trunk/src/lib/graphics/effects/fog_effect.cc

@@ -62 +62 @@
 void FogEffect::loadParams(const TiXmlElement* root)
 {
+  printf(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>.loadParms\n\n");
   GraphicsEffect::loadParams(root);
 
-   LoadParam(root, "fog-effect", this, FogEffect, setFogMode)
+   LoadParam(root, "fog-mode", this, FogEffect, setFogMode)
        .describe("sets the the fog mode {GL_LINEAR, GL_EXP, GL_EXP2}");
 
@@ -87 +88 @@
 bool FogEffect::activate()
 {
+  printf("fog==============================================>>>>>>>>>>>>>>>>>>>>>>>>...\n\n");
   PRINTF(4)( "Enabling Fog Effect, mode: %i, density: %f, start: %f, end: %f\n", this->fogMode, this->fogDensity,
              this->fogStart, this->fogEnd);
@@ -92 +94 @@
   glEnable(GL_FOG);
   {
-    GLfloat fogColor[4] = {0.5, 0.5, 0.5, 1.0};
+    GLfloat fogColor[4] = {0.6, 0.6, 0.6, 1.0};
 
     glFogi(GL_FOG_MODE, this->fogMode);

trunk/src/lib/graphics/effects/graphics_effect.cc

@@ -72 +72 @@
 bool GraphicsEffect::init()
 {}
+
+
+
+/**
+ * draws the effect, if needed
+ */
+void GraphicsEffect::draw() const
+{}
+
+
+
+/**
+ * ticks the effect if there is any time dependancy
+ */
+void GraphicsEffect::tick(float dt)
+{}

trunk/src/lib/graphics/effects/graphics_effect.h

@@ -25 +25 @@
     virtual bool deactivate() = 0;
 
-    inline bool isActivated() { return this->bActivated; }
+    virtual void draw() const;
+    virtual void tick(float dt);
+
+    inline bool isActivated() const { return this->bActivated; }
 
 

trunk/src/lib/graphics/graphics_engine.cc

@@ -41 +41 @@
 #include "shell_command.h"
 
+
+#include "parser/tinyxml/tinyxml.h"
+#include "load_param.h"
+#include "factory.h"
+
 #ifdef __WIN32__
  #include "class_list.h"
@@ -113 +118 @@
   GraphicsEngine::singletonRef = NULL;
 }
+
+
+/**
+ * loads the GraphicsEngine Specific Parameters.
+ * @param root: the XML-Element to load the Data From
+ */
+void GraphicsEngine::loadParams(const TiXmlElement* root)
+{
+  LoadParamXML(root, "load-effect", this, GraphicsEngine, loadGraphicsEffectXML)
+      .describe("loads a graphics effect");
+}
+
 
 /**
@@ -150 +167 @@
   this->initVideo(atoi(resolution.getString(0)), atoi(resolution.getString(1)), 16);
 
-  GraphicsEffect* fe = new FogEffect(NULL);
-  this->loadGraphicsEffect(fe);
-  fe->activate();
-  PRINTF(0)("--------------------------------------------------------------\n");
+//   GraphicsEffect* fe = new FogEffect(NULL);
+//   this->loadGraphicsEffect(fe);
+//   fe->activate();
+//   PRINTF(0)("--------------------------------------------------------------\n");
 }
 
@@ -571 +588 @@
 #endif /* NO_TEXT */
 
-
-  }
+  }
+
   Render2D::getInstance()->tick(dt);
+
+  // tick the graphics effects
+  list<GraphicsEffect*>::iterator it;
+  for (it = this->graphicsEffects.begin(); it != this->graphicsEffects.end(); it++)
+    (*it)->tick(dt);
 }
 
@@ -587 +609 @@
   Render2D::getInstance()->draw(E2D_LAYER_ALL);
   Shader::restoreShader();
+
+  //draw the graphics
+  list<GraphicsEffect*>::const_iterator it;
+  for (it = this->graphicsEffects.begin(); it != this->graphicsEffects.end(); it++)
+    (*it)->draw();
 }
 
@@ -661 +688 @@
 
 /**
+ * @param root The XML-element to load GraphicsEffects from
+ */
+void GraphicsEngine::loadGraphicsEffectXML(const TiXmlElement* root)
+{
+  const TiXmlElement* element = root->FirstChildElement();
+
+  while (element != NULL)
+  {
+    Factory::fabricate(element);
+
+    element = element->NextSiblingElement();
+  }
+}
+
+
+/**
  * loads a GraphicsEffect into the engine
  * @param effect the GraphicsEffect to add

trunk/src/lib/graphics/graphics_engine.h

@@ -23 +23 @@
 class WorldEntity;
 class GraphicsEffect;
+class TiXmlElement;
 
 //! class to handle graphics
@@ -34 +35 @@
     /** @returns a Pointer to the only object of this Class */
     inline static GraphicsEngine* getInstance() { if (!GraphicsEngine::singletonRef) GraphicsEngine::singletonRef = new GraphicsEngine();  return GraphicsEngine::singletonRef; };
+
+    virtual void loadParams(const TiXmlElement* root);
 
     int init();
@@ -83 +86 @@
     void process(const Event  &event);
 
+    void loadGraphicsEffectXML(const TiXmlElement* root);
     bool loadGraphicsEffect(GraphicsEffect* effect);
     bool unloadGraphicsEffect(GraphicsEffect* effect);

trunk/src/lib/lang/base_object.cc

@@ -204 +204 @@
     objectName = NULL;
   }
-  SYNCHELP_READ_STRINGM( this->objectName );
+  SYNCHELP_READ_STRINGM( this->objectName, NWT_BO_NAME );
   if ( this->objectName && !strcmp(this->objectName, "") )
   {
@@ -225 +225 @@
 
   //PRINTF(0)("objectname = %s\n", this->objectName);
-  SYNCHELP_WRITE_STRING( this->objectName );
+  SYNCHELP_WRITE_STRING( this->objectName, NWT_BO_NAME );
 
   return SYNCHELP_WRITE_N;

trunk/src/lib/network/handshake.cc

@@ -95 +95 @@
   if ( !isServer() && hasState( HS_RECVD_VER ) && !hasState( HS_RECVD_HID ) )
   {
-    if ( length != INTSIZE+INTSIZE )
-    {
-      PRINTF(0)("hostID packet has wrong size %d instead of %d\n", length, 1);
-      setState( HS_COMPLETED );
-      return 0;
-    }
+    /*if ( length != INTSIZE+INTSIZE )
+    {
+      PRINTF(0)("hostID packet has wrong size %d instead of %d\n", length, INTSIZE+INTSIZE);
+      setState( HS_COMPLETED );
+      return 0;
+  }*/
 
     setState( HS_COMPLETED );
     setState( HS_RECVD_HID );
     this->isOk = true;
-    SYNCHELP_READ_INT( this->newHostId );
-    SYNCHELP_READ_INT( this->newNetworkGameManagerId );
+    SYNCHELP_READ_INT( this->newHostId, NWT_HS_HOST_ID );
+    SYNCHELP_READ_INT( this->newNetworkGameManagerId, NWT_HS_NGM_ID );
 
     if ( newHostId == 0 )
@@ -180 +180 @@
       isOk = false;
       //memcpy(data, (byte*)0, 4);
-      SYNCHELP_WRITE_INT( 0 );
-      SYNCHELP_WRITE_INT( 0 );
+      SYNCHELP_WRITE_INT( 0, NWT_HS_HOST_ID);
+      SYNCHELP_WRITE_INT( 0, NWT_HS_NGM_ID);
     }
     else
@@ -187 +187 @@
       isOk = true;
       //memcpy(data, &clientId, 4);
-      SYNCHELP_WRITE_INT( clientId );
-      SYNCHELP_WRITE_INT( networkGameManagerId );
+      SYNCHELP_WRITE_INT( clientId, NWT_HS_HOST_ID );
+      SYNCHELP_WRITE_INT( networkGameManagerId, NWT_HS_NGM_ID );
     }
     *reciever = clientId;

trunk/src/lib/network/network_game_manager.cc

@@ -167 +167 @@
   if ( !isServer() && !hasRequestedWorld )
   {
-    SYNCHELP_WRITE_BEGIN();
-    byte b = NET_REQUEST_ENTITY_LIST;
-    SYNCHELP_WRITE_BYTE( b );
+    assert( maxLength >= 1 );
+    data[0] = NET_REQUEST_ENTITY_LIST;
     hasRequestedWorld = true;
-    return SYNCHELP_WRITE_N;
+    return 1;
   }
 

trunk/src/lib/network/synchronizeable.h

@@ -20 +20 @@
 #define STATE_OUTOFSYNC 2
 #define STATE_REQUESTEDSYNC 4
+
+enum {
+  NWT_SS_WE_STATE = 1000000,
+  NWT_SS_B,
+  NWT_SS_FLAGS,
+  NWT_SS_MOUSEDIRX,
+  NWT_SS_MOUSEDIRY,
+  NWT_SS_MOUSEDIRZ,
+  NWT_SS_MOUSEDIRW,
+  NWT_SS_PN_SYNC,
+  NWT_SS_VELX,
+  NWT_SS_VELY,
+  NWT_SS_VELZ,
+  
+  NWT_HS_HOST_ID,
+  NWT_HS_NGM_ID,
+  
+  NWT_PN_BO_WRITESTATE,
+  NWT_PN_PARENTMODE,
+  NWT_PN_COORX,
+  NWT_PN_COORY,
+  NWT_PN_COORZ,
+  NWT_PN_ROTX,
+  NWT_PN_ROTY,
+  NWT_PN_ROTZ,
+  NWT_PN_ROTV,
+  
+  NWT_PN_FLAGS,
+  NWT_PN_SCOORX,
+  NWT_PN_SCOORY,
+  NWT_PN_SCOORZ,
+  NWT_PN_SROTX,
+  NWT_PN_SROTY,
+  NWT_PN_SROTZ,
+  NWT_PN_SROTV,
+  
+  NWT_BO_NAME,
+  
+  NWT_WE_PN_WRITESTATE,
+  NWT_WE_PN_MODELFILENAME,
+  NWT_WE_PN_SCALING,
+  
+  NWT_GT_WE_STATE,
+  
+  NWT_SB_WE_STATE,
+  NWT_SB_SIZE,
+  NWT_SB_TEXTURENAME,
+  
+  NWT_TER_WE_STATE,
+  
+  NWT_PU_WE_STATE,
+  
+  NWT_TPU_WE_STATE,
+  
+  NWT_LPU_WE_STATE,
+  
+  NWT_WPU_WE_STATE,
+  
+  NWT_PPU_WE_STATE,
+  NWT_PPU_TYPE,
+  NWT_PPU_VALUE,
+  NWT_PPU_MINVALUE,
+  NWT_PPU_MAXVALUE,
+
+  NWT_WAT_STATE,
+  NWT_WAT_WE_STATE,
+  NWT_WAT_SIZEX,
+  NWT_WAT_SIZEY,
+  NWT_WAT_RESX,
+  NWT_WAT_RESY,
+  NWT_WAT_HEIGHT
+};
 
 
@@ -58 +130 @@
  *
  */
+#define SYNCHELP_WRITE_DEBUG(n) {\
+  __synchelp_write_n = Converter::intToByteArray( n, data+__synchelp_write_i, maxLength-__synchelp_write_i ); \
+  assert( __synchelp_write_n == INTSIZE ); \
+  __synchelp_write_i += __synchelp_write_n; \
+}
+
+#define SYNCHELP_READ_DEBUG(n) {  \
+  int nn; \
+  __synchelp_read_n = Converter::byteArrayToInt( data+__synchelp_read_i, &nn );  \
+  assert( __synchelp_read_n == INTSIZE ); \
+  if ( n != nn ) { \
+    PRINTF(1)("Check your code! read/writes not in right order! read %d instead of %d\n", nn, n); \
+    assert( false ); \
+  } \
+  __synchelp_read_i += __synchelp_read_n; \
+}
+
 #define SYNCHELP_WRITE_BEGIN()    int __synchelp_write_i = 0; \
                                   int __synchelp_write_n
-#define SYNCHELP_WRITE_INT(i) { __synchelp_write_n = \
+#define SYNCHELP_WRITE_INT(i,n) { SYNCHELP_WRITE_DEBUG(n); \
+                                __synchelp_write_n = \
                                 Converter::intToByteArray( i, data+__synchelp_write_i, maxLength-__synchelp_write_i ); \
                                 assert( __synchelp_write_n == INTSIZE ); \
@@ -70 +160 @@
                                 __synchelp_write_i += __synchelp_write_n; \
 }
-#define SYNCHELP_WRITE_FLOAT(f) { __synchelp_write_n = \
+#define SYNCHELP_WRITE_FLOAT(f,n) { SYNCHELP_WRITE_DEBUG(n); \
+                                __synchelp_write_n = \
                                 Converter::floatToByteArray( f, data+__synchelp_write_i, maxLength-__synchelp_write_i ); \
                                 assert( __synchelp_write_n == FLOATSIZE ); \
@@ -80 +171 @@
                                 __synchelp_write_i += __synchelp_write_n; \
 }
-#define SYNCHELP_WRITE_BYTE(b) { \
+#define SYNCHELP_WRITE_BYTE(b,n) { SYNCHELP_WRITE_DEBUG(n); \
+                                \
                                 if (maxLength - __synchelp_write_i < 1) \
 { \
@@ -89 +181 @@
                                 __synchelp_write_i++; \
 }
-#define SYNCHELP_WRITE_STRING(s) { if (s!=NULL) {\
+#define SYNCHELP_WRITE_STRING(s,n) { SYNCHELP_WRITE_DEBUG(n); \
+                                if (s!=NULL) {\
                                 __synchelp_write_n = \
                                 Converter::stringToByteArray( s, data+__synchelp_write_i, strlen(s), maxLength-__synchelp_write_i ); \
@@ -105 +198 @@
 }
 #define SYNCHELP_WRITE_N        __synchelp_write_i
-#define SYNCHELP_WRITE_FKT(f)   { \
+#define SYNCHELP_WRITE_FKT(f,n)   { SYNCHELP_WRITE_DEBUG(n); \
                                   __synchelp_write_i += \
                                   f( data+__synchelp_write_i, maxLength-__synchelp_write_i ); \
@@ -114 +207 @@
                                   int __synchelp_read_n
 
-#define SYNCHELP_READ_INT(i)       { \
+#define SYNCHELP_READ_INT(i,n)       { SYNCHELP_READ_DEBUG(n); \
                                     if ( length-__synchelp_read_i < INTSIZE ) \
 { \
@@ -124 +217 @@
                                     __synchelp_read_i += __synchelp_read_n; \
 }
-#define SYNCHELP_READ_FLOAT(f)    { \
+#define SYNCHELP_READ_FLOAT(f,n)    { SYNCHELP_READ_DEBUG(n); \
                                     if ( length-__synchelp_read_i < FLOATSIZE ) \
 { \
@@ -134 +227 @@
                                     __synchelp_read_i += __synchelp_read_n; \
 }
-#define SYNCHELP_READ_STRING(s,l)    { \
+#define SYNCHELP_READ_STRING(s,l,n)    {SYNCHELP_READ_DEBUG(n); \
                                     __synchelp_read_n = Converter::byteArrayToString( data+__synchelp_read_i, s, l );  \
                                     assert( __synchelp_read_n == strlen(s)+INTSIZE ) ;\
@@ -144 +237 @@
                                     __synchelp_read_i += __synchelp_read_n; \
 }
-#define SYNCHELP_READ_STRINGM(s)    { \
+#define SYNCHELP_READ_STRINGM(s,n)    { SYNCHELP_READ_DEBUG(n); \
                                     __synchelp_read_n = Converter::byteArrayToStringM( data+__synchelp_read_i, s );  \
                                     assert( __synchelp_read_n == strlen(s)+INTSIZE ) ;\
@@ -154 +247 @@
                                     __synchelp_read_i += __synchelp_read_n; \
 }
-#define SYNCHELP_READ_BYTE(b)      { \
+#define SYNCHELP_READ_BYTE(b,n)      { SYNCHELP_READ_DEBUG(n); \
                                     if ( length-__synchelp_read_i < 1 ) \
 { \
@@ -163 +256 @@
                                     __synchelp_read_i ++;  \
 }
-#define SYNCHELP_READ_FKT(f)   { \
+#define SYNCHELP_READ_FKT(f,n)   { SYNCHELP_READ_DEBUG(n); \
                                   __synchelp_read_i += \
                                   f( data+__synchelp_read_i, length-__synchelp_read_i, sender); \
                                   }
+#define SYNCHELP_READ_REMAINING() ( length-__synchelp_read_i )
+#define SYNCHELP_READ_NEXTBYTE() ( data[__synchelp_read_i] )
 #define SYNCHELP_READ_N           __synchelp_read_i
 

trunk/src/story_entities/game_world_data.cc

@@ -278 +278 @@
 {
   LoadParamXML(root, "LightManager", LightManager::getInstance(), LightManager, loadParams);
+  LoadParamXML(root, "GraphicsEngine", GraphicsEngine::getInstance(), GraphicsEngine, loadParams);
 
 //  LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams);

trunk/src/world_entities/environments/water.cc

@@ -302 +302 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( Water::writeState );
+  SYNCHELP_READ_FKT( Water::writeState, NWT_WAT_STATE );
 
   return SYNCHELP_READ_N;
@@ -328 +328 @@
   {
     *reciever = rec;
-    SYNCHELP_WRITE_FKT( Water::readState );
+    SYNCHELP_WRITE_FKT( Water::readState, NWT_WAT_STATE );
   }
 
@@ -347 +347 @@
   SYNCHELP_WRITE_BEGIN();
 
-  SYNCHELP_WRITE_FKT( WorldEntity::readState );
+  SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_WAT_WE_STATE );
 
   // sync the size
-  SYNCHELP_WRITE_FLOAT( this->sizeX );
-  SYNCHELP_WRITE_FLOAT( this->sizeY );
+  SYNCHELP_WRITE_FLOAT( this->sizeX, NWT_WAT_SIZEX );
+  SYNCHELP_WRITE_FLOAT( this->sizeY, NWT_WAT_SIZEY );
 
   //sync resolution
-  SYNCHELP_WRITE_INT( this->resX );
-  SYNCHELP_WRITE_INT( this->resY );
+  SYNCHELP_WRITE_INT( this->resX, NWT_WAT_RESX );
+  SYNCHELP_WRITE_INT( this->resY, NWT_WAT_RESY );
 
   //sync the height
-  SYNCHELP_WRITE_FLOAT( this->height );
+  SYNCHELP_WRITE_FLOAT( this->height, NWT_WAT_HEIGHT );
 
   return SYNCHELP_WRITE_N;
@@ -374 +374 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( WorldEntity::writeState );
+  SYNCHELP_READ_FKT( WorldEntity::writeState, NWT_WAT_WE_STATE );
 
   float f1, f2;
@@ -380 +380 @@
 
   //read the size
-  SYNCHELP_READ_FLOAT( f1 );
-  SYNCHELP_READ_FLOAT( f2 );
+  SYNCHELP_READ_FLOAT( f1, NWT_WAT_SIZEX );
+  SYNCHELP_READ_FLOAT( f2, NWT_WAT_SIZEY );
   this->sizeX = f1;
   this->sizeY = f2;
@@ -387 +387 @@
 
   //read the resolution
-  SYNCHELP_READ_INT( i1 );
-  SYNCHELP_READ_INT( i2 );
+  SYNCHELP_READ_INT( i1, NWT_WAT_RESX );
+  SYNCHELP_READ_INT( i2, NWT_WAT_RESY );
   this->resX = i1;
   this->resY = i2;
@@ -394 +394 @@
 
   //read the height
-  SYNCHELP_READ_FLOAT( f1 );
+  SYNCHELP_READ_FLOAT( f1, NWT_WAT_HEIGHT );
   this->height = f1;
 

trunk/src/world_entities/image_entity.cc

@@ -49 +49 @@
 {
   if (this->material)
-  delete this->material;
-
-  // delete what has to be deleted here
-
-  GraphicsEngine::showMouse(true);
-  GraphicsEngine::stealWMEvents(false);
+    delete this->material;
 }
 
@@ -90 +85 @@
       .describe("the Speed with which the ImageEntity should rotate");
 
-  LoadParam(root, "billboarding", this, ImageEntity, toggleBillboard)
-      .describe("sets the ImageEntity to always look in the direction of the Player");
+  LoadParam(root, "billboarding", this, ImageEntity, toggleBillboarding)
+      .describe("sets the Billboard to always look in the direction of the Player");
 }
 
@@ -119 +114 @@
  * This means that the image will always look in the direction of the Player
  */
-void ImageEntity::toggleBillboard()
+void ImageEntity::toggleBillboarding()
 {
   this->bBillboarding = !this->bBillboarding;

trunk/src/world_entities/image_entity.h

@@ -1 +1 @@
 /*!
- * @file crosshair.h
-  *  Definition of ...
-
-*/
+ * @file image_entity.h
+ *  Definition of an ImageEntity
+ */
 
 #ifndef _IMAGE_ENTITY_H
@@ -34 +33 @@
   /** @param rotationSpeed the speed at what the crosshair should rotate */
   void setRotationSpeed(float rotationSpeed) { this->rotationSpeed = rotationSpeed; };
-  void toggleBillboard();
+  void toggleBillboarding();
 
   virtual void tick(float dt);

trunk/src/world_entities/npcs/ground_turret.cc

@@ -181 +181 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( WorldEntity::writeState );
+  SYNCHELP_READ_FKT( WorldEntity::writeState, NWT_GT_WE_STATE );
 
   return SYNCHELP_READ_N;
@@ -207 +207 @@
     *reciever = rec;
 
-    SYNCHELP_WRITE_FKT( WorldEntity::readState );
+    SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_GT_WE_STATE );
 
   }

trunk/src/world_entities/power_ups/laser_power_up.cc

@@ -127 +127 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( PowerUp::writeState );
+  SYNCHELP_READ_FKT( PowerUp::writeState, NWT_LPU_WE_STATE );
 
   return SYNCHELP_READ_N;
@@ -149 +149 @@
     SYNCHELP_WRITE_BEGIN();
 
-    SYNCHELP_WRITE_FKT( PowerUp::readState );
+    SYNCHELP_WRITE_FKT( PowerUp::readState, NWT_LPU_WE_STATE );
 
     return SYNCHELP_WRITE_N;

trunk/src/world_entities/power_ups/param_power_up.cc

@@ -131 +131 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( PowerUp::writeState );
+  SYNCHELP_READ_FKT( PowerUp::writeState, NWT_PPU_WE_STATE );
 
   int i;
-  SYNCHELP_READ_INT( i );
+  SYNCHELP_READ_INT( i, NWT_PPU_TYPE );
   this->type = (EnumParamPowerUpType)i;
-  SYNCHELP_READ_FLOAT( this->value );
+  SYNCHELP_READ_FLOAT( this->value, NWT_PPU_VALUE );
 
   if ( this->value != 0 )
   {
-    SYNCHELP_READ_FLOAT( this->min_value );
-    SYNCHELP_READ_FLOAT( this->max_value );
+    SYNCHELP_READ_FLOAT( this->min_value, NWT_PPU_MINVALUE );
+    SYNCHELP_READ_FLOAT( this->max_value, NWT_PPU_MAXVALUE );
     respawn();
   }
@@ -165 +165 @@
     SYNCHELP_WRITE_BEGIN();
 
-    SYNCHELP_WRITE_FKT( PowerUp::readState );
+    SYNCHELP_WRITE_FKT( PowerUp::readState, NWT_PPU_WE_STATE );
 
     int i = (int)this->type;
-    SYNCHELP_WRITE_INT( i );
-    SYNCHELP_WRITE_FLOAT( this->value );
+    SYNCHELP_WRITE_INT( i, NWT_PPU_TYPE );
+    SYNCHELP_WRITE_FLOAT( this->value, NWT_PPU_VALUE );
 
     if ( this->value != 0 )
     {
-      SYNCHELP_WRITE_FLOAT( this->min_value );
-      SYNCHELP_WRITE_FLOAT( this->max_value );
+      SYNCHELP_WRITE_FLOAT( this->min_value, NWT_PPU_MINVALUE );
+      SYNCHELP_WRITE_FLOAT( this->max_value, NWT_PPU_MAXVALUE );
     }
 

trunk/src/world_entities/power_ups/power_up.cc

@@ -20 +20 @@
 #include "extendable.h"
 #include "primitive_model.h"
+
+#include "assert.h"
 
 using namespace std;
@@ -124 +126 @@
 {
   SYNCHELP_WRITE_BEGIN();
-  SYNCHELP_WRITE_FKT( WorldEntity::readState );
+  SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_PU_WE_STATE );
   return SYNCHELP_WRITE_N;
 }
@@ -138 +140 @@
 {
   SYNCHELP_READ_BEGIN();
-  SYNCHELP_READ_FKT( WorldEntity::writeState );
+  SYNCHELP_READ_FKT( WorldEntity::writeState, NWT_PU_WE_STATE );
   return SYNCHELP_READ_N;
 }

trunk/src/world_entities/power_ups/turret_power_up.cc

@@ -136 +136 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( PowerUp::writeState );
+  SYNCHELP_READ_FKT( PowerUp::writeState, NWT_TPU_WE_STATE );
 
   return SYNCHELP_READ_N;
@@ -157 +157 @@
     SYNCHELP_WRITE_BEGIN();
 
-    SYNCHELP_WRITE_FKT( PowerUp::readState );
+    SYNCHELP_WRITE_FKT( PowerUp::readState, NWT_TPU_WE_STATE );
 
     return SYNCHELP_WRITE_N;

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -100 +100 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( PowerUp::writeState );
+  SYNCHELP_READ_FKT( PowerUp::writeState, NWT_WPU_WE_STATE );
 
   //TODO: sync weapon class ( see loadParams )
@@ -124 +124 @@
     SYNCHELP_WRITE_BEGIN();
 
-    SYNCHELP_WRITE_FKT( PowerUp::readState );
+    SYNCHELP_WRITE_FKT( PowerUp::readState, NWT_WPU_WE_STATE );
 
     //TODO: sync weapon class ( see loadParams )

trunk/src/world_entities/skybox.cc

@@ -297 +297 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( WorldEntity::writeState );
-
-  SYNCHELP_READ_FLOAT( size );
+  SYNCHELP_READ_FKT( WorldEntity::writeState, NWT_SB_WE_STATE );
+
+  SYNCHELP_READ_FLOAT( size, NWT_SB_SIZE );
   if ( textureName )
   {
@@ -305 +305 @@
     textureName = NULL;
   }
-  SYNCHELP_READ_STRINGM( textureName );
+  SYNCHELP_READ_STRINGM( textureName, NWT_SB_TEXTURENAME );
 
   this->setSize( size );
@@ -331 +331 @@
     SYNCHELP_WRITE_BEGIN();
 
-    SYNCHELP_WRITE_FKT( WorldEntity::readState );
-
-    SYNCHELP_WRITE_FLOAT(this->size);
-    SYNCHELP_WRITE_STRING(this->textureName);
+    SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_SB_WE_STATE );
+
+    SYNCHELP_WRITE_FLOAT(this->size, NWT_SB_SIZE);
+    SYNCHELP_WRITE_STRING(this->textureName, NWT_SB_TEXTURENAME);
 
     return SYNCHELP_WRITE_N;

trunk/src/world_entities/space_ships/space_ship.cc

@@ -523 +523 @@
 #define DATA_flags       2
 #define DATA_mouse       3
+#define DATA_sync        4
+#define DATA_velocity    5
 
 int SpaceShip::writeBytes( const byte * data, int length, int sender )
@@ -529 +531 @@
 
   byte b;
-
-  do
-  {
-    SYNCHELP_READ_BYTE( b );
-
-    if ( b == DATA_state /*&& (this->getHostID()!=this->getOwner() || sender==0)*/ )
-    {
-     PRINTF(0)("GOT STATE %d\n", this->getUniqueID());
-     setRequestedSync( false );
-     setIsOutOfSync( false );
-     SYNCHELP_READ_FKT( WorldEntity::writeState );
-     //SYNCHELP_READ_FLOAT( cycle );
-
-      return SYNCHELP_READ_N;
-    }
-
-
-    //TODO: do not recieve data if you are the owner
-    if ( b == DATA_flags /*&& this->getHostID()!=this->getOwner()*/ )
+  
+  while ( SYNCHELP_READ_REMAINING()>0 )
+  {
+    SYNCHELP_READ_BYTE( b, NWT_SS_B );
+    
+    if ( b == DATA_state )
+    {
+      setRequestedSync( false );
+      setIsOutOfSync( false );
+      SYNCHELP_READ_FKT( WorldEntity::writeState, NWT_SS_WE_STATE );
+
+      continue;
+    }
+    
+    if ( b == DATA_flags )
     {
       int flags = 0;
-      SYNCHELP_READ_INT( flags );
+      SYNCHELP_READ_INT( flags, NWT_SS_FLAGS );
 
       bUp = (flags & MASK_bUp) != 0;
@@ -561 +559 @@
       bRollL = (flags & MASK_bRollL) != 0;
       bRollR = (flags & MASK_bRollR) != 0;
-
-    }
-
-    //TODO: do not recieve data if you are the owner
-    if ( b == DATA_mouse /*&& this->getHostID()!=this->getOwner()*/ )
-    {
-      SYNCHELP_READ_FLOAT( mouseDir.w );
-      SYNCHELP_READ_FLOAT( mouseDir.v.x );
-      SYNCHELP_READ_FLOAT( mouseDir.v.y );
-      SYNCHELP_READ_FLOAT( mouseDir.v.z );
-    }
-  } while( b != 0 );
-
-  /*if ( b == DATA_mouse && this->getHostID()!=this->getOwner() )
-  {
-    SYNCHELP_READ_FLOAT( xMouse );
-    SYNCHELP_READ_FLOAT( yMouse );
-    SYNCHELP_READ_FLOAT( mouseSensitivity );
-    SYNCHELP_READ_FLOAT( cycle );
-}*/
-
-  if ( this->getOwner() != this->getHostID() )
-    SYNCHELP_READ_FKT( PNode::writeSync );
-
+      
+      continue;
+    }
+    
+    if ( b == DATA_mouse )
+    {
+      SYNCHELP_READ_FLOAT( mouseDir.w, NWT_SS_MOUSEDIRW );
+      SYNCHELP_READ_FLOAT( mouseDir.v.x, NWT_SS_MOUSEDIRX );
+      SYNCHELP_READ_FLOAT( mouseDir.v.y, NWT_SS_MOUSEDIRY );
+      SYNCHELP_READ_FLOAT( mouseDir.v.z, NWT_SS_MOUSEDIRZ );
+      
+      continue;
+    }
+    
+    if ( b == DATA_sync )
+    {
+      if ( this->getOwner() != this->getHostID() )
+        SYNCHELP_READ_FKT( PNode::writeSync, NWT_SS_PN_SYNC );
+      
+      continue;
+    }
+    
+    if ( b == DATA_velocity )
+    {
+      SYNCHELP_READ_FLOAT( velocity.x, NWT_SS_VELX );
+      SYNCHELP_READ_FLOAT( velocity.y, NWT_SS_VELY );
+      SYNCHELP_READ_FLOAT( velocity.z, NWT_SS_VELZ );
+    }
+  }
+  
   return SYNCHELP_READ_N;
 }
@@ -608 +612 @@
     PRINTF(0)("SEND STATE %d %d\n", this->getUniqueID(), rec);
 
-    SYNCHELP_WRITE_BYTE( (byte)DATA_state );
-
-    SYNCHELP_WRITE_FKT( WorldEntity::readState );
+    SYNCHELP_WRITE_BYTE( (byte)DATA_state, NWT_SS_B );
+
+    SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_SS_WE_STATE );
     //SYNCHELP_WRITE_FLOAT( cycle );
 
@@ -617 +621 @@
 
   *reciever = 0;
+  
+  if ( this->getOwner() == this->getHostID() && PNode::needsReadSync() )
+  {
+    SYNCHELP_WRITE_BYTE( DATA_sync, NWT_SS_B );
+    SYNCHELP_WRITE_FKT( PNode::readSync, NWT_SS_PN_SYNC );
+  }
 
   if ( this->getHostID()==this->getOwner() )
@@ -646 +656 @@
     {
       oldMask = mask;
-      SYNCHELP_WRITE_BYTE( DATA_flags );
-      SYNCHELP_WRITE_INT( mask );
-    }
-#define __OFFSET_ROT 0.05
-    if ( fabs( oldMouseDir.w - mouseDir.w ) > __OFFSET_ROT ||
-         fabs( oldMouseDir.v.x - mouseDir.v.x ) > __OFFSET_ROT ||
-         fabs( oldMouseDir.v.y - mouseDir.v.y ) > __OFFSET_ROT ||
-         fabs( oldMouseDir.v.z - mouseDir.v.z ) > __OFFSET_ROT )
+      SYNCHELP_WRITE_BYTE( DATA_flags, NWT_SS_B );
+      SYNCHELP_WRITE_INT( mask, NWT_SS_FLAGS );
+    }
+#define __OFFSET_MDIR_W 0.01
+#define __OFFSET_MDIR_V 0.01
+    if ( fabs( oldMouseDir.w - mouseDir.w ) > __OFFSET_MDIR_W ||
+         fabs( oldMouseDir.v.x - mouseDir.v.x ) > __OFFSET_MDIR_V ||
+         fabs( oldMouseDir.v.y - mouseDir.v.y ) > __OFFSET_MDIR_V ||
+         fabs( oldMouseDir.v.z - mouseDir.v.z ) > __OFFSET_MDIR_V )
     {
       oldMouseDir = mouseDir;
 
-      SYNCHELP_WRITE_BYTE( DATA_mouse );
-      SYNCHELP_WRITE_FLOAT( mouseDir.w );
-      SYNCHELP_WRITE_FLOAT( mouseDir.v.x );
-      SYNCHELP_WRITE_FLOAT( mouseDir.v.y );
-      SYNCHELP_WRITE_FLOAT( mouseDir.v.z );
-    }
-
-  }
-
-  SYNCHELP_WRITE_BYTE( 0 );
-
-
-  if ( this->getOwner() == this->getHostID() )
-    SYNCHELP_WRITE_FKT( PNode::readSync );
+      SYNCHELP_WRITE_BYTE( DATA_mouse, NWT_SS_B );
+      PRINTF(0)("SENDING mousedir\n");
+      SYNCHELP_WRITE_FLOAT( mouseDir.w, NWT_SS_MOUSEDIRW );
+      SYNCHELP_WRITE_FLOAT( mouseDir.v.x, NWT_SS_MOUSEDIRX );
+      SYNCHELP_WRITE_FLOAT( mouseDir.v.y, NWT_SS_MOUSEDIRY );
+      SYNCHELP_WRITE_FLOAT( mouseDir.v.z, NWT_SS_MOUSEDIRZ );
+    }
+#define __OFFSET_VEL 0.05
+    if ( fabs( oldVelocity.x - velocity.x ) > __OFFSET_VEL*velocity.x ||
+         fabs( oldVelocity.y - velocity.y ) > __OFFSET_VEL*velocity.y ||
+         fabs( oldVelocity.z - velocity.z ) > __OFFSET_VEL*velocity.z )
+    {
+      oldVelocity = velocity;
+      PRINTF(0)("SENDING velocity\n");
+      SYNCHELP_WRITE_BYTE( DATA_velocity, NWT_SS_B );
+      SYNCHELP_WRITE_FLOAT( velocity.x, NWT_SS_VELX );
+      SYNCHELP_WRITE_FLOAT( velocity.y, NWT_SS_VELY );
+      SYNCHELP_WRITE_FLOAT( velocity.z, NWT_SS_VELZ );
+    }
+
+  }
 
   return SYNCHELP_WRITE_N;
 }
+
+

trunk/src/world_entities/space_ships/space_ship.h

@@ -42 +42 @@
     virtual int       readBytes(byte* data, int maxLength, int * reciever);
 
-
   private:
     void init();
@@ -70 +69 @@
 
     Vector                velocity;           //!< the velocity of the player.
+    Vector                oldVelocity;        //!< the velocity the player had last synced
     Quaternion            mouseDir;           //!< the direction where the player wants to fly
     Quaternion            oldMouseDir;        //!< the direction where the player wanted to fly

trunk/src/world_entities/terrain.cc

@@ -325 +325 @@
 
   SYNCHELP_READ_BEGIN();
-  SYNCHELP_READ_FKT( WorldEntity::writeState );
+  SYNCHELP_READ_FKT( WorldEntity::writeState, NWT_TER_WE_STATE );
 
   return SYNCHELP_READ_N;
@@ -343 +343 @@
     *reciever = rec;
 
-    return WorldEntity::readState( data, maxLength );
+    SYNCHELP_WRITE_BEGIN();
+    SYNCHELP_WRITE_FKT( WorldEntity::readState, NWT_TER_WE_STATE );
+    return SYNCHELP_WRITE_N;
 
   }

trunk/src/world_entities/world_entity.cc

@@ -518 +518 @@
   SYNCHELP_READ_BEGIN();
 
-  SYNCHELP_READ_FKT( PNode::writeState );
-
-  SYNCHELP_READ_STRINGM( modelFileName );
-  SYNCHELP_READ_FLOAT( scaling );
+  SYNCHELP_READ_FKT( PNode::writeState, NWT_WE_PN_WRITESTATE );
+
+  SYNCHELP_READ_STRINGM( modelFileName, NWT_WE_PN_MODELFILENAME );
+  SYNCHELP_READ_FLOAT( scaling, NWT_WE_PN_SCALING );
   //check if modelFileName is relative to datadir or absolute
 
@@ -562 +562 @@
   SYNCHELP_WRITE_BEGIN();
 
-  SYNCHELP_WRITE_FKT( PNode::readState );
+  SYNCHELP_WRITE_FKT( PNode::readState, NWT_WE_PN_WRITESTATE );
 
   if ( getModel(0) && getModel(0)->getName() )
@@ -573 +573 @@
     }
 
-    SYNCHELP_WRITE_STRING( name );
+    SYNCHELP_WRITE_STRING( name, NWT_WE_PN_MODELFILENAME );
   }
   else
   {
-    SYNCHELP_WRITE_STRING("");
-  }
-
-  SYNCHELP_WRITE_FLOAT( scaling );
+    SYNCHELP_WRITE_STRING("", NWT_WE_PN_MODELFILENAME);
+  }
+
+  SYNCHELP_WRITE_FLOAT( scaling, NWT_WE_PN_SCALING );
   /*if ( this->md2TextureFileName!=NULL && strcmp(this->md2TextureFileName, "") )
   {