Changeset 6966 for code/branches/rocket2/src/modules/weapons/projectiles

Timestamp:

May 26, 2010, 4:28:14 PM (15 years ago)

Author:

gnadler

Message:

now rocket slows and then finally stops after a given number of ticks (aka fuel).
rocket speeds up if distance is greater than x (right now 1000 but can be changed).
collisionShape not yet fixed.

Location:

code/branches/rocket2/src/modules/weapons/projectiles

Files:

• SimpleRocket.cc (modified) (6 diffs)
• SimpleRocket.h (modified) (7 diffs)

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

@@ -59 +59 @@
         this->bDestroy_ = false;
         this->lifetime_ = 100;
+        this->setMass(15);
         COUT(4) << "simplerocket constructed\n";
-
+        this->counter_=0;
+        this->slowing_=false;
 
         if (GameMode::isMaster())
        {
             this->setCollisionType(WorldEntity::Kinematic);
-            //this->setVelocity(0,0,100);
+            this->fuel_=true;
 
             Model* model = new Model(this);
@@ -72 +74 @@
             this->attach(model);
 
-            ParticleEmitter* fire = new ParticleEmitter(this);
-            this->attach(fire);
-            fire->setOrientation(this->getOrientation());
-            fire->setSource("Orxonox/rocketfire2");
-
+            this->fire_ = new ParticleEmitter(this);
+            this->attach(this->fire_);
+           
+            this->fire_->setOrientation(this->getOrientation());
+            this->fire_->setSource("Orxonox/simplerocketfire");
             this->enableCollisionCallback();
             this->setCollisionResponse(false);
@@ -83 +85 @@
             // TODO: fix the orientation and size of this collision shape to match the rocket
             ConeCollisionShape* collisionShape = new ConeCollisionShape(this);
-            collisionShape->setRadius(3);
-            collisionShape->setHeight(5);
+            collisionShape->setOrientation(this->getOrientation());
+            collisionShape->setRadius(1.5f);
+            collisionShape->setHeight(200);
             this->attachCollisionShape(collisionShape);
+            
 
             this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&SimpleRocket::destroyObject, this)));
@@ -91 +95 @@
 
     }
-    
+   
+    void SimpleRocket::disableFire(){
+        this->setAcceleration(0,0,0);
+        this->setVelocity(Vector3(0,0,0));
+        
+        this->fire_->detachFromParent();
+        //this->fire_->setVisible(false);
+
+    }
+
+
     void SimpleRocket::tick(float dt)
     {
+
         SUPER(SimpleRocket, tick, dt);
+        counter_++;
+        if (this->getVelocity().squaredLength() >130000 && !slowing_) counter_++; //if Velocity bigger than about 360, uses a lot more "fuel" :)
 
             this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
@@ -100 +117 @@
             this->localAngularVelocity_ = 0;
 
+            
+            if (this->fuel_) {
+                COUT(0)<<this->getVelocity().length()<<endl;
+                if (this->counter_>1000 && counter_%12==0) 
+                    
+                    if (!this->slowing_) {
+                        this->setAcceleration(this->getOrientation()*Vector3(10,10,10));
+                        this->slowing_=true;
+                    }
+
+                if (this->counter_ > 1800) 
+                    this->fuel_=false;
+            }
             if( this->bDestroy_ )
                 this->destroy();
+            if (!this->fuel_) 
+                this->disableFire();
+        
+           
+            
         
     }
@@ -134 +169 @@
         this->player_ = this->owner_->getPlayer();
     }
+
 
 

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

@@ -34 +34 @@
 #include "tools/Timer.h"
 #include "worldentities/ControllableEntity.h"
+#include "graphics/ParticleSpawner.h"
 
 namespace orxonox
@@ -56 +57 @@
             virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
             void destroyObject();
+
+            void disableFire();
 
             virtual void moveFrontBack(const Vector2& value){}
@@ -96 +99 @@
             */
             inline void rotatePitch(float value)
-            {   COUT(0)<<"rotated rocket yaw";
+            {   
                                 this->rotatePitch(Vector2(value, 0)); }
             /**
@@ -104 +107 @@
             inline void rotateRoll(float value)
             { 
-                                COUT(0)<<"rotated rocket roll";
                                 this->rotateRoll(Vector2(value, 0)); }
 
@@ -110 +112 @@
             inline Pawn* getOwner() const
                 { return this->owner_; }
+            inline bool hasFuel()
+            { return this->fuel_;}
+
+            inline void fuelRefill()
+            {this->fuel_=true;}
 
             inline void setDamage(float damage)
@@ -123 +130 @@
             float damage_;
             bool bDestroy_;
+            bool fuel_;
+            bool slowing_;
+            int counter_;
 
 
@@ -128 +138 @@
             Timer destroyTimer_;
             float lifetime_;
+            ParticleEmitter* fire_;
+
 
     };