[Orxonox-commit 1275] r5993 - in code/branches/steering/src/orxonox: controllers infos
scheusso at orxonox.net
scheusso at orxonox.net
Mon Oct 26 23:01:40 CET 2009
Author: scheusso
Date: 2009-10-26 23:01:39 +0100 (Mon, 26 Oct 2009)
New Revision: 5993
Modified:
code/branches/steering/src/orxonox/controllers/Controller.h
code/branches/steering/src/orxonox/controllers/HumanController.cc
code/branches/steering/src/orxonox/controllers/HumanController.h
code/branches/steering/src/orxonox/controllers/NewHumanController.cc
code/branches/steering/src/orxonox/controllers/NewHumanController.h
code/branches/steering/src/orxonox/infos/PlayerInfo.cc
Log:
Changed input of NewHumanController from InputListener to normal console command (yaw and pitch virtually inherited from HumanPlayer)
removed some unneccessary stuff
Modified: code/branches/steering/src/orxonox/controllers/Controller.h
===================================================================
--- code/branches/steering/src/orxonox/controllers/Controller.h 2009-10-26 21:55:43 UTC (rev 5992)
+++ code/branches/steering/src/orxonox/controllers/Controller.h 2009-10-26 22:01:39 UTC (rev 5993)
@@ -56,8 +56,6 @@
inline ControllableEntity* getControllableEntity() const
{ return this->controllableEntity_; }
virtual void changedControllableEntity() {}
- virtual void startControl() {}
- virtual void stopControl() {}
protected:
PlayerInfo* player_;
Modified: code/branches/steering/src/orxonox/controllers/HumanController.cc
===================================================================
--- code/branches/steering/src/orxonox/controllers/HumanController.cc 2009-10-26 21:55:43 UTC (rev 5992)
+++ code/branches/steering/src/orxonox/controllers/HumanController.cc 2009-10-26 22:01:39 UTC (rev 5993)
@@ -112,7 +112,7 @@
HumanController::localController_s->controllableEntity_->moveUpDown(value);
}
- void HumanController::rotateYaw(const Vector2& value)
+ void HumanController::yaw(const Vector2& value)
{
//Hack to enable mouselook in map
if ( Map::getSingletonPtr() && Map::getSingletonPtr()->getVisibility() && HumanController::localController_s->controllableEntity_->isInMouseLook() )
@@ -124,7 +124,7 @@
HumanController::localController_s->controllableEntity_->rotateYaw(value);
}
- void HumanController::rotatePitch(const Vector2& value)
+ void HumanController::pitch(const Vector2& value)
{
//Hack to enable mouselook in map
if ( Map::getSingletonPtr() && Map::getSingletonPtr()->getVisibility() && HumanController::localController_s->controllableEntity_->isInMouseLook() )
Modified: code/branches/steering/src/orxonox/controllers/HumanController.h
===================================================================
--- code/branches/steering/src/orxonox/controllers/HumanController.h 2009-10-26 21:55:43 UTC (rev 5992)
+++ code/branches/steering/src/orxonox/controllers/HumanController.h 2009-10-26 22:01:39 UTC (rev 5993)
@@ -48,9 +48,12 @@
static void moveRightLeft(const Vector2& value);
static void moveUpDown(const Vector2& value);
- static void rotateYaw(const Vector2& value);
- static void rotatePitch(const Vector2& value);
+ static void rotateYaw(const Vector2& value){ HumanController::localController_s->yaw(value); }
+ static void rotatePitch(const Vector2& value){ HumanController::localController_s->pitch(value); }
static void rotateRoll(const Vector2& value);
+
+ virtual void yaw(const Vector2& value);
+ virtual void pitch(const Vector2& value);
static void fire(unsigned int firemode);
static void reload();
Modified: code/branches/steering/src/orxonox/controllers/NewHumanController.cc
===================================================================
--- code/branches/steering/src/orxonox/controllers/NewHumanController.cc 2009-10-26 21:55:43 UTC (rev 5992)
+++ code/branches/steering/src/orxonox/controllers/NewHumanController.cc 2009-10-26 22:01:39 UTC (rev 5993)
@@ -45,53 +45,22 @@
namespace orxonox
{
- SetConsoleCommand(NewHumanController, moveFrontBack, true).setAsInputCommand();
- SetConsoleCommand(NewHumanController, moveRightLeft, true).setAsInputCommand();
- SetConsoleCommand(NewHumanController, moveUpDown, true).setAsInputCommand();
- SetConsoleCommand(NewHumanController, rotateYaw, true).setAsInputCommand();
- SetConsoleCommand(NewHumanController, rotatePitch, true).setAsInputCommand();
- SetConsoleCommand(NewHumanController, rotateRoll, true).setAsInputCommand();
- SetConsoleCommand(NewHumanController, fire, true).keybindMode(KeybindMode::OnHold);
- SetConsoleCommand(NewHumanController, reload, true);
- SetConsoleCommand(NewHumanController, boost, true).keybindMode(KeybindMode::OnHold);
- SetConsoleCommand(NewHumanController, greet, true);
- SetConsoleCommand(NewHumanController, switchCamera, true);
- SetConsoleCommand(NewHumanController, mouseLook, true);
- SetConsoleCommand(NewHumanController, suicide, true);
- SetConsoleCommand(NewHumanController, addBots, true).defaultValues(1);
- SetConsoleCommand(NewHumanController, killBots, true).defaultValues(0);
- SetConsoleCommand(NewHumanController, dropItems, true);
- SetConsoleCommand(NewHumanController, useItem, true);
- SetConsoleCommand(NewHumanController, cycleNavigationFocus, true);
- SetConsoleCommand(NewHumanController, releaseNavigationFocus, true);
CreateUnloadableFactory(NewHumanController);
- NewHumanController* NewHumanController::localController_s = 0;
-
NewHumanController::NewHumanController(BaseObject* creator) : HumanController(creator)
{
RegisterObject(NewHumanController);
-
- NewHumanController::localController_s = this;
-
- gameInputState_ = InputManager::getInstance().createInputState("humansteering", true, true);
- gameInputState_->setMouseHandler(this);
- gameInputState_->setMouseMode(MouseMode::Exclusive);
}
NewHumanController::~NewHumanController()
{
- NewHumanController::localController_s = 0;
-
if( this->isInitialized() )
{
- gameInputState_->setHandler(0);
- InputManager::getInstance().destroyState("humansteering");
}
}
- void NewHumanController::tick(float dt)
+ /*void NewHumanController::tick(float dt)
{
if (GameMode::playsSound() && NewHumanController::localController_s && NewHumanController::localController_s->controllableEntity_)
{
@@ -105,24 +74,23 @@
else
COUT(3) << "NewHumanController, Warning: Using a ControllableEntity without Camera" << std::endl;
}
+ }*/
+
+ void NewHumanController::yaw(const Vector2& value)
+ {
+// SUPER(NewHumanController, yaw, value);
+ HumanController::yaw(value);
+
+ this->currentYaw_ = value.x;
+ std::cout << "X: " << static_cast<float>(this->currentPitch_) << " Y: " << static_cast<float>(this->currentYaw_) << endl;
}
-
- void NewHumanController::startControl() {
- //gameInputState_->setHandler(KeyBinderManager::getInstance().getDefaultAsHandler());
- //KeyBinderManager::getInstance().setToDefault();
-
- InputManager::getInstance().enterState("humansteering");
- std::cout << "started control" << endl;
- }
-
- void NewHumanController::stopControl() {
- InputManager::getInstance().leaveState("humansteering");
- std::cout << "stopped control" << endl;
- }
-
- void NewHumanController::mouseMoved(IntVector2 abs, IntVector2 rel, IntVector2 clippingSize)
+ void NewHumanController::pitch(const Vector2& value)
{
- std::cout << "X: " << static_cast<float>(abs.x) << " Y: " << static_cast<float>(abs.y) << endl;
+// SUPER(NewHumanController, pitch, value);
+ HumanController::pitch(value);
+
+ this->currentPitch_ = value.x;
+ std::cout << "X: " << static_cast<float>(this->currentPitch_) << " Y: " << static_cast<float>(this->currentYaw_) << endl;
}
}
Modified: code/branches/steering/src/orxonox/controllers/NewHumanController.h
===================================================================
--- code/branches/steering/src/orxonox/controllers/NewHumanController.h 2009-10-26 21:55:43 UTC (rev 5992)
+++ code/branches/steering/src/orxonox/controllers/NewHumanController.h 2009-10-26 22:01:39 UTC (rev 5993)
@@ -31,30 +31,24 @@
#include "OrxonoxPrereqs.h"
-//#include "tools/interfaces/Tickable.h"
#include "HumanController.h"
-#include "core/input/InputHandler.h"
-#include "core/input/InputState.h"
namespace orxonox
{
- class _OrxonoxExport NewHumanController : public HumanController, public InputHandler
+ class _OrxonoxExport NewHumanController : public HumanController
{
public:
NewHumanController(BaseObject* creator);
virtual ~NewHumanController();
- virtual void tick(float dt);
+// virtual void tick(float dt);
+
+ virtual void yaw(const Vector2& value);
+ virtual void pitch(const Vector2& value);
- void startControl();
- void stopControl();
-
private:
- static NewHumanController* localController_s;
- InputState* gameInputState_;
-
- //mouse handler functions
- void mouseMoved (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
+ float currentYaw_;
+ float currentPitch_;
};
}
Modified: code/branches/steering/src/orxonox/infos/PlayerInfo.cc
===================================================================
--- code/branches/steering/src/orxonox/infos/PlayerInfo.cc 2009-10-26 21:55:43 UTC (rev 5992)
+++ code/branches/steering/src/orxonox/infos/PlayerInfo.cc 2009-10-26 22:01:39 UTC (rev 5993)
@@ -157,10 +157,8 @@
this->bReadyToSpawn_ &= (!this->bSetUnreadyAfterSpawn_);
- if (this->controller_) {
+ if (this->controller_)
this->controller_->setControllableEntity(entity);
- this->controller_->startControl();
- }
this->changedControllableEntity();
}
@@ -175,10 +173,8 @@
this->controllableEntity_ = 0;
this->controllableEntityID_ = OBJECTID_UNKNOWN;
- if (this->controller_) {
+ if (this->controller_)
this->controller_->setControllableEntity(0);
- this->controller_->stopControl();
- }
entity->removePlayer();
More information about the Orxonox-commit
mailing list