Changeset 6001 for code/branches/steering

Timestamp:

Oct 28, 2009, 2:38:10 PM (15 years ago)

Author:

wirthmi

Message:

Added a crosshair overlay.

Location:

code/branches/steering/src/orxonox

Files:

• controllers/NewHumanController.cc (modified) (4 diffs)
• controllers/NewHumanController.h (modified) (3 diffs)
• overlays/OrxonoxOverlay.h (modified) (2 diffs)

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

@@ -52 +52 @@
     {
         RegisterObject(NewHumanController);
+
+        CrossHairOverlay = new OrxonoxOverlay(this);
+        CrossHairOverlay->setBackgroundMaterial("Orxonox/Crosshair3");
+        CrossHairOverlay->setSize(Vector2(0.08,0.08));
+        CrossHairOverlay->show();
     }
 
@@ -59 +64 @@
         {
         }
+    }
+
+    void NewHumanController::tick(float dt) {
+        CrossHairOverlay->setPosition(Vector2(static_cast<float>(this->currentYaw_), static_cast<float>(this->currentPitch_)));
+
+        HumanController::tick(dt);
     }
 
@@ -83 +94 @@
         
         this->currentYaw_ = value.x;
-        std::cout << "X: " << static_cast<float>(this->currentPitch_) << " Y: " << static_cast<float>(this->currentYaw_) << endl;
+        std::cout << "Y: " << static_cast<float>(this->currentPitch_) << " X: " << static_cast<float>(this->currentYaw_) << endl;
     }
     void NewHumanController::pitch(const Vector2& value)
@@ -91 +102 @@
         
         this->currentPitch_ = value.x;
-        std::cout << "X: " << static_cast<float>(this->currentPitch_) << " Y: " << static_cast<float>(this->currentYaw_) << endl;
+        std::cout << "Y: " << static_cast<float>(this->currentPitch_) << " X: " << static_cast<float>(this->currentYaw_) << endl;
     }
 

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

@@ -33 +33 @@
 
 #include "HumanController.h"
+#include "overlays/OrxonoxOverlay.h"
 
 namespace orxonox
@@ -42 +43 @@
             virtual ~NewHumanController();
 
-//             virtual void tick(float dt);
+            virtual void tick(float dt);
             
             virtual void yaw(const Vector2& value);
@@ -50 +51 @@
             float                       currentYaw_;
             float                       currentPitch_;
+            OrxonoxOverlay              *CrossHairOverlay;
     };
 }

code/branches/steering/src/orxonox/overlays/OrxonoxOverlay.h

@@ -155 +155 @@
         static void rotateOverlay(const std::string& name, const Degree& angle);
 
+        void setBackgroundMaterial(const std::string& material);
+        const std::string& getBackgroundMaterial() const;
+
         virtual void changedVisibility();
 
@@ -187 +190 @@
         virtual void positionChanged();
 
-        void setBackgroundMaterial(const std::string& material);
-        const std::string& getBackgroundMaterial() const;
-
         Ogre::Overlay* overlay_;                   //!< The overlay the entire class is about.
         Ogre::PanelOverlayElement* background_;    //!< Background image (blank per default).