Changeset 7751 in orxonox.OLD for trunk/src/world_entities/elements/image_entity.cc

Timestamp:

May 21, 2006, 12:51:36 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: all Textures are shown again.

File:

• trunk/src/world_entities/elements/image_entity.cc (modified) (5 diffs)

trunk/src/world_entities/elements/image_entity.cc

@@ -49 +49 @@
 ImageEntity::~ImageEntity ()
 {
+  if (this->material)
+    delete this->material;
 }
+
 
 /**
@@ -64 +67 @@
 
   this->setBindNode(this);
-  //this->setTexture("pictures/error_texture.png");
+  this->material = new Material;
+  this->setTexture("pictures/error_texture.png");
   this->bBillboarding = false;
 }
@@ -74 +78 @@
   Element2D::loadParams(root);
 
-//   LoadParam(root, "texture", this, ImageEntity, setTexture)
-//       .describe("the texture-file to load onto the ImageEntity");
+  LoadParam(root, "texture", this, ImageEntity, setTexture)
+      .describe("the texture-file to load onto the ImageEntity");
 
   LoadParam(root, "size", this, ImageEntity, setSize)
@@ -104 +108 @@
 void ImageEntity::setTexture(const std::string& textureFile)
 {
- //   this->material.setDiffuseMap(textureFile);
+  this->material->setDiffuseMap(textureFile);
 }
 
@@ -140 +144 @@
 
   //glRotatef(this->getAbsDir2D(), 0,0,1);
-  this->material.select();
+  this->material->select();
   glBegin(GL_TRIANGLE_STRIP);
   glTexCoord2f(0, 0);