Changeset 7751 in orxonox.OLD

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: all Textures are shown again.

Location:

trunk/src

Files:

• lib/graphics/importer/texture.cc (modified) (1 diff)
• world_entities/elements/image_entity.cc (modified) (5 diffs)
• world_entities/elements/image_entity.h (modified) (2 diffs)

trunk/src/lib/graphics/importer/texture.cc

@@ -272 +272 @@
   glBindTexture(target, texture);
 
-   glTexImage2D(target,  0,  format,
-                surface->w,  surface->h,
-                0, format,  GL_UNSIGNED_BYTE,
-                surface->pixels);
+//   glTexImage2D(target,  0,  format,
+//                surface->w,  surface->h,
+//                0, format,  GL_UNSIGNED_BYTE,
+//                surface->pixels);
 
   glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_REPEAT);

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);

trunk/src/world_entities/elements/image_entity.h

@@ -10 +10 @@
 #include "element_2d.h"
 #include "event_listener.h"
-#include "material.h"
+
+#include "vector.h"
+
+
+// FORWARD DECLARATION
+class Model;
+class Material;
+class TiXmlElement;
 
 //! A class that enables the
@@ -32 +39 @@
 
  private:
-   Material         material;             //!< a material for the Aim.
+   Material*        material;             //!< a material for the Aim.
    float            rotationSpeed;        //!< Speed of the Rotation.
    bool             bBillboarding;        //!< true if billboarding is on