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

Timestamp:

Sep 26, 2008, 12:59:48 AM (16 years ago)

Author:

scheusso

Message:

Fix in Projectiles (network fix)
different improvements in synchronisable and gamestates

Location:

code/branches/network/src/orxonox/objects

Files:

• BillboardProjectile.cc (modified) (1 diff)
• ParticleProjectile.cc (modified) (2 diffs)
• ParticleProjectile.h (modified) (1 diff)
• Projectile.cc (modified) (2 diffs)
• Projectile.h (modified) (1 diff)
• SpaceShip.cc (modified) (5 diffs)

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

@@ -42 +42 @@
         RegisterObject(BillboardProjectile);
 
-        if (this->owner_)
-        {
-            this->billboard_.setBillboardSet("Examples/Flare", ColourValue(1.0, 1.0, 0.5), 1);
-            this->attachObject(this->billboard_.getBillboardSet());
-            this->scale(0.5);
-        }
+        this->billboard_.setBillboardSet("Examples/Flare", ColourValue(1.0, 1.0, 0.5), 1);
+        this->attachObject(this->billboard_.getBillboardSet());
+        this->scale(0.5);
     }
 

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

@@ -42 +42 @@
         RegisterObject(ParticleProjectile);
 
+        this->particles_ = new ParticleInterface("Orxonox/shot2", LODParticle::normal);
+        this->particles_->addToSceneNode(this->getNode());
+        this->particles_->setKeepParticlesInLocalSpace(true);
         if (this->owner_)
         {
-            this->particles_ = new ParticleInterface("Orxonox/shot2", LODParticle::normal);
-            this->particles_->addToSceneNode(this->getNode());
-            this->particles_->getAllEmitters()->setDirection(-this->owner_->getInitialDir());
-            this->particles_->setKeepParticlesInLocalSpace(true);
         }
-        else
-        {
-            this->particles_ = 0;
-        }
+//        else
+//        {
+//            this->particles_ = 0;
+//        }
 
         this->setConfigValues();
@@ -73 +72 @@
         this->particles_->setEnabled(this->isVisible());
     }
+    
+    bool ParticleProjectile::create(){
+      if(!Projectile::create())
+        return false;
+      this->particles_->getAllEmitters()->setDirection(-this->getOrientation()*Vector3(1,0,0));
+      return true;
+    }
 }

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

@@ -45 +45 @@
             virtual void changedVisibility();
             void setConfigValues();
+            
+            virtual bool create();
 
         private:

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

@@ -54 +54 @@
         this->smokeTemplateName_ = "Orxonox/smoke4";
 
+        this->setStatic(false);
+        this->translate(Vector3(55, 0, 0), Ogre::Node::TS_LOCAL);
+        
         if (this->owner_)
         {
-            this->setStatic(false);
             this->setOrientation(this->owner_->getOrientation());
             this->setPosition(this->owner_->getPosition());
-            this->translate(Vector3(55, 0, 0), Ogre::Node::TS_LOCAL);
             this->setVelocity(this->owner_->getInitialDir() * this->speed_);
         }
@@ -121 +122 @@
         delete this;
     }
+    
+    bool Projectile::create(){
+      return WorldEntity::create();
+    }
 }

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

@@ -45 +45 @@
             void destroyObject();
             virtual void tick(float dt);
+            
+            virtual bool create();
 
             static float getSpeed()

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

@@ -78 +78 @@
       for(it = ObjectList<SpaceShip>::begin(); it; ++it){
         assert(it->isA(Class(SpaceShip)));
-        if( (it)->myShip_ || (network::Host::running() && network::Host::getShipID()==(it)->objectID) ){
+        if( (it)->myShip_ || (network::Host::running() && network::Host::getShipID()==(it)->getObjectID()) ){
 //        COUT(1) << "^^^^^^^^^^ myShip_:" << *it << " classname: " << (*it)->getIdentifier()->getName() << " objectid: " << (*it)->objectID << std::endl;
           return *it;
@@ -173 +173 @@
         if(network::Host::running())
 //          COUT(3) << "this id: " << this->objectID << " myShipID: " << network::Host::getShipID() << std::endl;
-        if(network::Host::running() && objectID == network::Host::getShipID()){
+        if(network::Host::running() && getObjectID() == network::Host::getShipID()){
           if(!network::Host::isServer())
             setObjectMode(0x3);
@@ -375 +375 @@
         if(this->isExactlyA(Class(SpaceShip))){
           getFocus();
-          COUT(3) << "getting focus for obj id: " << objectID << std::endl;
+          COUT(3) << "getting focus for obj id: " << getObjectID() << std::endl;
         }else
-          COUT(3) << "not getting focus (not exactly spaceship) for obj id: " << objectID << std::endl;
+          COUT(3) << "not getting focus (not exactly spaceship) for obj id: " << getObjectID() << std::endl;
       }else
-        COUT(3) << "not getting focus (not my ship) for obj id: " << objectID << std::endl;
+        COUT(3) << "not getting focus (not my ship) for obj id: " << getObjectID() << std::endl;
     }
 
@@ -475 +475 @@
             projectile->setColour(this->getProjectileColour());
             projectile->create();
-            if (projectile->classID == 0)
+            if (projectile->getClassID() == 0)
             {
               COUT(3) << "generated projectile with classid 0" <<  std::endl; // TODO: remove this output
@@ -570 +570 @@
         }
 
-        COUT(5) << "steering our ship: " << objectID << std::endl;
+        COUT(5) << "steering our ship: " << getObjectID() << std::endl;
         this->acceleration_.x = 0;
         this->acceleration_.y = 0;