Changeset 5981 for code/branches

Timestamp:

Oct 21, 2009, 5:17:05 PM (15 years ago)

Author:

wirthmi

Message:

Made NewHumanController an InputHandler so we can control the crosshair.

Location:

code/branches/steering/src/orxonox

Files:

• controllers/Controller.h (modified) (1 diff)
• controllers/NewHumanController.cc (modified) (5 diffs)
• controllers/NewHumanController.h (modified) (3 diffs)
• infos/PlayerInfo.cc (modified) (2 diffs)

code/branches/steering/src/orxonox/controllers/Controller.h

@@ -57 +57 @@
                 { return this->controllableEntity_; }
             virtual void changedControllableEntity() {}
+            virtual void startControl() {}
+            virtual void stopControl() {}
 
         protected:

code/branches/steering/src/orxonox/controllers/NewHumanController.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Michael Wirth
  *   Co-authors:
  *      ...
@@ -28 +28 @@
 
 #include "NewHumanController.h"
+
+#include "core/input/InputManager.h"
+#include "core/input/InputState.h"
 
 #include "core/CoreIncludes.h"
@@ -72 +75 @@
 
         NewHumanController::localController_s = this;
+
+        gameInputState_ = InputManager::getInstance().createInputState("humansteering", true, true);
+        gameInputState_->setMouseHandler(this);
+        gameInputState_->setMouseMode(MouseMode::Exclusive);
     }
 
@@ -77 +84 @@
     {
         NewHumanController::localController_s = 0;
+
+        if( this->isInitialized() )
+        {
+            gameInputState_->setHandler(0);
+            InputManager::getInstance().destroyState("humansteering");
+        }
     }
 
@@ -95 +108 @@
     }
 
+    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)
+    {
+        std::cout << "X: " << static_cast<float>(abs.x) << " Y: " << static_cast<float>(abs.y) << endl;
+    }
+
 }

code/branches/steering/src/orxonox/controllers/NewHumanController.h

@@ -21 +21 @@
  *
  *   Author:
- *      Fabian 'x3n' Landau
+ *      Michael Wirth
  *   Co-authors:
  *      ...
@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "tools/interfaces/Tickable.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
+    class _OrxonoxExport NewHumanController : public HumanController, public InputHandler
     {
         public:
@@ -45 +47 @@
             virtual void tick(float dt);
 
+            void startControl();
+            void stopControl();
+
         private:
             static NewHumanController* localController_s;
+            InputState* gameInputState_;
+
+            //mouse handler functions
+            void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
     };
 }

code/branches/steering/src/orxonox/infos/PlayerInfo.cc

@@ -158 +158 @@
         this->bReadyToSpawn_ &= (!this->bSetUnreadyAfterSpawn_);
 
-        if (this->controller_)
+        if (this->controller_) {
             this->controller_->setControllableEntity(entity);
+            this->controller_->startControl();
+        }
 
         this->changedControllableEntity();
@@ -174 +176 @@
         this->controllableEntityID_ = OBJECTID_UNKNOWN;
 
-        if (this->controller_)
+        if (this->controller_) {
             this->controller_->setControllableEntity(0);
+            this->controller_->stopControl();
+        }
 
         entity->removePlayer();