Changeset 6033

Timestamp:

Nov 4, 2009, 5:47:31 PM (15 years ago)

Author:

wirthmi

Message:

Added the ability to raytrace on fire to find the object to user wants to aim at.

Location:

code/branches/steering/src/orxonox

Files:

• controllers/HumanController.cc (modified) (1 diff)
• controllers/HumanController.h (modified) (2 diffs)
• controllers/NewHumanController.cc (modified) (6 diffs)
• controllers/NewHumanController.h (modified) (2 diffs)
• graphics/Camera.h (modified) (1 diff)

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

@@ -143 +143 @@
     }
 
-    void HumanController::fire(unsigned int firemode)
+    void HumanController::doFire(unsigned int firemode)
     {
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)

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

@@ -56 +56 @@
             virtual void pitch(const Vector2& value);
 
-            static void fire(unsigned int firemode);
+            static void fire(unsigned int firemode) { HumanController::localController_s->doFire(firemode); }
+            virtual void doFire(unsigned int firemode);
             static void reload();
 
@@ -79 +80 @@
             friend class Map;
 
-        private:
+        protected:
             static HumanController* localController_s;
     };

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

@@ -29 +29 @@
 #include "NewHumanController.h"
 
-#include "core/input/InputManager.h"
-#include "core/input/InputState.h"
+#include <OgreRay.h>
+#include <OgreSceneQuery.h>
+#include <OgreCamera.h>
+#include <OgreSceneManager.h>
 
 #include "core/CoreIncludes.h"
@@ -53 +55 @@
         RegisterObject(NewHumanController);
 
+        overlaySize = 0.08;
+
         CrossHairOverlay = new OrxonoxOverlay(this);
         CrossHairOverlay->setBackgroundMaterial("Orxonox/Crosshair3");
-        CrossHairOverlay->setSize(Vector2(0.08,0.08));
+        CrossHairOverlay->setSize(Vector2(overlaySize,overlaySize));
         CrossHairOverlay->show();
     }
@@ -67 +71 @@
 
     void NewHumanController::tick(float dt) {
-        CrossHairOverlay->setPosition(Vector2(static_cast<float>(this->currentYaw_), static_cast<float>(this->currentPitch_)));
+        CrossHairOverlay->setPosition(Vector2(static_cast<float>(this->currentYaw_)/2*-1+.5-overlaySize/2, static_cast<float>(this->currentPitch_)/2*-1+.5-overlaySize/2));
 
         HumanController::tick(dt);
@@ -88 +92 @@
     }*/
     
+    void NewHumanController::doFire(unsigned int firemode)
+    {
+        //if (HumanController::localController_s && HumanController::localController_s->controllableEntity_) {
+
+/*
+
+ // Get results, create a node/entity on the position
+ for ( itr = result.begin(); itr != result.end(); itr++ )
+ {
+     if (itr->movable && itr->movable->getName() == "Head")
+     {
+         soundMgr->StopSound( &jaguarSoundChannel );
+         soundMgr->PlaySound( jaguarSound, headNode, &jaguarSoundChannel );
+         break;
+     } // if
+ }
+*/
+
+            Ogre::RaySceneQuery * rsq = HumanController::localController_s->getControllableEntity()->getScene()->getSceneManager()->createRayQuery(Ogre::Ray());
+
+std::cout << "X: " << static_cast<float>(this->currentYaw_)/2*-1+.5 << "  Y: " << static_cast<float>(this->currentPitch_)/2*-1+.5 << endl;
+
+            Ogre::Ray mouseRay = HumanController::localController_s->getControllableEntity()->getCamera()->getCamera()->getCameraToViewportRay(static_cast<float>(this->currentYaw_)/2*-1+.5, static_cast<float>(this->currentPitch_)/2*-1+.5);
+
+            rsq->setRay(mouseRay);
+            rsq->setSortByDistance(true);
+
+
+            Ogre::RaySceneQueryResult &result = rsq->execute();
+
+            Ogre::RaySceneQueryResult::iterator itr;
+for ( itr = result.begin(); itr != result.end(); itr++ )
+ {
+     std::cout << "distance: " << itr->distance << "  name: " << itr->movable->getName() << " type: " << itr->movable->getMovableType() << endl;
+if (itr->movable->isInScene() && itr->movable->getMovableType() == "Entity") {
+std::cout << " in scene" << endl;
+        itr->movable->getParentSceneNode()->showBoundingBox(true);
+}
+ }
+
+//if (result.front().movable->isInScene()) std::cout << "in scene" << endl;
+// && result.front().movable->getParentSceneNode() != NULL) result.front().movable->getParentSceneNode()->showBoundingBox(true);
+//result.front().movable->setVisible(false);
+
+std::cout << endl;
+/*
+            if (!result.empty()) {
+                Ogre::RaySceneQueryResultEntry obj = result.front();
+                std::cout << "distance: " << obj.distance << "  name: " << obj.movable->getName() << endl;
+            }
+*/
+
+
+            HumanController::localController_s->getControllableEntity()->fire(firemode);
+        //}
+//}
+    }
+
     void NewHumanController::yaw(const Vector2& value)
     {
@@ -94 +156 @@
         
         this->currentYaw_ = value.x;
-        std::cout << "Y: " << static_cast<float>(this->currentPitch_) << " X: " << 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)
@@ -102 +164 @@
         
         this->currentPitch_ = value.x;
-        std::cout << "Y: " << static_cast<float>(this->currentPitch_) << " X: " << 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

@@ -34 +34 @@
 #include "HumanController.h"
 #include "overlays/OrxonoxOverlay.h"
+#include "util/OgreForwardRefs.h"
 
 namespace orxonox
@@ -48 +49 @@
             virtual void pitch(const Vector2& value);
 
+            virtual void doFire(unsigned int firemode);
+
         private:
             float                       currentYaw_;
             float                       currentPitch_;
             OrxonoxOverlay              *CrossHairOverlay;
+            float                       overlaySize;
     };
 }

code/branches/steering/src/orxonox/graphics/Camera.h

@@ -52 +52 @@
             void releaseFocus();
 
+            inline Ogre::Camera* getCamera()
+               { return this->camera_; }
+
             inline bool hasFocus()
                 { return this->bHasFocus_; }