Changeset 2391 for code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles

Timestamp:

Dec 10, 2008, 5:30:39 PM (16 years ago)

Author:

polakma

Message:

fixed projectile, particle effect, reloadingTimer and magazineTimer

Location:

code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles

Files:

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

code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.cc

@@ -45 +45 @@
         assert(this->getScene()->getSceneManager()); // getScene() was already checked by WorldEntity
 
-        this->billboard_.setBillboardSet(this->getScene()->getSceneManager(), "Examples/Flare", ColourValue(1.0, 1.0, 0.5), 1);
-        //this->attachObject(this->billboard_.getBillboardSet());
-        this->scale(0.5);
+        this->billboard_.setBillboardSet(this->getScene()->getSceneManager(), "Examples/Flare", ColourValue(0.5, 0.5, 0.7, 0.8), 1);
+        this->getNode()->attachObject(this->billboard_.getBillboardSet());
+        this->scale(0.2);
     }
 

code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc

@@ -43 +43 @@
         RegisterObject(ParticleProjectile);
 
-        this->particles_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/shot2", LODParticle::normal);
+        this->particles_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/shot2_small", LODParticle::normal);
         this->particles_->addToSceneNode(this->getNode());
-        this->particles_->setKeepParticlesInLocalSpace(true);
+        //this->particles_->setKeepParticlesInLocalSpace(true);
 
+        this->particles_->getAllEmitters()->setDirection(-WorldEntity::FRONT);
         /*
         if (this->owner_)
@@ -76 +77 @@
         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/weapon2/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.h

@@ -46 +46 @@
             void setConfigValues();
 
-            virtual bool create();
-
         private:
             ParticleInterface* particles_;

code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc

@@ -48 +48 @@
         RegisterObject(Projectile);
 
+COUT(0) << "Projectile::Projectile" << std::endl;
+
         this->setConfigValues();
         this->explosionTemplateName_ = "Orxonox/explosion3";
@@ -53 +55 @@
 
         //this->setStatic(false);
-        this->translate(Vector3(55, 0, 0), Ogre::Node::TS_LOCAL);
+//        this->translate(Vector3(55, 0, 0), Ogre::Node::TS_LOCAL);
 
         /*
@@ -121 +123 @@
         delete this;
     }
-
-    bool Projectile::create(){
-      return WorldEntity::create();
-    }
 }

code/branches/weapon2/src/orxonox/objects/weaponSystem/projectiles/Projectile.h

@@ -45 +45 @@
             virtual void tick(float dt);
 
-            virtual bool create();
-
         protected:
             Projectile(BaseObject* creator);