Changeset 505

Timestamp:

Dec 12, 2007, 11:28:38 PM (16 years ago)

Author:

scheusso

Message:

gamestateclient completet

Location:

code/branches/FICN/src

Files:

• network/ConnectionManager.cc (modified) (1 diff)
• network/GameStateClient.cc (modified) (2 diffs)
• network/GameStateClient.h (modified) (1 diff)
• network/TODO (modified) (1 diff)
• orxonox/orxonox.cc (modified) (2 diffs)

code/branches/FICN/src/network/ConnectionManager.cc

@@ -140 +140 @@
         break;
       case ENET_EVENT_TYPE_RECEIVE:
-        std::cout << "received data" << std::endl;
+        //std::cout << "received data" << std::endl;
         processData(&event);
         break;

code/branches/FICN/src/network/GameStateClient.cc

@@ -59 +59 @@
         removeObject(it);
       }
-      if(it==0){  // add the new object
-        // =================== factory command to add object
-        // can we be sure the object really was added?
+      if(it==0){
+        orxonox::BaseObject *no = ID(sync.classID)->fabricate();
+        ((Synchronisable *)no)->objectID=sync.objectID;
+        ((Synchronisable *)no)->classID=sync.classID;
         it=orxonox::ObjectList<Synchronisable>::end();
-        it->objectID=sync.objectID;
-        it->classID=sync.classID;
       }
     } else {
@@ -72 +71 @@
             << sync.objectID << "; classID: " << sync.classID << std::endl;
     }
-    
+    ++it;
   }
   

code/branches/FICN/src/network/GameStateClient.h

@@ -16 +16 @@
 #include "Synchronisable.h"
 #include "orxonox/core/CoreIncludes.h"
+#include "orxonox/objects/BaseObject.h"
 #include "GameStateManager.h"
 

code/branches/FICN/src/network/TODO

@@ -8 +8 @@
 - integrate ClientInformation into gamestatemanager [done]
 
-- write dummyserver and dummyclient (chat system)
+- write dummyserver and dummyclient (chat system) [done]
+
+- include GameStateClient into Client and write processGamestate (also packetdecoder (virtual))
+- create object with worldentity .....
+
+- try and error ;)

code/branches/FICN/src/orxonox/orxonox.cc

@@ -269 +269 @@
     server_g = new network::Server(); // add some settings if wanted
     if(!ogre_->load()) die(/* unable to load */);
-    //ogre_->getRoot()->addFrameListener(new network::ServerFrameListener());
+    ogre_->getRoot()->addFrameListener(new network::ServerFrameListener());
     ogre_->startRender();
 
@@ -282 +282 @@
     client_g = new network::Client(); // address here
     if(!ogre_->load()) die(/* unable to load */);
-    //ogre_->getRoot()->addFrameListener(new network::ClientFrameListener());
+    ogre_->getRoot()->addFrameListener(new network::ClientFrameListener());
     ogre_->startRender();