Changeset 4136 in orxonox.OLD for orxonox/trunk/src/lib/graphics

Timestamp:

May 10, 2005, 12:06:20 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: skyModel now gets unloaded/loaded for real. There was some danger, when loading a model into a WorldEntity not using the resourceManager. so this should not be done anymore.
maybe i will write a fix to the ResourceManager, enabling it, to also load pointers to user-space-defined Variables… we'll see

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

• material.cc (modified) (3 diffs)
• material.h (modified) (1 diff)

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

@@ -45 +45 @@
   this->setTransparency(1.0);
 
-
   this->diffuseTexture = NULL;
   this->ambientTexture = NULL;
   this->specularTexture = NULL;
-
-  this->diffuseTextureSet = false;
-  this->ambientTextureSet = false;
-  this->specularTextureSet = false;
 
   this->setName(mtlName);
@@ -107 +102 @@
     glShadeModel(GL_SMOOTH);
 
-  if (this->diffuseTextureSet)
+  if (this->diffuseTexture)
     {
       glEnable(GL_TEXTURE_2D);
@@ -300 +295 @@
 {
   PRINTF(4)("setting Diffuse Map %s\n", dMap);
-  //    diffuseTexture = new Texture();
-  //    this->diffuseTextureSet = diffuseTexture->loadImage(dMap);
 
   //! \todo check if RESOURCE MANAGER is availiable
   //! \todo Textures from .mtl-file need special care.
-  this->diffuseTextureSet = this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE);
+  this->diffuseTexture = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE);
 }
 

orxonox/trunk/src/lib/graphics/importer/material.h

@@ -67 +67 @@
   Texture* ambientTexture; //!< The ambient texture of the Material.
   Texture* specularTexture;//!< The specular texture of the Material.
-  
-  bool diffuseTextureSet; //!< Chekcs if the diffuse texture is Set.
-  bool ambientTextureSet; //!< Chekcs if the ambient texture is Set.
-  bool specularTextureSet;//!< Chekcs if the specular texture is Set.
-
 };
 #endif