Changeset 1425 for code/branches/network/src/orxonox

Timestamp:

May 25, 2008, 11:08:19 PM (16 years ago)

Author:

scheusso

Message:

implemented some sort of buffer for the spaceship movements (makes the movements on the client smoother)

Location:

code/branches/network/src/orxonox/objects

Files:

• Ambient.h (modified) (1 diff)
• Explosion.cc (modified) (1 diff)
• Explosion.h (modified) (1 diff)
• Model.h (modified) (1 diff)
• NPC.cc (modified) (1 diff)
• NPC.h (modified) (1 diff)
• Projectile.cc (modified) (1 diff)
• Projectile.h (modified) (1 diff)
• Skybox.h (modified) (1 diff)
• SpaceShip.cc (modified) (6 diffs)
• SpaceShip.h (modified) (3 diffs)
• WorldEntity.cc (modified) (1 diff)
• WorldEntity.h (modified) (1 diff)

code/branches/network/src/orxonox/objects/Ambient.h

@@ -47 +47 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             void setAmbientLight(const ColourValue& colour);
-            bool create();
+            virtual bool create();
             void registerAllVariables();
 

code/branches/network/src/orxonox/objects/Explosion.cc

@@ -80 +80 @@
     };
     
-    bool Explosion::create(){
-      return WorldEntity::create();
-    }
+    /*bool Explosion::create(){
+      if(!WorldEntity::create())
+        return false;
+      classID=this->getIdentifier()->getNetworkID();
+    }*/
 
     void Explosion::destroyObject()

code/branches/network/src/orxonox/objects/Explosion.h

@@ -43 +43 @@
             virtual ~Explosion();
             void destroyObject();
-            bool create();
+            virtual bool create(){return WorldEntity::create();}
 
         private:

code/branches/network/src/orxonox/objects/Model.h

@@ -45 +45 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             void setMesh(const std::string& meshname);
-            bool create();
+            virtual bool create();
 
         protected:

code/branches/network/src/orxonox/objects/NPC.cc

@@ -67 +67 @@
   }
   
-  bool NPC::create(){
-    Model::create();
-    return true;
-  }
 
   /**

code/branches/network/src/orxonox/objects/NPC.h

@@ -53 +53 @@
       void setValues(Vector3 location, Vector3 speed, Vector3 acceleration, bool movable);
       void registerAllVariables();
-      bool create();
+      virtual bool create(){return Model::create();}
 
     private:

code/branches/network/src/orxonox/objects/Projectile.cc

@@ -91 +91 @@
                 if (this->getPosition().squaredDistance(it->getPosition()) <= (radius*radius))
                 {
-                    new Explosion(this);
+                    Explosion *exp = new Explosion(this);
+                    exp->create();
                     delete this;
                     return;

code/branches/network/src/orxonox/objects/Projectile.h

@@ -46 +46 @@
             void destroyObject();
             virtual void tick(float dt);
+            virtual bool create(){return WorldEntity::create();}
 
         private:

code/branches/network/src/orxonox/objects/Skybox.h

@@ -47 +47 @@
             void setSkybox(const std::string& skyboxname);
             
-            bool create();
+            virtual bool create();
             void registerAllVariables();
             void setSkyboxSrc(const std::string &src);

code/branches/network/src/orxonox/objects/SpaceShip.cc

@@ -70 +70 @@
       Iterator<SpaceShip> it;
       for(it = ObjectList<SpaceShip>::start(); it; ++it){
-        if((it)->server_ || ( network::Client::getSingleton() && network::Client::getSingleton()->getShipID()==it->objectID ) )
+        if( (it)->myShip_ )
           return *it;
       }
@@ -109 +109 @@
       mouseY_(0.0f),
       emitterRate_(0.0f),
-      server_(false)
+      myShip_(false)
     {
         RegisterObject(SpaceShip);
@@ -140 +140 @@
 
     bool SpaceShip::create(){
+      if(!myShip_){
+        if(network::Client::getSingleton() && objectID == network::Client::getSingleton()->getShipID())
+          myShip_=true;
+      }
       if(Model::create())
         this->init();
@@ -299 +303 @@
         XMLPortParamLoadOnly(SpaceShip, "transDamp", setTransDamp, xmlelement, mode);
         XMLPortParamLoadOnly(SpaceShip, "rotDamp", setRotDamp, xmlelement, mode);
-        server_=true; // TODO: this is only a hack
+        myShip_=true; // TODO: this is only a hack
         SpaceShip::create();
         getFocus();
@@ -354 +358 @@
 
             Projectile *p = new Projectile(this);
+            p->create();
 
             p->setBacksync(true);
@@ -439 +444 @@
             this->tt_->setRate(0);
 
-        if( (network::Client::getSingleton() &&  network::Client::getSingleton()->getShipID() == objectID) || server_ )
+        if( myShip_ )
         {
           COUT(4) << "steering our ship: " << objectID << std::endl;

code/branches/network/src/orxonox/objects/SpaceShip.h

@@ -49 +49 @@
             SpaceShip();
             ~SpaceShip();
-            bool create();
+            virtual bool create();
             void registerAllVariables();
             void init();
@@ -81 +81 @@
             Vector3 getOrth();
             Camera* getCamera();
+            
+            bool getMyShip(){return myShip_;}
 
         private:
@@ -135 +137 @@
 
             float emitterRate_;
-            bool server_;
+            bool myShip_;
 
             static SpaceShip* instance_s;

code/branches/network/src/orxonox/objects/WorldEntity.cc

@@ -153 +153 @@
       registerVar( (void*) &(this->bStatic_), sizeof(this->bStatic_), network::DATA, 0x3);
       //register acceleration & momentum
-      registerVar( (void*) &(this->getAcceleration().x), sizeof(this->getAcceleration().x), network::DATA, 0x3);
-      registerVar( (void*) &(this->getAcceleration().y), sizeof(this->getAcceleration().y), network::DATA, 0x3);
-      registerVar( (void*) &(this->getAcceleration().z), sizeof(this->getAcceleration().z), network::DATA, 0x3);
-      registerVar( (void*) &(this->getMomentum()), sizeof(this->getMomentum()), network::DATA);
+//       registerVar( (void*) &(this->getAcceleration().x), sizeof(this->getAcceleration().x), network::DATA, 0x2);
+//       registerVar( (void*) &(this->getAcceleration().y), sizeof(this->getAcceleration().y), network::DATA, 0x2);
+//       registerVar( (void*) &(this->getAcceleration().z), sizeof(this->getAcceleration().z), network::DATA, 0x2);
+//       registerVar( (void*) &(this->getMomentum()), sizeof(this->getMomentum()), network::DATA, 0x2); // only backsync
     }
 

code/branches/network/src/orxonox/objects/WorldEntity.h

@@ -53 +53 @@
             virtual void loadParams(TiXmlElement* xmlElem);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            inline bool create(){ return Synchronisable::create(); }
+            virtual inline bool create(){ return Synchronisable::create(); }
 
             void attachWorldEntity(WorldEntity* entity);