Changeset 3344 in orxonox.OLD for orxonox/branches/parenting/src/importer/material.cc

Timestamp:

Jan 5, 2005, 5:50:07 PM (21 years ago)

Author:

bensch

Message:

orxonox/branches/parenting: importer: modularity improvement. Now Textures handle the texture-ID themselves and can be retrieved with the getTexture()-function

File:

• orxonox/branches/parenting/src/importer/material.cc (modified) (4 diffs)

orxonox/branches/parenting/src/importer/material.cc

@@ -50 +50 @@
   if (this->name)
     delete []this->name;
-  if (this->diffuseTextureSet)
-    glDeleteTextures (1, &this->diffuseTexture);
+  if (this->diffuseTexture)
+    this->diffuseTexture;
   if (this->nextMat)
     delete this->nextMat;
@@ -89 +89 @@
   this->setTransparency(0.0);
 
+
+  this->diffuseTexture = NULL;
+  this->ambientTexture = NULL;
+  this->specularTexture = NULL;
 
   this->diffuseTextureSet = false;
@@ -145 +149 @@
 
   if (this->diffuseTextureSet)
-    glBindTexture(GL_TEXTURE_2D, this->diffuseTexture);
+    glBindTexture(GL_TEXTURE_2D, this->diffuseTexture->getTexture());
   else
     glBindTexture(GL_TEXTURE_2D, 0);
@@ -318 +322 @@
 {
   PRINTF(3)("setting Diffuse Map %s\n", dMap);
-  Texture* tmp = new Texture();
-  this->diffuseTextureSet = tmp->loadImage(dMap, &this->diffuseTexture);
+  diffuseTexture = new Texture();
+  this->diffuseTextureSet = diffuseTexture->loadImage(dMap);
 
 }