Changeset 10063 for code/branches/turretFS14/src/modules/objects/Turret.h

Timestamp:

May 20, 2014, 10:21:20 AM (11 years ago)

Author:

muemart

Message:

Comment out all the raytest stuff. Needs more work and/or knowledge

File:

• code/branches/turretFS14/src/modules/objects/Turret.h (modified) (3 diffs)

code/branches/turretFS14/src/modules/objects/Turret.h

@@ -37 +37 @@
 #include "objects/ObjectsPrereqs.h"
 #include "worldentities/pawns/Pawn.h"
+#include <OgreSceneQuery.h>
 
 namespace orxonox
@@ -63 +64 @@
             virtual void rotateYaw(const Vector2& value);
             virtual void rotateRoll(const Vector2& value);
-            virtual float isInRange(const WorldEntity* target) const;
+            virtual float isInRange(const WorldEntity* target);
             virtual void aimAtPosition(const Vector3 &position);
 
@@ -119 +120 @@
             Ogre::Real maxYaw_; //!< The maxmium yaw the turret can have (on one side).
             float rotationThrust_;  //!< The velocity the turret rotates with.
+            Ogre::RaySceneQuery* rayTest_; //!< Used to perform a raytest, currently unused @see isInRange
 
     };