Changeset 7730 in orxonox.OLD for trunk/src/world_entities/elements/image_entity.cc
- Timestamp:
- May 19, 2006, 3:46:41 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/world_entities/elements/image_entity.cc
r7221 r7730 49 49 ImageEntity::~ImageEntity () 50 50 { 51 if (this->material)52 delete this->material;53 51 } 54 55 52 56 53 /** … … 67 64 68 65 this->setBindNode(this); 69 this->material = new Material; 70 this->setTexture("pictures/error_texture.png"); 66 //this->setTexture("pictures/error_texture.png"); 71 67 this->bBillboarding = false; 72 68 } … … 78 74 Element2D::loadParams(root); 79 75 80 LoadParam(root, "texture", this, ImageEntity, setTexture)81 .describe("the texture-file to load onto the ImageEntity");76 // LoadParam(root, "texture", this, ImageEntity, setTexture) 77 // .describe("the texture-file to load onto the ImageEntity"); 82 78 83 79 LoadParam(root, "size", this, ImageEntity, setSize) … … 108 104 void ImageEntity::setTexture(const std::string& textureFile) 109 105 { 110 this->material->setDiffuseMap(textureFile);106 // this->material.setDiffuseMap(textureFile); 111 107 } 112 108 … … 144 140 145 141 //glRotatef(this->getAbsDir2D(), 0,0,1); 146 this->material ->select();142 this->material.select(); 147 143 glBegin(GL_TRIANGLE_STRIP); 148 144 glTexCoord2f(0, 0);
Note: See TracChangeset
for help on using the changeset viewer.