Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7221 in orxonox.OLD for trunk/src/world_entities/elements


Ignore:
Timestamp:
Mar 15, 2006, 3:10:45 PM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

Location:
trunk/src/world_entities/elements
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/world_entities/elements/image_entity.cc

    r7193 r7221  
    106106 * @param textureFile The texture-file to load onto the crosshair
    107107 */
    108 void ImageEntity::setTexture(const char* textureFile)
     108void ImageEntity::setTexture(const std::string& textureFile)
    109109{
    110110  this->material->setDiffuseMap(textureFile);

  • trunk/src/world_entities/elements/image_entity.h

    r7016 r7221  
    3030
    3131  void setSize(float sizeX, float sizeY);
    32   void setTexture(const char* textureFile);
     32  void setTexture(const std::string& textureFile);
    3333  /** @param rotationSpeed the speed at what the crosshair should rotate */
    3434  void setRotationSpeed(float rotationSpeed) { this->rotationSpeed = rotationSpeed; };

  • trunk/src/world_entities/elements/text_element.cc

    r7193 r7221  
    7070}
    7171
    72 void TextElement::setText(const char* text)
     72void TextElement::setText(const std::string& text)
    7373{
    7474  Text::setText(text);
    7575}
    7676
    77 void TextElement::setFont(const char* font)
     77void TextElement::setFont(const std::string& font)
    7878{
    7979  Text::setFont(font, (unsigned int)this->getSizeY2D());

  • trunk/src/world_entities/elements/text_element.h

    r7019 r7221  
    2929  virtual void loadParams(const TiXmlElement* root);
    3030
    31   void setText(const char* text);
    32   void setFont(const char* font);
     31  void setText(const std::string& text);
     32  void setFont(const std::string& font);
    3333
    3434 private:
Note: See TracChangeset for help on using the changeset viewer.