Changeset 1391

Timestamp:

May 23, 2008, 4:02:03 PM (17 years ago)

Author:

rgrieder

Message:

• fixed some bugs

Location:

code/branches/network

Files:

• bin/keybindings.ini (modified) (7 diffs)
• src/core/CommandExecutor.cc (modified) (1 diff)
• src/core/InputHandler.cc (modified) (8 diffs)
• src/core/InputHandler.h (modified) (2 diffs)
• src/core/InputManager.cc (modified) (4 diffs)
• src/orxonox/Orxonox.cc (modified) (1 diff)
• src/orxonox/objects/SpaceShip.cc (modified) (5 diffs)
• src/orxonox/objects/SpaceShip.h (modified) (3 diffs)

code/branches/network/bin/keybindings.ini

@@ -17 +17 @@
 KeyTAB=
 KeyQ=
-KeyW=
-KeyE=
-KeyR=
+KeyW=scale -1 moveRoll
+KeyE=moveLongitudinal
+KeyR=moveRoll
 KeyT=
 KeyY=
@@ -31 +31 @@
 KeyLCONTROL=
 KeyA=
-KeyS=
-KeyD=
-KeyF=
+KeyS=scale -1 moveLateral
+KeyD=scale -1 moveLongitudinal
+KeyF=moveLateral
 KeyG=
-KeyH=
-KeyJ=
-KeyK=
-KeyL=
+KeyH=scale -0.3 moveYaw
+KeyJ=scale -0.3 movePitch
+KeyK=scale  0.3 movePitch
+KeyL=scale  0.3 moveYaw
 KeySEMICOLON=
 KeyAPOSTROPHE=
@@ -146 +146 @@
 KeyMAIL=
 KeyMEDIASELECT=
-MouseLeft=
-MouseRight=
-MouseMiddle=
-MouseButton3=
-MouseButton4=
-MouseButton5=
-MouseButton6=
-MouseButton7=
-MouseWheel1Up=AxisAmp 0.1 slomo
-MouseWheel1Down=AxisAmp 0.1 slomo
+MouseLeft=fire
+MouseRight=fire
+MouseMiddle=fire
+MouseButton3=fire
+MouseButton4=fire
+MouseButton5=fire
+MouseButton6=fire
+MouseButton7=fire
+MouseWheel1Up=scale 0.1 slomo
+MouseWheel1Down=scale 0.1 slomo
 MouseWheel2Up=
 MouseWheel2Down=
-MouseXPos= #exit | ButtonThreshold 0.85
-MouseXNeg=
-MouseYPos=
-MouseYNeg=
+MouseXPos=scale  1 moveYaw
+MouseXNeg=scale -1 moveYaw
+MouseYPos=scale  1 movePitch
+MouseYNeg=scale -1 movePitch
 Empty1Pos=
 Empty1Neg=
 Empty2Pos=
 Empty2Neg=
-JoyAxis1Pos=
-JoyAxis1Neg=
+JoyAxis1Pos=scale -1 movePitch
+JoyAxis1Neg=scale  1 movePitch
 JoyAxis2Pos=
 JoyAxis2Neg=
@@ -175 +175 @@
 JoyAxis4Neg=
 JoyAxis5Pos=
-JoyAxis5Neg= #AxisAmp 10 slomo | ButtonThreshold 0.9 | onPress exit
-JoyAxis6Pos= #AxisAmp  10 slomo
+JoyAxis5Neg=
+JoyAxis6Pos=
 JoyAxis6Neg=
 JoyAxis7Pos=
@@ -182 +182 @@
 JoyAxis8Pos=
 JoyAxis8Neg=
-JoyAxis9Pos=
-JoyAxis9Neg=
+JoyAxis9Pos=scale   1 moveYaw
+JoyAxis9Neg=scale  -1 moveYaw
 JoyAxis10Pos=
 JoyAxis10Neg=
-JoyAxis11Pos=
-JoyAxis11Neg=
-JoyAxis12Pos=
-JoyAxis12Neg=
+JoyAxis11Pos=scale -1 moveLongitudinal
+JoyAxis11Neg=scale  1 moveLongitudinal
+JoyAxis12Pos=scale  1 moveLateral
+JoyAxis12Neg=scale -1 moveLateral
 JoyAxis13Pos=
 JoyAxis13Neg=
@@ -214 +214 @@
 JoyAxis24Pos=
 JoyAxis24Neg=
-JoyButton0=
+JoyButton0=cycleFocus
 JoyButton1=
 JoyButton2=
@@ -220 +220 @@
 JoyButton4=
 JoyButton5=
-JoyButton6=
-JoyButton7=
+JoyButton6=scale  1 moveRoll
+JoyButton7=scale -1 moveRoll
 JoyButton8=
-JoyButton9=
+JoyButton9=fire
 JoyButton10=
 JoyButton11=

code/branches/network/src/core/CommandExecutor.cc

@@ -403 +403 @@
         if (evaluation.bEvaluatedParams_ && evaluation.evaluatedExecutor_)
         {
-std::cout << "CE_execute (evaluation): " << evaluation.evaluatedExecutor_->getName() << " " << evaluation.param_[0] << " " << evaluation.param_[1] << " " << evaluation.param_[2] << " " << evaluation.param_[3] << " " << evaluation.param_[4] << std::endl;
+//std::cout << "CE_execute (evaluation): " << evaluation.evaluatedExecutor_->getName() << " " << evaluation.param_[0] << " " << evaluation.param_[1] << " " << evaluation.param_[2] << " " << evaluation.param_[3] << " " << evaluation.param_[4] << std::endl;
             (*evaluation.evaluatedExecutor_)(evaluation.param_[0], evaluation.param_[1], evaluation.param_[2], evaluation.param_[3], evaluation.param_[4]);
             return true;
         }
 
-std::cout << "CE_execute: " << evaluation.processedCommand_ << "\n";
+//std::cout << "CE_execute: " << evaluation.processedCommand_ << "\n";
         switch (evaluation.state_)
         {

code/branches/network/src/core/InputHandler.cc

@@ -159 +159 @@
         // default amplitude is 1.0f
         float paramModifier = 1.0f;
-        if (getLowercase(tokens[iToken]) == "axisamp")
+        if (getLowercase(tokens[iToken]) == "scale")
         {
           iToken++;
@@ -307 +307 @@
   KeyBinder::KeyBinder() : deriveTime_(0.0f)
   {
+    mouseRelative_[0] = 0;
+    mouseRelative_[1] = 0;
+    mousePosition_[0] = 0;
+    mousePosition_[1] = 0;
+
     RegisterObject(KeyBinder);
 
@@ -477 +482 @@
   {
     SetConfigValue(analogThreshold_, 0.01f)  .description("Threshold for analog axes until which the state is 0.");
+    SetConfigValue(mouseSensitivity_, 1.0f)  .description("Mouse sensitivity.");
     SetConfigValue(bDeriveMouseInput_, false).description("Whether or not to derive moues movement for the absolute value.");
-    SetConfigValue(derivePeriod_, 0.1f)      .description("Accuracy of the mouse input deriver. The higher the more precise, but laggier.");
-    SetConfigValue(mouseSensitivity_, 1.0f)  .description("Mouse sensitivity.");
+    SetConfigValue(derivePeriod_, 0.1f).description("Accuracy of the mouse input deriver. The higher the more precise, but laggier.");
+    SetConfigValue(mouseSensitivityDerived_, 1.0f).description("Mouse sensitivity if mouse input is derived.");
 
     float oldThresh = buttonThreshold_;
@@ -574 +580 @@
       if (halfAxes_[i].relVal_ > analogThreshold_ || halfAxes_[i].absVal_ > analogThreshold_)
       {
+        COUT(3) << halfAxes_[i].name_ << "\t" << halfAxes_[i].absVal_ << std::endl;
         halfAxes_[i].execute();
       }
@@ -588 +595 @@
           if (mouseRelative_[i] > 0)
           {
-            halfAxes_[2*i + 0].absVal_ = mouseRelative_[i] * derivePeriod_ / 500 * mouseSensitivity_;
+            halfAxes_[2*i + 0].absVal_ =  mouseRelative_[i] / derivePeriod_ / 5000 * mouseSensitivityDerived_;
             halfAxes_[2*i + 1].absVal_ = 0.0f;
           }
-          else if (mouseRelative_[0] < 0)
+          else if (mouseRelative_[i] < 0)
           {
             halfAxes_[2*i + 0].absVal_ = 0.0f;
-            halfAxes_[2*i + 1].absVal_ = -mouseRelative_[i] * derivePeriod_ / 500 * mouseSensitivity_;
+            halfAxes_[2*i + 1].absVal_ = -mouseRelative_[i] / derivePeriod_ / 5000 * mouseSensitivityDerived_;
+          }
+          else
+          {
+            halfAxes_[2*i + 0].absVal_ = 0.0f;
+            halfAxes_[2*i + 1].absVal_ = 0.0f;
           }
           //COUT(3) << mouseRelative_[i] << " | ";
@@ -672 +684 @@
             }
             else
-              halfAxes_[1 + 2*i].absVal_ =  ((float)mousePosition_[i])/1024 * mouseSensitivity_;
+              halfAxes_[0 + 2*i].absVal_ =  ((float)mousePosition_[i])/1024 * mouseSensitivity_;
           }
           else
@@ -687 +699 @@
               halfAxes_[1 + 2*i].absVal_ = -((float)mousePosition_[i])/1024 * mouseSensitivity_;
           }
+          //COUT(3) << "half axis 0: " << halfAxes_[0].absVal_ << std::endl;
+          //COUT(3) << "half axis 1: " << halfAxes_[1].absVal_ << std::endl;
+          //COUT(3) << "half axis 2: " << halfAxes_[2].absVal_ << std::endl;
+          //COUT(3) << "half axis 3: " << halfAxes_[3].absVal_ << std::endl;
 
           // relative
@@ -722 +738 @@
   {
     // TODO: check whether 16 bit integer as general axis value is a good idea (works under windows)
-    CCOUT(3) << halfAxes_[8 + axis].name_ << std::endl;
+    int i = 8 + axis * 2;
     if (value >= 0)
     {
-      halfAxes_[8 + axis].absVal_ = ((float)value)/0x8000;
-      halfAxes_[8 + axis].relVal_ = ((float)value)/0x8000;
-      halfAxes_[8 + axis].hasChanged_ = true;
+      //if (value > 10000)
+      //{ CCOUT(3) << halfAxes_[i].name_ << std::endl; }
+
+      halfAxes_[i].absVal_ = ((float)value)/0x8000;
+      halfAxes_[i].relVal_ = ((float)value)/0x8000;
+      halfAxes_[i].hasChanged_ = true;
+      if (halfAxes_[i + 1].absVal_ > 0)
+      {
+        halfAxes_[i + 1].absVal_ = -0.0f;
+        halfAxes_[i + 1].relVal_ = -0.0f;
+        halfAxes_[i + 1].hasChanged_ = true;
+      }
     }
     else
     {
-      halfAxes_[8 + axis + 1].absVal_ = -((float)value)/0x8000;
-      halfAxes_[8 + axis + 1].relVal_ = -((float)value)/0x8000;
-      halfAxes_[8 + axis + 1].hasChanged_ = true;
+      //if (value < -10000)
+      //{ CCOUT(3) << halfAxes_[i + 1].name_ << std::endl; }
+
+      halfAxes_[i + 1].absVal_ = -((float)value)/0x8000;
+      halfAxes_[i + 1].relVal_ = -((float)value)/0x8000;
+      halfAxes_[i + 1].hasChanged_ = true;
+      if (halfAxes_[i].absVal_ > 0)
+      {
+        halfAxes_[i].absVal_ = -0.0f;
+        halfAxes_[i].relVal_ = -0.0f;
+        halfAxes_[i].hasChanged_ = true;
+      }
     }
   }

code/branches/network/src/core/InputHandler.h

@@ -208 +208 @@
 
     //! Keeps track of the absolute mouse value (incl. scroll wheel)
-    int mousePosition_[3];
+    int mousePosition_[2];
     //! Used to derive mouse input if requested
     int mouseRelative_[2];
@@ -224 +224 @@
     //! mouse sensitivity
     float mouseSensitivity_;
+    //! mouse sensitivity if mouse input is derived
+    float mouseSensitivityDerived_;
   };
 

code/branches/network/src/core/InputManager.cc

@@ -603 +603 @@
 
     // check whether the button already is in the list (can happen when focus was lost)
-    std::vector<int> buttonsDown = joyStickButtonsDown_[iJoyStick];
+    std::vector<int>& buttonsDown = joyStickButtonsDown_[iJoyStick];
     unsigned int iButton = 0;
     while (iButton < buttonsDown.size() && buttonsDown[iButton] != button)
@@ -625 +625 @@
 
     // remove the button from the joyStickButtonsDown_ list
-    std::vector<int> buttonsDown = joyStickButtonsDown_[iJoyStick];
+    std::vector<int>& buttonsDown = joyStickButtonsDown_[iJoyStick];
     for (unsigned int iButton = 0; iButton < buttonsDown.size(); iButton++)
     {
@@ -643 +643 @@
   bool InputManager::axisMoved(const OIS::JoyStickEvent &arg, int axis)
   {
-    //CCOUT(3) << arg.state.mAxes[axis].abs << std::endl;
+    //if (arg.state.mAxes[axis].abs > 10000 || arg.state.mAxes[axis].abs < -10000)
+    //{ CCOUT(3) << "axis " << axis << " moved" << arg.state.mAxes[axis].abs << std::endl;}
     // use the device to identify which one called the method
     OIS::JoyStick* joyStick = (OIS::JoyStick*)arg.device;
@@ -659 +660 @@
   bool InputManager::sliderMoved(const OIS::JoyStickEvent &arg, int id)
   {
+    //if (arg.state.mSliders[id].abX > 10000 || arg.state.mSliders[id].abX < -10000)
+    //{CCOUT(3) << "slider " << id << " moved" << arg.state.mSliders[id].abX << std::endl;}
     //CCOUT(3) << arg.state.mSliders[id].abX << "\t |" << arg.state.mSliders[id].abY << std::endl;
     // use the device to identify which one called the method

code/branches/network/src/orxonox/Orxonox.cc

@@ -517 +517 @@
       // again, just to be sure ogre works fine
       ogreRoot._fireFrameEnded(evt);
+      //msleep(100);
           }
 

code/branches/network/src/orxonox/objects/SpaceShip.cc

@@ -53 +53 @@
     ConsoleCommand(SpaceShip, setMaxSpeedTest, AccessLevel::Debug, false);
     ConsoleCommand(SpaceShip, whereAmI, AccessLevel::User, true);
+    ConsoleCommand(SpaceShip, moveLongitudinal, AccessLevel::User, true).setDefaultValue(0, 1.0f).setAxisParamIndex(0).setKeybindMode(KeybindMode::OnHold);
+    ConsoleCommand(SpaceShip, moveLateral, AccessLevel::User, true).setDefaultValue(0, 1.0f).setAxisParamIndex(0).setKeybindMode(KeybindMode::OnHold);
+    ConsoleCommand(SpaceShip, moveYaw, AccessLevel::User, true).setDefaultValue(0, 1.0f).setAxisParamIndex(0).setKeybindMode(KeybindMode::OnHold);
+    ConsoleCommand(SpaceShip, movePitch, AccessLevel::User, true).setDefaultValue(0, 1.0f).setAxisParamIndex(0).setKeybindMode(KeybindMode::OnHold);
+    ConsoleCommand(SpaceShip, moveRoll, AccessLevel::User, true).setDefaultValue(0, 1.0f).setAxisParamIndex(0).setKeybindMode(KeybindMode::OnHold);
+    ConsoleCommand(SpaceShip, fire, AccessLevel::User, true).setKeybindMode(KeybindMode::OnHold);
     ConsoleCommandGeneric(test1, SpaceShip, createExecutor(createFunctor(&SpaceShip::setMaxSpeedTest), "setMaxSpeed", AccessLevel::Debug), false);
     ConsoleCommandGeneric(test2, SpaceShip, createExecutor(createFunctor(&SpaceShip::setMaxSpeedTest), "setMaxBlubber", AccessLevel::Debug), false);
@@ -308 +314 @@
     }
 
-    void SpaceShip::mouseMoved(IntVector2 abs, IntVector2 rel, IntVector2 clippingSize)
-    {
-/*
-        this->mouseX += e.state.X.rel;
-        if (this->bInvertMouse_)
-            this->mouseY += e.state.Y.rel;
-        else
-            this->mouseY -= e.state.Y.rel;
-
-//        if(mouseX>maxMouseX) maxMouseX = mouseX;
-//        if(mouseX<minMouseX) minMouseX = mouseX;
-//        cout << "mouseX: " << mouseX << "\tmouseY: " << mouseY << endl;
-
-        this->moved = true;
-*/
-        if (this->bRMousePressed_)
-        {
-            this->camNode_->roll(Degree(-rel.x * 0.10));
-            this->camNode_->yaw(Degree(rel.y * 0.10));
-        }
-        else
-        {
-            float minDimension = clippingSize.y;
-            if (clippingSize.x < minDimension)
-                minDimension = clippingSize.x;
-
-            this->mouseX_ += rel.x;
-            if (this->mouseX_ < -minDimension)
-                this->mouseX_ = -minDimension;
-            if (this->mouseX_ > minDimension)
-                this->mouseX_ = minDimension;
-
-            this->mouseY_ += rel.y;
-            if (this->mouseY_ < -minDimension)
-                this->mouseY_ = -minDimension;
-            if (this->mouseY_ > minDimension)
-                this->mouseY_ = minDimension;
-
-            float xRotation = this->mouseX_ / minDimension;
-            xRotation = xRotation*xRotation * sgn(xRotation);
-            xRotation *= -this->rotationAcceleration_;
-            if (xRotation > this->maxRotation_)
-                xRotation = this->maxRotation_;
-            if (xRotation < -this->maxRotation_)
-                xRotation = -this->maxRotation_;
-            this->mouseXRotation_ = Radian(xRotation);
-
-            float yRotation = this->mouseY_ / minDimension;
-            yRotation = yRotation*yRotation * sgn(yRotation);
-            yRotation *= this->rotationAcceleration_;
-            if (yRotation > this->maxRotation_)
-                yRotation = this->maxRotation_;
-            if (yRotation < -this->maxRotation_)
-                yRotation = -this->maxRotation_;
-            this->mouseYRotation_ = Radian(yRotation);
-        }
-    }
-
     void SpaceShip::mouseButtonPressed(MouseButton::Enum id)
     {
-        if (id == MouseButton::Left)
-            this->bLMousePressed_ = true;
-        else if (id == MouseButton::Right)
+        if (id == MouseButton::Right)
             this->bRMousePressed_ = true;
     }
@@ -376 +322 @@
     void SpaceShip::mouseButtonReleased(MouseButton::Enum id)
     {
-        if (id == MouseButton::Left)
-            this->bLMousePressed_ = false;
-        else if (id == MouseButton::Right)
+        if (id == MouseButton::Right)
         {
             this->bRMousePressed_ = false;
@@ -495 +439 @@
         }
 
-        if( (network::Client::getSingleton() &&  network::Client::getSingleton()->getShipID() == objectID) || server_ )
-        {
-          COUT(4) << "steering our ship: " << objectID << std::endl;
-          if (InputManager::isKeyDown(KeyCode::Up) || InputManager::isKeyDown(KeyCode::W))
-            this->acceleration_.x = this->translationAcceleration_;
-          else if(InputManager::isKeyDown(KeyCode::Down) || InputManager::isKeyDown(KeyCode::S))
-            this->acceleration_.x = -this->translationAcceleration_;
-          else
-            this->acceleration_.x = 0;
-
-          if (InputManager::isKeyDown(KeyCode::Right) || InputManager::isKeyDown(KeyCode::D))
-            this->acceleration_.y = -this->translationAcceleration_;
-          else if (InputManager::isKeyDown(KeyCode::Left) || InputManager::isKeyDown(KeyCode::A))
-            this->acceleration_.y = this->translationAcceleration_;
-          else
-            this->acceleration_.y = 0;
-
-          if (InputManager::isKeyDown(KeyCode::Delete) || InputManager::isKeyDown(KeyCode::Q))
-            this->momentum_ = Radian(-this->rotationAccelerationRadian_);
-          else if (InputManager::isKeyDown(KeyCode::PageDown) || InputManager::isKeyDown(KeyCode::E))
-            this->momentum_ = Radian(this->rotationAccelerationRadian_);
-          else
-            this->momentum_ = 0;
-        }/*else
-          COUT(4) << "not steering ship: " << objectID << " our ship: " << network::Client::getSingleton()->getShipID() << std::endl;*/
 
         WorldEntity::tick(dt);
@@ -533 +452 @@
         else
             this->tt_->setRate(0);
-    }
-
+
+        if( (network::Client::getSingleton() &&  network::Client::getSingleton()->getShipID() == objectID) || server_ )
+        {
+          COUT(4) << "steering our ship: " << objectID << std::endl;
+          this->acceleration_.x = 0;
+          this->acceleration_.y = 0;
+          this->momentum_ = 0;
+          this->mouseXRotation_ = Radian(0);
+          this->mouseYRotation_ = Radian(0);
+          this->bLMousePressed_ = false;
+        }/*else
+          COUT(4) << "not steering ship: " << objectID << " our ship: " << network::Client::getSingleton()->getShipID() << std::endl;*/
+    }
+    void SpaceShip::movePitch(float val)
+    {
+        SpaceShip* this_ = getLocalShip();
+        val = -val * val * sgn(val) * this_->rotationAcceleration_;
+        if (val > this_->maxRotation_)
+            val = this_->maxRotation_;
+        if (val < -this_->maxRotation_)
+            val = -this_->maxRotation_;
+        this_->mouseYRotation_ = Radian(val);
+    }
+
+    void SpaceShip::moveYaw(float val)
+    {
+        SpaceShip* this_ = getLocalShip();
+        val = -val * val * sgn(val) * this_->rotationAcceleration_;
+        if (val > this_->maxRotation_)
+            val = this_->maxRotation_;
+        if (val < -this_->maxRotation_)
+            val = -this_->maxRotation_;
+        this_->mouseXRotation_ = Radian(val);
+    }
+
+    void SpaceShip::moveRoll(float val)
+    {
+        SpaceShip* this_ = getLocalShip();
+        this_->momentum_ = Radian(-this_->rotationAccelerationRadian_ * val);
+    }
+
+    void SpaceShip::moveLongitudinal(float val)
+    {
+        SpaceShip* this_ = getLocalShip();
+        COUT(3) << val << std::endl;
+        this_->acceleration_.x = this_->translationAcceleration_ * val;
+    }
+
+    void SpaceShip::moveLateral(float val)
+    {
+        SpaceShip* this_ = getLocalShip();
+        this_->acceleration_.y = -this_->translationAcceleration_ * val;
+    }
+
+    void SpaceShip::fire()
+    {
+        SpaceShip* this_ = getLocalShip();
+        this_->bLMousePressed_ = true;
+    }
 }

code/branches/network/src/orxonox/objects/SpaceShip.h

@@ -66 +66 @@
 
             void getFocus();
-            static SpaceShip* instance_s;
             static Vector3 getSPosition();
             static Quaternion getSOrientation();
@@ -73 +72 @@
                 { SpaceShip::instance_s->setMaxSpeed(value); }
 
+            static void movePitch(float value);
+            static void moveYaw(float value);
+            static void moveRoll(float value);
+            static void moveLongitudinal(float value);
+            static void moveLateral(float value);
+            static void fire();
+
             void mouseButtonPressed (MouseButton::Enum id);
             void mouseButtonReleased(MouseButton::Enum id);
             void mouseButtonHeld    (MouseButton::Enum id) { }
-            void mouseMoved         (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
+            void mouseMoved         (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) { }
             void mouseScrolled      (int abs, int rel) { }
 
@@ -131 +137 @@
             float emitterRate_;
             bool server_;
+
+            static SpaceShip* instance_s;
     };
 }