Changeset 7524 in orxonox.OLD for branches

Timestamp:

May 3, 2006, 5:20:13 PM (19 years ago)

Author:

stefalie

Message:

branches/bsp_model: setSDLSurfaceDiffuseMap added to Material

Location:

branches/bsp_model/src/lib/graphics/importer

Files:

• bsp_file.cc (modified) (10 diffs)
• material.cc (modified) (2 diffs)
• material.h (modified) (3 diffs)

branches/bsp_model/src/lib/graphics/importer/bsp_file.cc

@@ -45 +45 @@
   int size;
   struct stat results;
-  name = "/root/data/Kanti175.bsp";
+  name = "/home/stefalie/svn/orxonox/data/Kanti175.bsp";
 
   if (stat( name , &results) == 0) {
@@ -384 +384 @@
     // Check for tga
     strcpy(fileName, &this->textures[8+ 72*i]);
-    strcpy (absFileName,"/root/data/trunk/");
+    strcpy (absFileName,"/home/stefalie/svn/orxonox/data/trunk/");
     strcpy(ext, ".tga");
     strncat (fileName, ext, strlen(fileName));
@@ -397 +397 @@
     // Check for TGA
     strcpy(fileName, &this->textures[8+ 72*i]);
-    strcpy (absFileName,"/root/data/trunk/");
+    strcpy (absFileName,"/home/stefalie/svn/orxonox/data/trunk/");
     strcpy(ext, ".TGA");
     strncat (fileName, ext, strlen(fileName));
@@ -410 +410 @@
     // Check for jpg
     strcpy(fileName, &this->textures[8+ 72*i]);
-    strcpy (absFileName,"/root/data/trunk/");
+    strcpy (absFileName,"/home/stefalie/svn/orxonox/data/trunk/");
     strcpy(ext, ".jpg");
     strncat (fileName, ext, strlen(fileName));
@@ -424 +424 @@
     // Check for JPG
     strcpy(fileName, &this->textures[8+ 72*i]);
-    strcpy (absFileName,"/root/data/trunk/");
+    strcpy (absFileName,"/home/stefalie/svn/orxonox/data/trunk/");
     strcpy(ext, ".JPG");
     strncat (fileName, ext, strlen(fileName));
@@ -437 +437 @@
     // Check for jpeg
     strcpy(fileName, &this->textures[8+ 72*i]);
-    strcpy (absFileName,"/root/data/trunk/");
+    strcpy (absFileName,"/home/stefalie/svn/orxonox/data/trunk/");
     strcpy(ext, ".jpeg");
     strncat (fileName, ext, strlen(fileName));
@@ -451 +451 @@
     // Check for JPEG
     strcpy(fileName, &this->textures[8+ 72*i]);
-    strcpy (absFileName,"/root/data/trunk/");
+    strcpy (absFileName,"/home/stefalie/svn/orxonox/data/trunk/");
     strcpy(ext, ".JPEG");
     strncat (fileName, ext, strlen(fileName));
@@ -465 +465 @@
     // Check for bmp
     strcpy(fileName, &this->textures[8+ 72*i]);
-    strcpy (absFileName,"/root/data/trunk/");
+    strcpy (absFileName,"/home/stefalie/svn/orxonox/data/trunk/");
     strcpy(ext, ".bmp");
     strncat (fileName, ext, strlen(fileName));
@@ -479 +479 @@
     // Check for BMP
     strcpy(fileName, &this->textures[8+ 72*i]);
-    strcpy (absFileName,"/root/data/trunk/");
+    strcpy (absFileName,"/home/stefalie/svn/orxonox/data/trunk/");
     strcpy(ext, ".BMP");
     strncat (fileName, ext, strlen(fileName));
@@ -485 +485 @@
     // absFileName = ResourceManager::getFullName(fileName);
 
-    if(stat( absFileName , &results) == 0) {
+    if(false /*stat( absFileName , &results) == 0*/) {
       PRINTF(0)("BSP FILE: gefunden . \n");
       this->Materials[i] = this->loadMat(fileName);

branches/bsp_model/src/lib/graphics/importer/material.cc

@@ -167 +167 @@
       glActiveTexture(Material::glTextureArbs[i]);
       glEnable(GL_TEXTURE_2D);
+      if(this->textures[i]->hasAlpha())
+      {
+        glEnable(GL_BLEND);
+      }
       glBindTexture(GL_TEXTURE_2D, this->textures[i]->getTexture());
     }
@@ -355 +359 @@
 
 /**
+ *  Sets the Materials Diffuse Map
+ * @param surface pointer to SDL_Surface which shall be used as texture
+*/
+void Material::setSDLDiffuseMap(SDL_Surface *surface, GLenum target, 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);
+
+  if(surface != NULL)
+  {
+    this->textures[textureNumber] = &Texture(surface, GL_TEXTURE_2D);
+  }
+  else
+  {
+    this->textures[textureNumber] = NULL;
+  }
+
+}
+
+
+/**
  *  Sets the Materials Ambient Map
  * @param aMap the Name of the Image to Use

branches/bsp_model/src/lib/graphics/importer/material.h

@@ -10 +10 @@
 #include "base_object.h"
 
+
 #if HAVE_CONFIG_H
 #include <config.h>
@@ -15 +16 @@
 
 #include <vector>
-
+#include "SDL_image.h"
 
 #include "texture.h"
@@ -53 +54 @@
     // MAPPING //
     void setDiffuseMap(const std::string& dMap, GLenum target = GL_TEXTURE_2D, unsigned int textureNumber = 0);
+    void setSDLDiffuseMap(SDL_Surface *surface, GLenum target = GL_TEXTURE_2D, unsigned int textureNumber = 0);
 
     void setAmbientMap(const std::string& aMap, GLenum target = GL_TEXTURE_2D);