Changeset 2775 for code/branches/tutorial/src/orxonox/objects/worldentities/Drone.cc

Timestamp:

Mar 12, 2009, 11:12:01 AM (15 years ago)

Author:

landauf

Message:

small adjustments

File:

• code/branches/tutorial/src/orxonox/objects/worldentities/Drone.cc (modified) (5 diffs)

code/branches/tutorial/src/orxonox/objects/worldentities/Drone.cc

@@ -37 +37 @@
     // PLACE YOUR CODE HERE
     // create the factory for the drone
-    CreateFactory(Drone);
 
     Drone::Drone(BaseObject* creator) : ControllableEntity(creator)
@@ -45 +44 @@
         // - register the drone class to the core
         // - create a new controller and pass our this pointer to it as creator
-        
+
         this->localLinearAcceleration_.setValue(0, 0, 0);
         this->localAngularAcceleration_.setValue(0, 0, 0);
@@ -52 +51 @@
         this->rotationThrust_ = 10;
         this->steering_ = Vector3::ZERO;
-        
+
         this->setCollisionType(WorldEntity::Dynamic);
-        
-        myController_ = new DroneController(static_cast<BaseObject*>(this));
+
+        this->myController_ = new DroneController(this);
     }
 
     Drone::~Drone()
     {
-        if( this->myController_ )
+        if (this->isInitialized() && this->myController_)
             delete this->myController_;
     }
@@ -79 +78 @@
         // PLACE YOUR CODE HERE
         // make sure the tick function of the base class gets called here
-        
+
         this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() * getMass() * this->auxilaryThrust_);
         this->localLinearAcceleration_.setY(this->localLinearAcceleration_.y() * getMass() * this->auxilaryThrust_);
         if (this->localLinearAcceleration_.z() > 0)
-          this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->auxilaryThrust_);
+            this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->auxilaryThrust_);
         else
-          this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->primaryThrust_);
+            this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->primaryThrust_);
         this->physicalBody_->applyCentralForce(physicalBody_->getWorldTransform().getBasis() * this->localLinearAcceleration_);
         this->localLinearAcceleration_.setValue(0, 0, 0);
-    
+
         this->localAngularAcceleration_ *= this->getLocalInertia() * this->rotationThrust_;
         this->physicalBody_->applyTorque(physicalBody_->getWorldTransform().getBasis() * this->localAngularAcceleration_);
         this->localAngularAcceleration_.setValue(0, 0, 0);
     }
-    
-    
+
+
     void Drone::moveFrontBack(const Vector2& value)
     {
@@ -127 +126 @@
         this->localAngularAcceleration_.setZ(this->localAngularAcceleration_.z() + value.x);
     }
-    
 }