[Orxonox-commit 3533] r8219 - in code/branches/tutorial/src/orxonox: controllers worldentities
dafrick at orxonox.net
dafrick at orxonox.net
Sat Apr 9 21:09:11 CEST 2011
Author: dafrick
Date: 2011-04-09 21:09:11 +0200 (Sat, 09 Apr 2011)
New Revision: 8219
Modified:
code/branches/tutorial/src/orxonox/controllers/AutonomousDroneController.cc
code/branches/tutorial/src/orxonox/worldentities/AutonomousDrone.cc
code/branches/tutorial/src/orxonox/worldentities/AutonomousDrone.h
Log:
Minor changes in documentation.
Modified: code/branches/tutorial/src/orxonox/controllers/AutonomousDroneController.cc
===================================================================
--- code/branches/tutorial/src/orxonox/controllers/AutonomousDroneController.cc 2011-04-09 17:18:45 UTC (rev 8218)
+++ code/branches/tutorial/src/orxonox/controllers/AutonomousDroneController.cc 2011-04-09 19:09:11 UTC (rev 8219)
@@ -43,8 +43,7 @@
AutonomousDroneController::AutonomousDroneController(BaseObject* creator) : Controller(creator)
{
//TODO: Place your code here:
- // Make sure to register the object in the factory.
- // Do some kind of initialisation.
+ // Make sure to register the object and create the factory.
// This checks that our creator really is a drone
// and saves the pointer to the drone for the controlling commands
@@ -76,6 +75,7 @@
// You can use the commands provided by the AutonomousDrone to steer it:
// - moveFrontBack, moveRightLeft, moveUpDown
// - rotatePitch, rotateYaw, rotateRoll
+ // You will see, that the AutonomousDrone has two variants for each of these commands, one with a vector as input and one with just a float. Use the one with just the float as input.
// Apply them to myDrone (e.g. myDrone->rotateYaw(..) )
}
Modified: code/branches/tutorial/src/orxonox/worldentities/AutonomousDrone.cc
===================================================================
--- code/branches/tutorial/src/orxonox/worldentities/AutonomousDrone.cc 2011-04-09 17:18:45 UTC (rev 8218)
+++ code/branches/tutorial/src/orxonox/worldentities/AutonomousDrone.cc 2011-04-09 19:09:11 UTC (rev 8219)
@@ -83,9 +83,10 @@
XMLPortParam(AutonomousDrone, "primaryThrust", setPrimaryThrust, getPrimaryThrust, xmlelement, mode);
//TODO: Put your code in here:
// Make sure you add the variables auxiliaryThrust_ and rotationThrust_ to XMLPort.
- // Make sure that you also create the get- and set-functions. As you can see, the get- and set-functions for the variable primaryThrust_ has already been specified, so you can get your inspiration from there.
// Variables can be added by the following command
// XMLPortParam(Classname, "xml-attribute-name (i.e. variablename)", setFunctionName, getFunctionName, xmlelement, mode);
+ // Also make sure that you also create the get- and set-functions in AutonomousDrone.h. As you can see, the get- and set-functions for the variable primaryThrust_ has already been specified there, so you can get your inspiration from there.
+
}
Modified: code/branches/tutorial/src/orxonox/worldentities/AutonomousDrone.h
===================================================================
--- code/branches/tutorial/src/orxonox/worldentities/AutonomousDrone.h 2011-04-09 17:18:45 UTC (rev 8218)
+++ code/branches/tutorial/src/orxonox/worldentities/AutonomousDrone.h 2011-04-09 19:09:11 UTC (rev 8219)
@@ -107,7 +107,7 @@
inline void setPrimaryThrust( float thrust )
{ this->primaryThrust_ = thrust; }
//TODO: Place your set-functions here.
- // - hint: auxiliary thrust, rotation thrust.
+ // Hint: auxiliary thrust, rotation thrust.
/**
@brief Gets the primary thrust to the input amount.
More information about the Orxonox-commit
mailing list