[Orxonox-commit 3894] r8568 - in code/branches/presentation: data/gui/scripts src/modules/docking
dafrick at orxonox.net
dafrick at orxonox.net
Tue May 24 22:41:44 CEST 2011
Author: dafrick
Date: 2011-05-24 22:41:43 +0200 (Tue, 24 May 2011)
New Revision: 8568
Modified:
code/branches/presentation/data/gui/scripts/DockingDialog.lua
code/branches/presentation/src/modules/docking/DockToShip.cc
code/branches/presentation/src/modules/docking/DockToShip.h
code/branches/presentation/src/modules/docking/DockingAnimation.cc
code/branches/presentation/src/modules/docking/DockingAnimation.h
code/branches/presentation/src/modules/docking/DockingController.cc
code/branches/presentation/src/modules/docking/DockingController.h
code/branches/presentation/src/modules/docking/DockingEffect.cc
code/branches/presentation/src/modules/docking/DockingTarget.cc
code/branches/presentation/src/modules/docking/DockingTarget.h
code/branches/presentation/src/modules/docking/MoveToDockingTarget.cc
Log:
Renaming member variables to adhere to styleguide, initialize values, always select an item in the DockingDialog.
Modified: code/branches/presentation/data/gui/scripts/DockingDialog.lua
===================================================================
--- code/branches/presentation/data/gui/scripts/DockingDialog.lua 2011-05-24 20:17:10 UTC (rev 8567)
+++ code/branches/presentation/data/gui/scripts/DockingDialog.lua 2011-05-24 20:41:43 UTC (rev 8568)
@@ -43,6 +43,9 @@
local item = CEGUI.createListboxTextItem("Dock " .. k)
item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
listbox:addItem(item)
+ if k == 1 then
+ listbox:setItemSelectState(item, true)
+ end
end
end
Modified: code/branches/presentation/src/modules/docking/DockToShip.cc
===================================================================
--- code/branches/presentation/src/modules/docking/DockToShip.cc 2011-05-24 20:17:10 UTC (rev 8567)
+++ code/branches/presentation/src/modules/docking/DockToShip.cc 2011-05-24 20:41:43 UTC (rev 8568)
@@ -58,11 +58,11 @@
}
void DockToShip::setTargetId(const std::string& str) {
- this->target = str;
+ this->target_ = str;
}
const std::string& DockToShip::getTargetId() const {
- return this->target;
+ return this->target_;
}
@@ -70,9 +70,9 @@
{
COUT(4) << "DockToShip::attach" << endl;
- DockingTarget *target = DockingEffect::findTarget(this->target);
+ DockingTarget *target = DockingEffect::findTarget(this->target_);
if (target == NULL) {
- COUT(0) << "Can't retrieve target for '" << this->target << "'.." << std::endl;
+ COUT(0) << "Can't retrieve target for '" << this->target_ << "'.." << std::endl;
return false;
}
Modified: code/branches/presentation/src/modules/docking/DockToShip.h
===================================================================
--- code/branches/presentation/src/modules/docking/DockToShip.h 2011-05-24 20:17:10 UTC (rev 8567)
+++ code/branches/presentation/src/modules/docking/DockToShip.h 2011-05-24 20:41:43 UTC (rev 8568)
@@ -66,7 +66,7 @@
virtual bool docking(PlayerInfo* player); //!< Called when docking starts
virtual bool release(PlayerInfo* player); //!< Called when player wants undock
private:
- std::string target;
+ std::string target_;
};
}
Modified: code/branches/presentation/src/modules/docking/DockingAnimation.cc
===================================================================
--- code/branches/presentation/src/modules/docking/DockingAnimation.cc 2011-05-24 20:17:10 UTC (rev 8567)
+++ code/branches/presentation/src/modules/docking/DockingAnimation.cc 2011-05-24 20:41:43 UTC (rev 8568)
@@ -40,6 +40,8 @@
DockingAnimation::DockingAnimation(BaseObject* creator) : BaseObject(creator)
{
RegisterObject(DockingAnimation);
+
+ this->parent_ = NULL;
}
DockingAnimation::~DockingAnimation()
Modified: code/branches/presentation/src/modules/docking/DockingAnimation.h
===================================================================
--- code/branches/presentation/src/modules/docking/DockingAnimation.h 2011-05-24 20:17:10 UTC (rev 8567)
+++ code/branches/presentation/src/modules/docking/DockingAnimation.h 2011-05-24 20:41:43 UTC (rev 8568)
@@ -72,11 +72,11 @@
static bool invokeAnimation(bool dock, PlayerInfo* player, std::list<DockingAnimation*> &animations); //!< Invokes calls the docking or release method of all list entries
static DockingTarget *findTarget(std::string name); //!< Iterates through all DockingTarget objects to find the one with name=target
- void setParent(Dock *parent) { this->parent = parent; }
+ void setParent(Dock *parent) { this->parent_ = parent; }
protected:
- Dock *parent;
- std::set<PlayerInfo*> animations; //!< Contains a list of currently running animations
+ Dock *parent_;
+ std::set<PlayerInfo*> animations_; //!< Contains a list of currently running animations
};
}
Modified: code/branches/presentation/src/modules/docking/DockingController.cc
===================================================================
--- code/branches/presentation/src/modules/docking/DockingController.cc 2011-05-24 20:17:10 UTC (rev 8567)
+++ code/branches/presentation/src/modules/docking/DockingController.cc 2011-05-24 20:41:43 UTC (rev 8568)
@@ -41,6 +41,10 @@
DockingController::DockingController(BaseObject* creator) : ArtificialController(creator)
{
RegisterObject(DockingController);
+
+ this->dock_ = NULL;
+ this->player_ = NULL;
+ this->entity_ = NULL;
}
DockingController::~DockingController()
@@ -54,12 +58,12 @@
if (!entity)
return;
- float distance = (dock->getWorldPosition() - entity->getPosition()).length();
+ float distance = (this->dock_->getWorldPosition() - entity->getPosition()).length();
Vector2 coord = get2DViewdirection( // I don't understand this too
entity->getPosition(),
entity->getOrientation() * WorldEntity::FRONT,
entity->getOrientation() * WorldEntity::UP,
- dock->getWorldPosition()
+ dock_->getWorldPosition()
);
// adjust direction of spaceship
@@ -85,19 +89,19 @@
void DockingController::takeControl(bool docking)
{
- this->docking = docking;
+ this->docking_ = docking;
- entity = player->getControllableEntity();
- assert(entity);
+ this->entity_ = this->player_->getControllableEntity();
+ assert(this->entity_);
if (docking)
{
COUT(4) << "DockingController::takeControl Taking over control." << std::endl;
- entity->setDestroyWhenPlayerLeft(false);
- player->pauseControl();
- entity->setController(this);
- this->setControllableEntity(entity);
+ this->entity_->setDestroyWhenPlayerLeft(false);
+ this->player_->pauseControl();
+ this->entity_->setController(this);
+ this->setControllableEntity(this->entity_);
}
}
@@ -105,21 +109,21 @@
{
COUT(4) << "DockingController::positionReached() called." << std::endl;
- assert(this->player);
- assert(this->dock);
+ assert(this->player_);
+ assert(this->dock_);
// stop spaceship
- entity->setPosition(dock->getWorldPosition());
- entity->setVelocity(0, 0, 0);
- entity->setOrientation(dock->getWorldOrientation());
+ this->entity_->setPosition(this->dock_->getWorldPosition());
+ this->entity_->setVelocity(0, 0, 0);
+ this->entity_->setOrientation(this->dock_->getWorldOrientation());
// give control back to player
- player->startControl(entity);
+ this->player_->startControl(this->entity_);
this->setActive(false);
this->controllableEntity_ = NULL;
- if (docking)
- dock->dockingAnimationFinished(player);
+ if (this->docking_)
+ this->dock_->dockingAnimationFinished(this->player_);
/*else
dock->undockingAnimationFinished(player);*/
Modified: code/branches/presentation/src/modules/docking/DockingController.h
===================================================================
--- code/branches/presentation/src/modules/docking/DockingController.h 2011-05-24 20:17:10 UTC (rev 8567)
+++ code/branches/presentation/src/modules/docking/DockingController.h 2011-05-24 20:41:43 UTC (rev 8568)
@@ -48,19 +48,19 @@
void takeControl(bool docking);
- void setDock(Dock* dock) { this->dock = dock; }
- void setPlayer(PlayerInfo* player) { this->player = player; }
+ void setDock(Dock* dock) { this->dock_ = dock; }
+ void setPlayer(PlayerInfo* player) { this->player_ = player; }
protected:
virtual void positionReached();
private:
- bool docking;
+ bool docking_;
- Dock* dock;
- PlayerInfo* player;
+ Dock* dock_;
+ PlayerInfo* player_;
- ControllableEntity* entity;
+ ControllableEntity* entity_;
};
}
Modified: code/branches/presentation/src/modules/docking/DockingEffect.cc
===================================================================
--- code/branches/presentation/src/modules/docking/DockingEffect.cc 2011-05-24 20:17:10 UTC (rev 8567)
+++ code/branches/presentation/src/modules/docking/DockingEffect.cc 2011-05-24 20:41:43 UTC (rev 8568)
@@ -61,8 +61,7 @@
}
DockingTarget *DockingEffect::findTarget(std::string name) {
- for (ObjectList<DockingTarget>::iterator it = ObjectList<DockingTarget>::begin();
- it != ObjectList<DockingTarget>::end(); ++it)
+ for (ObjectList<DockingTarget>::iterator it = ObjectList<DockingTarget>::begin(); it != ObjectList<DockingTarget>::end(); ++it)
{
if ((*it)->getName().compare(name) == 0)
return (*it);
Modified: code/branches/presentation/src/modules/docking/DockingTarget.cc
===================================================================
--- code/branches/presentation/src/modules/docking/DockingTarget.cc 2011-05-24 20:17:10 UTC (rev 8567)
+++ code/branches/presentation/src/modules/docking/DockingTarget.cc 2011-05-24 20:41:43 UTC (rev 8568)
@@ -59,11 +59,11 @@
void DockingTarget::setName(const std::string& str) {
- this->name = str;
+ this->name_ = str;
}
const std::string& DockingTarget::getName() const {
- return this->name;
+ return this->name_;
}
}
Modified: code/branches/presentation/src/modules/docking/DockingTarget.h
===================================================================
--- code/branches/presentation/src/modules/docking/DockingTarget.h 2011-05-24 20:17:10 UTC (rev 8567)
+++ code/branches/presentation/src/modules/docking/DockingTarget.h 2011-05-24 20:41:43 UTC (rev 8568)
@@ -54,7 +54,7 @@
class _DockingExport DockingTarget : public StaticEntity
{
private:
- std::string name;
+ std::string name_;
public:
DockingTarget(BaseObject* creator);
Modified: code/branches/presentation/src/modules/docking/MoveToDockingTarget.cc
===================================================================
--- code/branches/presentation/src/modules/docking/MoveToDockingTarget.cc 2011-05-24 20:17:10 UTC (rev 8567)
+++ code/branches/presentation/src/modules/docking/MoveToDockingTarget.cc 2011-05-24 20:41:43 UTC (rev 8568)
@@ -51,10 +51,10 @@
bool MoveToDockingTarget::docking(PlayerInfo *player)
{
- assert(parent);
+ assert(this->parent_);
DockingController *dockingController = new DockingController(this);
- dockingController->setDock(parent);
+ dockingController->setDock(this->parent_);
dockingController->setPlayer(player);
dockingController->takeControl(true);
@@ -64,9 +64,9 @@
bool MoveToDockingTarget::release(PlayerInfo *player)
{
//TODO: Investigate strange things...
- parent->detach((WorldEntity*)player->getControllableEntity());
+ this->parent_->detach((WorldEntity*)player->getControllableEntity());
- parent->undockingAnimationFinished(player);
+ this->parent_->undockingAnimationFinished(player);
return true;
}
More information about the Orxonox-commit
mailing list