- Timestamp:
- Mar 31, 2005, 10:27:46 PM (20 years ago)
- Location:
- orxonox/branches/textEngine
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/textEngine/config.h.in
r3691 r3701 53 53 #undef HAVE_PTHREAD_H 54 54 55 /* Define to 1 if you have the <SDL.h> header file. */ 56 #undef HAVE_SDL_H 57 58 /* Define to 1 if you have the <SDL_image.h> header file. */ 59 #undef HAVE_SDL_IMAGE_H 60 55 61 /* Define to 1 if you have the <SDL/SDL.h> header file. */ 56 62 #undef HAVE_SDL_SDL_H 57 58 /* Define to 1 if you have the <SDL/SDL_image.h> header file. */59 #undef HAVE_SDL_SDL_IMAGE_H60 63 61 64 /* Define to 1 if you have the <SDL/SDL_ttf.h> header file. */ -
orxonox/branches/textEngine/configure
r3691 r3701 5518 5518 # checking for SDL-headers 5519 5519 5520 for ac_header in SDL /SDL.h5520 for ac_header in SDL.h 5521 5521 do 5522 5522 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` … … 6347 6347 # checking for SDL_image-headers 6348 6348 6349 for ac_header in SDL /SDL_image.h6349 for ac_header in SDL_image.h 6350 6350 do 6351 6351 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -
orxonox/branches/textEngine/configure.ac
r3691 r3701 325 325 326 326 # checking for SDL-headers 327 AC_CHECK_HEADERS([SDL /SDL.h] ,,327 AC_CHECK_HEADERS([SDL.h] ,, 328 328 [AC_MSG_ERROR([cannot find SDL headers]) ]) 329 329 … … 426 426 if test x$def_sdl_image = xyes; then 427 427 # checking for SDL_image-headers 428 AC_CHECK_HEADERS([SDL /SDL_image.h] ,,428 AC_CHECK_HEADERS([SDL_image.h] ,, 429 429 [echo "sdl_image not found. falling back to other options"; def_sdl_image=no ]) 430 430 fi -
orxonox/branches/textEngine/src/lib/graphics/font/glfont.cc
r3700 r3701 19 19 20 20 for some fonts and licenses visit: =http://www.dafont.com/en/font.php= 21 22 !! IMPORTANT !! When using ttf fonts clear the license issues prior to 23 adding them to orxonox. This is really important, because we do not 24 want to defend anyone. 21 25 */ 22 26 23 27 /* 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 28 glfont: An example of using the SDL_ttf library with OpenGL. 29 Copyright (C) 1997-2004 Sam Lantinga 30 31 This library is free software; you can redistribute it and/or 32 modify it under the terms of the GNU Library General Public 33 License as published by the Free Software Foundation; either 34 version 2 of the License, or (at your option) any later version. 35 36 This library is distributed in the hope that it will be useful, 37 but WITHOUT ANY WARRANTY; without even the implied warranty of 38 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 39 Library General Public License for more details. 40 41 You should have received a copy of the GNU Library General Public 42 License along with this library; if not, write to the Free 43 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 44 45 The SDL_GL_* functions in this file are available in the public domain. 46 47 Sam Lantinga 48 slouken@libsdl.org 45 49 */ 46 50 -
orxonox/branches/textEngine/src/lib/graphics/font/glfont.h
r3700 r3701 12 12 13 13 /* some default values */ 14 #define FONT_DEFAULT_SIZE 50//!< default size of the Text14 #define FONT_DEFAULT_SIZE 18 //!< default size of the Text 15 15 #define FONT_DEFAULT_TEXT "orxonox 1234567890" //!< some default text to display 16 16 #define FONT_DEFAULT_COLOR_R 256 //!< the default red part (color) of the text -
orxonox/branches/textEngine/src/lib/graphics/importer/texture.cc
r3681 r3701 98 98 } 99 99 100 #ifdef HAVE_SDL_ SDL_IMAGE_H100 #ifdef HAVE_SDL_IMAGE_H 101 101 bool Texture::loadImage(const char* imageName) 102 102 { … … 118 118 pImage->format = GL_RGB; 119 119 else if (pImage->bpp == 4) 120 pImage->format = GL_RGBA; 121 120 { 121 pImage->format = GL_RGBA; 122 SDL_SetAlpha(this->map, 0, 0); 123 } 124 122 125 if( !IMG_isPNG(SDL_RWFromFile(imageName, "rb")) && !IMG_isJPG(SDL_RWFromFile(imageName, "rb"))) 123 126 for (int i=0;i<map->h * map->w *3;i+=3) … … 146 149 147 150 148 #else /* HAVE_SDL_ SDL_IMAGE_H */151 #else /* HAVE_SDL_IMAGE_H */ 149 152 /** 150 153 \brief Makes the Programm ready to Read-in a texture-File … … 832 835 833 836 } 834 #endif /* HAVE_SDL_ SDL_IMAGE_H */837 #endif /* HAVE_SDL_IMAGE_H */ -
orxonox/branches/textEngine/src/lib/graphics/importer/texture.h
r3681 r3701 14 14 #include "debug.h" 15 15 16 #ifdef HAVE_SDL_ SDL_IMAGE_H17 #include <SDL /SDL_image.h>16 #ifdef HAVE_SDL_IMAGE_H 17 #include <SDL_image.h> 18 18 #else 19 19 // IMAGE LIBS // … … 26 26 #include <png.h> 27 27 #endif /* HAVE_PNG_H */ 28 #endif /* HAVE_SDL_ SDL_IMAGE_H */28 #endif /* HAVE_SDL_IMAGE_H */ 29 29 30 30 //! A Class, that reads in Textures from different fileformats. … … 57 57 58 58 bool loadImage(const char* imageName); 59 #ifndef HAVE_SDL_ SDL_IMAGE_H59 #ifndef HAVE_SDL_IMAGE_H 60 60 61 61 bool loadBMP (char* bmpName); … … 74 74 75 75 }; 76 77 78 79 76 #endif /* _TEXTURE_H */ -
orxonox/branches/textEngine/src/story_entities/world.cc
r3696 r3701 205 205 tmpFont = new GLFont("../data/fonts/refluxed.ttf"); 206 206 this->glmis->step(); 207 208 207 // initializing the TrackManager 209 208 trackManager = TrackManager::getInstance(); … … 748 747 { 749 748 float fps = 1000/dt; 750 PRINTF(3)("fps = %f\n", fps); 749 PRINTF(0)("fps = %f\n", fps); 750 char tmpChar[20]; 751 sprintf(tmpChar, "fps: %d", rand()); 752 tmpFont->setText(tmpChar); 753 tmpFont->createTexture(); 751 754 } 752 755 else
Note: See TracChangeset
for help on using the changeset viewer.