Changeset 11184 for code/branches/tgidronFS16/src/orxonox

Timestamp:

May 12, 2016, 4:02:21 PM (9 years ago)

Author:

tgidron

Message:

New Pickup + try to create ground from separate tiles

Location:

code/branches/tgidronFS16

Files:

• . (modified) (1 prop)
• src/orxonox/Scene.h (modified) (1 diff)
• src/orxonox/gametypes/TeamGametype.cc (modified) (1 diff)
• src/orxonox/weaponsystem/WeaponSystem.h (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (4 diffs)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (3 diffs)

code/branches/tgidronFS16/src/orxonox/Scene.h

@@ -48 +48 @@
 #include "network/synchronisable/Synchronisable.h"
 #include "tools/interfaces/Tickable.h"
+#include "core/command/ConsoleCommandIncludes.h"
 
 namespace orxonox

code/branches/tgidronFS16/src/orxonox/gametypes/TeamGametype.cc

@@ -141 +141 @@
     void TeamGametype::spawnDeadPlayersIfRequested()
     {
-        for (const auto& mapEntry : this->players_)\
+        for (const auto& mapEntry : this->players_)
         {
             if(allowedInGame_[mapEntry.first] == false)//check if dead player is allowed to enter

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

@@ -55 +55 @@
             void removeWeaponSlot(WeaponSlot * wSlot);
             WeaponSlot * getWeaponSlot(unsigned int index) const;
+            inline const std::vector<WeaponSlot *>& getAllWeaponSlots() const
+                { return weaponSlots_; }
 
             // adding and removing WeaponSets

code/branches/tgidronFS16/src/orxonox/worldentities/pawns/Pawn.cc

@@ -49 +49 @@
 #include "weaponsystem/Munition.h"
 #include "sound/WorldSound.h"
+#include "core/object/ObjectListIterator.h"
 
 #include "controllers/FormationController.h"
@@ -55 +56 @@
 {
     RegisterClass(Pawn);
+
+    SetConsoleCommand("Pawn", "debugDrawWeapons", &Pawn::consoleCommand_debugDrawWeapons).addShortcut();
 
     Pawn::Pawn(Context* context)
@@ -168 +171 @@
     {
         registerVariable(this->bAlive_,            VariableDirection::ToClient);
+        registerVariable(this->bVulnerable_,       VariableDirection::ToClient);
         registerVariable(this->health_,            VariableDirection::ToClient);
         registerVariable(this->maxHealth_,         VariableDirection::ToClient);
@@ -592 +596 @@
         return BLANKSTRING;
     }
+
+    void Pawn::drawWeapons(bool bDraw)
+    {
+        if (bDraw)
+        {
+            std::vector<WeaponSlot*> weaponSlots = weaponSystem_->getAllWeaponSlots();
+            int numWeaponSlots = weaponSlots.size();
+            Vector3 slotPosition = Vector3::ZERO;
+            Quaternion slotOrientation = Quaternion::IDENTITY;
+            Model* slotModel = nullptr;
+
+            for (int i = 0; i < numWeaponSlots; ++i)
+            {
+                slotPosition = weaponSlots.at(i)->getPosition();
+                slotOrientation = weaponSlots.at(i)->getOrientation();
+                slotModel = new Model(this->getContext());
+                slotModel->setMeshSource("Coordinates.mesh");
+                slotModel->setScale(3.0f);
+                slotModel->setOrientation(slotOrientation);
+                slotModel->setPosition(slotPosition);
+
+                this->attach(slotModel);
+                debugWeaponSlotModels_.push_back(slotModel);
+            }
+        }
+        else
+        {
+            // delete all debug models
+            for(Model* model : debugWeaponSlotModels_) 
+            {
+                model->destroy();
+            }
+            debugWeaponSlotModels_.clear();
+        }
+    }
+
+    /*static*/ void Pawn::consoleCommand_debugDrawWeapons(bool bDraw)
+    {
+        if (bDraw)
+        {
+            orxout() << "WeaponSlot visualization enabled." << endl;
+        }
+        else
+        {
+            orxout() << "WeaponSlot visualization disabled." << endl;
+        }
+
+        ObjectList<Pawn> pawnList;
+        for (ObjectListIterator<Pawn> it = pawnList.begin(); it != pawnList.end(); ++it)
+        {
+            it->drawWeapons(bDraw);
+        }
+    }
 }

code/branches/tgidronFS16/src/orxonox/worldentities/pawns/Pawn.h

@@ -218 +218 @@
                 { return this->weaponSystem_; }
 
+            static void consoleCommand_debugDrawWeapons(bool bDraw);
+
         protected:
             virtual void preDestroy() override;
@@ -233 +235 @@
 
             bool bAlive_;
-            bool bVulnerable_; ///< If false the pawn may not ged damaged
+            bool bVulnerable_; ///< If this is false, then the pawn may not take damage
 
             virtual std::vector<PickupCarrier*>* getCarrierChildren(void) const override
@@ -269 +271 @@
             inline void setWeaponSystem(WeaponSystem* weaponsystem)
                 { this->weaponSystem_ = weaponsystem; }
+            void drawWeapons(bool bDraw);
 
             Vector3 aimPosition_;
 
             WorldSound* explosionSound_; // TODO: Does this really belong here? Maybe move it to BigExplosion?
+
+            std::vector<Model*> debugWeaponSlotModels_;
 
     }; // tolua_export