Changeset 5306 in orxonox.OLD for trunk/src/lib/graphics/importer

Timestamp:

Oct 7, 2005, 6:17:49 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ResourceManage-fixes

Location:

trunk/src/lib/graphics/importer

Files:

• material.cc (modified) (2 diffs)
• texture.cc (modified) (1 diff)

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

@@ -31 +31 @@
 
 /**
- *  creates a Material.
+ * creates a Material.
  * @param mtlName Name of the Material to be added to the Material List
-*/
+ */
 Material::Material (const char* mtlName)
 {
@@ -105 +105 @@
     glShadeModel(GL_SMOOTH);
 
-  if (this->diffuseTexture)
+  if (this->diffuseTexture != NULL)
     {
       glEnable(GL_TEXTURE_2D);

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

@@ -33 +33 @@
 {
   this->setClassID(CL_TEXTURE, "Texture");
+  this->setName(imageName);
 
   this->bAlpha = false;