Changeset 11166 for code/branches/sagerjFS16/src/orxonox/controllers

Timestamp:

Apr 14, 2016, 4:02:00 PM (9 years ago)

Author:

sagerj

Message:

today I got pawn'ed

Location:

code/branches/sagerjFS16/src/orxonox/controllers

Files:

• HumanController.cc (modified) (4 diffs)
• NewHumanController.cc (modified) (4 diffs)
• NewHumanController.h (modified) (1 diff)

code/branches/sagerjFS16/src/orxonox/controllers/HumanController.cc

@@ -159 +159 @@
     void HumanController::fire(unsigned int firemode)
     {
+        orxout() << "fire hc " << firemode << endl;
         if (HumanController::localController_s)
             HumanController::localController_s->doFire(firemode);
@@ -165 +166 @@
     void HumanController::doFire(unsigned int firemode)
     {
+        orxout() << "do fire hc " << firemode << endl;
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
         {
@@ -178 +180 @@
     void HumanController::release(unsigned int firemode)
     {
-        orxout() << "HumanController " << firemode << endl;
+        orxout() << "release hc " << firemode << endl;
         if (HumanController::localController_s)
             HumanController::localController_s->doRelease(firemode);
@@ -185 +187 @@
     void HumanController::doRelease(unsigned int firemode)
     {
+        orxout() << "do release hc " << firemode << endl;
         if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
         {

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

@@ -54 +54 @@
     SetConsoleCommand("NewHumanController", "accelerate", &NewHumanController::accelerate).keybindMode(KeybindMode::OnPress);
     SetConsoleCommand("NewHumanController", "decelerate", &NewHumanController::decelerate).keybindMode(KeybindMode::OnPress);
-    //SetConsoleCommand("NewHumanController", "release",    &NewHumanController::release   ).keybindMode(KeybindMode::OnRelease).addShortcut();
 
     RegisterUnloadableClass(NewHumanController);
@@ -286 +285 @@
         if (firemode == 1 && this->controlMode_ == 1)
         {
+            orxout() << "do fire nhc if " << firemode << endl;
             //unlocked steering, steer on right mouse click
             HumanController::yaw(Vector2(this->currentYaw_, 0));
@@ -291 +291 @@
         }
         else
+        {
+            orxout() << "do fire nhc else " << firemode << endl;
             HumanController::doFire(firemode); //call for formationflight
-    }
-
-    /*void NewHumanController::release(unsigned int firemode)
-    {
-        if (NewHumanController::localController_s)
-            NewHumanController::localController_s->doRelease(firemode);
-        orxout() << "Trigger " << firemode << endl;
-    }
-
-    /void NewHumanController::doRelease(unsigned int firemode)
-    {
-        // this->firemode_ = -1; (outdated code from unfire)
-        // hideArrows();
+        }
+    }
+
+    void NewHumanController::doRelease(unsigned int firemode)
+    {
+        orxout() << "do release nhc" << firemode << endl;
         if (!this->controllableEntity_)
             return;
@@ -311 +306 @@
 
         HumanController::doRelease(firemode); //call for formationflight
-    }*/
+    }
 
     void NewHumanController::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage)

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

@@ -55 +55 @@
 
             virtual void doFire(unsigned int firemode) override;
-            /*virtual void release(unsigned int firemode);
-            virtual void doRelease(unsigned int firemode);*/
+            virtual void doRelease(unsigned int firemode) override;
 
             virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) override;