Changeset 7446 for code/branches/tutorial2/src

Timestamp:

Sep 13, 2010, 3:07:04 PM (14 years ago)

Author:

dafrick

Message:

Removing all the stuff the students are supposed to fill in themselves.

Location:

code/branches/tutorial2/src/orxonox

Files:

• controllers/AutonomousDroneController.cc (modified) (2 diffs)
• controllers/CMakeLists.txt (modified) (1 diff)
• worldentities/AutonomousDrone.cc (modified) (3 diffs)
• worldentities/AutonomousDrone.h (modified) (2 diffs)
• worldentities/CMakeLists.txt (modified) (1 diff)

code/branches/tutorial2/src/orxonox/controllers/AutonomousDroneController.cc

@@ -46 +46 @@
         // Make sure to register the object in the factory.
         // Do some kind of initialisation.
-        //TODO: Remove.
-        RegisterObject(AutonomousDroneController);
 
         // This checks that our creator really is a drone
@@ -80 +78 @@
         // - rotatePitch, rotateYaw, rotateRoll
         // Apply the to myDrone (e.g. myDrone->rotateYaw(..) )
-        //TODO: Remove:
-        myDrone->rotateRoll(dt*2);
-        myDrone->moveFrontBack(dt*50);
-        myDrone->rotateYaw(dt);
 
     }

code/branches/tutorial2/src/orxonox/controllers/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
-  AutonomousDroneController.cc
   Controller.cc
   HumanController.cc

code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.cc

@@ -36 +36 @@
     //TODO: Put your code in here:
     // Create the factory for the drone.
-    //TODO: Remove.
-    CreateFactory(AutonomousDrone);
 
     /**
@@ -49 +47 @@
         //TODO: Put your code in here:
         // Register the drone class to the core.
-        //TODO: Remove.
-        RegisterObject(AutonomousDrone);
 
         this->myController_ = NULL;
@@ -91 +87 @@
         // Variables can be added by the following command
         // XMLPortParam(Classname, "xml-attribute-name (i.e. variablename)", setFunction, getFunction, xmlelement, mode)
-        //TODO: Remove.
-        XMLPortParam(AutonomousDrone, "auxiliaryThrus", setAuxiliaryThrust, getAuxiliaryThrust, xmlelement, mode);
-        XMLPortParam(AutonomousDrone, "rotationThrust", setRotationThrust, getRotationThrust, xmlelement, mode);
 
     }

code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.h

@@ -109 +109 @@
             //TODO: Place your set-functions here.
             // - hint: auxiliary thrust, rotation thrust.
-            //TODO: Remove.
-            /**
-            @brief Sets the auxiliary thrust to the input amount.
-            @param thrust The amount of thrust.
-            */
-            inline void setAuxiliaryThrust( float thrust )
-                { this->auxiliaryThrust_ = thrust; }
-            /**
-            @brief Sets the rotation thrust to the input amount.
-            @param thrust The amount of thrust.
-            */
-            inline void setRotationThrust( float thrust )
-                { this->rotationThrust_ = thrust; }
 
             /**
@@ -130 +117 @@
                 { return this->primaryThrust_; }
             //TODO: Place your get-functions here.
-            //TODO: Remove.
-            /**
-            @brief Gets the auxiliary thrust to the input amount.
-            @return The amount of thrust.
-            */
-            inline float getAuxiliaryThrust()
-                { return this->auxiliaryThrust_; }
-                /**
-            @brief Gets the rotation thrust to the input amount.
-            @return The amount of thrust.
-            */
-            inline float getRotationThrust()
-                { return this->rotationThrust_; }
 
         private:

code/branches/tutorial2/src/orxonox/worldentities/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
-  AutonomousDrone.cc
   WorldEntity.cc
   StaticEntity.cc