mirror of
https://github.com/aseprite/aseprite.git
synced 2024-10-06 06:50:07 +00:00
Add new color wheel for normal maps
This commit is contained in:
parent
ea71455f81
commit
88d1165854
@ -925,6 +925,9 @@
|
||||
<item command="SetColorSelector" text="RYB Color Wheel">
|
||||
<param name="type" value="ryb-wheel" />
|
||||
</item>
|
||||
<item command="SetColorSelector" text="Normal Map Color Wheel">
|
||||
<param name="type" value="normal-map-wheel" />
|
||||
</item>
|
||||
<separator />
|
||||
<item command="LoadPalette" text="L&oad Palette" />
|
||||
<item command="SavePalette" text="S&ave Palette" />
|
||||
|
@ -55,6 +55,9 @@ void SetColorSelectorCommand::onLoadParams(const Params& params)
|
||||
else if (type == "ryb-wheel") {
|
||||
m_type = ColorBar::ColorSelector::RYB_WHEEL;
|
||||
}
|
||||
else if (type == "normal-map-wheel") {
|
||||
m_type = ColorBar::ColorSelector::NORMAL_MAP_WHEEL;
|
||||
}
|
||||
}
|
||||
|
||||
bool SetColorSelectorCommand::onChecked(Context* context)
|
||||
@ -84,6 +87,9 @@ std::string SetColorSelectorCommand::onGetFriendlyName() const
|
||||
case ColorBar::ColorSelector::RYB_WHEEL:
|
||||
result += "RYB Color Wheel";
|
||||
break;
|
||||
case ColorBar::ColorSelector::NORMAL_MAP_WHEEL:
|
||||
result += "Normal Map Color Wheel";
|
||||
break;
|
||||
default:
|
||||
result += "Unknown";
|
||||
break;
|
||||
|
@ -341,6 +341,7 @@ void ColorBar::setColorSelector(ColorSelector selector)
|
||||
|
||||
case ColorSelector::RGB_WHEEL:
|
||||
case ColorSelector::RYB_WHEEL:
|
||||
case ColorSelector::NORMAL_MAP_WHEEL:
|
||||
if (!m_wheel) {
|
||||
m_wheel = new ColorWheel;
|
||||
m_wheel->setExpansive(true);
|
||||
@ -348,10 +349,15 @@ void ColorBar::setColorSelector(ColorSelector selector)
|
||||
m_wheel->ColorChange.connect(&ColorBar::onPickSpectrum, this);
|
||||
m_selectorPlaceholder.addChild(m_wheel);
|
||||
}
|
||||
m_wheel->setColorModel(
|
||||
(m_selector == ColorSelector::RGB_WHEEL ?
|
||||
ColorWheel::ColorModel::RGB:
|
||||
ColorWheel::ColorModel::RYB));
|
||||
if (m_selector == ColorSelector::RGB_WHEEL) {
|
||||
m_wheel->setColorModel(ColorWheel::ColorModel::RGB);
|
||||
}
|
||||
else if (m_selector == ColorSelector::RYB_WHEEL) {
|
||||
m_wheel->setColorModel(ColorWheel::ColorModel::RYB);
|
||||
}
|
||||
else if (m_selector == ColorSelector::NORMAL_MAP_WHEEL) {
|
||||
m_wheel->setColorModel(ColorWheel::ColorModel::NORMAL_MAP);
|
||||
}
|
||||
m_wheel->setVisible(true);
|
||||
break;
|
||||
|
||||
|
@ -50,6 +50,7 @@ namespace app {
|
||||
SPECTRUM,
|
||||
RGB_WHEEL,
|
||||
RYB_WHEEL,
|
||||
NORMAL_MAP_WHEEL,
|
||||
TINT_SHADE_TONE,
|
||||
};
|
||||
|
||||
|
@ -84,6 +84,22 @@ app::Color ColorWheel::getColorInClientPos(const gfx::Point& pos)
|
||||
int v = (pos.y - (m_wheelBounds.y+m_wheelBounds.h/2));
|
||||
double d = std::sqrt(u*u + v*v);
|
||||
|
||||
if (m_colorModel == ColorModel::NORMAL_MAP) {
|
||||
float x = float(u) / float(m_wheelBounds.w / 2);
|
||||
float y = -float(v) / float(m_wheelBounds.h / 2);
|
||||
float z = std::sqrt(1 - x*x - y*y);
|
||||
if (z <= 1.f) {
|
||||
return app::Color::fromRgb(
|
||||
int(std::round((x + 1) * 127.5)),
|
||||
int(std::round((y + 1) * 127.5)),
|
||||
int(std::round((z + 1) * 127.5))
|
||||
);
|
||||
}
|
||||
else {
|
||||
return app::Color::fromRgb(128, 128, 255);
|
||||
}
|
||||
}
|
||||
|
||||
// Pick from the wheel
|
||||
if (d < m_wheelRadius+2*guiscale()) {
|
||||
double a = std::atan2(-v, u);
|
||||
@ -231,7 +247,7 @@ void ColorWheel::onPaint(ui::PaintEvent& ev)
|
||||
}
|
||||
}
|
||||
|
||||
if (m_color.getAlpha() > 0) {
|
||||
if (m_color.getAlpha() > 0 && m_colorModel != ColorModel::NORMAL_MAP) {
|
||||
int n = getHarmonies();
|
||||
int boxsize = MIN(rc.w/10, rc.h/10);
|
||||
|
||||
@ -336,6 +352,21 @@ void ColorWheel::onOptions()
|
||||
menu.addChild(&tetradic);
|
||||
menu.addChild(&square);
|
||||
|
||||
if (m_colorModel == ColorModel::NORMAL_MAP) {
|
||||
discrete.setSelected(false);
|
||||
discrete.setEnabled(false);
|
||||
|
||||
none.setSelected(true);
|
||||
none.setEnabled(false);
|
||||
complementary.setEnabled(false);
|
||||
monochromatic.setEnabled(false);
|
||||
analogous.setEnabled(false);
|
||||
split.setEnabled(false);
|
||||
triadic.setEnabled(false);
|
||||
tetradic.setEnabled(false);
|
||||
square.setEnabled(false);
|
||||
}
|
||||
else {
|
||||
if (isDiscrete()) discrete.setSelected(true);
|
||||
switch (m_harmony) {
|
||||
case Harmony::NONE: none.setSelected(true); break;
|
||||
@ -347,6 +378,7 @@ void ColorWheel::onOptions()
|
||||
case Harmony::TETRADIC: tetradic.setSelected(true); break;
|
||||
case Harmony::SQUARE: square.setSelected(true); break;
|
||||
}
|
||||
}
|
||||
|
||||
discrete.Click.connect(base::Bind<void>(&ColorWheel::setDiscrete, this, !isDiscrete()));
|
||||
none.Click.connect(base::Bind<void>(&ColorWheel::setHarmony, this, Harmony::NONE));
|
||||
|
@ -18,6 +18,7 @@ namespace app {
|
||||
enum class ColorModel {
|
||||
RGB,
|
||||
RYB,
|
||||
NORMAL_MAP,
|
||||
};
|
||||
|
||||
enum class Harmony {
|
||||
|
Loading…
Reference in New Issue
Block a user