Changeset 11164 for code/branches

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

Files:

• controllers/HumanController.cc (modified) (1 diff)
• controllers/HumanController.h (modified) (1 diff)
• controllers/NewHumanController.cc (modified) (3 diffs)
• controllers/NewHumanController.h (modified) (1 diff)
• weaponsystem/Weapon.cc (modified) (1 diff)
• weaponsystem/Weapon.h (modified) (1 diff)
• weaponsystem/WeaponMode.cc (modified) (1 diff)
• weaponsystem/WeaponMode.h (modified) (1 diff)
• weaponsystem/WeaponPack.cc (modified) (1 diff)
• weaponsystem/WeaponPack.h (modified) (1 diff)
• weaponsystem/WeaponSet.cc (modified) (1 diff)
• weaponsystem/WeaponSet.h (modified) (1 diff)
• weaponsystem/WeaponSystem.cc (modified) (1 diff)
• weaponsystem/WeaponSystem.h (modified) (1 diff)
• worldentities/ControllableEntity.cc (modified) (1 diff)
• worldentities/ControllableEntity.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();

code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.cc

@@ -134 +134 @@
     }
 
+    void Weapon::release(unsigned int mode)
+    {orxout() << "release weapon " << mode << endl;}
+
     /**
     @brief

code/branches/sagerjFS16/src/orxonox/weaponsystem/Weapon.h

@@ -53 +53 @@
 
             void fire(unsigned int mode);
+            void release(unsigned int mode);
             void reload();
 

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.cc

@@ -169 +169 @@
     }
 
-    void WeaponMode::release()
+    void WeaponMode::release(float* reloadTime)
+    {orxout() << "release wmode " << reloadTime << endl;}
 
     bool WeaponMode::reload()

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h

@@ -58 +58 @@
 
             virtual bool fire(float* reloadTime);
+            virtual void release(float* reloadTime);
             bool reload();
 

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.cc

@@ -78 +78 @@
         for (Weapon* weapon : this->weapons_)
             weapon->fire(weaponmode);
+    }
+
+    void WeaponPack::release(unsigned int weaponmode)
+    {
+        for (Weapon* weapon : this->weapons_)
+            weapon->release(weaponmode);
+        orxout() << "release wpack " << weaponmode << endl;
     }
 

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponPack.h

@@ -47 +47 @@
 
             void fire(unsigned int weaponmode);
+            void release(unsigned int weaponmode);
             void reload();
 

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.cc

@@ -68 +68 @@
     }
 
+    void WeaponSet::release()
+    {
+        
+        // Fire all WeaponPacks with their defined weaponmode
+        for (const auto& mapEntry : this->weaponpacks_)
+            if (mapEntry.second != WeaponSystem::WEAPON_MODE_UNASSIGNED)
+                mapEntry.first->release(mapEntry.second);
+        orxout() << "release wset " << endl;
+        
+    }
+
     void WeaponSet::reload()
     {

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSet.h

@@ -47 +47 @@
 
             void fire();
+            void release();
             void reload();
 

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.cc

@@ -299 +299 @@
         if (it != this->weaponSets_.end() && it->second)
             it->second->release();
+        orxout() << "release wsys " << firemode << endl;
     }
 

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponSystem.h

@@ -75 +75 @@
 
             void fire(unsigned int firemode);
+            void release(unsigned int firemode);
             void reload();
-            void release(unsigned int firemode);
 
             Munition * getMunition(SubclassIdentifier<Munition> * identifier);

code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.cc

@@ -303 +303 @@
         if(GameMode::isMaster())
         {
+            orxout() << "f CE IF " << firemode << endl;
             this->fired(firemode);
         }
         else
         {
+            orxout() << "f CE EL " << firemode << endl;
+            callMemberNetworkFunction(&ControllableEntity::fire, this->getObjectID(), 0, firemode);
+        }
+    }
+
+    void ControllableEntity::release(unsigned int firemode)
+    {
+        if(GameMode::isMaster())
+        {
+            orxout() << "r CE IF " << firemode << endl;
+            this->released(firemode);
+        }
+        else
+        {
+            orxout() << "r CE EL " << firemode << endl;
             callMemberNetworkFunction(&ControllableEntity::fire, this->getObjectID(), 0, firemode);
         }

code/branches/sagerjFS16/src/orxonox/worldentities/ControllableEntity.h

@@ -97 +97 @@
 
             void fire(unsigned int firemode);
+            void release(unsigned int firemode);
             virtual void fired(unsigned int firemode) {}
+            virtual void released(unsigned int firemode) {}
             virtual void reload() {}