Changeset 10715 in orxonox.OLD for branches/presentation/src

Timestamp:

Jun 18, 2007, 3:52:34 PM (17 years ago)

Author:

nicolasc

Message:

crosshair moves, but WM not

Location:

branches/presentation/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (4 diffs)
• space_ships/space_ship.h (modified) (4 diffs)
• weapons/rf_cannon.cc (modified) (1 diff)
• weapons/weapon_manager.cc (modified) (1 diff)

branches/presentation/src/world_entities/space_ships/space_ship.cc

@@ -204 +204 @@
   this->secWeaponMan.addWeaponToSlot(0, 2, "SwarmLauncher");
 
+  this->mouseSensitivity = 4;
 
   this->weaponMan.changeWeaponConfig(0);
@@ -343 +344 @@
   LoadParam(root, "loadWeapon", this, SpaceShip, loadWeapon)
   .describe("set weapon regeneration");
+
+  LoadParam(root, "mouseSenitivity", this, SpaceShip, setMouseSensitivity);
 
 /*
@@ -573 +576 @@
   else if( event.type == KeyMapper::PEV_FIRE2)
     this->bSecFire = event.bPressed;
-  else if( event.type == KeyMapper::PEV_FIRE1){
-    printf("fireing primary");
+  else if( event.type == KeyMapper::PEV_FIRE1)
     this->bFire = event.bPressed;
-  }
   else if( event.type == KeyMapper::PEV_NEXT_WEAPON && event.bPressed)
   {
@@ -591 +592 @@
     this->yMouse += event.yRel;
 //     printf("Mouse Coord: %f, %f\n", this->xMouse, this->yMouse);
-    this->weaponMan.getFixedTarget()->setRelCoor(10000, 4*xMouse, 4*yMouse);
+    this->weaponMan.getFixedTarget()->setRelCoor(10000, -10 * this->mouseSensitivity * yMouse, 10 * this->mouseSensitivity * xMouse);
+    this->secWeaponMan.getFixedTarget()->setRelCoor(10000, -10 * this->mouseSensitivity * yMouse, 10 * this->mouseSensitivity * xMouse);
   }
   else if (!(State::getCamera()->getEventHandling()))

branches/presentation/src/world_entities/space_ships/space_ship.h

@@ -97 +97 @@
     virtual void hit(float damage, WorldEntity* killer);
 
-    void                  setCameraDistance(float dist);
+    void setCameraDistance(float dist);
+
+    void setMouseSensitivity(float sens) { this->mouseSensitivity = sens;};
 
   private:
@@ -105 +107 @@
 
 //    void regen(float time);  //!< handler for shield and electronic regeneration
-
+// moove to WE
     void weaponRegen(float time);   //!< weapon energy regeneration
 
@@ -112 +114 @@
 //     void updateElectronicWidget();
 //     void updateShieldWidget();
-
+// moved to WE
     //WeaponManager         weaponMan;      //!< the primary weapon manager: managing a list of energy weapons to wepaon-slot mapping
     WeaponManager         secWeaponMan;       //!< the secondary weapon manager: managing a list of special weapons to weapon-slot mapping
@@ -118 +120 @@
     Playable::Playmode    playmode;           //!< The current playmode.
 
-    //ship atributes
+    //ship atributes, all moved to WE
 //    float       shieldCur;          //!< current shield
 //    float       shieldMax;          //!< maximum shield

branches/presentation/src/world_entities/weapons/rf_cannon.cc

@@ -138 +138 @@
 
   pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor());
-//   pj->setAbsDir(this->getAbsDir());
+  pj->setAbsDir(this->getAbsDir());
 //   pj->setAbsDir(Quaternion(0, dynamic_cast<WeaponManager*>(this->getParent())->getFixedTarget()->getAbsCoor() - this->getParent()->getAbsCoor()));
+//   pj->setAbsDir(dynamic_cast<WeaponManager*>(this->getParent())->getFixedTarget()->getAbsDir());
   pj->activate();
 

branches/presentation/src/world_entities/weapons/weapon_manager.cc

@@ -480 +480 @@
 {
   Weapon* tickWeapon;
-
 
   for(int i = 0; i < this->slotCount; i++)