[Orxonox-commit 3825] r8501 - in code/branches/dockingsystem2: data/gui/scripts src/modules/docking src/orxonox/controllers
dafrick at orxonox.net
dafrick at orxonox.net
Wed May 18 11:33:28 CEST 2011
Author: dafrick
Date: 2011-05-18 11:33:28 +0200 (Wed, 18 May 2011)
New Revision: 8501
Modified:
code/branches/dockingsystem2/data/gui/scripts/DockingDialog.lua
code/branches/dockingsystem2/src/modules/docking/Dock.cc
code/branches/dockingsystem2/src/modules/docking/DockToShip.cc
code/branches/dockingsystem2/src/modules/docking/DockToShip.h
code/branches/dockingsystem2/src/modules/docking/DockingAnimation.cc
code/branches/dockingsystem2/src/modules/docking/DockingController.cc
code/branches/dockingsystem2/src/modules/docking/DockingEffect.cc
code/branches/dockingsystem2/src/modules/docking/DockingPrereqs.h
code/branches/dockingsystem2/src/modules/docking/DockingTarget.cc
code/branches/dockingsystem2/src/modules/docking/DockingTarget.h
code/branches/dockingsystem2/src/modules/docking/MoveToDockingTarget.cc
code/branches/dockingsystem2/src/orxonox/controllers/ArtificialController.cc
code/branches/dockingsystem2/src/orxonox/controllers/ArtificialController.h
Log:
Minor changes.
Modified: code/branches/dockingsystem2/data/gui/scripts/DockingDialog.lua
===================================================================
--- code/branches/dockingsystem2/data/gui/scripts/DockingDialog.lua 2011-05-18 09:03:13 UTC (rev 8500)
+++ code/branches/dockingsystem2/data/gui/scripts/DockingDialog.lua 2011-05-18 09:33:28 UTC (rev 8501)
@@ -13,7 +13,7 @@
})
P:setButton(1, 2, {
- ["button"] = winMgr:getWindow("orxonox/DockingCancelButto"),
+ ["button"] = winMgr:getWindow("orxonox/DockingCancelButton"),
["callback"] = P.cancelButton_clicked
})
Modified: code/branches/dockingsystem2/src/modules/docking/Dock.cc
===================================================================
--- code/branches/dockingsystem2/src/modules/docking/Dock.cc 2011-05-18 09:03:13 UTC (rev 8500)
+++ code/branches/dockingsystem2/src/modules/docking/Dock.cc 2011-05-18 09:33:28 UTC (rev 8501)
@@ -277,3 +277,4 @@
return NULL;
}
}
+
Modified: code/branches/dockingsystem2/src/modules/docking/DockToShip.cc
===================================================================
--- code/branches/dockingsystem2/src/modules/docking/DockToShip.cc 2011-05-18 09:03:13 UTC (rev 8500)
+++ code/branches/dockingsystem2/src/modules/docking/DockToShip.cc 2011-05-18 09:33:28 UTC (rev 8501)
@@ -57,11 +57,11 @@
XMLPortParam(DockToShip, "target", setTargetId, getTargetId, xmlelement, mode);
}
- void DockToShip::setTargetId(std::string str) {
+ void DockToShip::setTargetId(const std::string& str) {
this->target = str;
}
- std::string DockToShip::getTargetId() {
+ const std::string& DockToShip::getTargetId() const {
return this->target;
}
@@ -98,3 +98,4 @@
return true;
}
}
+
Modified: code/branches/dockingsystem2/src/modules/docking/DockToShip.h
===================================================================
--- code/branches/dockingsystem2/src/modules/docking/DockToShip.h 2011-05-18 09:03:13 UTC (rev 8500)
+++ code/branches/dockingsystem2/src/modules/docking/DockToShip.h 2011-05-18 09:33:28 UTC (rev 8501)
@@ -60,8 +60,8 @@
virtual ~DockToShip();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- void setTargetId(std::string str);
- std::string getTargetId();
+ void setTargetId(const std::string& str);
+ const std::string& getTargetId() const;
virtual bool docking(PlayerInfo* player); //!< Called when docking starts
virtual bool release(PlayerInfo* player); //!< Called when player wants undock
Modified: code/branches/dockingsystem2/src/modules/docking/DockingAnimation.cc
===================================================================
--- code/branches/dockingsystem2/src/modules/docking/DockingAnimation.cc 2011-05-18 09:03:13 UTC (rev 8500)
+++ code/branches/dockingsystem2/src/modules/docking/DockingAnimation.cc 2011-05-18 09:33:28 UTC (rev 8501)
@@ -66,3 +66,4 @@
return DockingEffect::findTarget(name);
}
}
+
Modified: code/branches/dockingsystem2/src/modules/docking/DockingController.cc
===================================================================
--- code/branches/dockingsystem2/src/modules/docking/DockingController.cc 2011-05-18 09:03:13 UTC (rev 8500)
+++ code/branches/dockingsystem2/src/modules/docking/DockingController.cc 2011-05-18 09:33:28 UTC (rev 8501)
@@ -28,9 +28,10 @@
#include "DockingController.h"
+#include "infos/PlayerInfo.h"
+#include "worldentities/ControllableEntity.h"
#include "Dock.h"
-
namespace orxonox
{
CreateFactory(DockingController);
@@ -55,6 +56,8 @@
void DockingController::positionReached()
{
// TODO; Give control back to player
+ PlayerInfo* player = this->entity->getPlayer();
+ assert(player);
if (docking)
dock->dockingAnimationFinished(player);
@@ -62,3 +65,4 @@
dock->undockingAnimationFinished(player);
}
}
+
Modified: code/branches/dockingsystem2/src/modules/docking/DockingEffect.cc
===================================================================
--- code/branches/dockingsystem2/src/modules/docking/DockingEffect.cc 2011-05-18 09:03:13 UTC (rev 8500)
+++ code/branches/dockingsystem2/src/modules/docking/DockingEffect.cc 2011-05-18 09:33:28 UTC (rev 8501)
@@ -70,3 +70,4 @@
return NULL;
}
}
+
Modified: code/branches/dockingsystem2/src/modules/docking/DockingPrereqs.h
===================================================================
--- code/branches/dockingsystem2/src/modules/docking/DockingPrereqs.h 2011-05-18 09:03:13 UTC (rev 8500)
+++ code/branches/dockingsystem2/src/modules/docking/DockingPrereqs.h 2011-05-18 09:33:28 UTC (rev 8501)
@@ -66,6 +66,7 @@
{
class Dock;
class DockingAnimation;
+ class DockingController;
class DockingTarget;
class DockingEffect;
class DockToShip;
Modified: code/branches/dockingsystem2/src/modules/docking/DockingTarget.cc
===================================================================
--- code/branches/dockingsystem2/src/modules/docking/DockingTarget.cc 2011-05-18 09:03:13 UTC (rev 8500)
+++ code/branches/dockingsystem2/src/modules/docking/DockingTarget.cc 2011-05-18 09:33:28 UTC (rev 8501)
@@ -58,11 +58,12 @@
}
- void DockingTarget::setName(std::string str) {
+ void DockingTarget::setName(const std::string& str) {
this->name = str;
}
- std::string DockingTarget::getName() {
+ const std::string& DockingTarget::getName() const {
return this->name;
}
}
+
Modified: code/branches/dockingsystem2/src/modules/docking/DockingTarget.h
===================================================================
--- code/branches/dockingsystem2/src/modules/docking/DockingTarget.h 2011-05-18 09:03:13 UTC (rev 8500)
+++ code/branches/dockingsystem2/src/modules/docking/DockingTarget.h 2011-05-18 09:33:28 UTC (rev 8501)
@@ -62,8 +62,8 @@
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- virtual void setName(std::string str);
- virtual std::string getName();
+ virtual void setName(const std::string& str);
+ virtual const std::string& getName() const;
};
}
Modified: code/branches/dockingsystem2/src/modules/docking/MoveToDockingTarget.cc
===================================================================
--- code/branches/dockingsystem2/src/modules/docking/MoveToDockingTarget.cc 2011-05-18 09:03:13 UTC (rev 8500)
+++ code/branches/dockingsystem2/src/modules/docking/MoveToDockingTarget.cc 2011-05-18 09:33:28 UTC (rev 8501)
@@ -64,3 +64,4 @@
}
}
+
Modified: code/branches/dockingsystem2/src/orxonox/controllers/ArtificialController.cc
===================================================================
--- code/branches/dockingsystem2/src/orxonox/controllers/ArtificialController.cc 2011-05-18 09:03:13 UTC (rev 8500)
+++ code/branches/dockingsystem2/src/orxonox/controllers/ArtificialController.cc 2011-05-18 09:33:28 UTC (rev 8501)
@@ -392,12 +392,6 @@
this->moveToPosition(this->targetPosition_);
}
- void ArtificialController::positionReached()
- {
- // Override me !
- }
-
-
/**
@brief Unregisters a slave from its master. Initiated by a slave.
*/
Modified: code/branches/dockingsystem2/src/orxonox/controllers/ArtificialController.h
===================================================================
--- code/branches/dockingsystem2/src/orxonox/controllers/ArtificialController.h 2011-05-18 09:03:13 UTC (rev 8500)
+++ code/branches/dockingsystem2/src/orxonox/controllers/ArtificialController.h 2011-05-18 09:33:28 UTC (rev 8501)
@@ -96,7 +96,7 @@
void moveToPosition(const Vector3& target);
void moveToTargetPosition();
- virtual void positionReached();
+ virtual void positionReached() {}
void removeFromFormation();
void unregisterSlave();
More information about the Orxonox-commit
mailing list