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

Timestamp:

Jun 5, 2006, 11:49:26 AM (19 years ago)

Author:

bensch

Message:

trunk: merged the gui back
merged with command:
svn merge -r8114:HEAD ​https://svn.orxonox.net/orxonox/branches/gui .
→ no conflicts

Location:

trunk/src/lib/graphics/importer

Files:

• primitive_model.cc (modified) (2 diffs)
• texture.cc (modified) (1 diff)
• texture.h (modified) (1 diff)

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

@@ -104 +104 @@
 
   // defining the binding Faces.
-  unsigned int v1, v2, v3, v4;
+  int v1, v2, v3, v4;
   for (int i = 0; i <= detail * 2 -1; i++)
   {
@@ -235 +235 @@
     }
   //defining Faces
-  unsigned int v1, v2, v3, v4;
+  int v1, v2, v3, v4;
   for (int i = 0; i < detail-1; i++)
     for (int j = 0; j < detail-1; j++)

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

@@ -218 +218 @@
     this->setTexture(Texture::loadTexToGL(this->data->getStoredImage()));
   }
+  return true;
 }
 

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

@@ -34 +34 @@
     bool setSurface(SDL_Surface* newSurface);
     /** @returns true if the Surface has an Alpha Value. */
-    bool setAlpha(bool hasAlpha) { this->bAlpha = hasAlpha; };
+    bool setAlpha(bool hasAlpha) { this->bAlpha = hasAlpha; return this->bAlpha; };
     bool setTexture(GLuint texture);