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

Use the simple ink when there is just one color for the shading ink

Browse Source
This commit is contained in:
David Capello 2019-08-26 16:27:53 -03:00
parent 8e1f98a45f
commit e968758117
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/tools/inks.h
View File

@ -128,15 +128,22 @@ public:
};
class ShadingInk : public BaseInk {
class ShadingInk : public PaintInk {
public:
ShadingInk() : PaintInk(PaintInk::Simple) { }
Ink* clone() override { return new ShadingInk(*this); }
bool isPaint() const override { return true; }
bool isShading() const override { return true; }
void prepareInk(ToolLoop* loop) override {
setProc(get_ink_proc<ShadingInkProcessing>(loop));
if (loop->getShadingRemap()) {
setProc(get_ink_proc<ShadingInkProcessing>(loop));
}
else {
PaintInk::prepareInk(loop);
}
}
};

32
src/app/ui/color_shades.cpp
View File

@ -1,4 +1,5 @@
// Aseprite
// Copyright (C) 2019 Igara Studio S.A.
// Copyright (C) 2018 David Capello
//
// This program is distributed under the terms of
@ -49,28 +50,27 @@ void ColorShades::reverseShadeColors()
doc::Remap* ColorShades::createShadeRemap(bool left)
{
std::unique_ptr<doc::Remap> remap;
Shade colors = getShade();
// We need two or more colors to create a shading remap. In
// other case, the ShadingInkProcessing will use the full
// color palette.
if (colors.size() > 1) {
remap.reset(new doc::Remap(get_current_palette()->size()));
Shade colors = getShade();
if (colors.size() <= 1)
return nullptr;
for (int i=0; i<remap->size(); ++i)
remap->map(i, i);
std::unique_ptr<doc::Remap> remap(
new doc::Remap(get_current_palette()->size()));
if (left) {
for (int i=1; i<int(colors.size()); ++i)
remap->map(colors[i].getIndex(), colors[i-1].getIndex());
}
else {
for (int i=0; i<int(colors.size())-1; ++i)
remap->map(colors[i].getIndex(), colors[i+1].getIndex());
}
for (int i=0; i<remap->size(); ++i)
remap->map(i, i);
if (left) {
for (int i=1; i<int(colors.size()); ++i)
remap->map(colors[i].getIndex(), colors[i-1].getIndex());
}
else {
for (int i=0; i<int(colors.size())-1; ++i)
remap->map(colors[i].getIndex(), colors[i+1].getIndex());
}
return remap.release();
}