dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r10096) -Fix r10092: freetype bypassed the Blitter::Encode, making fonts look weird

Browse Source
This commit is contained in:
truelight
2007-06-11 13:38:11 +00:00
parent 9d570fa018
commit be0f5cf877
9 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blitter/8bpp_debug.cpp
View File

@@ -6,8 +6,6 @@
static FBlitter_8bppDebug iFBlitter_8bppDebug;
extern void* AllocSprite(size_t);
void Blitter_8bppDebug::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom)
{
const byte *src, *src_line;
@@ -33,10 +31,10 @@ void Blitter_8bppDebug::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomL
}
}
Sprite *Blitter_8bppDebug::Encode(SpriteLoader::Sprite *sprite)
Sprite *Blitter_8bppDebug::Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator)
{
Sprite *dest_sprite;
dest_sprite = (Sprite *)AllocSprite(sizeof(*dest_sprite) + sprite->height * sprite->width);
dest_sprite = (Sprite *)allocator(sizeof(*dest_sprite) + sprite->height * sprite->width);
dest_sprite->height = sprite->height;
dest_sprite->width = sprite->width;

2
src/blitter/8bpp_debug.hpp
View File

@@ -15,7 +15,7 @@ public:
void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
Sprite *Encode(SpriteLoader::Sprite *sprite);
Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator);
};
class FBlitter_8bppDebug: public BlitterFactory<FBlitter_8bppDebug> {

6
src/blitter/8bpp_optimized.cpp
View File

@@ -6,8 +6,6 @@
static FBlitter_8bppOptimized iFBlitter_8bppOptimized;
extern void* AllocSprite(size_t);
void Blitter_8bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom)
{
const byte *src, *src_next;
@@ -100,7 +98,7 @@ void Blitter_8bppOptimized::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Z
}
}
Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite)
Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator)
{
Sprite *dest_sprite;
byte *temp_dst;
@@ -191,7 +189,7 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite)
assert(index < memory);
/* Allocate the exact amount of memory we need */
dest_sprite = (Sprite *)AllocSprite(sizeof(*dest_sprite) + index);
dest_sprite = (Sprite *)allocator(sizeof(*dest_sprite) + index);
dest_sprite->height = sprite->height;
dest_sprite->width = sprite->width;

2
src/blitter/8bpp_optimized.hpp
View File

@@ -15,7 +15,7 @@ public:
void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
Sprite *Encode(SpriteLoader::Sprite *sprite);
Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator);
};
class FBlitter_8bppOptimized: public BlitterFactory<FBlitter_8bppOptimized> {

6
src/blitter/8bpp_slow.cpp
View File

@@ -5,8 +5,6 @@
static FBlitter_8bppSimple iFBlitter_8bppSimple;
extern void* AllocSprite(size_t);
void Blitter_8bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom)
{
const byte *src, *src_line;
@@ -46,10 +44,10 @@ void Blitter_8bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, Zoom
}
}
Sprite *Blitter_8bppSimple::Encode(SpriteLoader::Sprite *sprite)
Sprite *Blitter_8bppSimple::Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator)
{
Sprite *dest_sprite;
dest_sprite = (Sprite *)AllocSprite(sizeof(*dest_sprite) + sprite->height * sprite->width);
dest_sprite = (Sprite *)allocator(sizeof(*dest_sprite) + sprite->height * sprite->width);;
dest_sprite->height = sprite->height;
dest_sprite->width = sprite->width;

2
src/blitter/8bpp_slow.hpp
View File

@@ -15,7 +15,7 @@ public:
void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
Sprite *Encode(SpriteLoader::Sprite *sprite);
Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator);
};
class FBlitter_8bppSimple: public BlitterFactory<FBlitter_8bppSimple> {

4
src/blitter/blitter.hpp
View File

@@ -35,6 +35,8 @@ public:
int pitch; ///< The pitch of the destination buffer
};
typedef void *AllocatorProc(size_t size);
/**
* Get the screen depth this blitter works for.
* This is either: 8, 16, 24 or 32.
@@ -49,7 +51,7 @@ public:
/**
* Convert a sprite from the loader to our own format.
*/
virtual Sprite *Encode(SpriteLoader::Sprite *sprite) = 0;
virtual Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator) = 0;
virtual ~Blitter() { }
};

28
src/fontcache.cpp
View File

@@ -14,6 +14,8 @@
#include "string.h"
#include "fontcache.h"
#include "helpers.hpp"
#include "spriteloader/spriteloader.hpp"
#include "blitter/blitter.hpp"
#ifdef WITH_FREETYPE
@@ -361,6 +363,11 @@ static void SetGlyphPtr(FontSize size, WChar key, const GlyphEntry *glyph)
_glyph_ptr[size][GB(key, 8, 8)][GB(key, 0, 8)].width = glyph->width;
}
void *AllocateFont(size_t size)
{
return malloc(size);
}
const Sprite *GetGlyph(FontSize size, WChar key)
{
@@ -368,7 +375,7 @@ const Sprite *GetGlyph(FontSize size, WChar key)
FT_GlyphSlot slot;
GlyphEntry new_glyph;
GlyphEntry *glyph;
Sprite *sprite;
SpriteLoader::Sprite sprite;
int width;
int height;
int x;
@@ -398,20 +405,20 @@ const Sprite *GetGlyph(FontSize size, WChar key)
height = max(1, slot->bitmap.rows + (size == FS_NORMAL));
/* FreeType has rendered the glyph, now we allocate a sprite and copy the image into it */
sprite = (Sprite*)calloc(width * height + 8, 1);
sprite->width = width;
sprite->height = height;
sprite->x_offs = slot->bitmap_left;
sprite.data = CallocT<SpriteLoader::CommonPixel>(width * height);
sprite.width = width;
sprite.height = height;
sprite.x_offs = slot->bitmap_left;
// XXX 2 should be determined somehow... it's right for the normal face
y_adj = (size == FS_NORMAL) ? 2 : 0;
sprite->y_offs = GetCharacterHeight(size) - slot->bitmap_top - y_adj;
sprite.y_offs = GetCharacterHeight(size) - slot->bitmap_top - y_adj;
/* Draw shadow for medium size */
if (size == FS_NORMAL) {
for (y = 0; y < slot->bitmap.rows; y++) {
for (x = 0; x < slot->bitmap.width; x++) {
if (HASBIT(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) {
sprite->data[1 + x + (1 + y) * sprite->width] = SHADOW_COLOUR;
sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR;
}
}
}
@@ -420,17 +427,18 @@ const Sprite *GetGlyph(FontSize size, WChar key)
for (y = 0; y < slot->bitmap.rows; y++) {
for (x = 0; x < slot->bitmap.width; x++) {
if (HASBIT(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) {
sprite->data[x + y * sprite->width] = FACE_COLOUR;
sprite.data[x + y * sprite.width].m = FACE_COLOUR;
}
}
}
new_glyph.sprite = sprite;
new_glyph.sprite = BlitterFactoryBase::GetCurrentBlitter()->Encode(&sprite, AllocateFont);
free(sprite.data);
new_glyph.width = (slot->advance.x >> 6) + (size != FS_NORMAL);
SetGlyphPtr(size, key, &new_glyph);
return sprite;
return new_glyph.sprite;
}

2
src/spritecache.cpp
View File

@@ -152,7 +152,7 @@ static void* ReadSprite(SpriteCache *sc, SpriteID id)
if (!sprite_loader.LoadSprite(&sprite, file_pos)) return NULL;
if (id == 142) sprite.height = 10; // Compensate for a TTD bug
sc->ptr = BlitterFactoryBase::GetCurrentBlitter()->Encode(&sprite);
sc->ptr = BlitterFactoryBase::GetCurrentBlitter()->Encode(&sprite, &AllocSprite);
free(sprite.data);
return sc->ptr;