m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SFont now uses T_GFX2_Surface instead of SDL_Surface

Browse Source
This commit is contained in:
Thomas Bernard 2018-06-23 21:40:05 +02:00
parent 6aaef13a6b
commit 3b69ccb1ec
5 changed files with 102 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
project/msvc/grafx2-win32.vcxproj
View File

@ -128,6 +128,7 @@
<ClCompile Include="..\..\src\recoil.c" />
<ClCompile Include="..\..\src\saveini.c" />
<ClCompile Include="..\..\src\setup.c" />
<ClCompile Include="..\..\src\SFont.c" />
<ClCompile Include="..\..\src\shade.c" />
<ClCompile Include="..\..\src\special.c" />
<ClCompile Include="..\..\src\text.c" />

3
project/msvc/grafx2-win32.vcxproj.filters
View File

@ -180,6 +180,9 @@
<ClCompile Include="..\..\src\win32screen.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\SFont.c">
<Filter>Fichiers sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\brush.h">

89
src/SFont.c
View File

@ -3,6 +3,9 @@
/* SFont: a simple font-library that uses special .pngs as fonts
Copyright (C) 2003 Karl Bartel
GrafX2 Modification
Copyright (c) 2018 Thomas Bernard
License: GPL or LGPL (at your choice)
WWW: http://www.linux-games.com/sfont/
@ -25,55 +28,18 @@
GERMANY
karlb@gmx.net
*/
#if defined(USE_SDL) || defined(USE_SDL2)
#include <SDL.h>
#include <SDL_video.h>
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include "SFont.h"
static Uint32 GetPixel(SDL_Surface *Surface, Sint32 X, Sint32 Y)
{
Uint8 *bits;
Uint32 Bpp;
assert(X>=0);
assert(X<Surface->w);
Bpp = Surface->format->BytesPerPixel;
bits = ((Uint8 *)Surface->pixels)+Y*Surface->pitch+X*Bpp;
// Get the pixel
switch(Bpp) {
case 1:
return *((Uint8 *)Surface->pixels + Y * Surface->pitch + X);
break;
case 2:
return *((Uint16 *)Surface->pixels + Y * Surface->pitch/2 + X);
break;
case 3: { // Format/endian independent
Uint8 r, g, b;
r = *((bits)+Surface->format->Rshift/8);
g = *((bits)+Surface->format->Gshift/8);
b = *((bits)+Surface->format->Bshift/8);
return SDL_MapRGB(Surface->format, r, g, b);
}
break;
case 4:
return *((Uint32 *)Surface->pixels + Y * Surface->pitch/4 + X);
break;
}
return -1;
}
SFont_Font* SFont_InitFont(SDL_Surface* Surface)
SFont_Font* SFont_InitFont(T_GFX2_Surface * Surface)
{
int x = 0, i = 33;
Uint32 pixel;
byte pixel;
SFont_Font* Font;
Uint32 pink;
byte pink;
if (Surface == NULL)
return NULL;
@ -83,13 +49,11 @@ SFont_Font* SFont_InitFont(SDL_Surface* Surface)
Font->Surface = Surface;
SDL_LockSurface(Surface);
pink = GetPixel(Surface, 0, 0);
pink = Get_GFX2_Surface_pixel(Surface, 0, 0);
while (x < Surface->w) {
if (GetPixel(Surface, x, 0) != pink) {
if (Get_GFX2_Surface_pixel(Surface, x, 0) != pink) {
Font->CharBegin[i]=x;
while((x < Surface->w) && (GetPixel(Surface, x, 0)!= pink))
while((x < Surface->w) && (Get_GFX2_Surface_pixel(Surface, x, 0)!= pink))
x++;
Font->CharWidth[i]=x-Font->CharBegin[i];
i++;
@ -116,10 +80,7 @@ SFont_Font* SFont_InitFont(SDL_Surface* Surface)
if (Font->Space<2)
Font->Space = Font->CharWidth[(int)'a'];
pixel = GetPixel(Surface, 0, Surface->h-1);
SDL_UnlockSurface(Surface);
// No longer use SDL color keying
//SDL_SetColorKey(Surface, SDL_SRCCOLORKEY, pixel);
pixel = Get_GFX2_Surface_pixel(Surface, 0, Surface->h-1);
Font->Transparent=pixel;
return Font;
@ -127,28 +88,26 @@ SFont_Font* SFont_InitFont(SDL_Surface* Surface)
void SFont_FreeFont(SFont_Font* FontInfo)
{
SDL_FreeSurface(FontInfo->Surface);
Free_GFX2_Surface(FontInfo->Surface);
free(FontInfo);
}
void SFont_Write(SDL_Surface *Surface, const SFont_Font *Font,
void SFont_Write(T_GFX2_Surface *Surface, const SFont_Font *Font,
int x, int y, const char *text)
{
const char* c;
SDL_Rect srcrect, dstrect;
int line;
int height;
if(text == NULL)
return;
// these values won't change in the loop
srcrect.y = 1;
dstrect.y = y;
srcrect.h = dstrect.h = Font->Surface->h - 1;
height = Font->Surface->h - 1;
for(c = text; *c != '\0' && x <= Surface->w ; c++) {
if (*c == '\n') {
dstrect.y += Font->Surface->h-1;
x=0;
y += height;
x = 0;
continue;
}
// skip spaces and nonprintable characters
@ -157,12 +116,11 @@ void SFont_Write(SDL_Surface *Surface, const SFont_Font *Font,
continue;
}
srcrect.w = Font->CharWidth[(int)*c];
dstrect.w = srcrect.w;
srcrect.x = Font->CharBegin[(int)*c];
dstrect.x = x;
SDL_BlitSurface(Font->Surface, &srcrect, Surface, &dstrect);
for (line = 0; line < height && (y + line) < Surface->h; line++) {
memcpy(Surface->pixels + (y + line) * Surface->w + x,
Font->Surface->pixels + (line + 1) * Font->Surface->w + Font->CharBegin[(int)*c],
Font->CharWidth[(int)*c]);
}
x += Font->CharWidth[(int)*c];
}
@ -223,4 +181,3 @@ void SFont_WriteCenter(SDL_Surface *Surface, const SFont_Font *Font,
y, text);
}
*/
#endif

15
src/SFont.h
View File

@ -3,6 +3,9 @@
/* SFont: a simple font-library that uses special bitmaps as fonts
Copyright (C) 2003 Karl Bartel
GrafX2 Modification
Copyright (c) 2018 Thomas Bernard
License: GPL or LGPL (at your choice)
WWW: http://www.linux-games.com/sfont/
@ -44,7 +47,7 @@
#ifndef _SFONT_H_
#define _SFONT_H_
#include <SDL.h>
#include "gfx2surface.h"
#ifdef __cplusplus
extern "C" {
@ -55,7 +58,7 @@ extern "C" {
/// To load the fonts, load the font image into YourFont->Surface
/// and call InitFont( YourFont );
typedef struct {
SDL_Surface *Surface;
T_GFX2_Surface *Surface;
int CharBegin[256];
int CharWidth[256];
int Space;
@ -66,7 +69,7 @@ typedef struct {
/// Initializes the font.
/// @param Font this contains the suface with the font.
/// The Surface must be loaded before calling this function
SFont_Font* SFont_InitFont (SDL_Surface *Font);
SFont_Font* SFont_InitFont (T_GFX2_Surface *Font);
///
/// Frees the font.
@ -81,7 +84,7 @@ void SFont_FreeFont(SFont_Font* Font);
/// @param text A string containing the text you want to blit.
/// @param x Coordinates to start drawing.
/// @param y Coordinates to start drawing.
void SFont_Write(SDL_Surface *Surface, const SFont_Font *Font, int x, int y,
void SFont_Write(T_GFX2_Surface *Surface, const SFont_Font *Font, int x, int y,
const char *text);
/// Returns the width of "text" in pixels
@ -90,8 +93,8 @@ int SFont_TextWidth(const SFont_Font* Font, const char *text);
int SFont_TextHeight(const SFont_Font* Font, const char *text);
/// Blits a string to Surface with centered x position
void SFont_WriteCenter(SDL_Surface *Surface, const SFont_Font* Font, int y,
const char *text);
//void SFont_WriteCenter(SDL_Surface *Surface, const SFont_Font* Font, int y,
// const char *text);
#ifdef __cplusplus
}

108
src/text.c
View File

@ -64,7 +64,6 @@
#if defined(USE_SDL) || defined(USE_SDL2)
#include <SDL_image.h>
#include "SFont.h"
#include "sdlscreen.h"
#endif
@ -75,6 +74,8 @@
#include "windows.h"
#include "misc.h"
#include "setup.h"
#include "loadsave.h"
#include "SFont.h"
typedef struct T_Font
{
@ -693,109 +694,43 @@ byte *Render_text_Win32(const char *str, int font_number, int size, int antialia
}
#endif
#if defined(USE_SDL) || defined(USE_SDL2)
byte *Render_text_SFont(const char *str, int font_number, int *width, int *height, T_Palette palette)
{
SFont_Font *font;
SDL_Surface * text_surface;
SDL_Surface *font_surface;
byte * new_brush;
SDL_Rect rectangle;
T_GFX2_Surface * text_surface;
T_GFX2_Surface *font_surface;
byte * new_brush = NULL;
// Chargement de la fonte
font_surface=IMG_Load(Font_name(font_number));
font_surface = Load_surface(Font_name(font_number), NULL);
if (!font_surface)
{
char buffer[256];
strcpy(buffer, "Error loading font.\n");
strcat(buffer,IMG_GetError());
Verbose_message("Warning",buffer);
// TODO this leaves a non-erased cursor when the window closes.
Verbose_message("Warning", "Error loading font");
// TODO this leaves a non-erased cursor when the window closes.
return NULL;
}
// Font is 24bit: Perform a color reduction
if (font_surface->format->BitsPerPixel>8)
{
SDL_Surface * reduced_surface;
int x,y,color;
SDL_Color rgb;
reduced_surface=SDL_CreateRGBSurface(SDL_SWSURFACE, font_surface->w, font_surface->h, 8, 0, 0, 0, 0);
if (!reduced_surface)
{
SDL_FreeSurface(font_surface);
return NULL;
}
// Set the quick palette
for (color=0;color<256;color++)
{
rgb.r=((color & 0xE0)>>5)<<5;
rgb.g=((color & 0x1C)>>2)<<5;
rgb.b=((color & 0x03)>>0)<<6;
#if defined(USE_SDL)
SDL_SetColors(reduced_surface, &rgb, color, 1);
#else
//SDL_SetPaletteColors
#endif
}
// Perform reduction
for (y=0; y<font_surface->h; y++)
for (x=0; x<font_surface->w; x++)
{
SDL_GetRGB(Get_SDL_pixel_hicolor(font_surface, x, y), font_surface->format, &rgb.r, &rgb.g, &rgb.b);
color=((rgb.r >> 5) << 5) |
((rgb.g >> 5) << 2) |
((rgb.b >> 6));
Set_SDL_pixel_8(reduced_surface, x, y, color);
}
SDL_FreeSurface(font_surface);
font_surface=reduced_surface;
}
font=SFont_InitFont(font_surface);
if (!font)
{
DEBUG("Font init failed",1);
SDL_FreeSurface(font_surface);
Free_GFX2_Surface(font_surface);
return NULL;
}
// Calcul des dimensions
*height=SFont_TextHeight(font, str);
*width=SFont_TextWidth(font, str);
// Allocation d'une surface SDL
text_surface=SDL_CreateRGBSurface(SDL_SWSURFACE, *width, *height, 8, 0, 0, 0, 0);
// Copy palette
#if defined(USE_SDL)
SDL_SetPalette(text_surface, SDL_LOGPAL, font_surface->format->palette->colors, 0, 256);
#else
//SDL_SetPaletteColors(
#endif
*height = SFont_TextHeight(font, str);
*width = SFont_TextWidth(font, str);
text_surface = New_GFX2_Surface(*width, *height);
// Fill with transparent color
rectangle.x=0;
rectangle.y=0;
rectangle.w=*width;
rectangle.h=*height;
SDL_FillRect(text_surface, &rectangle, font->Transparent);
memset(text_surface->pixels, font->Transparent, *width * *height);
// Rendu du texte
SFont_Write(text_surface, font, 0, 0, str);
if (!text_surface)
{
DEBUG("Rendering failed",2);
SFont_FreeFont(font);
return NULL;
}
new_brush=Surface_to_bytefield(text_surface, NULL);
if (!new_brush)
{
DEBUG("Converting failed",3);
SDL_FreeSurface(text_surface);
SFont_FreeFont(font);
return NULL;
}
// Copy palette
memcpy(palette, font_surface->palette, sizeof(T_Palette));
Get_SDL_Palette(font_surface->format->palette, palette);
new_brush = text_surface->pixels; // "Steal" pixels from surface
// Swap current BG color with font's transparent color
if (font->Transparent != Back_color)
@ -816,16 +751,15 @@ byte *Render_text_SFont(const char *str, int font_number, int *width, int *heigh
colmap[font->Transparent]=Back_color;
colmap[Back_color]=font->Transparent;
Remap_general_lowlevel(colmap, new_brush, new_brush, text_surface->w,text_surface->h, text_surface->w);
Remap_general_lowlevel(colmap, new_brush, new_brush, text_surface->w, text_surface->h, text_surface->w);
}
SDL_FreeSurface(text_surface);
SFont_FreeFont(font);
free(text_surface); // Do not call Free_GFX2_Surface() because pixels was stolen
return new_brush;
}
#endif
// Crée une brosse à partir des paramètres de texte demandés.
// Si cela réussit, la fonction place les dimensions dans width et height,
@ -859,11 +793,7 @@ byte *Render_text(const char *str, int font_number, int size, int antialias, int
}
else
{
#if defined(USE_SDL) || defined(USE_SDL2)
return Render_text_SFont(str, font_number, width, height, palette);
#else
return NULL;
#endif
}
}