Changeset 6654 in orxonox.OLD

Timestamp:

Jan 23, 2006, 12:08:34 PM (18 years ago)

Author:

patrick

Message:

network: synchronizeable and network manager start of new concept implementation

Location:

branches/network/src

Files:

• lib/graphics/importer/vertex_array_model.cc (modified) (3 diffs)
• lib/network/network_manager.cc (modified) (5 diffs)
• lib/network/network_manager.h (modified) (2 diffs)
• lib/network/synchronizeable.h (modified) (2 diffs)
• world_entities/planet.cc (modified) (4 diffs)
• world_entities/projectiles/laser.cc (modified) (1 diff)

branches/network/src/lib/graphics/importer/vertex_array_model.cc

@@ -305 +305 @@
     this->addColor(.125,.436,.246); ///FIXME
   }
+
   for (unsigned int loopNumber = 0; loopNumber <= loops; ++loopNumber)
   {
@@ -326 +327 @@
     }
   }
+
   for (unsigned int loopSegmentNumber = 0; loopSegmentNumber < segmentsPerLoop; ++loopSegmentNumber)
   {
@@ -331 +333 @@
     this->addIndice(segmentsPerLoop + loopSegmentNumber);
   }
+
   for (unsigned int loopNumber = 0; loopNumber < loops; ++loopNumber)
   {

branches/network/src/lib/network/network_manager.cc

@@ -49 +49 @@
   this->netStreamList = NULL;
   this->syncList = NULL;
-  this->tmpStream = NULL;
+  this->defaultSyncStream = NULL;
 
   this->hostID = -1;
@@ -98 +98 @@
   }
 
-  this->tmpStream = new NetworkStream(ipAddress);
+  this->defaultSyncStream = new NetworkStream(ipAddress);
   return 1;
 }
@@ -111 +111 @@
   this->hostID = 0;
   this->bGameServer = true;
-  this->tmpStream = new NetworkStream(port);
+  this->defaultSyncStream = new NetworkStream(port);
   this->bGameServer = true;
   SDL_Delay(20);
@@ -126 +126 @@
 {
   /* creating a new network stream, it will register itself automaticaly to the class list */
-  this->tmpStream = new NetworkStream(address);
-  this->tmpStream->connectSynchronizeable(sync);
+  this->defaultSyncStream = new NetworkStream(address);
+  this->defaultSyncStream->connectSynchronizeable(sync);
 }
 
@@ -142 +142 @@
 void NetworkManager::connectSynchronizeable(Synchronizeable& sync)
 {
-  this->tmpStream->connectSynchronizeable(sync);
+  this->defaultSyncStream->connectSynchronizeable(sync);
 }
 

branches/network/src/lib/network/network_manager.h

@@ -51 +51 @@
     void synchronize();
 
+    inline NetworkStream* getDefaultSyncStream() { return this->defaultSyncStream; }
+
+
   private:
     NetworkManager();
@@ -59 +62 @@
     const std::list<BaseObject*>*    syncList;                // list of synchronizeables
     static NetworkManager*           singletonRef;            //!< Pointer to the only instance of this Class
-    NetworkStream*                   tmpStream;               //!< FIXME: this is only for testing purposes
+    NetworkStream*                   defaultSyncStream;       //!< FIXME: this is only for testing purposes
     int                              hostID;                  //!< The Host-ID of the Manager
     bool                             bGameServer;             //!< true if it is a server

branches/network/src/lib/network/synchronizeable.h

@@ -163 +163 @@
 
 class Synchronizeable : virtual public BaseObject
-  {
+{
+
   public:
     Synchronizeable();
@@ -179 +180 @@
     bool isOutOfSync();
     bool requestedSync();
+
     inline void setUniqueID( int id ){ uniqueID = id; }
-    inline int  getUniqueID() const { return uniqueID; };
+    inline int  getUniqueID() const { return uniqueID; }
+    inline int getHostID() { return this->hostID; }
+
+    inline int getOwner(){ return owner; }
+    inline void setOwner(int owner){ this->owner = owner; }
+
+    /** @returns true if this Synchronizeable has to be synchronized over network */
+    inline bool beSynchronized() { return this->bSynchronize; }
+    /** @param bSynchronize sets the Synchronizeable to be sunchronized or not */
+    inline void setSynchronized(bool bSynchronize) { this->bSynchronize = bSynchronize; }
+
     inline void requestSync( int hostID ){ this->synchronizeRequests.push_back( hostID ); }
     inline int getRequestSync( void ){ if ( this->synchronizeRequests.size()>0 ){ int n = *(synchronizeRequests.begin()); synchronizeRequests.pop_front(); return n; } else { return -1; } };
-    inline int getHostID() { return this->hostID; }
-
-    inline int getOwner(){ return owner; }
-    inline void setOwner(int owner){ this->owner = owner; }
 
     inline void setNetworkStream(NetworkStream* stream) { this->networkStream = stream; }
 
+
+  protected:
+    NetworkStream*    networkStream;
+    int               state;
+
+
   private:
-
     int               uniqueID;
-
-
-
-    //static std::vector<Synchronizeable*> classList;
-    int owner;
-    int hostID;
+    int               owner;
+    int               hostID;
+    bool              bSynchronize;
 
     std::list<int> synchronizeRequests;
 
-  protected:
-    NetworkStream* networkStream;
-    int state;
-
-  };
+};
 #endif /* _SYNCHRONIZEABLE_H */

branches/network/src/world_entities/planet.cc

@@ -27 +27 @@
 #include "network_game_manager.h"
 #include "converter.h"
+#include "vertex_array_model.h"
+#include "primitive_model.h"
 
 using namespace std;
@@ -44 +46 @@
 
   this->material = new Material();
-  this->material->setIllum(10);
+  //this->material->setIllum(20);
+  //this->material->setAmbient(0.1, 0.1, 0.1);
+
+
+
+      //st float radius, const unsigned int loops, const unsigned int segmentsPerLoop
 
   this->loadParams(root);
+
+//   VertexArrayModel* model = new VertexArrayModel();
+//   model->spiralSphere(this->size, 10, 10);
+//   this->setModel(model);
+//   model->debug();
+//
+  PrimitiveModel* model = new PrimitiveModel(PRIM_SPHERE, this->size, 50);
+  this->setModel(model);
 }
 
@@ -98 +113 @@
 {
 
+
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
+
+  glShadeModel(GL_SMOOTH);
 
   /* translate */
@@ -109 +127 @@
   this->material->select();
 
-
-  Vector c;
-  double r = this->size;
-  int n = 200;
-  int method = 1;
-  double theta1 = 0;
-  double theta2 = 2 * M_PI;
-  double phi1 = -M_PI/2.0;
-  double phi2 = M_PI/2.0;
-
-
-  int i,j;
-  double jdivn,j1divn,idivn,dosdivn,unodivn=1/(double)n,ndiv2=(double)n/2,t1,t2,t3,cost1,cost2,cte1,cte3;
-  cte3 = (theta2-theta1)/n;
-  cte1 = (phi2-phi1)/ndiv2;
-  dosdivn = 2*unodivn;
-  Vector e,p,e2,p2;
-
-
-  t2=phi1;
-  cost2=cos(phi1);
-  j1divn=0;
-  for (j=0;j<ndiv2;j++) {
-    t1 = t2;//t1 = phi1 + j * cte1;
-    t2 += cte1;//t2 = phi1 + (j + 1) * cte1;
-    t3 = theta1 - cte3;
-    cost1 = cost2;//cost1=cos(t1);
-    cost2 = cos(t2);
-    e.y = sin(t1);
-    e2.y = sin(t2);
-    p.y = c.y + r * e.y;
-    p2.y = c.y + r * e2.y;
-
-    if (method == 0)
-      glBegin(GL_QUAD_STRIP);
-    else
-      glBegin(GL_TRIANGLE_STRIP);
-
-    idivn=0;
-    jdivn=j1divn;
-    j1divn+=dosdivn;//=2*(j+1)/(double)n;
-    for (i=0;i<=n;i++) {
-       //t3 = theta1 + i * (theta2 - theta1) / n;
-      t3 += cte3;
-      e.x = cost1 * cos(t3);
-       //e.y = sin(t1);
-      e.z = cost1 * sin(t3);
-      p.x = c.x + r * e.x;
-       //p.y = c.y + r * e.y;
-      p.z = c.z + r * e.z;
-      glNormal3f(e.x,e.y,e.z);
-      glTexCoord2f(idivn,jdivn);
-      glVertex3f(p.x,p.y,p.z);
-
-
-      e2.x = cost2 * cos(t3);
-       //e.y = sin(t2);
-      e2.z = cost2 * sin(t3);
-      p2.x = c.x + r * e2.x;
-       //p.y = c.y + r * e.y;
-      p2.z = c.z + r * e2.z;
-      glNormal3f(e2.x,e2.y,e2.z);
-      glTexCoord2f(idivn,j1divn);
-      glVertex3f(p2.x,p2.y,p2.z);
-      idivn += unodivn;
-    }
-    glEnd();
-  }
+//   /WorldEntity::draw();
+  this->getModel(0)->draw();
+ // static_cast<VertexArrayModel*>(this->getModel(0))->debug();
 }
 

branches/network/src/world_entities/projectiles/laser.cc

@@ -26 +26 @@
 #include "particle_emitter.h"
 #include "sprite_particles.h"
+
+#include "assert.h"