[Orxonox-commit 2741] r7446 - in code/branches/tutorial2: data/levels src/orxonox/controllers src/orxonox/worldentities
dafrick at orxonox.net
dafrick at orxonox.net
Mon Sep 13 15:07:04 CEST 2010
Author: dafrick
Date: 2010-09-13 15:07:04 +0200 (Mon, 13 Sep 2010)
New Revision: 7446
Modified:
code/branches/tutorial2/data/levels/tutorial.oxw
code/branches/tutorial2/src/orxonox/controllers/AutonomousDroneController.cc
code/branches/tutorial2/src/orxonox/controllers/CMakeLists.txt
code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.cc
code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.h
code/branches/tutorial2/src/orxonox/worldentities/CMakeLists.txt
Log:
Removing all the stuff the students are supposed to fill in themselves.
Modified: code/branches/tutorial2/data/levels/tutorial.oxw
===================================================================
--- code/branches/tutorial2/data/levels/tutorial.oxw 2010-09-13 13:05:55 UTC (rev 7445)
+++ code/branches/tutorial2/data/levels/tutorial.oxw 2010-09-13 13:07:04 UTC (rev 7446)
@@ -27,22 +27,6 @@
<?lua end ?>
<!-- TODO: Insert drone here. -->
- <!-- TODO: Remove. -->
- <AutonomousDrone
- primaryThrust = 100
- auxiliaryThrust = 30
- rotationThrust = 25
- mass = 50
- linearDamping = 0.9
- angularDamping = 0.7
- >
- <attached>
- <Model scale="10" mesh="drone.mesh"/>
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,0" halfExtents="10, 10, 10" />
- </collisionShapes>
- </AutonomousDrone>
</Scene>
</Level>
Modified: code/branches/tutorial2/src/orxonox/controllers/AutonomousDroneController.cc
===================================================================
--- code/branches/tutorial2/src/orxonox/controllers/AutonomousDroneController.cc 2010-09-13 13:05:55 UTC (rev 7445)
+++ code/branches/tutorial2/src/orxonox/controllers/AutonomousDroneController.cc 2010-09-13 13:07:04 UTC (rev 7446)
@@ -45,8 +45,6 @@
//TODO: Place your code here:
// 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
// and saves the pointer to the drone for the controlling commands
@@ -79,10 +77,6 @@
// - moveFrontBack, moveRightLeft, moveUpDown
// - rotatePitch, rotateYaw, rotateRoll
// Apply the to myDrone (e.g. myDrone->rotateYaw(..) )
- //TODO: Remove:
- myDrone->rotateRoll(dt*2);
- myDrone->moveFrontBack(dt*50);
- myDrone->rotateYaw(dt);
}
}
Modified: code/branches/tutorial2/src/orxonox/controllers/CMakeLists.txt
===================================================================
--- code/branches/tutorial2/src/orxonox/controllers/CMakeLists.txt 2010-09-13 13:05:55 UTC (rev 7445)
+++ code/branches/tutorial2/src/orxonox/controllers/CMakeLists.txt 2010-09-13 13:07:04 UTC (rev 7446)
@@ -1,5 +1,4 @@
ADD_SOURCE_FILES(ORXONOX_SRC_FILES
- AutonomousDroneController.cc
Controller.cc
HumanController.cc
NewHumanController.cc
Modified: code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.cc
===================================================================
--- code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.cc 2010-09-13 13:05:55 UTC (rev 7445)
+++ code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.cc 2010-09-13 13:07:04 UTC (rev 7446)
@@ -35,8 +35,6 @@
{
//TODO: Put your code in here:
// Create the factory for the drone.
- //TODO: Remove.
- CreateFactory(AutonomousDrone);
/**
@brief
@@ -48,8 +46,6 @@
{
//TODO: Put your code in here:
// Register the drone class to the core.
- //TODO: Remove.
- RegisterObject(AutonomousDrone);
this->myController_ = NULL;
@@ -90,9 +86,6 @@
// 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)
- //TODO: Remove.
- XMLPortParam(AutonomousDrone, "auxiliaryThrus", setAuxiliaryThrust, getAuxiliaryThrust, xmlelement, mode);
- XMLPortParam(AutonomousDrone, "rotationThrust", setRotationThrust, getRotationThrust, xmlelement, mode);
}
Modified: code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.h
===================================================================
--- code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.h 2010-09-13 13:05:55 UTC (rev 7445)
+++ code/branches/tutorial2/src/orxonox/worldentities/AutonomousDrone.h 2010-09-13 13:07:04 UTC (rev 7446)
@@ -108,19 +108,6 @@
{ this->primaryThrust_ = thrust; }
//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; }
/**
@brief Gets the primary thrust to the input amount.
@@ -129,19 +116,6 @@
inline float getPrimaryThrust()
{ 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:
AutonomousDroneController *myController_; //!< The controller of the AutonomousDrone.
Modified: code/branches/tutorial2/src/orxonox/worldentities/CMakeLists.txt
===================================================================
--- code/branches/tutorial2/src/orxonox/worldentities/CMakeLists.txt 2010-09-13 13:05:55 UTC (rev 7445)
+++ code/branches/tutorial2/src/orxonox/worldentities/CMakeLists.txt 2010-09-13 13:07:04 UTC (rev 7446)
@@ -1,5 +1,4 @@
ADD_SOURCE_FILES(ORXONOX_SRC_FILES
- AutonomousDrone.cc
WorldEntity.cc
StaticEntity.cc
MovableEntity.cc
More information about the Orxonox-commit
mailing list