Changeset 10222 in orxonox.OLD

Timestamp:

Jan 10, 2007, 4:29:00 PM (17 years ago)

Author:

hejja

Message:

more

Location:

branches/gui/src

Files:

• lib/gui/gl/glgui_widget.cc (modified) (2 diffs)
• world_entities/questGUI/quest.cc (modified) (1 diff)
• world_entities/questGUI/quest.h (modified) (2 diffs)
• world_entities/questGUI/quest_gui.cc (modified) (7 diffs)

branches/gui/src/lib/gui/gl/glgui_widget.cc

@@ -112 +112 @@
 
 
-//   this->mat->setBlendFunc(GL_SRC_ALPHA,GL_ONE);
-//   this->mat->setDiffuse(1,1,1);
-//   this->mat->setDiffuseMap("laser_add.png");
-//   this->mat->setDiffuseMap("laser.png",1);
-
-    this->setBackgroundColor(Color(.51, .3, .3, 0));
-    this->setBackgroundColor(Color(.51, .3, .3, 0), OrxGui::Selected);
+
+    this->setBackgroundColor(Color(1, 1, 1, 0.5));
+    this->setBackgroundColor(Color(0, 0, 0, 0), OrxGui::Selected);
+
+
     this->_style[0]._background.setBlendFunc( GL_SRC_ALPHA, GL_SRC_ALPHA);
     this->_style[1]._background.setBlendFunc( GL_SRC_ALPHA, GL_SRC_ALPHA);
@@ -132 +130 @@
 
     this->setBorderLeft(15);
-    //this->setBackgroundTexture("gui_element_background.png");
+    //this->setBackgroundTexture("pogo_bunny.png");
 
     this->switchState(_state);

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

@@ -85 +85 @@
    LoadParam(root, "quest-difficulty", this, Quest, setQuestDifficulty)
        .describe("sets the difficulty of a quest");
+   LoadParam(root, "quest-persons", this, Quest, setQuestPersons)
+       .describe("sets the number of persons needed for a quest");
    LoadParam(root, "reward-description", this, Quest, setRewardDescription)
        .describe("sets the description of a reward");

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

@@ -28 +28 @@
    inline void setQuestDifficulty(const std::string& questDifficulty)    { this->questDifficulty = questDifficulty; }
    inline const std::string& getQuestDifficulty()                        { return this->questDifficulty; }
+   
+   inline void setQuestPersons(const std::string& questPersons)          { this->questPersons = questPersons; }
+   inline const std::string& getQuestPersons()                        { return this->questPersons; }
+   
    inline void setRewardDescription(const std::string& rewardDescription){ this->rewardDescription  = rewardDescription; }
    inline const std::string& getRewardDescription()                      { return this->rewardDescription; }
@@ -42 +46 @@
     std::string             questName;
     std::string             questDescription;
+    std::string             questPersons;
     std::string             questPicture;
     std::string             questDifficulty;

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

@@ -4 +4 @@
    orxonox - the future of 3D-vertical-scrollers
 
-   Copyright (C) 2004 orx
+   Copyright (C) 1004 orx
 
    This program is free software; you can redistribute it and/or modify
@@ -71 +71 @@
   this->bKillGui = false;
   
-  this->background = "maps/pogo_bunny.png";
+  this->background = "maps/rand2.png";
 
   this->myQuest = new Quest(root);
@@ -108 +108 @@
   {
     this->questBox= new OrxGui::GLGuiBox(OrxGui::Vertical);
+    questBox->setBorderTop(10);
+    questBox->setBorderRight(10);
+    questBox->setBorderBottom(20);
+    questBox->setBorderLeft(10);
+    this->questBox->setBackgroundTexture(background);
     this->bKillGui = false;
-    this->questBox->setBackgroundTexture(background);
     
     OrxGui::GLGuiBox* headerBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
@@ -115 +119 @@
       OrxGui::GLGuiImage* questImage = new OrxGui::GLGuiImage();
       questImage->setWidgetSize(100, 100);
-
       questImage->loadImageFromFile(this->myQuest->getQuestPicture());
       questImage->show();
-      headerBox->setBackgroundTexture("maps/pogo_bunny.png");
       headerBox->pack(questImage);
       
       OrxGui::GLGuiBox* outlineBox = new OrxGui::GLGuiBox(OrxGui::Vertical);
       {
-        OrxGui::GLGuiMultiLineText* questDifficulty = new OrxGui::GLGuiMultiLineText();
-        questDifficulty->setText(this->myQuest->getQuestDifficulty());
-        outlineBox->setBackgroundTexture("pogo_bunny.png");
-        outlineBox->pack(questDifficulty);
+        OrxGui::GLGuiMultiLineText* questDetails = new OrxGui::GLGuiMultiLineText();
+        questDetails->setText(this->myQuest->getQuestDifficulty());
+        questDetails->append(this->myQuest->getQuestPersons());
+        outlineBox->setBorderTop(0);
+        outlineBox->setBorderRight(0);
+        outlineBox->setBorderBottom(20);
+        outlineBox->setBorderLeft(0);
+        outlineBox->pack(questDetails);
       }
-      headerBox->setBorderBottom(40);
+      headerBox->setBorderTop(0);
+      headerBox->setBorderRight(0);
+      headerBox->setBorderBottom(20);
+      headerBox->setBorderLeft(0);
       headerBox->pack(outlineBox);
     }
@@ -136 +145 @@
       OrxGui::GLGuiMultiLineText* questTxt = new OrxGui::GLGuiMultiLineText();
       questTxt->setText(this->myQuest->getQuestDescription());
+      labelBox->setBorderTop(0);
+      labelBox->setBorderRight(0);
+      labelBox->setBorderBottom(20);
+      labelBox->setBorderLeft(0);
       labelBox->pack(questTxt);
-      labelBox->setBorderBottom(40);
     }
     
@@ -151 +163 @@
       OrxGui::GLGuiMultiLineText* rewardTxt = new OrxGui::GLGuiMultiLineText();
       rewardTxt->setText(this->myQuest->getRewardDescription());
-      rewardBox->setBorderBottom(40);
+      rewardBox->setBorderTop(0);
+      rewardBox->setBorderRight(0);
+      rewardBox->setBorderBottom(20);
+      rewardBox->setBorderLeft(0);
       rewardBox->pack(rewardTxt);
     }
@@ -181 +196 @@
     this->questBox->showAll();
     
-    this->questBox->setAbsCoor2D(300, 200);
+    this->questBox->setAbsCoor2D(300, 100);
     OrxGui::GLGuiHandler::getInstance()->activate();
     OrxGui::GLGuiHandler::getInstance()->activateCursor();