Context Navigation

elements

Timestamp:

Mar 15, 2006, 3:10:45 PM (19 years ago)

Author:

bensch

Message:

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

Location:

trunk/src/world_entities/elements

Files:

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

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

r7193	r7221
70	70	}
71	71
72		void TextElement::setText(const char* text)
	72	void TextElement::setText(const std::string& text)
73	73	{
74	74	Text::setText(text);
75	75	}
76	76
77		void TextElement::setFont(const char* font)
	77	void TextElement::setFont(const std::string& font)
78	78	{
79	79	Text::setFont(font, (unsigned int)this->getSizeY2D());

-                      r7019
+                      r7221
   virtual void loadParams(const TiXmlElement* root);
   void setText(const char* text);
   void setFont(const char* font);
+  void setText(const std::string& text);
+  void setFont(const std::string& font);
  private:

Note: See TracChangeset for help on using the changeset viewer.