Difference for 2d/font.c from version 1.9 to 1.10


version 1.9 version 1.10
Line 18
 
Line 18
  * Graphical routines for drawing fonts.   * Graphical routines for drawing fonts.
  *   *
  * $Log$   * $Log$
    * Revision 1.10  1999/10/18 07:26:38  donut
    * beginning work on bitblt with source==BM_OGL, fixes squished bitblts, better support for alternate texture formats, support for driver specific hacks, etc
    *
  * Revision 1.9  1999/10/15 05:36:00  donut   * Revision 1.9  1999/10/15 05:36:00  donut
  * byteswap stuff for font loading   * byteswap stuff for font loading
  *   *
Line 1087
 
Line 1090
  }   }
  if (!(font->ft_flags & FT_COLOR)) {   if (!(font->ft_flags & FT_COLOR)) {
  //use GL_INTENSITY instead of GL_RGB   //use GL_INTENSITY instead of GL_RGB
  if (FindArg("-gl_font2")){   if (ogl_intensity4_ok){
    font->ft_parent_bitmap.gltexture->internalformat=GL_INTENSITY4;
    font->ft_parent_bitmap.gltexture->format=GL_LUMINANCE;
    }else if (ogl_luminance4_alpha4_ok){
  font->ft_parent_bitmap.gltexture->internalformat=GL_LUMINANCE4_ALPHA4;   font->ft_parent_bitmap.gltexture->internalformat=GL_LUMINANCE4_ALPHA4;
  font->ft_parent_bitmap.gltexture->format=GL_LUMINANCE_ALPHA;   font->ft_parent_bitmap.gltexture->format=GL_LUMINANCE_ALPHA;
  }else if (FindArg("-gl_font3")){   }else if (ogl_rgba2_ok){
  font->ft_parent_bitmap.gltexture->internalformat=GL_RGBA2;   font->ft_parent_bitmap.gltexture->internalformat=GL_RGBA2;
  font->ft_parent_bitmap.gltexture->format=GL_RGBA;   font->ft_parent_bitmap.gltexture->format=GL_RGBA;
  }else if (FindArg("-gl_font4")){  
  font->ft_parent_bitmap.gltexture->internalformat=GL_RGBA;  
  font->ft_parent_bitmap.gltexture->format=GL_RGBA;  
  }else{   }else{
  font->ft_parent_bitmap.gltexture->internalformat=GL_INTENSITY4;   font->ft_parent_bitmap.gltexture->internalformat=ogl_rgba_format;
  font->ft_parent_bitmap.gltexture->format=GL_LUMINANCE;   font->ft_parent_bitmap.gltexture->format=GL_RGBA;
  }   }
  }   }
  ogl_loadbmtexture_m(&font->ft_parent_bitmap,0);   ogl_loadbmtexture_m(&font->ft_parent_bitmap,0);

Legend:
line(s) removed in v.1.9 
line(s) changed
 line(s) added in v.1.10