Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10741 in orxonox.OLD for branches


Ignore:
Timestamp:
Jun 20, 2007, 8:39:37 PM (17 years ago)
Author:
bknecht
Message:

Kralle entfernt?

Location:
branches/presentation/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/presentation/src/util/hud.cc

    r10736 r10741  
    7272  delete this->inputLine;
    7373  delete this->notifier;
     74  delete this->leftHit;
     75  delete this->rightHit;
    7476
    7577  delete this->_radar;
     
    104106        notifier->setAbsCoor2D(100,100);
    105107       
    106         this->barSocket = new OrxGui::GLGuiImage();
    107         this->barSocket->setParent2D(this->bottomRect);
     108
    108109       
    109110        this->_radar = new OrxGui::GLGuiRadar();
     
    115116        if (this->playmode == FirstPerson)
    116117        {
    117                 this->topHit = new OrxGui::GLGuiImage();
     118                /*this->topHit = new OrxGui::GLGuiImage();
    118119                this->topHit->loadImageFromFile("textures/gui/gui_hitbar.png");
    119120                this->topHit->setParent2D(this->middleRect);
    120                 this->topHit->setRelDir2D(-1.5708);
     121                this->topHit->setAbsDir2D(-1.5708);
    121122               
    122123                this->bottomHit = new OrxGui::GLGuiImage();
    123124                this->bottomHit->loadImageFromFile("textures/gui/gui_hitbar.png");
    124125                this->bottomHit->setParent2D(this->middleRect);
    125                 this->bottomHit->setRelDir2D(1.5708);
     126                this->bottomHit->setAbsDir2D(1.5708);*/
     127
     128                this->barSocket = new OrxGui::GLGuiImage();
     129                this->barSocket->loadImageFromFile("textures/gui/gui_barSocket.png");
     130                this->barSocket->setParent2D(this->bottomRect);
    126131               
    127132                this->leftHit = new OrxGui::GLGuiImage();
    128133                this->leftHit->loadImageFromFile("textures/gui/gui_hitbar.png");
    129134                this->leftHit->setParent2D(this->middleRect);
     135                this->leftHit->shiftDir2D(0.5);
    130136               
    131137                this->rightHit = new OrxGui::GLGuiImage();
    132138                this->rightHit->loadImageFromFile("textures/gui/gui_hitbar.png");
    133139                this->rightHit->setParent2D(this->middleRect);
    134                 this->rightHit->setRelDir2D(3.1416);
     140               
    135141               
    136142                this->leftRect->setParent2D(this);
     
    388394      {
    389395        //PRINTF(0)("WEAPON %s::%s in Slots\n", weapon->getClassCName(), weapon->getName());
    390         weapon->getEnergyWidget()->setParent2D(this->rightRect);
     396        if (this->playmode != FirstPerson)
     397                weapon->getEnergyWidget()->setParent2D(this->rightRect);
     398        else
     399                weapon->getEnergyWidget()->setParent2D(this->bottomRect);
    391400        weapon->getEnergyWidget()->show();
    392401        weapon->getEnergyWidget()->setBackgroundColor(Color(.8,.2,.11, 0.1));
     
    476485       
    477486        this->middleRect->setParent2D(this);
    478         //this->middleRect->setWidgetSize(float(this->resY)/2, float(this->resY)/2);
    479         this->middleRect->setAbsCoor2D(/*float(this->resX - this->resY/2)/2, float(this->resY)/4*/float(this->resX/2), float(this->resY/2));
    480        
    481         this->bottomHit->setRelCoor2D(0, this->resY/4);
    482         this->bottomHit->setWidgetSize(this->resX/10, this->resX/2);
     487        this->middleRect->setWidgetSize(float(this->resY)/2, float(this->resY)/2);
     488        this->middleRect->setAbsCoor2D(float(this->resX)/4, float(this->resY)/4/*float(this->resX/2), float(this->resY/2)*/);
     489       
     490        /*this->bottomHit->setRelCoor2D(0, this->resY/4);
     491        this->bottomHit->setWidgetSize(this->resX/8, this->resX/3);
    483492        this->bottomHit->show();
    484493        this->topHit->setRelCoor2D(0, -this->resY/4);
    485         this->topHit->setWidgetSize(this->resX/10, this->resX/2);
    486         this->topHit->show();
    487         this->leftHit->setRelCoor2D(-this->resX/4, 0);
    488         this->leftHit->setWidgetSize(this->resX/10, this->resX/2);
     494        this->topHit->setWidgetSize(this->resX/8, this->resX/3);
     495        this->topHit->show();*/
     496        this->leftHit->setRelCoor2D(0, 0);
     497        this->leftHit->setWidgetSize(this->resX/9, this->resX/3);
    489498        this->leftHit->show();
    490         this->rightHit->setRelCoor2D(this->resX/4, 0);
    491         this->rightHit->setWidgetSize(this->resX/10, this->resX/2);
    492         this->rightHit->show();
     499        this->rightHit->setRelCoor2D(this->resX/3, 0);
     500        this->rightHit->setWidgetSize(this->resX/9, this->resX/3);
     501        this->rightHit->hide();
     502
     503        this->barSocket->setWidgetSize(overlayWidth, overlayWidth);
     504        this->barSocket->setRelCoor2D(this->resX - overlayWidth, 0);
     505        this->barSocket->hide();
    493506
    494507        //this->middleRect->show();
  • branches/presentation/src/util/hud.h

    r10716 r10741  
    119119  OrxGui::GLGuiWidget*          bottomRect;
    120120  OrxGui::GLGuiWidget*          middleRect;
    121   OrxGui::GLGuiWidget*          barSocket;
    122   OrxGui::GLGuiImage*           topHit;
    123   OrxGui::GLGuiImage*           bottomHit;
     121  OrxGui::GLGuiImage*           barSocket;
     122  //OrxGui::GLGuiImage*         topHit;
     123  //OrxGui::GLGuiImage*         bottomHit;
    124124  OrxGui::GLGuiImage*           leftHit;
    125125  OrxGui::GLGuiImage*           rightHit;
  • branches/presentation/src/world_entities/creatures/fps_player.cc

    r10718 r10741  
    151151  this->cameraNode->addNodeFlags(PNODE_PROHIBIT_CHILD_DELETE);
    152152
     153  this->getWeaponManager().setRotationSpeed(0);
    153154  this->getWeaponManager().getFixedTarget()->setParent(this->cameraNode);
    154155  this->getWeaponManager().getFixedTarget()->setParentMode(PNODE_ALL);
Note: See TracChangeset for help on using the changeset viewer.