Changeset 2993 for code/trunk/src

Timestamp:

May 20, 2009, 12:23:51 AM (16 years ago)

Author:

dafrick

Message:

Small changes in QuestManager for the GUI. Added toggleVisibility command to OrxonoxOverlay.

Location:

code/trunk/src/orxonox

Files:

• objects/quest/QuestManager.cc (modified) (8 diffs)
• objects/quest/QuestManager.h (modified) (3 diffs)
• overlays/OrxonoxOverlay.cc (modified) (2 diffs)
• overlays/OrxonoxOverlay.h (modified) (1 diff)

code/trunk/src/orxonox/objects/quest/QuestManager.cc

@@ -38 +38 @@
 #include "core/ConsoleCommand.h"
 #include "core/input/InputManager.h"
-#include "util/Convert.h"
 
 #include "util/Exception.h"
 #include "gui/GUIManager.h"
+#include "objects/infos/PlayerInfo.h"
 #include "Quest.h"
 #include "QuestHint.h"
@@ -49 +49 @@
     //! Pointer to the current (and single) instance of this class.
     /*static*/ QuestManager* QuestManager::singletonRef_s = NULL;
-    /*static*/ bool QuestManager::GUIOpen = false;
-
-    SetConsoleCommand(QuestManager, toggleQuestGUI, true);
 
     /**
@@ -220 +217 @@
     }
 
+    /**
+    @brief
+        
+    @param name
+    @return
+    */
     QuestContainer* QuestManager::getQuestTree(std::string & name)
     {
@@ -227 +230 @@
         if(gui == NULL)
         {
-            COUT(1) << "Something BAD happened." << std::endl;
+            COUT(1) << "Error: No GUIOverlay with the given name '" << name << "' present." << std::endl;
             return NULL;
         }
-        COUT(1) << player << std::endl;
-        ConverterExplicit<BaseObject, PlayerInfo>::convert(player, *(gui->getOwner()));
+        BaseObject* obj = gui->getOwner();
+        if(obj == NULL)
+        {
+            COUT(1) << "Error: GUIOverlay has no owner. " << std::endl;
+            return NULL;
+        }
+        player = dynamic_cast<PlayerInfo*>(obj);
     
         QuestContainer* root = NULL;
         QuestContainer* current = NULL;
         
-        std::list<Quest*>* pRootQuests = new std::list<Quest*>();
-        std::list<Quest*> rootQuests = *pRootQuests;
-        getRootQuests(player, rootQuests);
-        
-        for(std::list<Quest*>::iterator it = rootQuests.begin(); it != rootQuests.end(); it++)
-        {
-            Quest* quest = *it;
-            
-            QuestContainer* container = new QuestContainer;
-
-            container->description = quest->getDescription();
-            addHints(container, quest, player);
-            addSubQuests(container, quest, player);
+        std::list<Quest*>* rootQuests = new std::list<Quest*>();
+        getRootQuests(player, *rootQuests);
+        
+        for(std::list<Quest*>::iterator it = rootQuests->begin(); it != rootQuests->end(); it++)
+        {
+            QuestContainer* container = addSubQuest(*it, player);
 
             if(root == NULL)
@@ -265 +266 @@
             current->next = NULL;
 
-        delete pRootQuests;
+        delete rootQuests;
 
         return root;
     }
 
+    /**
+    @brief
+        
+    @param player
+    @param list
+    @return
+    */
     void QuestManager::getRootQuests(const PlayerInfo* player, std::list<Quest*> & list)
     {
@@ -282 +290 @@
     }
 
-    void QuestManager::addSubQuests(QuestContainer* container, Quest* quest, const PlayerInfo* player)
-    {
+    /**
+    @brief
+        
+    @param quest
+    @param player
+    @return
+    */
+    QuestContainer* QuestManager::addSubQuest(Quest* quest, const PlayerInfo* player)
+    {
+        if(quest == NULL)
+            return NULL;
+
+        QuestContainer* container = new QuestContainer;
+        container->description = quest->getDescription();
+        container->hint = addHints(quest, player);
+
+        if(quest->isActive(player))
+        {
+            container->status = "active";
+        }
+        else if(quest->isCompleted(player))
+        {
+            container->status = "completed";
+        }
+        else if(quest->isFailed(player))
+        {
+            container->status = "failed";
+        }
+        else
+        {
+            container->status = "";
+            COUT(1) << "An error occured. A Quest of un-specified status wanted to be displayed." << std::endl;
+        }
+        
+        std::list<Quest*> quests = quest->getSubQuestList();
         QuestContainer* current = NULL;
         QuestContainer* first = NULL;
-
-        std::list<Quest*> quests = quest->getSubQuestList();
         for(std::list<Quest*>::iterator it = quests.begin(); it != quests.end(); it++)
         {
@@ -293 +332 @@
             if(!subQuest->isInactive(player))
             {
-                QuestContainer* subQuestContainer = new QuestContainer;
-
-                subQuestContainer->description = subQuest->getDescription();
-                addHints(subQuestContainer, subQuest, player);
-                addSubQuests(subQuestContainer, subQuest, player);
+                QuestContainer* subContainer = addSubQuest(subQuest, player);
 
                 if(first == NULL)
                 {
-                    first = subQuestContainer;
+                    first = subContainer;
                 }
                 else
                 {
-                    current->next = subQuestContainer;
+                    current->next = subContainer;
                 }
                 
-                current = subQuestContainer;
-            }
-        }
-
+                current = subContainer;
+            }
+        }
         if(current != NULL)
             current->next = NULL;
         container->subQuests = first;
         
-    }
-
-    void QuestManager::addHints(QuestContainer* container, Quest* quest, const PlayerInfo* player)
+        return container;
+    }
+
+    /**
+    @brief
+        
+    @param quest
+    @param player
+    @return
+    */
+    HintContainer* QuestManager::addHints(Quest* quest, const PlayerInfo* player)
     {
         HintContainer* current = NULL;
@@ -346 +388 @@
         if(current != NULL)
             current->next = NULL;
-        container->hint = first;
-    }
-
-    /*static*/ void QuestManager::toggleQuestGUI(void)
-    {
-        if (!QuestManager::GUIOpen)
-        {
-            GUIManager::getInstancePtr()->showGUI("QuestGUI");
-            GUIManager::getInstancePtr()->executeCode("showCursor()");
-            InputManager::getInstance().requestEnterState("guiMouseOnly");
-            GUIManager::getInstancePtr()->executeCode("loadQuestsList()");
-            GUIOpen = true;
-        }
-        else
-        {
-            GUIManager::getInstancePtr()->executeCode("hideGUI(\"QuestGUI\")");
-            GUIManager::getInstancePtr()->executeCode("hideCursor()");
-            InputManager::getInstance().requestLeaveState("guiMouseOnly");
-            GUIOpen = false;
-        }
+        return first;
     }
 

code/trunk/src/orxonox/objects/quest/QuestManager.h

@@ -55 +55 @@
     {
         const QuestDescription* description;
+        std::string status;
         HintContainer* hint;
         QuestContainer* subQuests;
@@ -93 +94 @@
             QuestContainer* getQuestTree(std::string & name); // tolua_export
 
-            static void toggleQuestGUI(void); //!< Opens the GUI.
-
         private:
             static QuestManager* singletonRef_s;
-            static bool GUIOpen;
 
             std::map<std::string, Quest*> questMap_; //!< All Quests registered by their id's.
@@ -103 +101 @@
 
             void getRootQuests(const PlayerInfo* player, std::list<Quest*> & list);
-            void addHints(QuestContainer* container, Quest* quest, const PlayerInfo* player);
-            void addSubQuests(QuestContainer* container, Quest* quest, const PlayerInfo* player);
+            HintContainer* addHints(Quest* quest, const PlayerInfo* player);
+            QuestContainer* addSubQuest(Quest* quest, const PlayerInfo* player);
 
     }; // tolua_export

code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -57 +57 @@
     SetConsoleCommand(OrxonoxOverlay, scaleOverlay, false).accessLevel(AccessLevel::User);
     SetConsoleCommand(OrxonoxOverlay, scrollOverlay, false).accessLevel(AccessLevel::User);
+    SetConsoleCommand(OrxonoxOverlay, toggleVisibility, false).accessLevel(AccessLevel::User);
     SetConsoleCommand(OrxonoxOverlay, rotateOverlay, false).accessLevel(AccessLevel::User);
 
@@ -311 +312 @@
     /**
     @brief
+        Toggles the visibility of an Overlay by it's name.
+    @param name
+        The name of the overlay defined BaseObject::setName() (usually done with the "name"
+        attribute in the xml file).
+    */
+    /*static*/ void OrxonoxOverlay::toggleVisibility(const std::string& name)
+    {
+        std::map<std::string, OrxonoxOverlay*>::const_iterator it = overlays_s.find(name);
+        if (it != overlays_s.end())
+        {
+            OrxonoxOverlay* overlay= (*it).second;
+            if(overlay->isVisible())
+                overlay->hide();
+            else
+                overlay->show();
+        }
+    }
+
+    /**
+    @brief
         Scrolls an overlay by its name.
     @param name

code/trunk/src/orxonox/overlays/OrxonoxOverlay.h

@@ -149 +149 @@
         //! ConsoleCommand: Accesses the overlay by its name and scrolls it.
         static void scrollOverlay(const std::string& name, const Vector2& scroll);
+        static void toggleVisibility(const std::string& name);
         //! ConsoleCommand: Accesses the overlay by its name and rotates it.
         static void rotateOverlay(const std::string& name, const Degree& angle);