Changeset 6045 for code/branches

Timestamp:

Nov 11, 2009, 5:39:53 PM (15 years ago)

Author:

wirthmi

Message:

First implementation of direction shooting.

Location:

code/branches/steering/src

Files:

• modules/weapons/weaponmodes/HsW01.cc (modified) (2 diffs)
• orxonox/controllers/Controller.cc (modified) (2 diffs)
• orxonox/controllers/Controller.h (modified) (1 diff)
• orxonox/controllers/NewHumanController.cc (modified) (5 diffs)
• orxonox/controllers/NewHumanController.h (modified) (2 diffs)
• orxonox/infos/PlayerInfo.cc (modified) (3 diffs)
• orxonox/weaponsystem/WeaponMode.h (modified) (2 diffs)
• orxonox/worldentities/ControllableEntity.cc (modified) (1 diff)
• orxonox/worldentities/ControllableEntity.h (modified) (2 diffs)

code/branches/steering/src/modules/weapons/weaponmodes/HsW01.cc

@@ -39 +39 @@
 #include "weaponsystem/WeaponPack.h"
 #include "weaponsystem/WeaponSystem.h"
+#include "worldentities/WorldEntity.h"
 
 namespace orxonox
@@ -110 +111 @@
         model->setScale(5);
 
-        projectile->setOrientation(this->getMuzzleOrientation());
+        //projectile->setOrientation(this->getMuzzleOrientation());
+        projectile->lookAt(this->getTarget(), WorldEntity::World);
         projectile->setPosition(this->getMuzzlePosition());
-        projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
+        projectile->setVelocity((projectile->getOrientation() * Vector3::UNIT_Z) * this->speed_); //getWorldOrientation??
+        //projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
 
         projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());

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

@@ -29 +29 @@
 #include "Controller.h"
 #include "core/CoreIncludes.h"
+#include "worldentities/ControllableEntity.h"
 
 namespace orxonox
@@ -45 +46 @@
     {
     }
+
+    Vector3 Controller::getTarget() {
+        return this->controllableEntity_->getPosition() + (this->controllableEntity_->getOrientation() * Vector3::UNIT_Z);
+    }
 }

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

@@ -58 +58 @@
             virtual void changedControllableEntity() {}
 
+            virtual Vector3 getTarget();
+
         protected:
             PlayerInfo* player_;

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

@@ -57 +57 @@
         overlaySize = 0.08;
 
+        controlMode = 0;
+
         CrossHairOverlay = new OrxonoxOverlay(this);
         CrossHairOverlay->setBackgroundMaterial("Orxonox/Crosshair3");
@@ -110 +112 @@
 */
 
+            HumanController::localController_s->getControllableEntity()->fire(firemode);
+        //}
+//}
+    }
+
+    Vector3 NewHumanController::getTarget() {
             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;
+//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);
@@ -119 +127 @@
             rsq->setSortByDistance(true);
 
+/*
+Distance of objects:
+ignore everything under 200 maybe even take 1000 as min distance to shoot at
+
+shots are regularly traced and are entities!!!!!!!!! this is the biggest problem
+they vanish only after a distance of 10'000
+*/
+
 
             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);
-}
- }
+            for ( itr = result.begin(); itr != result.end(); itr++ )
+            {
+                //std::cout << "distance: " << itr->distance << "  name: " << itr->movable->getName() << " type: " << itr->movable->getMovableType();
+                if (itr->movable->isInScene() && itr->movable->getMovableType() == "Entity" && itr->distance > 500) {
+                    //std::cout << "  TAGGED";
+                    itr->movable->getParentSceneNode()->showBoundingBox(true);
+std::cout << itr->movable->getParentSceneNode()->_getDerivedPosition() << endl;
+return itr->movable->getParentSceneNode()->_getDerivedPosition();
+                }
+                //std::cout << endl;
+            }
 
 //if (result.front().movable->isInScene()) std::cout << "in scene" << endl;
@@ -136 +155 @@
 //result.front().movable->setVisible(false);
 
-std::cout << endl;
+            //std::cout << endl;
 /*
             if (!result.empty()) {
@@ -143 +162 @@
             }
 */
-
-
-            HumanController::localController_s->getControllableEntity()->fire(firemode);
-        //}
-//}
+        return this->controllableEntity_->getWorldPosition() + (this->controllableEntity_->getWorldOrientation() * Vector3::NEGATIVE_UNIT_Z);
+//return this->controllableEntity_->getWorldPosition() + (this->controllableEntity_->getCamera()->getCamera()->getOrientation() * Vector3::NEGATIVE_UNIT_Z);
     }
 

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

@@ -45 +45 @@
 
             virtual void tick(float dt);
-            
+
             virtual void yaw(const Vector2& value);
             virtual void pitch(const Vector2& value);
 
             virtual void doFire(unsigned int firemode);
+
+            void changeMode(unsigned int controleMode);
+
+            virtual Vector3 getTarget();
 
         private:
@@ -56 +60 @@
             OrxonoxOverlay              *CrossHairOverlay;
             float                       overlaySize;
+            unsigned int                controlMode;
     };
 }

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

@@ -138 +138 @@
         assert(this->controller_);
         this->controller_->setPlayer(this);
-        if (this->controllableEntity_)
+        if (this->controllableEntity_) {
             this->controller_->setControllableEntity(this->controllableEntity_);
+            this->controllableEntity_->setController(this->controller_);
+        }
         this->changedController();
     }
@@ -158 +160 @@
         this->bReadyToSpawn_ &= (!this->bSetUnreadyAfterSpawn_);
 
-        if (this->controller_)
+        if (this->controller_) {
             this->controller_->setControllableEntity(entity);
+            this->controllableEntity_->setController(this->controller_);
+        }
 
         this->changedControllableEntity();
@@ -171 +175 @@
             return;
 
+        this->controllableEntity_->setController(0);
         this->controllableEntity_ = 0;
         this->controllableEntityID_ = OBJECTID_UNKNOWN;

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

@@ -38 +38 @@
 #include "core/SubclassIdentifier.h"
 #include "tools/Timer.h"
+
+#include "weaponsystem/Weapon.h"
+#include "weaponsystem/WeaponPack.h"
+#include "weaponsystem/WeaponSystem.h"
+#include "worldentities/pawns/Pawn.h"
+#include "controllers/Controller.h"
 
 namespace orxonox
@@ -125 +131 @@
                 { return this->mode_; }
 
+            inline Vector3 getTarget()
+                { return this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getController()->getTarget(); }
+
         protected:
             virtual void fire() = 0;

code/branches/steering/src/orxonox/worldentities/ControllableEntity.cc

@@ -62 +62 @@
         this->camera_ = 0;
         this->xmlcontroller_ = 0;
+        this->controller_ = 0;
         this->reverseCamera_ = 0;
         this->bDestroyWhenPlayerLeft_ = false;

code/branches/steering/src/orxonox/worldentities/ControllableEntity.h

@@ -139 +139 @@
             inline Controller* getXMLController() const
                 { return this->xmlcontroller_; }
+
+            inline Controller* getController() const
+                { return this->controller_; }
+            inline void setController(Controller* c)
+                { this->controller_ = c; }
 
         protected:
@@ -201 +206 @@
             std::string cameraPositionTemplate_;
             Controller* xmlcontroller_;
+            Controller* controller_;
             CameraPosition* reverseCamera_;
     };