Commit 4f5c01e0 authored by claes's avatar claes

ColorTone DarkDarkGray and LightLightGray added

parent 6b533061
...@@ -472,6 +472,8 @@ static attrnav_sEnumElement elem_tone_or_color[] = { ...@@ -472,6 +472,8 @@ static attrnav_sEnumElement elem_tone_or_color[] = {
{ (int) glow_eDrawTone_Green, "ToneGreen"}, { (int) glow_eDrawTone_Green, "ToneGreen"},
{ (int) glow_eDrawTone_DarkGray, "ToneDarkGray"}, { (int) glow_eDrawTone_DarkGray, "ToneDarkGray"},
{ (int) glow_eDrawTone_LightGray, "ToneLightGray"}, { (int) glow_eDrawTone_LightGray, "ToneLightGray"},
{ (int) glow_eDrawTone_LightGrayHighSaturation, "ToneLightLightGray"},
{ (int) glow_eDrawTone_DarkGrayHighSaturation, "ToneDarkDarkGray"},
{ (int) glow_eDrawTone_DarkYellowGreen, "ToneDarkYellowGreen"}, { (int) glow_eDrawTone_DarkYellowGreen, "ToneDarkYellowGreen"},
{ (int) glow_eDrawTone_LightYellowGreen, "ToneLightYellowGreen"}, { (int) glow_eDrawTone_LightYellowGreen, "ToneLightYellowGreen"},
{ (int) glow_eDrawTone_YellowGreenHighSaturation, "ToneYellowGreenHighSaturation"}, { (int) glow_eDrawTone_YellowGreenHighSaturation, "ToneYellowGreenHighSaturation"},
......
...@@ -201,27 +201,33 @@ glow_eDrawType GlowColor::get_drawtype( glow_eDrawType local_drawtype, ...@@ -201,27 +201,33 @@ glow_eDrawType GlowColor::get_drawtype( glow_eDrawType local_drawtype,
glow_eDrawTone tone = ((GrowNode *)node)->color_tone; glow_eDrawTone tone = ((GrowNode *)node)->color_tone;
if ( local_drawtype > 30) { if ( local_drawtype > 30) {
if ( tone >= glow_eDrawTone_GrayHighSaturation && if ( tone == glow_eDrawTone_LightGrayHighSaturation)
tone < glow_eDrawTone_GrayLowSaturation) { drawtype = glow_eDrawType_Color31; // GrayLow1
tone = glow_eDrawTone( tone - 27); else if ( tone == glow_eDrawTone_DarkGrayHighSaturation)
intensity += 2; drawtype = glow_eDrawType_Color30; // DarkGrey
} else {
else if ( tone >= glow_eDrawTone_GrayLowSaturation) { if ( tone >= glow_eDrawTone_GrayHighSaturation &&
tone = glow_eDrawTone( tone - 2 * 27); tone < glow_eDrawTone_GrayLowSaturation) {
intensity -= 1; tone = glow_eDrawTone( tone - 27);
} intensity += 2;
if ( tone >= glow_eDrawTone_DarkGray && }
tone < glow_eDrawTone_LightGray) { else if ( tone >= glow_eDrawTone_GrayLowSaturation) {
tone = glow_eDrawTone( tone - 9); tone = glow_eDrawTone( tone - 2 * 27);
lightness -= 2; intensity -= 1;
} }
else if ( tone >= glow_eDrawTone_LightGray) { if ( tone >= glow_eDrawTone_DarkGray &&
tone = glow_eDrawTone( tone - 18); tone < glow_eDrawTone_LightGray) {
lightness += 2; tone = glow_eDrawTone( tone - 9);
lightness -= 2;
}
else if ( tone >= glow_eDrawTone_LightGray) {
tone = glow_eDrawTone( tone - 18);
lightness += 2;
}
drawtype = (glow_eDrawType) (local_drawtype - local_drawtype / 30 * 30 +
30 * tone);
} }
drawtype = (glow_eDrawType) (local_drawtype - local_drawtype / 30 * 30 +
30 * tone);
} }
else else
drawtype = local_drawtype; drawtype = local_drawtype;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment