Changeset 6424 in orxonox.OLD for trunk/src/lib

Timestamp:

Jan 7, 2006, 11:07:22 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the branche network back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r 6351:HEAD
no conflicts

Location:

trunk/src/lib

Files:

• Makefile.am (modified) (3 diffs)
• coord/p_node.cc (modified) (2 diffs)
• coord/p_node.h (modified) (2 diffs)
• data (copied) (copied from branches/network/src/lib/data)
• data/data_tank.cc (copied) (copied from branches/network/src/lib/data/data_tank.cc)
• data/data_tank.h (copied) (copied from branches/network/src/lib/data/data_tank.h)
• network/network_game_manager.cc (modified) (10 diffs)
• network/network_game_manager.h (modified) (2 diffs)
• network/synchronizeable.cc (modified) (1 diff)

trunk/src/lib/Makefile.am

@@ -36 +36 @@
                         lang/base_object.cc \
                         lang/class_list.cc \
+                        data/data_tank.cc \
                         util/substring.cc \
                         util/color.cc \
@@ -47 +48 @@
 noinst_HEADERS =        coord/p_node.h \
                         lang/base_object.h \
+                        data/data_tank.h \
                         graphics/render2D/element_2d.h \
                         graphics/render2D/render_2d.h \
@@ -70 +72 @@
           particles \
           collision_detection \
-          network \
+                network \
           parser \
           shell \

trunk/src/lib/coord/p_node.cc

@@ -29 +29 @@
 
 #include "synchronizeable.h"
+
+#include "shell_command.h"
+SHELL_COMMAND(debugNode, PNode, debugNodeSC);
 
 using namespace std;
@@ -152 +155 @@
   }
 }
+
+
+/**
+ *  init the pnode to a well definied state
+ *
+ * this function actualy only updates the PNode tree
+ */
+void PNode::init()
+{
+  /* just update all aboslute positions via timestep 0.001ms */
+  this->updateNode(0.001f);
+  this->updateNode(0.001f);
+}
+
 
 /**

trunk/src/lib/coord/p_node.h

@@ -78 +78 @@
 
   void loadParams(const TiXmlElement* root);
+
+  void init();
 
   // ACTIVATION //
@@ -172 +174 @@
   // DEBUG //
   void countChildNodes(int& nodes) const;
+  void debugNodeSC (unsigned int depth = 1, unsigned int level = 0) { this->debugNode(depth, level); };
   void debugNode (unsigned int depth = 1, unsigned int level = 0) const;
   void debugDraw(unsigned int depth = 1, float size = 1.0, const Vector& color = Vector(1, 0, 0), unsigned int level = 0) const;

trunk/src/lib/network/network_game_manager.cc

@@ -23 +23 @@
 #include "network_stream.h"
 #include "converter.h"
+
+#include "p_node.h"
+
 
 /* include your own header */
@@ -237 +240 @@
  * @param classID: The ID of the class of which an entity should be created
  */
-BaseObject* NetworkGameManager::createEntity( TiXmlElement* element)
+BaseObject* NetworkGameManager::createEntity(const TiXmlElement* element)
 {
   if ( this->isServer() )
@@ -252 +255 @@
     if ( !b )
     {
-      PRINTF(1)("Could not fabricate Object with classID %x\n", element->Value() );
+      PRINTF(1)("Could not fabricate Object with className %s\n", element->Value() );
       return NULL;
     }
@@ -391 +394 @@
   //PRINTF(0)("SendEntityList: n = %d\n", networkStream->getSyncCount()-2 );
 
+  int n = 0;
+
   while ( it != e )
   {
@@ -403 +408 @@
     if ( !writeToClientBuffer( outBuffer[userID], (int)((*it)->getOwner()) ) )
       return;
+
+
+    PRINTF(0)("id = %x %s %s\n", (int)((*it)->getLeafClassID()), (*it)->getClassName(), (*it)->getName());
+
+
+    /*if ( (*it)->isA(CL_WORLD_ENTITY) )
+    {
+      n = dynamic_cast<WorldEntity*>((*it))->readState( outBuffer[userID].buffer, outBuffer[userID].maxLength-outBuffer[userID].length );
+      if ( n = 0 )
+      {
+        PRINTF(2)("n = 0\n");
+      }
+      outBuffer[userID].length += n;
+  }*/
 
     it++;
@@ -436 +455 @@
  * @param owner: owner of this synchronizealbe
  */
-void NetworkGameManager::doCreateEntity( ClassID classID, int uniqueID, int owner )
+BaseObject* NetworkGameManager::doCreateEntity( ClassID classID, int uniqueID, int owner )
 {
   BaseObject * b = Factory::fabricate( classID );
@@ -443 +462 @@
   {
     PRINTF(1)("Could not fabricate Object with classID %x\n", classID);
-    return;
+    return NULL;
   }
 
@@ -455 +474 @@
       s->setIsOutOfSync( true );
     PRINTF(0)("Fabricated %s with id %d\n", s->getClassName(), s->getUniqueID());
+    return b;
   }
   else
@@ -461 +481 @@
     delete b;
   }
+  return NULL;
 }
 
@@ -695 +716 @@
     i += Converter::byteArrayToInt( &data[i], &owner );
 
+    PRINTF(0)("before fabricate\n");
     if ( classID != CL_NETWORK_GAME_MANAGER && classID != CL_HANDSHAKE )
-      doCreateEntity( (ClassID)classID, uniqueID, owner );
-
-  }
+    {
+      BaseObject* b = doCreateEntity( (ClassID)classID, uniqueID, owner );
+
+      /*if ( b != NULL )
+      {
+        if ( b->isA(CL_WORLD_ENTITY) )
+        {
+          int n = dynamic_cast<WorldEntity*>(b)->writeState( data, length, sender );
+
+          i += n;
+        }
+    }*/
+    }
+
+  }
+
   return true;
 }

trunk/src/lib/network/network_game_manager.h

@@ -75 +75 @@
 
     void createEntity( ClassID classID, int owner = 0 );
-    BaseObject* createEntity( TiXmlElement* element);
+    BaseObject* createEntity(const TiXmlElement* element);
     void removeEntity( int uniqueID );
     void sendYouAre( int uniqueID, int userID );
@@ -94 +94 @@
     void executeRequestSync( int uniqueID, int user );
 
-    void doCreateEntity(ClassID classID, int uniqueID, int owner);
+    BaseObject* doCreateEntity(ClassID classID, int uniqueID, int owner);
     void doRemoveEntity(int uniqueID);
     void doRequestSync(int uniqueID, int userID);

trunk/src/lib/network/synchronizeable.cc

@@ -36 +36 @@
   this->networkStream = NULL;
   this->setRequestedSync( false );
+  this->setIsOutOfSync( !(this->isServer()) );
 }