Changeset 6834 for code/branches/rocket/src/modules/weapons/projectiles

Timestamp:

May 3, 2010, 1:40:16 PM (15 years ago)

Author:

gnadler

Message:

Success:
Now rocket spawns somewhere around the ship and the orientation is more or less correct. The controller does nothing but change some pitch/roll (to be sure it does something).
I modified the rocketfire particle to produce rocketfire2.particle which is slightly smaller and matches the smaller rocket.

Location:

code/branches/rocket/src/modules/weapons/projectiles

Files:

• SimpleRocket.cc (modified) (3 diffs)
• SimpleRocket.h (modified) (1 diff)

code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -60 +60 @@
         this->lifetime_ = 100;
                 COUT(0)<< "simplerocket constructed\n";
-                //this->camera_ = null;
-                //RocketController* myRController = new RocketController(this);
-                //this->setController(creator);
-                //myRController->setRocket(this, myRController);
-                
-                //this->getController()->setControllableEntity(this);
-                //myController->setControllableEntity(this);
-                //this->getController()->setControllableEntity(this);
-        //this->controllableEntity_->setController(this->controller_);
+
 
         //if (GameMode::isMaster())
         //{
-         /*   this->setCollisionType(WorldEntity::Kinematic);
-            this->setVelocity(0,0,-100);*/
+           this->setCollisionType(WorldEntity::Kinematic);
+            this->setVelocity(0,0,100);
 
             Model* model = new Model(this);
             model->setMeshSource("rocket.mesh");
-            //model->scale(0.7f);
+            model->scale(0.7f);
             this->attach(model);
-           /* ParticleEmitter* fire = new ParticleEmitter(this);
+
+            ParticleEmitter* fire = new ParticleEmitter(this);
             this->attach(fire);
             fire->setOrientation(this->getOrientation());
-            fire->setSource("Orxonox/Rocketfire");
+            fire->setSource("Orxonox/rocketfire2");
 
             this->enableCollisionCallback();
@@ -91 +84 @@
             collisionShape->setRadius(3);
             collisionShape->setHeight(500);
-            this->attachCollisionShape(collisionShape);*/
+            this->attachCollisionShape(collisionShape);
 
             this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&SimpleRocket::destroyObject, this)));
@@ -127 +120 @@
     }
 
-    /**
-    @brief
-        Defines which actions the SimpleRocket has to take in each tick.
-    @param dt
-        The length of the tick.
-    */
-    void SimpleRocket::tick(float dt)
-    {
-        SUPER(SimpleRocket, tick, dt);
-
-        if( this->hasLocalController() )
-        {
-            this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
-            this->setVelocity( this->getOrientation()*WorldEntity::FRONT*this->getVelocity().length() );
-            this->localAngularVelocity_ = 0;
-
-            if( this->bDestroy_ )
-                this->destroy();
-        }
-    }
 
     bool SimpleRocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)

code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.h

@@ -53 +53 @@
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a SimpleRocket through XML.
-            virtual void tick(float dt); //!< Defines which actions the SimpleRocket has to take in each tick.
 
             virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);