Changeset 6337 in orxonox.OLD

Timestamp:

Dec 30, 2005, 1:32:46 AM (18 years ago)

Author:

rennerc

Message:

groundturret now scales correctly on client

Location:

branches/network/src

Files:

• lib/coord/p_node.cc (modified) (6 diffs)
• lib/lang/base_object.cc (modified) (2 diffs)
• lib/lang/base_object.h (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (3 diffs)
• world_entities/world_entity.h (modified) (1 diff)

branches/network/src/lib/coord/p_node.cc

@@ -1016 +1016 @@
   SYNCHELP_READ_BEGIN();
 
-  char * name;
-  SYNCHELP_READ_STRINGM( name );
+  SYNCHELP_READ_FKT( BaseObject::writeState );
+
+  PRINTF(0)("name = %s\n", this->getName());
 
   char * parentName = NULL;
@@ -1036 +1037 @@
   SYNCHELP_READ_INT( parentMode );
   this->setParentMode((PARENT_MODE)parentMode);
-
-  if ( strcmp(name, "")==0 )
-  {
-    this->setName( NULL );
-  }
-  else
-  {
-    this->setName( name );
-  }
-  delete name;
-  name = NULL;
 
   float f1, f2, f3, f4;
@@ -1056 +1046 @@
   //this->setRelCoor( 10, 0, 0 );
 
-  PRINTF(0)("%f %f %f\n", f1, f2, f3);
-
   SYNCHELP_READ_FLOAT( f1 );
   SYNCHELP_READ_FLOAT( f2 );
   SYNCHELP_READ_FLOAT( f3 );
   //this->setAbsCoor( f1, f2, f3 );
-
-  PRINTF(0)("%f %f %f\n", f1, f2, f3);
 
   SYNCHELP_READ_FLOAT( f1 );
@@ -1085 +1071 @@
   {
     SYNCHELP_READ_STRINGM( childName );
+    PRINTF(0)("childname = %s\n", childName);
     addChild( childName );
     delete childName;
@@ -1103 +1090 @@
   SYNCHELP_WRITE_BEGIN();
 
-  SYNCHELP_WRITE_STRING( this->getName() );
+  SYNCHELP_WRITE_FKT( BaseObject::readState );
+
+  PRINTF(0)("name = %s\n", this->getName());
 
   if ( this->parent )
@@ -1143 +1132 @@
   for (std::list<PNode*>::const_iterator it = children.begin(); it!=children.end(); it++)
   {
+    PRINTF(0)("childname = %s\n", (*it)->getName() );
     SYNCHELP_WRITE_STRING( (*it)->getName() );
   }

branches/network/src/lib/lang/base_object.cc

@@ -22 +22 @@
 #include "compiler.h"
 #include "class_list.h"
+
+#include "synchronizeable.h"
 
 using namespace std;
@@ -194 +196 @@
       PRINT(0)(" -Weapon-");
     PRINT(0)("\n");
-}
-}
+  }
+}
+
+/**
+ * Writes data from network containing information about the state
+ * @param data pointer to data
+ * @param length length of data
+ * @param sender hostID of sender
+ */
+int BaseObject::writeState( const byte * data, int length, int sender )
+{
+  SYNCHELP_READ_BEGIN();
+
+  if ( objectName )
+  {
+    delete[] objectName;
+    objectName = NULL;
+  }
+  SYNCHELP_READ_STRINGM( this->objectName );
+
+  return SYNCHELP_READ_N;
+}
+
+/**
+ * data copied in data will bee sent to another host
+ * @param data pointer to data
+ * @param maxLength max length of data
+ * @return the number of bytes writen
+ */
+int BaseObject::readState( byte * data, int maxLength )
+{
+  SYNCHELP_WRITE_BEGIN();
+
+  SYNCHELP_WRITE_STRING( this->objectName );
+
+  return SYNCHELP_WRITE_N;
+}

branches/network/src/lib/lang/base_object.h

@@ -15 +15 @@
 #define NULL     0    //!< NULL
 #endif
+
+#include "stdincl.h"
 
 class TiXmlElement;
@@ -44 +46 @@
   bool operator==(ClassID classID) { return this->isA(classID); };
 
+  int       writeState(const byte* data, int length, int sender);
+  int       readState(byte* data, int maxLength );
  protected:
   void setClassID(ClassID classID, const char* className);

branches/network/src/world_entities/world_entity.cc

@@ -121 +121 @@
 
     PRINTF(4)("fetching %s\n", fileName);
+    this->scaling = scaling;
     if (scaling == 1.0)
       this->setModel((Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN), modelNumber);
@@ -343 +344 @@
 
   SYNCHELP_READ_STRINGM( modelFileName );
+  SYNCHELP_READ_FLOAT( scaling );
   //check if modelFileName is relative to datadir or absolute
   if ( strstr(modelFileName, ResourceManager::getInstance()->getDataDir()) )
   {
-    loadModel( modelFileName+strlen(ResourceManager::getInstance()->getDataDir()) );
+    loadModel( modelFileName+strlen(ResourceManager::getInstance()->getDataDir()), scaling );
   }
   else
   {
-    loadModel( modelFileName );
+    loadModel( modelFileName, scaling );
   }
   delete[] modelFileName;
@@ -370 +372 @@
 
   SYNCHELP_WRITE_STRING( getModel( 0 )->getName() );
-  PRINTF(0)("%s\n", getModel( 0 )->getName());
+  SYNCHELP_WRITE_FLOAT( scaling );
   return SYNCHELP_WRITE_N;
 }

branches/network/src/world_entities/world_entity.h

@@ -89 +89 @@
   std::list<WorldEntity*>::iterator objectListIterator; //!< The iterator position of this Entity in the given list of the ObjectManager.
 
+  float                   scaling;
+
 
 };