Changeset 7060 for code/branches/presentation3

Timestamp:

May 31, 2010, 4:44:02 PM (14 years ago)

Author:

gasserlu

Message:

drone shootingRange implemented

Location:

code/branches/presentation3

Files:

• data/levels/templates/pickup_representation_templates.oxt (modified) (1 diff)
• src/orxonox/controllers/DroneController.cc (modified) (3 diffs)
• src/orxonox/worldentities/Drone.cc (modified) (1 diff)
• src/orxonox/worldentities/Drone.h (modified) (3 diffs)

code/branches/presentation3/data/levels/templates/pickup_representation_templates.oxt

@@ -429 +429 @@
 
 <Template name=droneTemplate>
-    <Drone name="meineDrohne"  mass= "50" linearDamping = "0.7" angularDamping = "0.99999" maxDistanceToOwner_=150 minDistanceToOwner_=50 primaryThrust_=250 auxilaryThrust_=250 rotationThrust_=50>
+    <Drone name="meineDrohne"  mass= "50" linearDamping = "0.7" angularDamping = "0.99999" maxDistanceToOwner_=150 minDistanceToOwner_=75 maxShootingRange_=1000 primaryThrust_=250 auxilaryThrust_=250 rotationThrust_=50>
         <attached>
             <Model scale="1" mesh="drone.mesh"/>

code/branches/presentation3/src/orxonox/controllers/DroneController.cc

@@ -75 +75 @@
         float random;
         float maxrand = 100.0f / ACTION_INTERVAL;
+        float distanceToTargetSquared;
 
-        // const Vector3& ownerPosition = getOwner()->getWorldPosition();
-        // const Vector3& dronePosition = getDrone()->getWorldPosition();
-
-        // const Vector3& locOwnerDir = getDrone()->getOrientation().UnitInverse()*(ownerPosition-dronePosition); //Vector from Drone To Owner out of drones local coordinate system
-
+        if (target_) {
+        const Vector3& locTargetDir = getDrone()->getOrientation().UnitInverse()*((getDrone()->getWorldPosition())-(target_->getWorldPosition())); //Vector from Drone To target out of drones local coordinate system
+            distanceToTargetSquared = locTargetDir.squaredLength();
+        }
+         
         random = rnd(maxrand);
-        if ( random < 30 && (!this->target_))
+        if ( random < 30 || (!this->target_) || distanceToTargetSquared > (this->getDrone()->getMaxShootingRange()*this->getDrone()->getMaxShootingRange()))
             this->searchNewTarget();
 
-        if (random < 50 && this->target_)
+        if (random < 50 && this->target_ && distanceToTargetSquared < (this->getDrone()->getMaxShootingRange()*this->getDrone()->getMaxShootingRange()))
         {
             this->isShooting_ = true;
@@ -105 +106 @@
     void DroneController::tick(float dt)
     {
-        // Drone *myDrone = static_cast<Drone*>(this->getControllableEntity());
         float maxDistanceSquared = this->getDrone()->getMaxDistanceToOwner()*this->getDrone()->getMaxDistanceToOwner();
         float minDistanceSquared = this->getDrone()->getMinDistanceToOwner()*this->getDrone()->getMinDistanceToOwner();
         if ((this->getDrone()->getWorldPosition() - this->getOwner()->getWorldPosition()).squaredLength()  > maxDistanceSquared) { 
-            this->moveToPosition(this->getOwner()->getWorldPosition());
+            this->moveToPosition(this->getOwner()->getWorldPosition()); //fly towards owner
         }
         else if((this->getDrone()->getWorldPosition() - this->getOwner()->getWorldPosition()).squaredLength() < minDistanceSquared) {
-            this->moveToPosition(-this->getOwner()->getWorldPosition());
+            this->moveToPosition(-this->getOwner()->getWorldPosition()); //fly away from owner
         }
         else if(!isShooting_) {
@@ -131 +131 @@
     void DroneController::ownerDied()
     {
+//         if (this->target_) {            //Drone has some kind of Stockholm-Syndrom --> gets attached to Owners Killer
+//             this->setOwner(target_);
+//             this->searchNewTarget();
+//         }
         if (this->drone_)
             this->drone_->destroy();

code/branches/presentation3/src/orxonox/worldentities/Drone.cc

@@ -79 +79 @@
         XMLPortParam(Drone, "maxDistanceToOwner_", setMaxDistanceToOwner, getMaxDistanceToOwner, xmlelement, mode);
         XMLPortParam(Drone, "minDistanceToOwner_", setMinDistanceToOwner, getMinDistanceToOwner, xmlelement, mode);
+        XMLPortParam(Drone, "maxShootingRange_", setMaxShootingRange, getMaxShootingRange, xmlelement, mode);
     }
 

code/branches/presentation3/src/orxonox/worldentities/Drone.h

@@ -114 +114 @@
             inline void setMinDistanceToOwner( float distance)
                 { this->minDistanceToOwner_=distance; }
+            inline void setMaxShootingRange( float distance)
+                { this->maxShootingRange_=distance; }
 
             
@@ -130 +132 @@
             inline float getMinDistanceToOwner()
                 { return this->minDistanceToOwner_; }
+            inline float getMaxShootingRange()
+                { return this->maxShootingRange_; }
             
         private:
@@ -141 +145 @@
             float maxDistanceToOwner_; //Maximum Distance to owner
             float minDistanceToOwner_; //Minimum Distance to owner
+            float maxShootingRange_;
     };