Changeset 7021 for code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc

Timestamp:

May 30, 2010, 3:57:05 PM (14 years ago)

Author:

gnadler

Message:

documentation & formatting commit

File:

• code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc (modified) (8 diffs)

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

@@ -45 +45 @@
 namespace orxonox
 {
+        /**
+    @file
+    @brief
+        SimpleRocket, follows direction from a Rocketcontroller, has fuel for 80% of its lifetime, afterwords it's fire disappears.
+    @author
+       Gabriel Nadler (Original file: Oli Scheuss)
+    */
     CreateFactory(SimpleRocket);
-    // create the factory for the SimpleRocket
-
-    /**
-    @brief
-        Constructor. Registers the object and initializes some default values.
-    */
+
+
     SimpleRocket::SimpleRocket(BaseObject* creator) : ControllableEntity(creator)
     {
@@ -59 +62 @@
         this->bDestroy_ = false;
         this->lifetime_ = 120;
+
         this->setMass(15);
         COUT(4) << "simplerocket constructed\n";
-        this->maxLife_=90;
 
         if (GameMode::isMaster())
@@ -92 +95 @@
 
     }
-   
-
-
-
+
+
+    
+    /**
+    * @brief updates state of rocket, disables fire if no fuel
+    * @param dt tick-length
+    */
     void SimpleRocket::tick(float dt)
     {
@@ -102 +108 @@
         if ( GameMode::isMaster() )
         {
-            if (this->getVelocity().squaredLength() >130000)
-                this->maxLife_-=dt; //if Velocity bigger than about 360, uses a lot more "fuel" :)
-            
+
 
             this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
@@ -110 +114 @@
             this->localAngularVelocity_ = 0;
 
-            
+        
             if (this->fuel_)
             {
-                if (this->destroyTimer_.getRemainingTime()<  this->lifetime_-this->maxLife_ ) 
+                if (this->destroyTimer_.getRemainingTime()<  (static_cast<float>(this->FUEL_PERCENTAGE)/100) *this->lifetime_ ) 
                     this->fuel_=false;
-            }
-            else 
+            } else
                 this->disableFire();
 
-            if( this->bDestroy_ )
+            if( this->bDestroy_ ) 
                 this->destroy();
         }
@@ -125 +128 @@
     }
 
+    /**
+    * @brief Sets the Acceleration to 0 and detaches the fire
+    * @return void
+    */
     void SimpleRocket::disableFire()
     {
-        this->setAcceleration(0,0,0);
-        this->fire_->destroy();
-        this->fire_ = 0;
-//         this->fire_->detachFromParent();
+        this->setAcceleration(0,0,0);        
+        this->fire_->detachFromParent();
     }
 
@@ -144 +149 @@
             {
                 this->getController()->destroy();
-                COUT(4)<< "simplerocket destroyed\n";
             }
         }
@@ -162 +166 @@
     {
         this->owner_ = owner;
-        //this->originalControllableEntity_ = this->owner_->getPlayer()->getControllableEntity();
         this->player_ = this->owner_->getPlayer();
     }
+