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

Timestamp:

Apr 14, 2016, 1:11:00 PM (9 years ago)

Author:

sagerj

Message:

added orxout() for every release lvl for debug purpose

Location:

code/branches/sagerjFS16/src/orxonox/controllers

Files:

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

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

@@ -178 +178 @@
     void HumanController::release(unsigned int firemode)
     {
+        orxout() << "HumanController " << firemode << endl;
         if (HumanController::localController_s)
             HumanController::localController_s->doRelease(firemode);

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

@@ -63 +63 @@
             static void fire(unsigned int firemode);
             virtual void doFire(unsigned int firemode);
-            static void reload();
             static void release(unsigned int firemode);
             virtual void doRelease(unsigned int firemode);
+            static void reload();
 
             static void boost(const Vector2& value); // Static method, controls boosting.

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();
+    //SetConsoleCommand("NewHumanController", "release",    &NewHumanController::release   ).keybindMode(KeybindMode::OnRelease).addShortcut();
 
     RegisterUnloadableClass(NewHumanController);
@@ -294 +294 @@
     }
 
+    /*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();
+        if (!this->controllableEntity_)
+            return;
+
+        this->firemode_ = firemode;
+
+        HumanController::doRelease(firemode); //call for formationflight
+    }*/
+
     void NewHumanController::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage)
     {
@@ -342 +361 @@
             }
         }
-    }
-
-    void NewHumanController::release(unsigned int firemode)
-    {
-        if (NewHumanController::localController_s)
-            NewHumanController::localController_s->doRelease();
-        orxout() << "Trigger" << endl;
-    }
-
-    void NewHumanController::doRelease(unsigned int firemode)
-    {
-        // this->firemode_ = -1; (outdated code from unfire)
-        // hideArrows();
-        if (!this->controllableEntity_)
-            return;
-
-        this->firemode_ = firemode;
-
-        HumanController::doRelease(firemode); //call for formationflight
     }
 

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 hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) override;
-
-            static void release(unsigned int firemode);
-            virtual void doRelease(unsigned int firemode);
 
             void centerCursor();