(svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
-Codechange: introduced a hierachy of blitters to avoid a lot of code duplication Note: this allows much easier adding other types of video-drivers, like OpenGLpull/155/head
truelight
17 years ago
parent
8c3e9d111f
commit
79cd3f5db0
@ -0,0 +1,125 @@
|
||||
#include "../stdafx.h"
|
||||
#include "../gfx.h"
|
||||
#include "32bpp_base.hpp"
|
||||
|
||||
void *Blitter_32bppBase::MoveTo(const void *video, int x, int y)
|
||||
{
|
||||
return (uint32 *)video + x + y * _screen.pitch;
|
||||
}
|
||||
|
||||
void Blitter_32bppBase::SetPixel(void *video, int x, int y, uint8 color)
|
||||
{
|
||||
*((uint32 *)video + x + y * _screen.pitch) = LookupColourInPalette(color);
|
||||
}
|
||||
|
||||
void Blitter_32bppBase::SetPixelIfEmpty(void *video, int x, int y, uint8 color)
|
||||
{
|
||||
uint32 *dst = (uint32 *)video + x + y * _screen.pitch;
|
||||
if (*dst == 0) *dst = LookupColourInPalette(color);
|
||||
}
|
||||
|
||||
void Blitter_32bppBase::SetHorizontalLine(void *video, int width, uint8 color)
|
||||
{
|
||||
uint32 *dst = (uint32 *)video;
|
||||
uint32 color32 = LookupColourInPalette(color);
|
||||
|
||||
for (; width > 0; width--) {
|
||||
*dst = color32;
|
||||
dst++;
|
||||
}
|
||||
}
|
||||
|
||||
void Blitter_32bppBase::DrawLine(void *video, int x, int y, int x2, int y2, uint8 color)
|
||||
{
|
||||
int dy;
|
||||
int dx;
|
||||
int stepx;
|
||||
int stepy;
|
||||
int frac;
|
||||
|
||||
dy = (y2 - y) * 2;
|
||||
if (dy < 0) {
|
||||
dy = -dy;
|
||||
stepy = -1;
|
||||
} else {
|
||||
stepy = 1;
|
||||
}
|
||||
|
||||
dx = (x2 - x) * 2;
|
||||
if (dx < 0) {
|
||||
dx = -dx;
|
||||
stepx = -1;
|
||||
} else {
|
||||
stepx = 1;
|
||||
}
|
||||
|
||||
this->SetPixel(video, x, y, color);
|
||||
if (dx > dy) {
|
||||
frac = dy - (dx >> 1);
|
||||
while (x != x2) {
|
||||
if (frac >= 0) {
|
||||
y += stepy;
|
||||
frac -= dx;
|
||||
}
|
||||
x += stepx;
|
||||
frac += dy;
|
||||
this->SetPixel(video, x, y, color);
|
||||
}
|
||||
} else {
|
||||
frac = dx - (dy >> 1);
|
||||
while (y != y2) {
|
||||
if (frac >= 0) {
|
||||
x += stepx;
|
||||
frac -= dy;
|
||||
}
|
||||
y += stepy;
|
||||
frac += dx;
|
||||
this->SetPixel(video, x, y, color);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Blitter_32bppBase::CopyFromBuffer(void *video, const void *src, int width, int height, int src_pitch)
|
||||
{
|
||||
int direction = (height < 0) ? -1 : 1;
|
||||
uint32 *dst = (uint32 *)video;
|
||||
uint32 *usrc = (uint32 *)src;
|
||||
|
||||
height = abs(height);
|
||||
for (; height > 0; height--) {
|
||||
memcpy(dst, usrc, width * sizeof(uint32));
|
||||
usrc += src_pitch * direction;
|
||||
dst += _screen.pitch * direction;
|
||||
}
|
||||
}
|
||||
|
||||
void Blitter_32bppBase::CopyToBuffer(const void *video, void *dst, int width, int height, int dst_pitch)
|
||||
{
|
||||
int direction = (height < 0) ? -1 : 1;
|
||||
uint32 *udst = (uint32 *)dst;
|
||||
uint32 *src = (uint32 *)video;
|
||||
|
||||
height = abs(height);
|
||||
for (; height > 0; height--) {
|
||||
memcpy(udst, src, width * sizeof(uint32));
|
||||
src += _screen.pitch * direction;
|
||||
udst += dst_pitch * direction;
|
||||
}
|
||||
}
|
||||
|
||||
void Blitter_32bppBase::MoveBuffer(void *video_dst, const void *video_src, int width, int height)
|
||||
{
|
||||
uint32 *dst = (uint32 *)video_dst;
|
||||
uint32 *src = (uint32 *)video_src;
|
||||
|
||||
for (; height > 0; height--) {
|
||||
memmove(dst, src, width * sizeof(uint32));
|
||||
src += _screen.pitch;
|
||||
dst += _screen.pitch;
|
||||
}
|
||||
}
|
||||
|
||||
int Blitter_32bppBase::BufferSize(int width, int height)
|
||||
{
|
||||
return width * height * sizeof(uint32);
|
||||
}
|
||||
@ -0,0 +1,129 @@
|
||||
#include "../stdafx.h"
|
||||
#include "../gfx.h"
|
||||
#include "8bpp_base.hpp"
|
||||
|
||||
void Blitter_8bppBase::DrawColorMappingRect(void *dst, int width, int height, int pal)
|
||||
{
|
||||
const uint8 *ctab = GetNonSprite(pal) + 1;
|
||||
|
||||
do {
|
||||
for (int i = 0; i != width; i++) *((uint8 *)dst + i) = ctab[((uint8 *)dst)[i]];
|
||||
dst = (uint8 *)dst + _screen.pitch;
|
||||
} while (height--);
|
||||
}
|
||||
|
||||
void *Blitter_8bppBase::MoveTo(const void *video, int x, int y)
|
||||
{
|
||||
return (uint8 *)video + x + y * _screen.pitch;
|
||||
}
|
||||
|
||||
void Blitter_8bppBase::SetPixel(void *video, int x, int y, uint8 color)
|
||||
{
|
||||
*((uint8 *)video + x + y * _screen.pitch) = color;
|
||||
}
|
||||
|
||||
void Blitter_8bppBase::SetPixelIfEmpty(void *video, int x, int y, uint8 color)
|
||||
{
|
||||
uint8 *dst = (uint8 *)video + x + y * _screen.pitch;
|
||||
if (*dst == 0) *dst = color;
|
||||
}
|
||||
|
||||
void Blitter_8bppBase::SetHorizontalLine(void *video, int width, uint8 color)
|
||||
{
|
||||
memset(video, color, width);
|
||||
}
|
||||
|
||||
void Blitter_8bppBase::DrawLine(void *video, int x, int y, int x2, int y2, uint8 color)
|
||||
{
|
||||
int dy;
|
||||
int dx;
|
||||
int stepx;
|
||||
int stepy;
|
||||
int frac;
|
||||
|
||||
dy = (y2 - y) * 2;
|
||||
if (dy < 0) {
|
||||
dy = -dy;
|
||||
stepy = -1;
|
||||
} else {
|
||||
stepy = 1;
|
||||
}
|
||||
|
||||
dx = (x2 - x) * 2;
|
||||
if (dx < 0) {
|
||||
dx = -dx;
|
||||
stepx = -1;
|
||||
} else {
|
||||
stepx = 1;
|
||||
}
|
||||
|
||||
this->SetPixel(video, x, y, color);
|
||||
if (dx > dy) {
|
||||
frac = dy - (dx / 2);
|
||||
while (x != x2) {
|
||||
if (frac >= 0) {
|
||||
y += stepy;
|
||||
frac -= dx;
|
||||
}
|
||||
x += stepx;
|
||||
frac += dy;
|
||||
this->SetPixel(video, x, y, color);
|
||||
}
|
||||
} else {
|
||||
frac = dx - (dy / 2);
|
||||
while (y != y2) {
|
||||
if (frac >= 0) {
|
||||
x += stepx;
|
||||
frac -= dy;
|
||||
}
|
||||
y += stepy;
|
||||
frac += dx;
|
||||
this->SetPixel(video, x, y, color);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Blitter_8bppBase::CopyFromBuffer(void *video, const void *src, int width, int height, int src_pitch)
|
||||
{
|
||||
int direction = (height < 0) ? -1 : 1;
|
||||
uint8 *dst = (uint8 *)video;
|
||||
uint8 *usrc = (uint8 *)src;
|
||||
|
||||
height = abs(height);
|
||||
for (; height > 0; height--) {
|
||||
memcpy(dst, usrc, width);
|
||||
usrc += src_pitch * direction;
|
||||
dst += _screen.pitch * direction;
|
||||
}
|
||||
}
|
||||
|
||||
void Blitter_8bppBase::CopyToBuffer(const void *video, void *dst, int width, int height, int dst_pitch)
|
||||
{
|
||||
int direction = (height < 0) ? -1 : 1;
|
||||
uint8 *udst = (uint8 *)dst;
|
||||
uint8 *src = (uint8 *)video;
|
||||
|
||||
height = abs(height);
|
||||
for (; height > 0; height--) {
|
||||
memcpy(udst, src, width);
|
||||
src += _screen.pitch * direction;
|
||||
udst += dst_pitch * direction;
|
||||
}
|
||||
}
|
||||
|
||||
void Blitter_8bppBase::MoveBuffer(void *video_dst, const void *video_src, int width, int height)
|
||||
{
|
||||
uint8 *dst = (uint8 *)video_dst;
|
||||
uint8 *src = (uint8 *)video_src;
|
||||
|
||||
for (; height > 0; height--) {
|
||||
memmove(dst, src, width);
|
||||
src += _screen.pitch;
|
||||
dst += _screen.pitch;
|
||||
}
|
||||
}
|
||||
|
||||
int Blitter_8bppBase::BufferSize(int width, int height)
|
||||
{
|
||||
return width * height;
|
||||
}
|
||||
@ -1,29 +1,27 @@
|
||||
/* $Id$ */
|
||||
|
||||
/** @file 8bpp.hpp */
|
||||
/** @file 8bpp_base.hpp */
|
||||
|
||||
#ifndef RENDERER_8BPP_HPP
|
||||
#define RENDERER_8BPP_HPP
|
||||
#ifndef BLITTER_8BPP_BASE_HPP
|
||||
#define BLITTER_8BPP_BASE_HPP
|
||||
|
||||
#include "renderer.hpp"
|
||||
#include "base.hpp"
|
||||
|
||||
class Renderer_8bpp : public Renderer {
|
||||
class Blitter_8bppBase : public Blitter {
|
||||
public:
|
||||
/* virtual */ uint8 GetScreenDepth() { return 8; }
|
||||
// /* virtual */ void Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomLevel zoom);
|
||||
/* virtual */ void DrawColorMappingRect(void *dst, int width, int height, int pal);
|
||||
// /* virtual */ Sprite *Encode(SpriteLoader::Sprite *sprite, Blitter::AllocatorProc *allocator);
|
||||
/* virtual */ void *MoveTo(const void *video, int x, int y);
|
||||
/* virtual */ void SetPixel(void *video, int x, int y, uint8 color);
|
||||
/* virtual */ void SetPixelIfEmpty(void *video, int x, int y, uint8 color);
|
||||
/* virtual */ void SetHorizontalLine(void *video, int width, uint8 color);
|
||||
/* virtual */ void DrawLine(void *video, int x, int y, int x2, int y2, uint8 color);
|
||||
/* virtual */ void CopyFromBuffer(void *video, const void *src, int width, int height, int src_pitch);
|
||||
/* virtual */ void CopyToBuffer(const void *video, void *dst, int width, int height, int dst_pitch);
|
||||
/* virtual */ void MoveBuffer(void *video_dst, const void *video_src, int width, int height);
|
||||
/* virtual */ int BufferSize(int width, int height);
|
||||
};
|
||||
|
||||
class FRenderer_8bpp: public RendererFactory<FRenderer_8bpp> {
|
||||
public:
|
||||
/* virtual */ const char *GetName() { return "8bpp"; }
|
||||
|
||||
/* virtual */ Renderer *CreateInstance() { return new Renderer_8bpp(); }
|
||||
};
|
||||
|
||||
#endif /* RENDERER_8BPP_HPP */
|
||||
#endif /* BLITTER_8BPP_BASE_HPP */
|
||||
@ -1,77 +0,0 @@
|
||||
#include "../stdafx.h"
|
||||
#include "../gfx.h"
|
||||
#include "32bpp.hpp"
|
||||
|
||||
static FRenderer_32bpp iFRenderer_32bpp;
|
||||
|
||||
void *Renderer_32bpp::MoveTo(const void *video, int x, int y)
|
||||
{
|
||||
return (uint32 *)video + x + y * _screen.pitch;
|
||||
}
|
||||
|
||||
void Renderer_32bpp::SetPixel(void *video, int x, int y, uint8 color)
|
||||
{
|
||||
*((uint32 *)video + x + y * _screen.pitch) = LookupColourInPalette(color);
|
||||
}
|
||||
|
||||
void Renderer_32bpp::SetPixelIfEmpty(void *video, int x, int y, uint8 color)
|
||||
{
|
||||
uint32 *dst = (uint32 *)video + x + y * _screen.pitch;
|
||||
if (*dst == 0) *dst = LookupColourInPalette(color);
|
||||
}
|
||||
|
||||
void Renderer_32bpp::SetHorizontalLine(void *video, int width, uint8 color)
|
||||
{
|
||||
uint32 *dst = (uint32 *)video;
|
||||
uint32 color32 = LookupColourInPalette(color);
|
||||
|
||||
for (; width > 0; width--) {
|
||||
*dst = color32;
|
||||
dst++;
|
||||
}
|
||||
}
|
||||
|
||||
void Renderer_32bpp::CopyFromBuffer(void *video, const void *src, int width, int height, int src_pitch)
|
||||
{
|
||||
int direction = (height < 0) ? -1 : 1;
|
||||
uint32 *dst = (uint32 *)video;
|
||||
uint32 *usrc = (uint32 *)src;
|
||||
|
||||
height = abs(height);
|
||||
for (; height > 0; height--) {
|
||||
memcpy(dst, usrc, width * sizeof(uint32));
|
||||
usrc += src_pitch * direction;
|
||||
dst += _screen.pitch * direction;
|
||||
}
|
||||
}
|
||||
|
||||
void Renderer_32bpp::CopyToBuffer(const void *video, void *dst, int width, int height, int dst_pitch)
|
||||
{
|
||||
int direction = (height < 0) ? -1 : 1;
|
||||
uint32 *udst = (uint32 *)dst;
|
||||
uint32 *src = (uint32 *)video;
|
||||
|
||||
height = abs(height);
|
||||
for (; height > 0; height--) {
|
||||
memcpy(udst, src, width * sizeof(uint32));
|
||||
src += _screen.pitch * direction;
|
||||
udst += dst_pitch * direction;
|
||||
}
|
||||
}
|
||||
|
||||
void Renderer_32bpp::MoveBuffer(void *video_dst, const void *video_src, int width, int height)
|
||||
{
|
||||
uint32 *dst = (uint32 *)video_dst;
|
||||
uint32 *src = (uint32 *)video_src;
|
||||
|
||||
for (; height > 0; height--) {
|
||||
memmove(dst, src, width * sizeof(uint32));
|
||||
src += _screen.pitch;
|
||||
dst += _screen.pitch;
|
||||
}
|
||||
}
|
||||
|
||||
int Renderer_32bpp::BufferSize(int width, int height)
|
||||
{
|
||||
return width * height * sizeof(uint32);
|
||||
}
|
||||
@ -1,71 +0,0 @@
|
||||
#include "../stdafx.h"
|
||||
#include "../gfx.h"
|
||||
#include "8bpp.hpp"
|
||||
|
||||
static FRenderer_8bpp iFRenderer_8bpp;
|
||||
|
||||
void *Renderer_8bpp::MoveTo(const void *video, int x, int y)
|
||||
{
|
||||
return (uint8 *)video + x + y * _screen.pitch;
|
||||
}
|
||||
|
||||
void Renderer_8bpp::SetPixel(void *video, int x, int y, uint8 color)
|
||||
{
|
||||
*((uint8 *)video + x + y * _screen.pitch) = color;
|
||||
}
|
||||
|
||||
void Renderer_8bpp::SetPixelIfEmpty(void *video, int x, int y, uint8 color)
|
||||
{
|
||||
uint8 *dst = (uint8 *)video + x + y * _screen.pitch;
|
||||
if (*dst == 0) *dst = color;
|
||||
}
|
||||
|
||||
void Renderer_8bpp::SetHorizontalLine(void *video, int width, uint8 color)
|
||||
{
|
||||
memset(video, color, width);
|
||||
}
|
||||
|
||||
void Renderer_8bpp::CopyFromBuffer(void *video, const void *src, int width, int height, int src_pitch)
|
||||
{
|
||||
int direction = (height < 0) ? -1 : 1;
|
||||
uint8 *dst = (uint8 *)video;
|
||||
uint8 *usrc = (uint8 *)src;
|
||||
|
||||
height = abs(height);
|
||||
for (; height > 0; height--) {
|
||||
memcpy(dst, usrc, width);
|
||||
usrc += src_pitch * direction;
|
||||
dst += _screen.pitch * direction;
|
||||
}
|
||||
}
|
||||
|
||||
void Renderer_8bpp::CopyToBuffer(const void *video, void *dst, int width, int height, int dst_pitch)
|
||||
{
|
||||
int direction = (height < 0) ? -1 : 1;
|
||||
uint8 *udst = (uint8 *)dst;
|
||||
uint8 *src = (uint8 *)video;
|
||||
|
||||
height = abs(height);
|
||||
for (; height > 0; height--) {
|
||||
memcpy(udst, src, width);
|
||||
src += _screen.pitch * direction;
|
||||
udst += dst_pitch * direction;
|
||||
}
|
||||
}
|
||||
|
||||
void Renderer_8bpp::MoveBuffer(void *video_dst, const void *video_src, int width, int height)
|
||||
{
|
||||
uint8 *dst = (uint8 *)video_dst;
|
||||
uint8 *src = (uint8 *)video_src;
|
||||
|
||||
for (; height > 0; height--) {
|
||||
memmove(dst, src, width);
|
||||
src += _screen.pitch;
|
||||
dst += _screen.pitch;
|
||||
}
|
||||
}
|
||||
|
||||
int Renderer_8bpp::BufferSize(int width, int height)
|
||||
{
|
||||
return width * height;
|
||||
}
|
||||
@ -1,39 +0,0 @@
|
||||
#include "../stdafx.h"
|
||||
#include "../gfx.h"
|
||||
#include "null.hpp"
|
||||
|
||||
static FRenderer_Null iFRenderer_Null;
|
||||
|
||||
void *Renderer_Null::MoveTo(const void *video, int x, int y)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void Renderer_Null::SetPixel(void *video, int x, int y, uint8 color)
|
||||
{
|
||||
}
|
||||
|
||||
void Renderer_Null::SetPixelIfEmpty(void *video, int x, int y, uint8 color)
|
||||
{
|
||||
}
|
||||
|
||||
void Renderer_Null::SetHorizontalLine(void *video, int width, uint8 color)
|
||||
{
|
||||
}
|
||||
|
||||
void Renderer_Null::CopyFromBuffer(void *video, const void *src, int width, int height, int src_pitch)
|
||||
{
|
||||
}
|
||||
|
||||
void Renderer_Null::CopyToBuffer(const void *video, void *dst, int width, int height, int dst_pitch)
|
||||
{
|
||||
}
|
||||
|
||||
void Renderer_Null::MoveBuffer(void *video_dst, const void *video_src, int width, int height)
|
||||
{
|
||||
}
|
||||
|
||||
int Renderer_Null::BufferSize(int width, int height)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
/* $Id$ */
|
||||
|
||||
/** @file null.hpp */
|
||||
|
||||
#ifndef RENDERER_NULL_HPP
|
||||
#define RENDERER_NULL_HPP
|
||||
|
||||
#include "renderer.hpp"
|
||||
|
||||
class Renderer_Null : public Renderer {
|
||||
public:
|
||||
/* virtual */ void *MoveTo(const void *video, int x, int y);
|
||||
/* virtual */ void SetPixel(void *video, int x, int y, uint8 color);
|
||||
/* virtual */ void SetPixelIfEmpty(void *video, int x, int y, uint8 color);
|
||||
/* virtual */ void SetHorizontalLine(void *video, int width, uint8 color);
|
||||
/* virtual */ void CopyFromBuffer(void *video, const void *src, int width, int height, int src_pitch);
|
||||
/* virtual */ void CopyToBuffer(const void *video, void *dst, int width, int height, int dst_pitch);
|
||||
/* virtual */ void MoveBuffer(void *video_dst, const void *video_src, int width, int height);
|
||||
/* virtual */ int BufferSize(int width, int height);
|
||||
};
|
||||
|
||||
class FRenderer_Null: public RendererFactory<FRenderer_Null> {
|
||||
public:
|
||||
/* virtual */ const char *GetName() { return "null"; }
|
||||
|
||||
/* virtual */ Renderer *CreateInstance() { return new Renderer_Null(); }
|
||||
};
|
||||
|
||||
#endif /* RENDERER_NULL_HPP */
|
||||
Loading…
Reference in New Issue