Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8529 in orxonox.OLD for branches/gui/src/lib


Ignore:
Timestamp:
Jun 16, 2006, 2:51:44 PM (18 years ago)
Author:
bensch
Message:

valgrind-sweep

Location:
branches/gui/src/lib
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/gui/src/lib/graphics/effects/lense_flare.cc

    r8495 r8529  
    4747    this->setClassID(CL_LENSE_FLARE, "LenseFlare");
    4848
    49     this->flareMatrix = new float[14];
    5049    /*          length                      image scale */
    5150    this->flareMatrix[0] = 1.0f;
  • branches/gui/src/lib/graphics/effects/lense_flare.h

    r8495 r8529  
    5151    bool                     bVisible;          //!< Checks visibility
    5252    Light*                   lightSource;        //!< reference to the sun (or primary light source)
    53     std::vector<ImagePlane*>  flares;             //!< the flares array
     53    std::vector<ImagePlane*> flares;             //!< the flares array
    5454
    5555    Vector2D                 flareVector;        //!< the axis to draw the flares on
     
    5757    Vector2D                 screenCenter;       //!< the vector marking the center of the screen
    5858
    59     float*                   flareMatrix;
     59    float                    flareMatrix[14];
    6060    Plane                    frustumPlane;       //!< plane that marks the view frustum
    6161};
  • branches/gui/src/lib/gui/gl/glgui_inputline.cc

    r8528 r8529  
    5757
    5858    this->delayNext = 0.0;
     59    this->pressedKey = SDLK_FIRST;
     60    this->pressedKeyName = SDLK_FIRST;
    5961
    6062  }
     
    202204    this->setSize2D( this->_text.getSize2D() + Vector2D(borderLeft() + borderRight(), borderTop() + borderBottom()));
    203205    GLGuiWidget::resize();
    204 /*    this->frontRect().setTopLeft(borderLeft(), borderTop());
    205     this->frontRect().setSize(this->getSize2D() - Vector2D(borderLeft() + borderRight(), borderTop() + borderBottom()));*/
     206    /*    this->frontRect().setTopLeft(borderLeft(), borderTop());
     207        this->frontRect().setSize(this->getSize2D() - Vector2D(borderLeft() + borderRight(), borderTop() + borderBottom()));*/
    206208  }
    207209
     
    230232    if (this->delayNext > 0.0)
    231233      this->delayNext -= dt;
    232         else if (this->pressedKey != SDLK_FIRST )
     234    else if (this->pressedKey != SDLK_FIRST )
    233235    {
    234236      this->delayNext = GLGuiInputLine::repeatRate;
     
    239241          break;
    240242        default:
    241         {
    242           if (likely(this->pressedKey < 127))
    243             this->appendCharacter(this->pressedKeyName);
    244         }
     243          {
     244            if (likely(this->pressedKey < 127))
     245              this->appendCharacter(this->pressedKeyName);
     246          }
    245247      }
    246248    }
     
    257259    GLGuiWidget::draw();
    258260
    259 //     this->frontMaterial().select();
    260 //     GLGuiWidget::drawRect(this->frontRect());
     261    //     this->frontMaterial().select();
     262    //     GLGuiWidget::drawRect(this->frontRect());
    261263
    262264    this->endDraw();
Note: See TracChangeset for help on using the changeset viewer.