Changeset 6991 for code/branches/ai/src/orxonox/worldentities

Timestamp:

May 27, 2010, 10:16:08 PM (14 years ago)

Author:

gasserlu

Message:

drone smooth flight mode & minmaxDistance, multiple drones possible

Location:

code/branches/ai/src/orxonox/worldentities

Files:

• Drone.cc (modified) (4 diffs)
• Drone.h (modified) (3 diffs)

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

@@ -40 +40 @@
 namespace orxonox
 {
-    // put your code in here:
-    // create the factory for the drone
     CreateFactory(Drone);
     /**
@@ -49 +47 @@
     Drone::Drone(BaseObject* creator) : Pawn(creator)
     {
-        // put your code in here:
-        // - register the drone class to the core
         RegisterObject(Drone);
 
@@ -57 +53 @@
         this->localLinearAcceleration_.setValue(0, 0, 0);
         this->localAngularAcceleration_.setValue(0, 0, 0);
-        this->primaryThrust_  = 100;
-        this->auxilaryThrust_ = 100;
-        this->rotationThrust_ = 10;
-        
+        this->setRadarVisibility(false);
         this->setCollisionType(WorldEntity::Dynamic);
         
@@ -85 +78 @@
     void Drone::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        // this calls the XMLPort function of the parent class
         SUPER(Drone, XMLPort, xmlelement, mode);
 
-        // put your code in here:
-        // make sure you add the variables primaryThrust_, auxilaryThrust_ and rotationThrust_ to xmlport 
-        // make sure that the set- and get-functions exist.
-        // variables can be added by the following command 
-        // XMLPortParam(Classname, "xml-attribute-name (i.e. variablename)", setFunction, getFunction, xmlelement, mode)
         XMLPortParam(Drone, "primaryThrust_", setPrimaryThrust, getPrimaryThrust, xmlelement, mode);
         XMLPortParam(Drone, "auxilaryThrust_", setAuxilaryThrust, getAuxilaryThrust, xmlelement, mode);
         XMLPortParam(Drone, "rotationThrust_", setRotationThrust, getRotationThrust, xmlelement, mode);
-
-
+        XMLPortParam(Drone, "maxDistanceToOwner_", setMaxDistanceToOwner, getMaxDistanceToOwner, xmlelement, mode);
+        XMLPortParam(Drone, "minDistanceToOwner_", setMinDistanceToOwner, getMinDistanceToOwner, xmlelement, mode);
     }
 

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

@@ -110 +110 @@
             inline void setRotationThrust( float thrust )
                 { this->rotationThrust_=thrust; }      
+            inline void setMaxDistanceToOwner( float distance)
+                { this->maxDistanceToOwner_=distance; }
+            inline void setMinDistanceToOwner( float distance)
+                { this->minDistanceToOwner_=distance; }
                         
             
@@ -118 +122 @@
             inline float getPrimaryThrust()
                 { return this->primaryThrust_; }
-
-           inline float getAuxilaryThrust()
+            inline float getAuxilaryThrust()
                 { return this->auxilaryThrust_; }
-           inline float getRotationThrust()
+            inline float getRotationThrust()
                 { return this->rotationThrust_; }
+            inline float getMaxDistanceToOwner()
+                { return this->maxDistanceToOwner_; }
+            inline float getMinDistanceToOwner()
+                { return this->minDistanceToOwner_; }
             
         private:
@@ -132 +139 @@
             float auxilaryThrust_; //!< The amount of auxilary thrust. Used for all other movements (except for rotations).
             float rotationThrust_; //!< The amount of rotation thrust. Used for rotations only.
+            float maxDistanceToOwner_; //Maximum Distance to owner
+            float minDistanceToOwner_; //Minimum Distance to owner
     };