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

Timestamp:

Jun 11, 2006, 1:57:27 PM (19 years ago)

Author:

bensch

Message:

trunk: fixed most -Wall warnings… but there are still many missing :/

Location:

trunk/src/lib/graphics

Files:

• effects/fog_effect.cc (modified) (6 diffs)
• effects/graphics_effect.cc (modified) (1 diff)
• effects/lense_flare.cc (modified) (4 diffs)
• effects/lightening_effect.cc (modified) (9 diffs)
• effects/rain_effect.cc (modified) (6 diffs)
• effects/snow_effect.cc (modified) (7 diffs)
• effects/volfog_effect.cc (modified) (6 diffs)
• effects/weather_effect.cc (modified) (1 diff)
• graphics_engine.cc (modified) (10 diffs)
• graphics_engine.h (modified) (2 diffs)
• importer/height_map.cc (modified) (2 diffs)
• importer/material.cc (modified) (4 diffs)
• importer/material.h (modified) (1 diff)
• importer/md2Model.cc (modified) (3 diffs)
• importer/media_container.cc (modified) (1 diff)
• importer/model.cc (modified) (1 diff)
• importer/primitive_model.cc (modified) (6 diffs)
• importer/static_model.cc (modified) (15 diffs)
• importer/tc.cc (modified) (6 diffs)
• importer/texture.cc (modified) (6 diffs)
• render2D/element_2d.cc (modified) (3 diffs)
• shader.cc (modified) (1 diff)
• text_engine/font.cc (modified) (11 diffs)

trunk/src/lib/graphics/effects/fog_effect.cc

@@ -72 +72 @@
         this->fogFadeDuration = 0;
         this->localTimer = 0;
-        
+
         this->fogMode = GL_EXP2;
         this->fogDensity = 0.001;
@@ -79 +79 @@
         this->colorVector = Vector(0.7, 0.7, 0.7);
 
+        return true;
 }
 
@@ -87 +88 @@
 
         this->fogActivate = true;
-        
+
         GLfloat fogColor[4] = { colorVector.x, colorVector.y, colorVector.z, 1.0};
         glFogi(GL_FOG_MODE, this->fogMode);
@@ -95 +96 @@
         glFogf(GL_FOG_START, this->fogStart);
         glFogf(GL_FOG_END, this->fogEnd);
-        
+
         glEnable(GL_FOG);
         // glClearColor(0.5, 0.5, 0.5, 1.0);
+        return true;
 }
 
@@ -106 +108 @@
 
         this->fogActivate = false;
-        
+
         glDisable(GL_FOG);
+
+        return true;
 }
 
@@ -122 +126 @@
         if (!this->fogActivate)
                 return;
-                
+
 
         if (this->fogFadeDuration != 0 && this->localTimer < this->fogFadeDuration) {

trunk/src/lib/graphics/effects/graphics_effect.cc

@@ -61 +61 @@
  */
 bool GraphicsEffect::init()
-{}
+{
+  return true;
+}
 
 

trunk/src/lib/graphics/effects/lense_flare.cc

@@ -104 +104 @@
  */
 bool LenseFlare::init()
-{}
+{
+  return true;
+}
 
 
@@ -113 +115 @@
 {
   this->bActivated = true;
+
+  return true;
 }
 
@@ -122 +126 @@
 {
   this->bActivated = false;
+
+  return true;
 }
 
@@ -130 +136 @@
  */
 GLint LenseFlare::stringToFogMode(const std::string& mode)
-{}
+{
+  PRINTF(1)("NOT IMPLEMENTED");
+  return 0;
+}
 
 

trunk/src/lib/graphics/effects/lightening_effect.cc

@@ -36 +36 @@
 {
         this->setClassID(CL_LIGHTENING_EFFECT, "LighteningEffect");
-  
+
         this->init();
 
@@ -54 +54 @@
 {
         WeatherEffect::loadParams(root);
-  
+
   LoadParam(root, "coord", this, LighteningEffect, coord);
   LoadParam(root, "option", this, LighteningEffect, setLighteningOption);
@@ -68 +68 @@
 {
   lighteningActivate = false;
-  
+
   this->time = 0.0;
   this->flashFrequency = 1.4f;
@@ -117 +117 @@
     ResourceManager::getInstance()->unload(this->thunderBuffer);
   this->thunderBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/thunder.wav", WAV);*/
+
+  return true;
 }
 
@@ -149 +151 @@
   this->time = 0;
   lighteningActivate = true;
+
+  return true;
 }
 
@@ -160 +164 @@
   this->billboard[3]->setVisibiliy(false);
   lighteningActivate = false;
+
+
+  return true;
 }
 
@@ -166 +173 @@
   if(!lighteningActivate)
     return;
-  
+
   this->time += dt;
 
@@ -175 +182 @@
     else
       this->flashLight->setDiffuseColor(100,100,100);
-    
+
     //PRINTF(0)("100*time: %f %i\n", 100*time, (int)(100*time));
 }*/
-  
+
   if( this->time > this->flashFrequency)
   {
     this->billboard[0]->setVisibiliy(true);
     this->time = 0.0f;
-    
+
     this->flashLight = new Light();
     this->flashLight->setAbsCoor(this->billboard[0]->getAbsCoor().x, this->billboard[0]->getAbsCoor().y, this->billboard[0]->getAbsCoor().z);
     this->flashLight->setDiffuseColor(100,100,100);
-    
+
     //this->soundSource.play(this->thunderBuffer);
   }
@@ -195 +202 @@
     this->time = 0.0f;
     this->bNewCoordinate = true;
-    
+
     if(flashLight != NULL)
     {

trunk/src/lib/graphics/effects/rain_effect.cc

@@ -117 +117 @@
         lightMan = LightManager::getInstance();
         this->rainAmbient = lightMan->getAmbientColor();
+
+        return true;
 }
 
@@ -150 +152 @@
 
         this->emitter->setSpread(this->rainWindForce / 50, 0.2);
-        
+
         this->soundSource.loop(this->rainBuffer, this->soundRainVolume);
         if (this->rainWindForce != 0) this->soundSource.loop(this->windBuffer, 0.1f * this->rainWindForce);
 
         lightMan->setAmbientColor(.1,.1,.1);
+
+        return true;
 }
 
@@ -161 +165 @@
 {
         PRINTF(0)("Deactivating RainEffect\n");
-        
+
         this->rainActivate = false;
         this->emitter->setSystem(NULL);
@@ -170 +174 @@
         // Restore Light Ambient
         lightMan->setAmbientColor(this->rainAmbient, this->rainAmbient, this->rainAmbient);
+
+        return true;
 }
 
@@ -176 +182 @@
         if (!this->rainActivate)
                 return;
-                
+
         if (this->rainMove) {
                 this->rainCoord = State::getCameraNode()->getAbsCoor();
@@ -202 +208 @@
                 // this->soundSource.fadein(this->rainBuffer, 10);
         }
-        
+
 }
 

trunk/src/lib/graphics/effects/snow_effect.cc

@@ -79 +79 @@
         LoadParam(root, "size", this, SnowEffect, size);
         LoadParam(root, "coord", this, SnowEffect, coord);
-  
+
         LOAD_PARAM_START_CYCLE(root, element);
         {
@@ -111 +111 @@
         this->snowCoord = Vector(100,450,400);
         this->snowWindForce = 1;
+
+        return true;
 }
 
@@ -143 +145 @@
         if (this->snowWindForce > 1)
                 this->soundSource.loop(this->windBuffer);
+
+        return true;
 }
 
@@ -156 +160 @@
                 ResourceManager::getInstance()->unload(this->windBuffer);
 
+        return true;
 }
 
@@ -171 +176 @@
         /*
         float distance = (State::getCameraNode()->getAbsCoor() - Vector(snowCoord.x, State::getCameraNode()->getAbsCoor().y, snowCoord.z)).len();
-        
+
         if(activated)
         {
@@ -182 +187 @@
         else if(distance > 0.1*snowSize.x || distance > 0.1*snowSize.y)
         this->alpha = 0.4;
-        
+
         SnowEffect::snowParticles->setColor(0,1, 1, 1, alpha);
         SnowEffect::snowParticles->setColor(.5, .6, .6, .6, alpha/2);
@@ -197 +202 @@
         else if( distance < 0.1*snowSize.x || distance < 0.1*snowSize.y )
         this->alpha = 0.5;
-        
+
         SnowEffect::snowParticles->setColor(0,1, 1, 1, alpha);
         SnowEffect::snowParticles->setColor(.5, .6, .6, .6, alpha/2);

trunk/src/lib/graphics/effects/volfog_effect.cc

@@ -29 +29 @@
 
 //#include <GL/glext.h> //OpenGL Extensions
-//#include <GL/glxext.h> // GLX Extensions 
+//#include <GL/glxext.h> // GLX Extensions
 
 #ifndef GL_EXT_fog_coord
@@ -92 +92 @@
         // Set fog color
         float fogColor[4] = {0.6f,0.58f,0.79f,0.0f};
-        
+
 
         glFogCoordfEXT       = (PFNGLFOGCOORDFEXTPROC)glXGetProcAddressARB((const GLubyte*)"glFogCoordfEXT");
@@ -132 +132 @@
 {
         PRINTF(0)("Activating VolFogEffect\n");
+
+        return true;
 }
 
@@ -139 +141 @@
 
         glDisable(GL_FOG);
+
+        return true;
 }
 
@@ -160 +164 @@
         //glEnable(GL_BLEND);
         //glBlendFunc(GL_SRC_ALPHA, GL_DST_ALPHA);
-        
+
         int i;
         glLoadIdentity();
 
-        
+
         glBegin( GL_LINES );
                 glNormal3f(0,1,0);
@@ -210 +214 @@
 * ticks the effect if there is any time dependancy
 */
-void VolFogEffect::tick(float dt)       
-{
-}
+void VolFogEffect::tick(float dt)
+{
+}

trunk/src/lib/graphics/effects/weather_effect.cc

@@ -56 +56 @@
  */
 bool WeatherEffect::init()
-{}
+{
+  return true;
+}
 
 

trunk/src/lib/graphics/graphics_engine.cc

@@ -145 +145 @@
     return -1;
   this->initVideo(640, 480, 16);
+  return 1;
 }
 
@@ -161 +162 @@
   // looking if we are in fullscreen-mode
   MultiType textures = Preferences::getInstance()->getString(CONFIG_SECTION_VIDEO_ADVANCED, CONFIG_NAME_TEXTURES, "1");
-    Texture::setTextureEnableState(textures.getBool());
+  Texture::setTextureEnableState(textures.getBool());
 
   // searching for a usefull resolution
@@ -167 +168 @@
   //resolution.debug();
   MultiType x = resolution.getString(0), y = resolution.getString(1);
-  this->initVideo(x.getInt(), y.getInt(), 16);
+  return this->initVideo(x.getInt(), y.getInt(), 16);
 
   //   GraphicsEffect* fe = new FogEffect(NULL);
@@ -203 +204 @@
   {
     PRINTF(1)("could not initialize SDL Video\n");
-    //      return -1;
+    return -1;
   }
   // initialize SDL_GL-settings
@@ -238 +239 @@
 
   this->isInit = true;
+  return 1;
 }
 
@@ -263 +265 @@
  * @brief Sets the GL-attributes
  */
-int GraphicsEngine::setGLattribs()
+void GraphicsEngine::setGLattribs()
 {
   // Set video mode
@@ -358 +360 @@
     //    SDL_Quit();
     //    return -1;
+    return -1;
   }
   glViewport(0, 0, width, height);                     // Reset The Current Viewport
@@ -379 +382 @@
   }
 #endif /* __WIN32__ */
+  return 1;
 }
 
@@ -410 +414 @@
  * @param resizeInfo SDL information about the size of the new screen size
  */
-int GraphicsEngine::resolutionChanged(const SDL_ResizeEvent& resizeInfo)
+void GraphicsEngine::resolutionChanged(const SDL_ResizeEvent& resizeInfo)
 {
   this->setResolution(resizeInfo.w, resizeInfo.h, this->bitsPerPixel);
@@ -655 +659 @@
   switch (event.type)
   {
-  case EV_VIDEO_RESIZE:
-    this->resolutionChanged(event.resize);
-    break;
-  }
-}
+    case EV_VIDEO_RESIZE:
+      this->resolutionChanged(event.resize);
+      break;
+  }
+}

trunk/src/lib/graphics/graphics_engine.h

@@ -54 +54 @@
     inline int getbbp() const { return this->bitsPerPixel; };
 
-    int resolutionChanged(const SDL_ResizeEvent& resizeInfo);
+    void resolutionChanged(const SDL_ResizeEvent& resizeInfo);
 
     static void enter2DMode();
@@ -88 +88 @@
     GraphicsEngine();
     int initVideo(unsigned int resX, unsigned int resY, unsigned int bbp);
-    int setGLattribs();
+    void setGLattribs();
     void grabHardwareSettings();
 

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

@@ -108 +108 @@
 
   float height = 0;
-  int offset = 0;
 
   float r = 0.0;
@@ -474 +473 @@
   Vector v = State::getCameraNode()->getAbsCoor();
 
-  int i_min = 0;
   int i_max = (heightMap->h )/ HM_TILE_SIZE;
-  int j_min = 0;
   int j_max= (heightMap->w  ) / HM_TILE_SIZE;
 

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

@@ -169 +169 @@
   }
   Material::selectedMaterial = this;
+
+  return true;
 }
 
@@ -411 +413 @@
 void Material::setAmbientMap(const std::string& aMap, GLenum target)
 {
-  SDL_Surface* ambientMap;
+  /// FIXME SDL_Surface* ambientMap;
 
 }
@@ -422 +424 @@
 void Material::setSpecularMap(const std::string& sMap, GLenum target)
 {
-  SDL_Surface* specularMap;
+  /// FIXME SDL_Surface* specularMap;
 
 }
@@ -437 +439 @@
 
 
-int Material::getMaxTextureUnits()
+unsigned int Material::getMaxTextureUnits()
 {
   int maxTexUnits = 0;

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

@@ -69 +69 @@
     static const GLenum glTextureArbs[];  //!< The Texture ARB's
 
-    static int getMaxTextureUnits();
+    static unsigned int getMaxTextureUnits();
 
   private:

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

@@ -290 +290 @@
 {
   //static sVec3D this->verticesList[MD2_MAX_VERTICES]; /* performance: created only once in a lifetime */
-  int* pCommands = this->data->pGLCommands;
+//  int* pCommands = this->data->pGLCommands;
   /* some face culling stuff */
 //   glPushAttrib(GL_POLYGON_BIT);
@@ -541 +541 @@
   delete [] buffer;
   fclose(pFile);
+  return true;
 }
 
@@ -563 +564 @@
   this->material.setIllum(3);
   this->material.setAmbient(1.0, 1.0, 1.0);
-}
+  return true;
+}

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

@@ -182 +182 @@
 
   // get all the frames and save them in the sequence
-  while(this->addFrame(this->getNextFrame()) != NULL);
+  while(this->addFrame(this->getNextFrame()) != 0);
 }
 

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

@@ -67 +67 @@
 
   glBegin(GL_TRIANGLES);
-  for( int i = 0; i < this->pModelInfo.numTriangles; ++i)
+  for(unsigned int i = 0; i < this->pModelInfo.numTriangles; ++i)
     {
       //printf("int i = %i\n", i);

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

@@ -105 +105 @@
   // defining the binding Faces.
   int v1, v2, v3, v4;
-  for (int i = 0; i <= detail * 2 -1; i++)
-  {
-    for (int j = 0; j <= detail; j++)
+  for (unsigned int i = 0; i <= detail * 2 -1; i++)
+  {
+    for (unsigned int j = 0; j <= detail; j++)
     {
 
@@ -147 +147 @@
   if (detail <= 3)
     detail = 3;
-  int count = 0;
+  unsigned int count = 0;
   // defining Points of the Cylinder.
   for (float phi = 0.0; phi < 2.0*PI; phi += 2.0*PI/(float)detail)
@@ -163 +163 @@
   }
   // adding Faces
-  for (int i = 0; i < detail-1; i++)
+  for (unsigned int i = 0; i < detail-1; i++)
   {
     int p1, p2, p3, p4;
@@ -204 +204 @@
 
   //defining Faces
-  for (int i = 0; i < detail; i++)
+  for (unsigned int i = 0; i < detail; i++)
   {
     unsigned int v1, v2;
     v1 = i+2;
-    if (i == detail -1)
+    if (i+1 == detail)
       v2 = 2;
     else
@@ -225 +225 @@
 {
   //defining vertices
-  for (int i = 0; i < detail; i++)
-    for (int j = 0; j < detail; j++)
+  for (unsigned int i = 0; i < detail; i++)
+    for (unsigned int j = 0; j < detail; j++)
     {
       this->addVertex(((float)i/(float)(detail-1) -.5)*size,
@@ -236 +236 @@
   //defining Faces
   int v1, v2, v3, v4;
-  for (int i = 0; i < detail-1; i++)
-    for (int j = 0; j < detail-1; j++)
+  for (unsigned int i = 0; i < detail-1; i++)
+    for (unsigned int j = 0; j < detail-1; j++)
     {
       v1 = i*detail + j;

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

@@ -386 +386 @@
   }
   ++this->groupCount;
+  return true;
 }
 
@@ -558 +559 @@
   this->currentGroup->faceCount += this->currentGroup->currentFace->vertexCount -2;
   this->faceCount += this->currentGroup->currentFace->vertexCount -2;
+  return true;
 }
 
@@ -591 +593 @@
   this->currentGroup->faceCount += this->currentGroup->currentFace->vertexCount - 2;
   this->faceCount += this->currentGroup->currentFace->vertexCount -2;
+  return true;
 }
 
@@ -606 +609 @@
   if (this->currentGroup->faceCount == 0)
     this->currentGroup->faceCount++;
+  return true;
 }
 
@@ -621 +625 @@
   if (this->currentGroup->faceCount == 0)
     this->currentGroup->faceCount++;
+  return true;
 }
 
@@ -637 +642 @@
 
   Vector* normArray = new Vector [vertices.size()/3];
-  for (int i=0; i<vertices.size()/3;i++)
+  for (unsigned int i=0; i<vertices.size()/3;i++)
     normArray[i] = Vector(.0,.0,.0);
 
-  int firstTouch;
-  int secondTouch;
   Vector prevV;
   Vector nextV;
@@ -668 +671 @@
 
         curElem = firstElem;
-        for (int j=0; j<tmpFace->vertexCount; j++)
+        for (unsigned int j = 0; j < tmpFace->vertexCount; j++)
         {
           if (!(nextElem = curElem->next))
@@ -696 +699 @@
   }
 
-  for (int i=0; i < this->vertices.size()/3;i++)
+  for (unsigned int i=0; i < this->vertices.size()/3;i++)
   {
     normArray[i].normalize();
@@ -705 +708 @@
   }
   delete[] normArray;
+  return true;
 }
 
@@ -741 +745 @@
           glEnd();
         this->currentGroup->faceMode = 0;
-        Material* tmpMat;
         if (tmpFace->material != NULL)
         {
@@ -797 +800 @@
     this->currentGroup = this->currentGroup->next;
   }
+  return true;
 }
 
@@ -933 +937 @@
   PRINTF(5)("importing grafical Element to openGL.\n");
 
-  if (elem->texCoordNumber != -1)
-  {
-    if (likely(elem->texCoordNumber < this->pModelInfo.numTexCoor))
+  if (elem->texCoordNumber > -1)
+  {
+    if (likely((unsigned int)elem->texCoordNumber < this->pModelInfo.numTexCoor))
       glTexCoord2fv(&this->vTexture[0] + elem->texCoordNumber * 2);
     else
@@ -941 +945 @@
                 elem->texCoordNumber, this->pModelInfo.numTexCoor);
   }
-  if (elem->normalNumber != -1)
-  {
-    if (likely(elem->normalNumber < this->pModelInfo.numNormals))
+  if (elem->normalNumber > -1)
+  {
+    if (likely((unsigned int)elem->normalNumber < this->pModelInfo.numNormals))
       glNormal3fv(&this->normals[0] + elem->normalNumber * 3);
     else
@@ -949 +953 @@
                 elem->normalNumber, this->pModelInfo.numNormals);
   }
-  if (elem->vertexNumber != -1)
-  {
-    if (likely(elem->vertexNumber < this->pModelInfo.numVertices))
+  if (elem->vertexNumber > -1)
+  {
+    if (likely((unsigned int)elem->vertexNumber < this->pModelInfo.numVertices))
       glVertex3fv(&this->vertices[0]+ elem->vertexNumber * 3);
     else
@@ -958 +962 @@
   }
 
+  return true;
 }
 

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

@@ -707 +707 @@
     if(tc->UsingStaticVerts) {
         double edgeTotal;
-        for(i = 0; i < tc->VertRange; i++) {
+        for(i = 0; i < (int)tc->VertRange; i++) {
             v = &tc->StaticVerts[i];
             if(v->Count > 0) {
@@ -830 +830 @@
 {
     int i;
-    int size;
+    int size = 1;
     ACTCVertex *v;
 
@@ -838 +838 @@
     if(tc->UsingStaticVerts) {
         size = tc->VertRange * sizeof(ACTCVertex);
-        for(i = 0; i < tc->VertRange; i++) {
+        for(i = 0; i < (int)tc->VertRange; i++) {
             v = &tc->StaticVerts[i];
             if(v->Count > 0)
@@ -915 +915 @@
 
         case ACTC_IN_MAX_VERT:
-            if(value < tc->MinInputVert) {
+          if(value < (int)tc->MinInputVert) {
                 ACTC_DEBUG(fprintf(stderr, "actcParami : tried to set "
                     "MAX_INPUT_VERT to %d, less than MIN_INPUT_VERT (%d)\n",
@@ -925 +925 @@
 
         case ACTC_IN_MIN_VERT:
-            if(value > tc->MaxInputVert) {
+          if(value > (int)tc->MaxInputVert) {
                 ACTC_DEBUG(fprintf(stderr, "actcParami : tried to set "
                     "MIN_INPUT_VERT to %d, greater than MAX_INPUT_VERT (%d)\n",
@@ -1065 +1065 @@
 static int mapVertexEdge(ACTCData *tc, ACTCVertex *v1, ACTCVertex *v2, ACTCEdge **edge)
 {
-    unsigned int i;
+    int i;
     ACTCEdge tmp;
     void *r;

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

@@ -33 +33 @@
 /*
  * On the BIG_ENDIAN architecture, the 24 and 32bit bitmaps have
- * different masks. If you don't do this distinction properly, 
+ * different masks. If you don't do this distinction properly,
  * you will get weird-looking textures.
  */
@@ -161 +161 @@
   unsigned int* pixels = new unsigned int[width * height * channels];
   memset(pixels, 0, width * height * channels * sizeof(unsigned int));
-  
-  
+
+
   glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR);
   glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR);
@@ -169 +169 @@
 
   glTexImage2D(target, 0, channels, width, height, 0, type, GL_UNSIGNED_INT, pixels);
-  
-  
-  
+
+
+
   delete[] pixels;
 
@@ -309 +309 @@
 
         Uint32* mask = opaqueMask;
-        
+
   /* Save the alpha blending attributes */
   saved_flags = surface->flags&(SDL_SRCALPHA | SDL_RLEACCELOK);
@@ -320 +320 @@
                 mask = alphaMask;
   }
-                
+
   retSurface = SDL_CreateRGBSurface(SDL_HWSURFACE,
                                     surface->w, surface->h,
@@ -360 +360 @@
   int      errorCode = 0;           //!< the error code for the texture loading functions
   GLuint   texture = 0;             //!< the OpenGL texture handle
-  int      mipmapLevel = 0;         //!< the maximum mipmap level for this texture
-  int      mipmapWidth = 0;         //!< the width of the mipmap
-  int      mipmapHight = 0;         //!< the height of the mipmap
+  //int      mipmapLevel = 0;         //!< the maximum mipmap level for this texture
+  //int      mipmapWidth = 0;         //!< the width of the mipmap
+  //int      mipmapHight = 0;         //!< the height of the mipmap
   GLenum   format = GL_RGB;
   if (surface->format->BitsPerPixel == 32)

trunk/src/lib/graphics/render2D/element_2d.cc

@@ -961 +961 @@
         /* update the current absCoordinate */
         this->prevRelCoordinate = this->relCoordinate;
-        float sine = sin(this->parent->getAbsDir2D());
-        float cose = cos(this->parent->getAbsDir2D());
+//         float sine = sin(this->parent->getAbsDir2D());
+//         float cose = cos(this->parent->getAbsDir2D());
         //        this->absCoordinate.x = this->relCoordinate.x*cose - this->relCoordinate.y*sine + this->parent->getRelCoor2D().x*(1-cose) +this->parent->getRelCoor2D().y*sine;
         //        this->absCoordinate.y = this->relCoordinate.x*sine + this->relCoordinate.y*cose + this->parent->getRelCoor2D().y*(1-cose) +this->parent->getRelCoor2D().x*sine;
@@ -1167 +1167 @@
   else if (parentingMode == E2D_PARENT_ROTATE_AND_MOVE)
     return "rotate-and-move";
+  else return "all";
 }
 
@@ -1186 +1187 @@
   else  if (parentingMode == "rotate-and-move")
     return (E2D_PARENT_ROTATE_AND_MOVE);
+  else return E2D_PARENT_ALL;
 }
 

trunk/src/lib/graphics/shader.cc

@@ -153 +153 @@
       glAttachObjectARB(this->shaderProgram, shader);
   }
+  return true;
 }
 

trunk/src/lib/graphics/text_engine/font.cc

@@ -220 +220 @@
 
 /**
- *  sets a specific renderStyle
+ * @brief sets a specific renderStyle
  * @param renderStyle the Style to render: a string (char-array) containing:
  *   i: italic, b: bold, u, underline
@@ -228 +228 @@
   this->renderStyle = TTF_STYLE_NORMAL;
 
-  for (int i = 0; i < renderStyle.size(); i++)
+  for (unsigned int i = 0; i < renderStyle.size(); i++)
   {
     if (renderStyle[i] == 'b')
@@ -246 +246 @@
 
 /**
- * creates and exports an Image, that has all the characters
+ * @brief creates and exports an Image, that has all the characters
  * stored in a Array (as an image)
  * @param fileName the File to write the image into.
@@ -257 +257 @@
 
   //
-  SDL_Color tmpColor = {0, 0, 0};
   // Surface definition.
   SDL_Rect tmpRect; // this represents a Rectangle for blitting.
@@ -277 +276 @@
   tmpRect.x = 0; tmpRect.y = 0; tmpRect.w = tmpSurf->w; tmpRect.h = tmpSurf->h;
   SDL_SetClipRect(tmpSurf, &tmpRect);
-  int maxLineHeight = 0;
 
   int posX, posY;
@@ -339 +337 @@
 /**
  * @returns the maximum ascent of the Font, if the font was initialized, 0 otherwise
-
-   the ascent is the pixels of the font above the baseline
+ *
+ * the ascent is the pixels of the font above the baseline
  */
 int Font::getMaxAscent() const
@@ -352 +350 @@
 /**
  * @returns the maximum descent of the Font, if the font was initialized, 0 otherwise
-
-   the descent is the pixels of the font below the baseline
+ *
+ * the descent is the pixels of the font below the baseline
  */
 int Font::getMaxDescent() const
@@ -404 +402 @@
 
 /**
- * creates a Fast-Texture of this Font
+ * @brief creates a Fast-Texture of this Font
  */
 bool Font::createFastTexture()
@@ -497 +495 @@
   if (this->setSurface(tmpSurf))
     (this->setTexture(Texture::loadTexToGL(tmpSurf)));
+  return true;
 }
 
@@ -547 +546 @@
     return 0;
 
-  int i;
-  int x,y; // the counters
+  unsigned int i;
+  unsigned int x,y; // the counters
   int maxLineHeight = this->getMaxHeight();
   unsigned int size = 32;  // starting Value, we have to start somewhere 32 seems reasonable. (take any small enough 2^i number)
@@ -587 +586 @@
 
 /**
- *  a simple function to get some interesting information about this class
+ * @brief a simple function to get some interesting information about this class
  */
 void Font::debug()
 {
   // print the loaded font's style
-  int style;
+  int style = TTF_STYLE_NORMAL;
   if (likely(this->fontTTF != NULL))
     style = TTF_GetFontStyle(this->fontTTF);