Changeset 6387 for code/branches/presentation2/src/modules/weapons/projectiles

Timestamp:

Dec 21, 2009, 1:18:36 PM (15 years ago)

Author:

rgrieder

Message:

Found some non empty new lines.

Location:

code/branches/presentation2/src/modules/weapons/projectiles

Files:

• LightningGunProjectile.cc (modified) (2 diffs)
• Rocket.cc (modified) (13 diffs)
• Rocket.h (modified) (6 diffs)

code/branches/presentation2/src/modules/weapons/projectiles/LightningGunProjectile.cc

@@ -43 +43 @@
         this->maxTextureIndex_ = 8;
         this->textureTimer_.setTimer(0.01f, true, createExecutor(createFunctor(&LightningGunProjectile::changeTexture, this)));
-        
+
         registerVariables();
     }
-    
+
     void LightningGunProjectile::registerVariables()
     {
         registerVariable(this->materialBase_);
     }
-    
+
     void LightningGunProjectile::setMaterial(const std::string& material)
     {
         this->materialBase_ = material;    
-    
+
         BillboardProjectile::setMaterial(material + multi_cast<std::string>(this->textureIndex_));
     }
@@ -64 +64 @@
         if (this->textureIndex_ > this->maxTextureIndex_)
             this->textureIndex_ = 1;
-        
+
         this->setMaterial(this->materialBase_);
     }

code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc

@@ -58 +58 @@
         this->bDestroy_ = false;
         this->lifetime_ = 100;
-        
+
         if (GameMode::isMaster())
         {
             this->setCollisionType(WorldEntity::Kinematic);
             this->setVelocity(0,0,-100);
-        
+
             Model* model = new Model(this);
             model->setMeshSource("rocket.mesh");
@@ -72 +72 @@
             fire->setOrientation(this->getOrientation());
             fire->setSource("Orxonox/rocketfire");
-        
+
             this->enableCollisionCallback();
             this->setCollisionResponse(false);
@@ -83 +83 @@
 
             this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&Rocket::destroyObject, this)));
-            
+
             this->defSndWpnEngine_ = new WorldSound(this);
             this->defSndWpnEngine_->setLooping(true);
@@ -99 +99 @@
             this->defSndWpnLaunch_ = 0;
         }
-        
+
         CameraPosition* camPosition = new CameraPosition(this);
         camPosition->setPosition(0,4,15);
@@ -134 +134 @@
         SUPER(Rocket, XMLPort, xmlelement, mode);
     }
-    
+
     void Rocket::setOwner(Pawn* owner)
     {
@@ -158 +158 @@
     {
         SUPER(Rocket, tick, dt);
-        
+
         if( this->hasLocalController() )
         {
@@ -164 +164 @@
             this->setVelocity( this->getOrientation()*WorldEntity::FRONT*this->getVelocity().length() );
             this->localAngularVelocity_ = 0;
-            
+
             if( this->bDestroy_ )
                 this->destroy();
         }
     }
-    
+
     bool Rocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
@@ -176 +176 @@
             if (otherObject == this->owner_)
                 return false;
-            
+
             this->bDestroy_ = true;
 
@@ -211 +211 @@
         return false;
     }
-    
+
     void Rocket::destroyObject()
     {
@@ -223 +223 @@
         }
     }
-    
+
     void Rocket::fired(unsigned int firemode)
     {
@@ -258 +258 @@
     {
         ControllableEntity::rotateYaw(value);
-        
+
         if( !this->isInMouseLook() )
             this->localAngularVelocity_.y += value.x;
@@ -272 +272 @@
     {
         ControllableEntity::rotatePitch(value);
-        
+
         if( !this->isInMouseLook() )
             this->localAngularVelocity_.x += value.x;
@@ -286 +286 @@
     {
         ControllableEntity::rotateRoll(value);
-        
+
         if( !this->isInMouseLook() )
             this->localAngularVelocity_.z += value.x;
     }
-    
+
 }

code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h

@@ -54 +54 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Rocket through XML.
             virtual void tick(float dt); //!< Defines which actions the Rocket has to take in each tick.
-            
+
             virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
             void destroyObject();
-            
+
             virtual void moveFrontBack(const Vector2& value){}
             virtual void moveRightLeft(const Vector2& value){}
@@ -65 +65 @@
             virtual void rotatePitch(const Vector2& value);
             virtual void rotateRoll(const Vector2& value);
-            
+
             /**
             @brief Moves the Rocket in the Front/Back-direction by the specifed amount.
@@ -84 +84 @@
             inline void moveUpDown(float value)
             { this->moveUpDown(Vector2(value, 0)); }
-            
+
             /**
             @brief Rotates the Rocket around the y-axis by the specifed amount.
@@ -103 +103 @@
             inline void rotateRoll(float value)
             { this->rotateRoll(Vector2(value, 0)); }
-            
+
             void setOwner(Pawn* owner);
             inline Pawn* getOwner() const
                 { return this->owner_; }
-                
+
             inline void setDamage(float damage)
                 { this->damage_ = damage; }
@@ -113 +113 @@
                 { return this->damage_; }
             virtual void fired(unsigned int firemode);
-            
+
         private:
             WeakPtr<Pawn> owner_;
@@ -120 +120 @@
             bool bDestroy_;
             ControllableEntity* originalControllableEntity_;
-            
+
             WeakPtr<PlayerInfo> player_;
             Timer destroyTimer_;