Changeset 2765 for code/branches

Timestamp:

Mar 9, 2009, 12:07:31 AM (16 years ago)

Author:

scheusso

Message:

the whole thing works kind of now

Location:

code/branches/tutorial/src/orxonox/objects

Files:

• controllers/DroneController.cc (modified) (2 diffs)
• worldentities/Drone.cc (modified) (3 diffs)
• worldentities/Drone.h (modified) (1 diff)

code/branches/tutorial/src/orxonox/objects/controllers/DroneController.cc

@@ -30 +30 @@
 #include "DroneController.h"
 #include "objects/worldentities/Drone.h"
+#include "util/Math.h"
 
 
@@ -58 +59 @@
         totaltime += dt;
         Drone *myDrone = static_cast<Drone*>(this->getControllableEntity());
-        myDrone->rotateRoll(1000);
-        myDrone->moveFrontBack( 1000 );
+        if(totaltime<1)
+        {
+            myDrone->moveFrontBack( -sqrt(dt) );
+            myDrone->rotatePitch(-dt);
+        }
     }
 }

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

@@ -44 +44 @@
         // - register the drone class to the core
         // - create a new controller and pass our this pointer to it as creator
-        this->myController = 0;
+        this->myController_ = 0;
         RegisterObject(Drone);
         
         this->localLinearAcceleration_.setValue(0, 0, 0);
-        this->localAngularAcceleration_.setValue(0, 0, 0);this->rotationThrust_ = 0;
+        this->localAngularAcceleration_.setValue(0, 0, 0);
+        this->primaryThrust_  = 100;
+        this->auxilaryThrust_ = 100;
+        this->rotationThrust_ = 10;
         this->steering_ = Vector3::ZERO;
         
         this->setCollisionType(WorldEntity::Dynamic);
         
-        myController = new DroneController(static_cast<BaseObject*>(this));
+        myController_ = new DroneController(static_cast<BaseObject*>(this));
     }
 
     Drone::~Drone()
     {
-        if( this->myController )
-            delete this->myController;
+        if( this->myController_ )
+            delete this->myController_;
     }
 
@@ -67 +70 @@
         SUPER(Drone, XMLPort, xmlelement, mode);
 
+        XMLPortParamVariable(Drone, "primaryThrust",  primaryThrust_,  xmlelement, mode);
+        XMLPortParamVariable(Drone, "auxilaryThrust", auxilaryThrust_, xmlelement, mode);
         XMLPortParamVariable(Drone, "rotationThrust", rotationThrust_, xmlelement, mode);
     }
@@ -76 +81 @@
         //if (this->hasLocalController())
         //{
+            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_);
+            else
+              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_);

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

@@ -70 +70 @@
             
         private:
-            DroneController *myController;
+            DroneController *myController_;
             
             Vector3 steering_;
             btVector3 localLinearAcceleration_;
             btVector3 localAngularAcceleration_;
+            float primaryThrust_;
+            float auxilaryThrust_;
             float rotationThrust_;
     };