Changeset 6058 for code/branches

Timestamp:

Nov 13, 2009, 12:06:22 PM (15 years ago)

Author:

rgrieder

Message:

Found the firing direction bug: "Fixed goes first" we were told a few weeks ago in a lecture about spatial coordinates.
Here the problem was a quaternion multiplication.

Location:

code/branches/steering/src/orxonox

Files:

• controllers/NewHumanController.cc (modified) (3 diffs)
• graphics/Camera.h (modified) (1 diff)
• weaponsystem/WeaponMode.cc (modified) (1 diff)

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

@@ -59 +59 @@
         crossHairOverlay_->show();
 
-        // HACK: Define which objects are targettable when considering the creator of an orxonox::Model
+        // HACK: Define which objects are targetable when considering the creator of an orxonox::Model
         this->targetMask_.exclude(ClassByString("BaseObject"));
         this->targetMask_.include(ClassByString("WorldEntity"));
@@ -121 +121 @@
         //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);
+        Ogre::Ray mouseRay = HumanController::localController_s->getControllableEntity()->getCamera()->getOgreCamera()->getCameraToViewportRay(static_cast<float>(this->currentYaw_)/2*-1+.5, static_cast<float>(this->currentPitch_)/2*-1+.5);
 
         rsq->setRay(mouseRay);
@@ -170 +170 @@
         }
 */
-        return this->controllableEntity_->getWorldPosition() + (this->controllableEntity_->getWorldOrientation() * Vector3::NEGATIVE_UNIT_Z * 100);
-        //return this->controllableEntity_->getWorldPosition() + (this->controllableEntity_->getCamera()->getCamera()->getOrientation() * Vector3::NEGATIVE_UNIT_Z);
+        return this->controllableEntity_->getWorldPosition() + (this->controllableEntity_->getWorldOrientation() * Vector3::NEGATIVE_UNIT_Z * 800);
+        //return this->controllableEntity_->getWorldPosition() + (this->controllableEntity_->getCamera()->getOgreCamera()->getOrientation() * Vector3::NEGATIVE_UNIT_Z);
     }
 

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

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

code/branches/steering/src/orxonox/weaponsystem/WeaponMode.cc

@@ -206 +206 @@
             {
                 Vector3 muzzleDirection(controller->getTarget() - this->muzzlePosition_);
-                this->muzzleOrientation_ = this->weapon_->getWorldOrientation() * (this->weapon_->getWorldOrientation() * WorldEntity::FRONT).getRotationTo(muzzleDirection);
+                this->muzzleOrientation_ = (this->weapon_->getWorldOrientation() * WorldEntity::FRONT).getRotationTo(muzzleDirection) * this->weapon_->getWorldOrientation();
             }
             else