Changeset 3701 in orxonox.OLD for orxonox/branches/textEngine/src

Timestamp:

Mar 31, 2005, 10:27:46 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/textEngine: SDL include fix in configure and texture

Location:

orxonox/branches/textEngine/src

Files:

• lib/graphics/font/glfont.cc (modified) (1 diff)
• lib/graphics/font/glfont.h (modified) (1 diff)
• lib/graphics/importer/texture.cc (modified) (4 diffs)
• lib/graphics/importer/texture.h (modified) (4 diffs)
• story_entities/world.cc (modified) (2 diffs)

orxonox/branches/textEngine/src/lib/graphics/font/glfont.cc

@@ -19 +19 @@
 
    for some fonts and licenses visit: =http://www.dafont.com/en/font.php=
+
+   !! IMPORTANT !! When using ttf fonts clear the license issues prior to
+   adding them to orxonox. This is really important, because we do not 
+   want to defend anyone.
 */
 
 /*
-    glfont:  An example of using the SDL_ttf library with OpenGL.
-    Copyright (C) 1997-2004 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-    The SDL_GL_* functions in this file are available in the public domain.
-
-    Sam Lantinga
-    slouken@libsdl.org
+  glfont:  An example of using the SDL_ttf library with OpenGL.
+  Copyright (C) 1997-2004 Sam Lantinga
+  
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public
+  License as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+  
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Library General Public License for more details.
+  
+  You should have received a copy of the GNU Library General Public
+  License along with this library; if not, write to the Free
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  
+  The SDL_GL_* functions in this file are available in the public domain.
+  
+  Sam Lantinga
+  slouken@libsdl.org
 */
 

orxonox/branches/textEngine/src/lib/graphics/font/glfont.h

@@ -12 +12 @@
 
 /* some default values */
-#define FONT_DEFAULT_SIZE       50                   //!< default size of the Text
+#define FONT_DEFAULT_SIZE       18                   //!< default size of the Text
 #define FONT_DEFAULT_TEXT       "orxonox 1234567890" //!< some default text to display
 #define FONT_DEFAULT_COLOR_R    256                  //!< the default red part (color) of the text

orxonox/branches/textEngine/src/lib/graphics/importer/texture.cc

@@ -98 +98 @@
 }
 
-#ifdef HAVE_SDL_SDL_IMAGE_H
+#ifdef HAVE_SDL_IMAGE_H
 bool Texture::loadImage(const char* imageName)
 {
@@ -118 +118 @@
             pImage->format = GL_RGB;
           else if (pImage->bpp == 4)
-            pImage->format = GL_RGBA;
-          
+            {
+              pImage->format = GL_RGBA;
+              SDL_SetAlpha(this->map, 0, 0);
+            }
+
           if( !IMG_isPNG(SDL_RWFromFile(imageName, "rb")) && !IMG_isJPG(SDL_RWFromFile(imageName, "rb")))
             for (int i=0;i<map->h * map->w *3;i+=3)
@@ -146 +149 @@
 
 
-#else /* HAVE_SDL_SDL_IMAGE_H */
+#else /* HAVE_SDL_IMAGE_H */
 /**
    \brief Makes the Programm ready to Read-in a texture-File
@@ -832 +835 @@
 
 }
-#endif /* HAVE_SDL_SDL_IMAGE_H */
+#endif /* HAVE_SDL_IMAGE_H */

orxonox/branches/textEngine/src/lib/graphics/importer/texture.h

@@ -14 +14 @@
 #include "debug.h"
 
-#ifdef HAVE_SDL_SDL_IMAGE_H
-#include <SDL/SDL_image.h>
+#ifdef HAVE_SDL_IMAGE_H
+#include <SDL_image.h>
 #else
 // IMAGE LIBS //
@@ -26 +26 @@
 #include <png.h>
 #endif /* HAVE_PNG_H */
-#endif /* HAVE_SDL_SDL_IMAGE_H */
+#endif /* HAVE_SDL_IMAGE_H */
 
 //! A Class, that reads in Textures from different fileformats.
@@ -57 +57 @@
 
   bool loadImage(const char* imageName);
-#ifndef HAVE_SDL_SDL_IMAGE_H
+#ifndef HAVE_SDL_IMAGE_H
 
   bool loadBMP (char* bmpName);
@@ -74 +74 @@
 
 };
-
-
-
 #endif /* _TEXTURE_H */

orxonox/branches/textEngine/src/story_entities/world.cc

@@ -205 +205 @@
       tmpFont = new GLFont("../data/fonts/refluxed.ttf");
       this->glmis->step();
-
       // initializing the TrackManager
       trackManager = TrackManager::getInstance();
@@ -748 +747 @@
         {
           float fps = 1000/dt;
-          PRINTF(3)("fps = %f\n", fps);
+          PRINTF(0)("fps = %f\n", fps);
+          char tmpChar[20];
+          sprintf(tmpChar, "fps: %d", rand());
+          tmpFont->setText(tmpChar);
+          tmpFont->createTexture();
         }
       else