From 340d5b43f91d303ecf2a14e4e6be6e9a5c7f32e2 Mon Sep 17 00:00:00 2001 From: truelight Date: Mon, 11 Jun 2007 15:13:30 +0000 Subject: (svn r10101) -Codechange: the class is named 8bppSimple, so name the files like that too --- src/blitter/8bpp_simple.cpp | 63 +++++++++++++++++++++++++++++++++++++++++++++ src/blitter/8bpp_simple.hpp | 30 +++++++++++++++++++++ src/blitter/8bpp_slow.cpp | 63 --------------------------------------------- src/blitter/8bpp_slow.hpp | 30 --------------------- 4 files changed, 93 insertions(+), 93 deletions(-) create mode 100644 src/blitter/8bpp_simple.cpp create mode 100644 src/blitter/8bpp_simple.hpp delete mode 100644 src/blitter/8bpp_slow.cpp delete mode 100644 src/blitter/8bpp_slow.hpp (limited to 'src') diff --git a/src/blitter/8bpp_simple.cpp b/src/blitter/8bpp_simple.cpp new file mode 100644 index 000000000..304917275 --- /dev/null +++ b/src/blitter/8bpp_simple.cpp @@ -0,0 +1,63 @@ +#include "../stdafx.h" +#include "../zoom.hpp" +#include "../gfx.h" +#include "8bpp_simple.hpp" + +static FBlitter_8bppSimple iFBlitter_8bppSimple; + +void Blitter_8bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom) +{ + const byte *src, *src_line; + Pixel8 *dst, *dst_line; + + /* Find where to start reading in the source sprite */ + src_line = (const byte *)bp->sprite + (bp->skip_top * bp->sprite_width + bp->skip_left) * ScaleByZoom(1, zoom); + dst_line = (Pixel8 *)bp->dst + bp->top * bp->pitch + bp->left; + + for (int y = 0; y < bp->height; y++) { + dst = dst_line; + dst_line += bp->pitch; + + src = src_line; + src_line += bp->sprite_width * ScaleByZoom(1, zoom); + + for (int x = 0; x < bp->width; x++) { + uint color = 0; + + switch (mode) { + case BM_COLOUR_REMAP: + color = bp->remap[*src]; + break; + + case BM_TRANSPARENT: + if (*src != 0) color = bp->remap[*dst]; + break; + + default: + color = *src; + break; + } + if (color != 0) *dst = color; + dst++; + src += ScaleByZoom(1, zoom); + } + } +} + +Sprite *Blitter_8bppSimple::Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator) +{ + Sprite *dest_sprite; + dest_sprite = (Sprite *)allocator(sizeof(*dest_sprite) + sprite->height * sprite->width);; + + dest_sprite->height = sprite->height; + dest_sprite->width = sprite->width; + dest_sprite->x_offs = sprite->x_offs; + dest_sprite->y_offs = sprite->y_offs; + + /* Copy over only the 'remap' channel, as that is what we care about in 8bpp */ + for (int i = 0; i < sprite->height * sprite->width; i++) { + dest_sprite->data[i] = sprite->data[i].m; + } + + return dest_sprite; +} diff --git a/src/blitter/8bpp_simple.hpp b/src/blitter/8bpp_simple.hpp new file mode 100644 index 000000000..fabab0529 --- /dev/null +++ b/src/blitter/8bpp_simple.hpp @@ -0,0 +1,30 @@ +/* $Id$ */ + +/** @file 8bpp.hpp */ + +#ifndef BLITTER_8BPP_SIMPLE_HPP +#define BLITTER_8BPP_SIMPLE_HPP + +#include "blitter.hpp" + +typedef Pixel Pixel8; + +class Blitter_8bppSimple : public Blitter { +public: + uint8 GetScreenDepth() { return 8; } + + void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom); + + Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator); +}; + +class FBlitter_8bppSimple: public BlitterFactory { +public: + /* virtual */ const char *GetName() { return "8bpp-simple"; } + + /* virtual */ const char *GetDescription() { return "8bpp Simple Blitter (relative slow, but never wrong)"; } + + /* virtual */ Blitter *CreateInstance() { return new Blitter_8bppSimple(); } +}; + +#endif /* BLITTER_8BPP_SIMPLE_HPP */ diff --git a/src/blitter/8bpp_slow.cpp b/src/blitter/8bpp_slow.cpp deleted file mode 100644 index ad83cff20..000000000 --- a/src/blitter/8bpp_slow.cpp +++ /dev/null @@ -1,63 +0,0 @@ -#include "../stdafx.h" -#include "../zoom.hpp" -#include "../gfx.h" -#include "8bpp_slow.hpp" - -static FBlitter_8bppSimple iFBlitter_8bppSimple; - -void Blitter_8bppSimple::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom) -{ - const byte *src, *src_line; - Pixel8 *dst, *dst_line; - - /* Find where to start reading in the source sprite */ - src_line = (const byte *)bp->sprite + (bp->skip_top * bp->sprite_width + bp->skip_left) * ScaleByZoom(1, zoom); - dst_line = (Pixel8 *)bp->dst + bp->top * bp->pitch + bp->left; - - for (int y = 0; y < bp->height; y++) { - dst = dst_line; - dst_line += bp->pitch; - - src = src_line; - src_line += bp->sprite_width * ScaleByZoom(1, zoom); - - for (int x = 0; x < bp->width; x++) { - uint color = 0; - - switch (mode) { - case BM_COLOUR_REMAP: - color = bp->remap[*src]; - break; - - case BM_TRANSPARENT: - if (*src != 0) color = bp->remap[*dst]; - break; - - default: - color = *src; - break; - } - if (color != 0) *dst = color; - dst++; - src += ScaleByZoom(1, zoom); - } - } -} - -Sprite *Blitter_8bppSimple::Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator) -{ - Sprite *dest_sprite; - dest_sprite = (Sprite *)allocator(sizeof(*dest_sprite) + sprite->height * sprite->width);; - - dest_sprite->height = sprite->height; - dest_sprite->width = sprite->width; - dest_sprite->x_offs = sprite->x_offs; - dest_sprite->y_offs = sprite->y_offs; - - /* Copy over only the 'remap' channel, as that is what we care about in 8bpp */ - for (int i = 0; i < sprite->height * sprite->width; i++) { - dest_sprite->data[i] = sprite->data[i].m; - } - - return dest_sprite; -} diff --git a/src/blitter/8bpp_slow.hpp b/src/blitter/8bpp_slow.hpp deleted file mode 100644 index fabab0529..000000000 --- a/src/blitter/8bpp_slow.hpp +++ /dev/null @@ -1,30 +0,0 @@ -/* $Id$ */ - -/** @file 8bpp.hpp */ - -#ifndef BLITTER_8BPP_SIMPLE_HPP -#define BLITTER_8BPP_SIMPLE_HPP - -#include "blitter.hpp" - -typedef Pixel Pixel8; - -class Blitter_8bppSimple : public Blitter { -public: - uint8 GetScreenDepth() { return 8; } - - void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom); - - Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator); -}; - -class FBlitter_8bppSimple: public BlitterFactory { -public: - /* virtual */ const char *GetName() { return "8bpp-simple"; } - - /* virtual */ const char *GetDescription() { return "8bpp Simple Blitter (relative slow, but never wrong)"; } - - /* virtual */ Blitter *CreateInstance() { return new Blitter_8bppSimple(); } -}; - -#endif /* BLITTER_8BPP_SIMPLE_HPP */ -- cgit v1.2.3-70-g09d2