Changeset 7788 in orxonox.OLD for trunk/src/lib/graphics/importer/material.cc

Timestamp:

May 24, 2006, 3:41:09 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Material handles references… lets see if this works

File:

• trunk/src/lib/graphics/importer/material.cc (modified) (11 diffs)

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

@@ -22 +22 @@
 #include "debug.h"
 #include "util/loading/resource_manager.h"
-#include <stdlib.h>
-#include <string.h>
-
-//! @todo check if we are in RESOURCE MANAGER-mode
-#include "util/loading/resource_manager.h"
-
-using namespace std;
-
-/**
- * creates a Material.
+
+/**
+ * @brief creates a Material.
  * @param mtlName Name of the Material to be added to the Material List
  */
@@ -54 +47 @@
 
 /**
-  *  deletes a Material
-*/
+ * @brief deletes a Material
+ */
 Material::~Material()
 {
   PRINTF(5)("delete Material %s.\n", this->getName());
-
-  while(!this->textures.empty())
-  {
-    if (this->textures.back() != NULL)
-      ResourceManager::getInstance()->unload(this->textures.back());
-    this->textures.pop_back();
-  }
 
   if (this->ambientTexture != NULL)
@@ -115 +101 @@
 
 /**
- *  sets the material with which the following Faces will be painted
+ * @brief sets the material with which the following Faces will be painted
  */
 bool Material::select() const
@@ -135 +121 @@
   // setting the transparency
   if (this->transparency < 1.0 ||       /* This allows alpha blending of 2D textures with the scene */
-      (likely(!this->textures.empty() && this->textures[0] != NULL) && this->textures[0]->hasAlpha()))
+      (likely(!this->textures.empty() && this->textures[0].hasAlpha())))
   {
     glEnable(GL_BLEND);
@@ -164 +150 @@
   for(unsigned int i = 0; i < this->textures.size(); ++i)
   {
-    if (likely(this->textures[i] != NULL))
-    {
       glActiveTexture(Material::glTextureArbs[i]);
       glEnable(GL_TEXTURE_2D);
-      if(this->textures[i]->hasAlpha())
+      if(this->textures[i].hasAlpha())
       {
         glEnable(GL_BLEND);
       }
-      glBindTexture(GL_TEXTURE_2D, this->textures[i]->getTexture());
-    }
+      glBindTexture(GL_TEXTURE_2D, this->textures[i].getTexture());
   }
   Material::selectedMaterial = this;
@@ -333 +316 @@
 // MAPPING //
 
-void Material::setDiffuseMap(Texture* texture, unsigned int textureNumber)
+void Material::setDiffuseMap(const Texture& texture, unsigned int textureNumber)
 {
   assert(textureNumber < Material::getMaxTextureUnits());
 
-  if (this->textures.size() > textureNumber && this->textures[textureNumber] != NULL)
-    ResourceManager::getInstance()->unload(this->textures[textureNumber]);
-
   if (this->textures.size() <= textureNumber)
-    this->textures.resize(textureNumber+1, NULL);
+    this->textures.resize(textureNumber+1, Texture());
 
   //! @todo check if RESOURCE MANAGER is availiable
@@ -357 +337 @@
 
   PRINTF(5)("setting Diffuse Map %s\n", dMap.c_str());
-  if (this->textures.size() > textureNumber && this->textures[textureNumber] != NULL)
-    ResourceManager::getInstance()->unload(this->textures[textureNumber]);
-
   if (this->textures.size() <= textureNumber)
-    this->textures.resize(textureNumber+1, NULL);
+    this->textures.resize(textureNumber+1, Texture());
 
   //! @todo check if RESOURCE MANAGER is availiable
@@ -367 +344 @@
   {
 
-    this->textures[textureNumber] = (Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (int)target);
+    this->textures[textureNumber] = *(Texture*)ResourceManager::getInstance()->load(dMap, IMAGE, RP_GAME, (int)target);
   }
   else
   {
-    this->textures[textureNumber] = NULL;
-  }
-}
-
-/**
- *  Sets the Materials Diffuse Map
+    this->textures[textureNumber] = Texture();
+  }
+}
+
+/**
+ * @brief Sets the Materials Diffuse Map
  * @param surface pointer to SDL_Surface which shall be used as texture
 */
@@ -384 +361 @@
 
 
-  if (this->textures.size() > textureNumber && this->textures[textureNumber] != NULL)
-    ResourceManager::getInstance()->unload(this->textures[textureNumber]);
-
   if (this->textures.size() <= textureNumber)
-    this->textures.resize(textureNumber+1, NULL);
+    this->textures.resize(textureNumber+1, Texture());
 
   if(surface != NULL)
   {
-    this->textures[textureNumber] = new Texture(surface, GL_TEXTURE_2D);
+    this->textures[textureNumber] = Texture(surface, GL_TEXTURE_2D);
   }
   else
   {
-    this->textures[textureNumber] = NULL;
-  }
-
-}
-
-
-/**
- *  Sets the Materials Ambient Map
+    this->textures[textureNumber] = Texture();
+  }
+
+}
+
+
+/**
+ * @brief Sets the Materials Ambient Map
  * @param aMap the Name of the Image to Use
    @todo implement this
@@ -414 +388 @@
 
 /**
- *  Sets the Materials Specular Map
+ * @brief Sets the Materials Specular Map
  * @param sMap the Name of the Image to Use
    @todo implement this
@@ -425 +399 @@
 
 /**
- *  Sets the Materials Bumpiness
+ * @brief Sets the Materials Bumpiness
  * @param bump the Name of the Image to Use
-   @todo implemet this
+ * @todo implemet this
 */
 void Material::setBump(const std::string& bump)