Changeset 645 for code/branches/FICN/src/orxonox/objects/Fighter.cc

Timestamp:

Dec 19, 2007, 3:05:56 AM (16 years ago)

Author:

rgrieder

Message:

• weapon system up and running

File:

• code/branches/FICN/src/orxonox/objects/Fighter.cc (modified) (8 diffs)

code/branches/FICN/src/orxonox/objects/Fighter.cc

@@ -55 +55 @@
         this->ammoDump_ = NULL;
         this->mainWeapon_ = NULL;
+        this->rightButtonPressed_ = false;
+        this->leftButtonPressed_ = false;
 
         this->moveForward_ = 0;
@@ -114 +116 @@
         Model::loadParams(xmlElem);
 
+#if 0
         w = new particle::ParticleInterface(Orxonox::getSingleton()->getSceneManager(),"schuss" + this->getName(),"Orxonox/schuss");
         w->getParticleSystem()->setParameter("local_space","true");
@@ -131 +134 @@
         node1->setInheritScale(false);
         w->addToSceneNode(node1);
-
-
+#endif
 
         tt = new particle::ParticleInterface(Orxonox::getSingleton()->getSceneManager(),"twinthruster" + this->getName(),"Orxonox/engineglow");
@@ -151 +153 @@
         tt->addToSceneNode(node2);
 
-
         // add weapon
 
@@ -160 +161 @@
         mainWeapon_ = new BarrelGun();
         mainWeapon_->setAmmoDump(ammoDump_);
+        Orxonox::getSingleton()->getSceneManager()->getRootSceneNode()->removeChild(mainWeapon_->getNode());
+        getNode()->addChild(mainWeapon_->getNode());
 
         if (xmlElem->Attribute("forward") && xmlElem->Attribute("rotateupdown") && xmlElem->Attribute("rotaterightleft") && xmlElem->Attribute("looprightleft"))
@@ -216 +219 @@
     bool Fighter::mousePressed(const OIS::MouseEvent &arg, OIS::MouseButtonID id )
     {
-
+      if (id == OIS::MB_Left)
+      {
+        this->leftButtonPressed_ = true;
+      }
+      else if (id == OIS::MB_Right)
+        this->rightButtonPressed_ = true;
+      return true;
+    }
+
+    bool Fighter::mouseReleased(const OIS::MouseEvent &arg, OIS::MouseButtonID id )
+    {
+      if (id == OIS::MB_Left)
+      {
+        this->leftButtonPressed_ = false;
+      }
+      else if (id == OIS::MB_Right)
+        this->rightButtonPressed_ = false;
       return true;
     }
@@ -239 +258 @@
         mMouse->capture();
 
+        if (leftButtonPressed_)
+            mainWeapon_->primaryFireRequest();
+        if (rightButtonPressed_)
+            mainWeapon_->secondaryFireRequest();
+
         if (mKeyboard->isKeyDown(OIS::KC_UP) || mKeyboard->isKeyDown(OIS::KC_W))
             this->moveForward(speed);
@@ -256 +280 @@
         if (mKeyboard->isKeyDown(OIS::KC_LEFT) || mKeyboard->isKeyDown(OIS::KC_A))
             this->loopLeft(loop);
+        else
+            this->loopLeft(0);
+
+        if (mKeyboard->isKeyDown(OIS::KC_G))
+            this->mainWeapon_->addAction(BaseWeapon::RELOAD);
         else
             this->loopLeft(0);