mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-14 04:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix shading ink for grayscale images

Browse Source
This commit is contained in:
David Capello 2016-02-24 19:48:46 -03:00
parent c09dfa89f0
commit 69e7623628
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/app/tools/ink_processing.h
View File

@ -1,5 +1,5 @@
// Aseprite
// Copyright (C) 2001-2015 David Capello
// Copyright (C) 2001-2016 David Capello
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as
@ -14,6 +14,8 @@
#include "doc/rgbmap.h"
#include "doc/sprite.h"
#include "filters/neighboring_pixels.h"
#include "gfx/hsv.h"
#include "gfx/rgb.h"
namespace app {
namespace tools {
@ -777,9 +779,20 @@ public:
m_left(loop->getMouseButton() == ToolLoop::Left) {
}
// Works as the RGBA version
void processPixel(int x, int y) {
color_t src = *m_srcAddress;
int i = graya_getv(src);
int i = m_palette->findExactMatch(graya_getv(src),
graya_getv(src),
graya_getv(src),
graya_geta(src),
-1);
if (i < 0) {
*m_dstAddress = src;
return;
}
if (m_remap) {
i = (*m_remap)[i];
@ -797,7 +810,12 @@ public:
}
}
*m_dstAddress = graya(i, graya_geta(src));
color_t rgba = m_palette->getEntry(i);
*m_dstAddress = graya(
int(255.0 * Hsv(Rgb(rgba_getr(rgba),
rgba_getg(rgba),
rgba_getb(rgba))).value()),
rgba_geta(rgba));
}
private:
@ -954,6 +972,7 @@ void BrushInkProcessing<RgbTraits>::processPixel(int x, int y) {
}
case IMAGE_GRAYSCALE: {
c = get_pixel_fast<GrayscaleTraits>(m_brushImage, x, y);
// TODO review this line
c = graya(m_palette->getEntry(c), graya_geta(c));
break;
}
@ -1023,7 +1042,10 @@ void BrushInkProcessing<IndexedTraits>::processPixel(int x, int y) {
}
case IMAGE_GRAYSCALE: {
c = get_pixel_fast<GrayscaleTraits>(m_brushImage, x, y);
c = m_palette->findBestfit(graya_getv(c), graya_getv(c), graya_getv(c), graya_geta(c), 0);
c = m_palette->findBestfit(graya_getv(c),
graya_getv(c),
graya_getv(c),
graya_geta(c), 0);
break;
}
case IMAGE_BITMAP: {