Changeset 10129 in orxonox.OLD for branches/gui/src

Timestamp:

Dec 20, 2006, 4:34:09 PM (17 years ago)

Author:

hejja

Message:

Quest-Klasse implementiert

Location:

branches/gui/src/world_entities

Files:

• Makefile.am (modified) (2 diffs)
• questGUI/quest.cc (added)
• questGUI/quest.h (added)
• questGUI/quest_gui.cc (modified) (12 diffs)
• questGUI/quest_gui.h (modified) (3 diffs)

branches/gui/src/world_entities/Makefile.am

@@ -29 +29 @@
                 \
                 questGUI/quest_gui.cc \
+                questGUI/quest.cc \
                 \
                 effects/explosion.cc \
@@ -60 +61 @@
                 \
                 questGUI/quest_gui.h \
+                questGUI/quest.h \
                 \
                 effects/explosion.h \

branches/gui/src/world_entities/questGUI/quest_gui.cc

@@ -12 +12 @@
 
    ### File Specific:
-   main-programmer: Andreas Hejj
+   main-programmer    std::string             questName;
+    std::string             questDescription;
+    std::string             questPicture;
+    std::string             questDifficulty;
+    std::string             rewardDescription;
+    std::string             rewardPicture;: Andreas Hejj
 
 */
@@ -35 +40 @@
 #include "sound_source.h"
 
+#include "glgui_widget.h"
 #include "glgui.h"
 #include "menu/glgui_imagebutton.h"
@@ -41 +47 @@
 
 
+#include "quest.h"
+
 #include "shell_command.h"
 
@@ -60 +68 @@
   
   this->questBox = NULL;  
-
-  if( root != NULL)
-    this->loadParams(root);
+  
+  this->bKillGui = false;
+
+  this->myQuest = new Quest(root);
+  if(root)
+    this->loadParams( root);
 
 }
@@ -72 +83 @@
 QuestGUI::~QuestGUI () 
 {
-}
-
-
-
+  if( this->myQuest)
+    delete this->myQuest;
+}
 
 /**
@@ -83 +93 @@
 void QuestGUI::loadParams(const TiXmlElement* root)
 {
-   WorldEntity::loadParams(root);
-   
-   LoadParam(root, "quest-name", this, QuestGUI, setQuestName)
-       .describe("sets the name of a quest");
-   LoadParam(root, "quest-description", this, QuestGUI, setQuestDescription)
-       .describe("sets the description of a quest");
-   LoadParam(root, "quest-picture", this, QuestGUI, setQuestPicture)
-       .describe("sets the picture of a quest");
-   LoadParam(root, "quest-difficulty", this, QuestGUI, setQuestDifficulty)
-       .describe("sets the difficulty of a quest");
-   LoadParam(root, "reward-description", this, QuestGUI, setRewardDescription)
-       .describe("sets the description of a reward");
-   LoadParam(root, "reward-picture", this, QuestGUI, setRewardPicture)
-       .describe("sets the Picture of a reward");
-   
-}
+  WorldEntity::loadParams(root);
+}
+
 
 
@@ -109 +106 @@
   {
     this->questBox= new OrxGui::GLGuiBox(OrxGui::Vertical);
+    this->bKillGui = false;
     
     OrxGui::GLGuiBox* headerBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
@@ -114 +112 @@
       OrxGui::GLGuiImage* questImage = new OrxGui::GLGuiImage();
       questImage->setWidgetSize(100, 100);
-      questImage->loadImageFromFile(questPicture);
+      questImage->loadImageFromFile(this->myQuest->getQuestPicture());
       questImage->show();
+      questImage->setBorderBottom(20);
       headerBox->pack(questImage);
+      headerBox->setBorderBottom(20);
       
       OrxGui::GLGuiBox* outlineBox = new OrxGui::GLGuiBox(OrxGui::Vertical);
       {
         OrxGui::GLGuiText* questDifficulty = new OrxGui::GLGuiText();
-        questDifficulty->setText(this->questDifficulty);
+        questDifficulty->setText(this->myQuest->getQuestDifficulty());
         outlineBox->pack(questDifficulty);
       }
       headerBox->pack(outlineBox);
+      headerBox->setBorderBottom(75);
       
     }
@@ -131 +132 @@
     { 
       OrxGui::GLGuiText* questTxt = new OrxGui::GLGuiText();
-      questTxt->setText(this->questDescription);
+      questTxt->setText(this->myQuest->getQuestDescription());
       labelBox->pack(questTxt);
+      labelBox->setBorderBottom(75);
     }
     
@@ -140 +142 @@
       OrxGui::GLGuiImage* rewardImage = new OrxGui::GLGuiImage();
       rewardImage->setWidgetSize(50, 50);
-      rewardImage->loadImageFromFile(rewardPicture);
+      rewardImage->loadImageFromFile(this->myQuest->getRewardPicture());
       rewardImage->show();
       rewardBox->pack(rewardImage);
+      rewardImage->setBorderBottom(50);
     
       OrxGui::GLGuiText* rewardTxt = new OrxGui::GLGuiText();
-      rewardTxt->setText(this->rewardDescription);
+      rewardTxt->setText(this->myQuest->getRewardDescription());
       rewardBox->pack(rewardTxt);
+      rewardBox->setBorderBottom(75);
+      
     }
     
@@ -152 +157 @@
     {
       OrxGui::GLGuiButton* acceptButton = new OrxGui::GLGuiPushButton("Accept");
+      acceptButton->released.connect(this, &QuestGUI::accept);
       answerBox->pack(acceptButton);
+      acceptButton->select();
       
       OrxGui::GLGuiButton* refuseButton = new OrxGui::GLGuiPushButton("Refuse");
+      refuseButton->released.connect(this, &QuestGUI::refuse);
       answerBox->pack(refuseButton);
     }
@@ -170 +178 @@
   else
   {
-    OrxGui::GLGuiHandler::getInstance()->deactivate();
-    OrxGui::GLGuiHandler::getInstance()->deactivateCursor();
-    delete this->questBox;
-    this->questBox = NULL;
+    this->bKillGui = true;
   }
   
 }
 
-
-
-
+    
+void QuestGUI::tick(float dt)
+{
+  if( this->bKillGui)
+    this->killgui();
+}
+    
+
+void QuestGUI::accept()
+{
+  this->bKillGui = true;
+  
+}
+
+void QuestGUI::refuse()
+{
+  this->bKillGui = true;
+}
+
+void QuestGUI::killgui()
+{
+  OrxGui::GLGuiHandler::getInstance()->deactivate();
+  OrxGui::GLGuiHandler::getInstance()->deactivateCursor();
+  delete this->questBox;
+  this->questBox = NULL;
+}

branches/gui/src/world_entities/questGUI/quest_gui.h

@@ -8 +8 @@
 #include <vector>
 
-
+class Quest;
 
 class QuestGUI : public WorldEntity 
@@ -18 +18 @@
    QuestGUI (const TiXmlElement* root);
    virtual ~QuestGUI ();
-
-
-   virtual void loadParams(const TiXmlElement* root = NULL);
-
-   /** @param questName sets the name of this quest */
-   inline void setQuestName(const std::string& questName)                { this->questName = questName; }
-   inline void setQuestDescription(const std::string& questDescription)  { this->questDescription = questDescription; }
-   inline void setQuestPicture(const std::string& questPicture)          { this->questPicture = questPicture; }
-   inline void setQuestDifficulty(const std::string& questDifficulty)    { this->questDifficulty = questDifficulty; }
-   inline void setRewardDescription(const std::string& rewardDescription){ this->rewardDescription  = rewardDescription; }
-   inline void setRewardPicture(const std::string& rewardPicture)        { this->rewardPicture  = rewardPicture; }
+                     
+   void loadParams(const TiXmlElement* root);
+   
    void guiInit();
 
+   virtual void tick(float dt);
    
   private:
-    std::string             questName;
-    std::string             questDescription;
-    std::string             questPicture;
-    std::string             questDifficulty;
-    std::string             rewardDescription;
-    std::string             rewardPicture;
+    Quest*                  myQuest;
+    bool                    bKillGui;
     
     OrxGui::GLGuiBox*       headerBox;
@@ -50 +39 @@
 
     OrxSound::SoundSource*  selectorSource;
+    
+    void accept();
+    void refuse();
+    void killgui();
 };