Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Jan 10, 2007, 4:29:00 PM (18 years ago)
Author:
hejja
Message:

more

Location:
branches/gui/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/gui/src/lib/gui/gl/glgui_widget.cc

    r10221 r10222  
    112112
    113113
    114 //   this->mat->setBlendFunc(GL_SRC_ALPHA,GL_ONE);
    115 //   this->mat->setDiffuse(1,1,1);
    116 //   this->mat->setDiffuseMap("laser_add.png");
    117 //   this->mat->setDiffuseMap("laser.png",1);
    118 
    119     this->setBackgroundColor(Color(.51, .3, .3, 0));
    120     this->setBackgroundColor(Color(.51, .3, .3, 0), OrxGui::Selected);
     114
     115    this->setBackgroundColor(Color(1, 1, 1, 0.5));
     116    this->setBackgroundColor(Color(0, 0, 0, 0), OrxGui::Selected);
     117
     118
    121119    this->_style[0]._background.setBlendFunc( GL_SRC_ALPHA, GL_SRC_ALPHA);
    122120    this->_style[1]._background.setBlendFunc( GL_SRC_ALPHA, GL_SRC_ALPHA);
     
    132130
    133131    this->setBorderLeft(15);
    134     //this->setBackgroundTexture("gui_element_background.png");
     132    //this->setBackgroundTexture("pogo_bunny.png");
    135133
    136134    this->switchState(_state);
  • branches/gui/src/world_entities/questGUI/quest.cc

    r10167 r10222  
    8585   LoadParam(root, "quest-difficulty", this, Quest, setQuestDifficulty)
    8686       .describe("sets the difficulty of a quest");
     87   LoadParam(root, "quest-persons", this, Quest, setQuestPersons)
     88       .describe("sets the number of persons needed for a quest");
    8789   LoadParam(root, "reward-description", this, Quest, setRewardDescription)
    8890       .describe("sets the description of a reward");
  • branches/gui/src/world_entities/questGUI/quest.h

    r10167 r10222  
    2828   inline void setQuestDifficulty(const std::string& questDifficulty)    { this->questDifficulty = questDifficulty; }
    2929   inline const std::string& getQuestDifficulty()                        { return this->questDifficulty; }
     30   
     31   inline void setQuestPersons(const std::string& questPersons)          { this->questPersons = questPersons; }
     32   inline const std::string& getQuestPersons()                        { return this->questPersons; }
     33   
    3034   inline void setRewardDescription(const std::string& rewardDescription){ this->rewardDescription  = rewardDescription; }
    3135   inline const std::string& getRewardDescription()                      { return this->rewardDescription; }
     
    4246    std::string             questName;
    4347    std::string             questDescription;
     48    std::string             questPersons;
    4449    std::string             questPicture;
    4550    std::string             questDifficulty;
  • branches/gui/src/world_entities/questGUI/quest_gui.cc

    r10213 r10222  
    44   orxonox - the future of 3D-vertical-scrollers
    55
    6    Copyright (C) 2004 orx
     6   Copyright (C) 1004 orx
    77
    88   This program is free software; you can redistribute it and/or modify
     
    7171  this->bKillGui = false;
    7272 
    73   this->background = "maps/pogo_bunny.png";
     73  this->background = "maps/rand2.png";
    7474
    7575  this->myQuest = new Quest(root);
     
    108108  {
    109109    this->questBox= new OrxGui::GLGuiBox(OrxGui::Vertical);
     110    questBox->setBorderTop(10);
     111    questBox->setBorderRight(10);
     112    questBox->setBorderBottom(20);
     113    questBox->setBorderLeft(10);
     114    this->questBox->setBackgroundTexture(background);
    110115    this->bKillGui = false;
    111     this->questBox->setBackgroundTexture(background);
    112116   
    113117    OrxGui::GLGuiBox* headerBox = new OrxGui::GLGuiBox(OrxGui::Horizontal);
     
    115119      OrxGui::GLGuiImage* questImage = new OrxGui::GLGuiImage();
    116120      questImage->setWidgetSize(100, 100);
    117 
    118121      questImage->loadImageFromFile(this->myQuest->getQuestPicture());
    119122      questImage->show();
    120       headerBox->setBackgroundTexture("maps/pogo_bunny.png");
    121123      headerBox->pack(questImage);
    122124     
    123125      OrxGui::GLGuiBox* outlineBox = new OrxGui::GLGuiBox(OrxGui::Vertical);
    124126      {
    125         OrxGui::GLGuiMultiLineText* questDifficulty = new OrxGui::GLGuiMultiLineText();
    126         questDifficulty->setText(this->myQuest->getQuestDifficulty());
    127         outlineBox->setBackgroundTexture("pogo_bunny.png");
    128         outlineBox->pack(questDifficulty);
     127        OrxGui::GLGuiMultiLineText* questDetails = new OrxGui::GLGuiMultiLineText();
     128        questDetails->setText(this->myQuest->getQuestDifficulty());
     129        questDetails->append(this->myQuest->getQuestPersons());
     130        outlineBox->setBorderTop(0);
     131        outlineBox->setBorderRight(0);
     132        outlineBox->setBorderBottom(20);
     133        outlineBox->setBorderLeft(0);
     134        outlineBox->pack(questDetails);
    129135      }
    130       headerBox->setBorderBottom(40);
     136      headerBox->setBorderTop(0);
     137      headerBox->setBorderRight(0);
     138      headerBox->setBorderBottom(20);
     139      headerBox->setBorderLeft(0);
    131140      headerBox->pack(outlineBox);
    132141    }
     
    136145      OrxGui::GLGuiMultiLineText* questTxt = new OrxGui::GLGuiMultiLineText();
    137146      questTxt->setText(this->myQuest->getQuestDescription());
     147      labelBox->setBorderTop(0);
     148      labelBox->setBorderRight(0);
     149      labelBox->setBorderBottom(20);
     150      labelBox->setBorderLeft(0);
    138151      labelBox->pack(questTxt);
    139       labelBox->setBorderBottom(40);
    140152    }
    141153   
     
    151163      OrxGui::GLGuiMultiLineText* rewardTxt = new OrxGui::GLGuiMultiLineText();
    152164      rewardTxt->setText(this->myQuest->getRewardDescription());
    153       rewardBox->setBorderBottom(40);
     165      rewardBox->setBorderTop(0);
     166      rewardBox->setBorderRight(0);
     167      rewardBox->setBorderBottom(20);
     168      rewardBox->setBorderLeft(0);
    154169      rewardBox->pack(rewardTxt);
    155170    }
     
    181196    this->questBox->showAll();
    182197   
    183     this->questBox->setAbsCoor2D(300, 200);
     198    this->questBox->setAbsCoor2D(300, 100);
    184199    OrxGui::GLGuiHandler::getInstance()->activate();
    185200    OrxGui::GLGuiHandler::getInstance()->activateCursor();
Note: See TracChangeset for help on using the changeset viewer.