Changeset 7214 in orxonox.OLD for branches/std/src/world_entities/elements

Timestamp:

Mar 10, 2006, 7:18:03 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now the branche works again, as it did before

Location:

branches/std/src/world_entities/elements

Files:

• image_entity.cc (modified) (1 diff)
• image_entity.h (modified) (1 diff)

branches/std/src/world_entities/elements/image_entity.cc

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

branches/std/src/world_entities/elements/image_entity.h

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