[Orxonox-commit 7042] r11661 - code/branches/Waypoints_HS17/src/orxonox/worldentities
jostoffe at orxonox.net
jostoffe at orxonox.net
Mon Dec 11 16:06:56 CET 2017
Author: jostoffe
Date: 2017-12-11 16:06:56 +0100 (Mon, 11 Dec 2017)
New Revision: 11661
Modified:
code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.cc
Log:
Der Pfeil zeigt nun in die richtige Richtung. Es ist jeweils nur derjenige Waypoint sichtbar, welcher als naechstes erreicht werden muss. Sobald alle erreicht wurden, wird der Pfeil unsichtbar. Falls man spaeter neue einfuegen will, kann man einfach einen neuen ArrayController erstellen
Modified: code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.cc
===================================================================
--- code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.cc 2017-12-11 15:06:44 UTC (rev 11660)
+++ code/branches/Waypoints_HS17/src/orxonox/worldentities/Arrow.cc 2017-12-11 15:06:56 UTC (rev 11661)
@@ -33,8 +33,7 @@
namespace orxonox
{
- //TODO: Put your code in here:
- // Create the factory for the drone.
+
RegisterClass(Arrow);
/**
@brief
@@ -44,12 +43,8 @@
*/
Arrow::Arrow(Context* context) : ControllableEntity(context)
{
- //TODO: Put your code in here:
- // Register the drone class to the core.
RegisterObject(Arrow);
- //this->myController_ = NULL;
-
this->localLinearAcceleration_.setValue(0, 0, 0);
this->localAngularAcceleration_.setValue(0, 0, 0);
this->primaryThrust_ = 100;
@@ -58,7 +53,7 @@
this->setCollisionType(CollisionType::Dynamic);
- //this->myController_ = new ArrowController(this); // Creates a new controller and passes our this pointer to it as creator.
+
}
/**
@@ -67,9 +62,7 @@
*/
Arrow::~Arrow()
{
- // Deletes the controller if the object was initialized and the pointer to the controller is not NULL.
- // if( this->isInitialized() && this->myController_ != NULL )
- //delete this->myController_;
+
}
/**
@@ -82,15 +75,9 @@
SUPER(Arrow, XMLPort, xmlelement, mode);
XMLPortParam(Arrow, "primaryThrust", setPrimaryThrust, getPrimaryThrust, xmlelement, mode);
- //TODO: Put your code in here:
XMLPortParam(Arrow, "auxiliaryThrust", setAuxiliaryThrust, getAuxiliaryThrust, xmlelement, mode);
XMLPortParam(Arrow, "rotationThrust", setRotationThrust, getRotationThrust, xmlelement, mode);
- // Make sure you add the variables auxiliaryThrust_ and rotationThrust_ to XMLPort.
- // 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 Arrow.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.
-
-
+
}
/**
More information about the Orxonox-commit
mailing list