new B_OP_ADD drawing mode
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10901 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
parent
9e89de2ca6
commit
2e4822e67d
271
src/servers/app/server/Painter/drawing_modes/DrawingModeAdd.h
Normal file
271
src/servers/app/server/Painter/drawing_modes/DrawingModeAdd.h
Normal file
@ -0,0 +1,271 @@
|
||||
// DrawingModeAdd.h
|
||||
|
||||
#ifndef DRAWING_MODE_ADD_H
|
||||
#define DRAWING_MODE_ADD_H
|
||||
|
||||
#include <SupportDefs.h>
|
||||
|
||||
#include "DrawingMode.h"
|
||||
#include "PatternHandler.h"
|
||||
|
||||
namespace agg
|
||||
{
|
||||
//====================================================DrawingModeAdd
|
||||
template<class Order>
|
||||
class DrawingModeAdd : public DrawingMode
|
||||
{
|
||||
public:
|
||||
typedef Order order_type;
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
DrawingModeAdd()
|
||||
: DrawingMode()
|
||||
{
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
virtual void blend_pixel(int x, int y, const color_type& c, int8u cover)
|
||||
{
|
||||
//printf("DrawingModeAdd::blend_pixel()\n");
|
||||
if (fPatternHandler->IsHighColor(x, y)) {
|
||||
int8u* p = m_rbuf->row(y) + (x << 2);
|
||||
rgb_color color = fPatternHandler->R5ColorAt(x, y);
|
||||
// int alpha = int(cover) * int(c.a);
|
||||
int alpha = int(cover) * int(color.alpha);
|
||||
if(alpha == 255*255)
|
||||
{
|
||||
p[Order::R] = min_c(255, p[Order::R] + color.red);
|
||||
p[Order::G] = min_c(255, p[Order::G] + color.green);
|
||||
p[Order::B] = min_c(255, p[Order::B] + color.blue);
|
||||
// p[Order::A] = color.alpha;
|
||||
}
|
||||
else
|
||||
{
|
||||
int r = p[Order::R];
|
||||
int g = p[Order::G];
|
||||
int b = p[Order::B];
|
||||
int a = p[Order::A];
|
||||
p[Order::R] = (int8u)((((color.red - r) * alpha) + (r << 16)) >> 16);
|
||||
p[Order::G] = (int8u)((((color.green - g) * alpha) + (g << 16)) >> 16);
|
||||
p[Order::B] = (int8u)((((color.blue - b) * alpha) + (b << 16)) >> 16);
|
||||
p[Order::A] = (int8u)(((alpha + (a << 8)) - ((alpha * a) >> 8)) >> 8);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
virtual void blend_hline(int x, int y, unsigned len,
|
||||
const color_type& c, int8u cover)
|
||||
{
|
||||
//printf("DrawingModeAdd::blend_hline()\n");
|
||||
int alpha = int(cover) * int(c.a);
|
||||
if(alpha == 255*255)
|
||||
{
|
||||
int32u v;
|
||||
int8u* p8 = (int8u*)&v;
|
||||
p8[Order::R] = (int8u)c.r;
|
||||
p8[Order::G] = (int8u)c.g;
|
||||
p8[Order::B] = (int8u)c.b;
|
||||
p8[Order::A] = (int8u)c.a;
|
||||
int32u* p32 = (int32u*)(m_rbuf->row(y)) + x;
|
||||
do
|
||||
{
|
||||
if (fPatternHandler->IsHighColor(x, y))
|
||||
*p32 = v;
|
||||
p32++;
|
||||
x++;
|
||||
}
|
||||
while(--len);
|
||||
}
|
||||
else
|
||||
{
|
||||
int8u* p = m_rbuf->row(y) + (x << 2);
|
||||
do
|
||||
{
|
||||
if (fPatternHandler->IsHighColor(x, y)) {
|
||||
int r = p[Order::R];
|
||||
int g = p[Order::G];
|
||||
int b = p[Order::B];
|
||||
int a = p[Order::A];
|
||||
p[Order::R] = (int8u)((((c.r - r) * alpha) + (r << 16)) >> 16);
|
||||
p[Order::G] = (int8u)((((c.g - g) * alpha) + (g << 16)) >> 16);
|
||||
p[Order::B] = (int8u)((((c.b - b) * alpha) + (b << 16)) >> 16);
|
||||
p[Order::A] = (int8u)(((alpha + (a << 8)) - ((alpha * a) >> 8)) >> 8);
|
||||
}
|
||||
x++;
|
||||
p += 4;
|
||||
}
|
||||
while(--len);
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
virtual void blend_vline(int x, int y, unsigned len,
|
||||
const color_type& c, int8u cover)
|
||||
{
|
||||
printf("DrawingModeAdd::blend_vline()\n");
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
virtual void blend_solid_hspan(int x, int y, unsigned len,
|
||||
const color_type& c, const int8u* covers)
|
||||
{
|
||||
//printf("DrawingModeAdd::blend_solid_hspan()\n");
|
||||
int8u* p = m_rbuf->row(y) + (x << 2);
|
||||
do
|
||||
{
|
||||
if (fPatternHandler->IsHighColor(x, y)) {
|
||||
rgb_color color = fPatternHandler->R5ColorAt(x, y);
|
||||
// int alpha = int(*covers++) * c.a;
|
||||
int alpha = int(*covers) * color.alpha;
|
||||
//int alpha = int(*covers++);
|
||||
if(alpha)
|
||||
{
|
||||
if(alpha == 255*255)
|
||||
{
|
||||
// p[Order::R] = (int8u)c.r;
|
||||
// p[Order::G] = (int8u)c.g;
|
||||
// p[Order::B] = (int8u)c.b;
|
||||
// p[Order::A] = (int8u)c.a;
|
||||
p[Order::R] = color.red;
|
||||
p[Order::G] = color.green;
|
||||
p[Order::B] = color.blue;
|
||||
p[Order::A] = color.alpha;
|
||||
}
|
||||
else
|
||||
{
|
||||
int r = p[Order::R];
|
||||
int g = p[Order::G];
|
||||
int b = p[Order::B];
|
||||
int a = p[Order::A];
|
||||
// p[Order::R] = (int8u)((((c.r - r) * alpha) + (r << 16)) >> 16);
|
||||
// p[Order::G] = (int8u)((((c.g - g) * alpha) + (g << 16)) >> 16);
|
||||
// p[Order::B] = (int8u)((((c.b - b) * alpha) + (b << 16)) >> 16);
|
||||
// p[Order::A] = (int8u)(((alpha + (a << 8)) - ((alpha * a) >> 8)) >> 8);
|
||||
p[Order::R] = (int8u)((((color.red - r) * alpha) + (r << 16)) >> 16);
|
||||
p[Order::G] = (int8u)((((color.green - g) * alpha) + (g << 16)) >> 16);
|
||||
p[Order::B] = (int8u)((((color.blue - b) * alpha) + (b << 16)) >> 16);
|
||||
p[Order::A] = (int8u)(((alpha + (a << 8)) - ((alpha * a) >> 8)) >> 8);
|
||||
}
|
||||
}
|
||||
}
|
||||
covers++;
|
||||
p += 4;
|
||||
x++;
|
||||
}
|
||||
while(--len);
|
||||
}
|
||||
|
||||
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
virtual void blend_solid_vspan(int x, int y, unsigned len,
|
||||
const color_type& c, const int8u* covers)
|
||||
{
|
||||
//printf("DrawingModeAdd::blend_solid_vspan()\n");
|
||||
int8u* p = m_rbuf->row(y) + (x << 2);
|
||||
do
|
||||
{
|
||||
if (fPatternHandler->IsHighColor(x, y)) {
|
||||
rgb_color color = fPatternHandler->R5ColorAt(x, y);
|
||||
// int alpha = int(*covers++) * c.a;
|
||||
int alpha = int(*covers) * color.alpha;
|
||||
//int alpha = int(*covers++);
|
||||
|
||||
if(alpha)
|
||||
{
|
||||
if(alpha == 255*255)
|
||||
{
|
||||
// p[Order::R] = (int8u)c.r;
|
||||
// p[Order::G] = (int8u)c.g;
|
||||
// p[Order::B] = (int8u)c.b;
|
||||
// p[Order::A] = (int8u)c.a;
|
||||
p[Order::R] = color.red;
|
||||
p[Order::G] = color.green;
|
||||
p[Order::B] = color.blue;
|
||||
p[Order::A] = color.alpha;
|
||||
}
|
||||
else
|
||||
{
|
||||
int r = p[Order::R];
|
||||
int g = p[Order::G];
|
||||
int b = p[Order::B];
|
||||
int a = p[Order::A];
|
||||
// p[Order::R] = (int8u)((((c.r - r) * alpha) + (r << 16)) >> 16);
|
||||
// p[Order::G] = (int8u)((((c.g - g) * alpha) + (g << 16)) >> 16);
|
||||
// p[Order::B] = (int8u)((((c.b - b) * alpha) + (b << 16)) >> 16);
|
||||
// p[Order::A] = (int8u)(((alpha + (a << 8)) - ((alpha * a) >> 8)) >> 8);
|
||||
p[Order::R] = (int8u)((((color.red - r) * alpha) + (r << 16)) >> 16);
|
||||
p[Order::G] = (int8u)((((color.green - g) * alpha) + (g << 16)) >> 16);
|
||||
p[Order::B] = (int8u)((((color.blue - b) * alpha) + (b << 16)) >> 16);
|
||||
p[Order::A] = (int8u)(((alpha + (a << 8)) - ((alpha * a) >> 8)) >> 8);
|
||||
}
|
||||
}
|
||||
};
|
||||
covers++;
|
||||
p += m_rbuf->stride();
|
||||
y++;
|
||||
}
|
||||
while(--len);
|
||||
}
|
||||
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
virtual void blend_color_hspan(int x, int y, unsigned len,
|
||||
const color_type* colors,
|
||||
const int8u* covers,
|
||||
int8u cover)
|
||||
{
|
||||
//printf("DrawingModeAdd::blend_color_hspan()\n");
|
||||
int8u* p = m_rbuf->row(y) + (x << 2);
|
||||
do
|
||||
{
|
||||
int alpha = colors->a * (covers ? int(*covers++) : int(cover));
|
||||
|
||||
if(alpha)
|
||||
{
|
||||
if(alpha == 255*255)
|
||||
{
|
||||
p[Order::R] = min_c(255, (int8u)colors->r + p[Order::R]);
|
||||
p[Order::G] = min_c(255, (int8u)colors->g + p[Order::G]);
|
||||
p[Order::B] = min_c(255, (int8u)colors->b + p[Order::B]);
|
||||
// p[Order::A] = min_c(255, (int8u)colors->a + p[Order::R]);
|
||||
}
|
||||
else
|
||||
{
|
||||
int r = p[Order::R];
|
||||
int g = p[Order::G];
|
||||
int b = p[Order::B];
|
||||
int a = p[Order::A];
|
||||
p[Order::R] = (int8u)((((min_c(255, r + colors->r) - r) * alpha) + (r << 16)) >> 16);
|
||||
p[Order::G] = (int8u)((((min_c(255, g + colors->g) - g) * alpha) + (g << 16)) >> 16);
|
||||
p[Order::B] = (int8u)((((min_c(255, b + colors->b) - b) * alpha) + (b << 16)) >> 16);
|
||||
p[Order::A] = (int8u)(((alpha + (a << 8)) - ((alpha * a) >> 8)) >> 8);
|
||||
}
|
||||
}
|
||||
p += 4;
|
||||
++colors;
|
||||
}
|
||||
while(--len);
|
||||
}
|
||||
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
virtual void blend_color_vspan(int x, int y, unsigned len,
|
||||
const color_type* colors,
|
||||
const int8u* covers,
|
||||
int8u cover)
|
||||
{
|
||||
printf("DrawingModeAdd::blend_color_vspan()\n");
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
typedef DrawingModeAdd<order_rgba32> DrawingModeRGBA32Add; //----DrawingModeRGBA32Over
|
||||
typedef DrawingModeAdd<order_argb32> DrawingModeARGB32Add; //----DrawingModeARGB32Over
|
||||
typedef DrawingModeAdd<order_abgr32> DrawingModeABGR32Add; //----DrawingModeABGR32Over
|
||||
typedef DrawingModeAdd<order_bgra32> DrawingModeBGRA32Add; //----DrawingModeBGRA32Over
|
||||
}
|
||||
|
||||
#endif // DRAWING_MODE_ADD_H
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
// DrawingModeFactory.h
|
||||
|
||||
|
||||
#include "DrawingModeAdd.h"
|
||||
#include "DrawingModeCopy.h"
|
||||
#include "DrawingModeInvert.h"
|
||||
#include "DrawingModeOver.h"
|
||||
@ -21,6 +22,9 @@ DrawingModeFactory::DrawingModeFor(drawing_mode mode)
|
||||
case B_OP_OVER:
|
||||
return new agg::DrawingModeBGRA32Over();
|
||||
break;
|
||||
case B_OP_ADD:
|
||||
return new agg::DrawingModeBGRA32Add();
|
||||
break;
|
||||
|
||||
default:
|
||||
return new agg::DrawingModeBGRA32Copy();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user