mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-02-02 20:29:17 +00:00
Code Issues Releases Wiki Activity

moved backbrightness edit to colors; it is based on modelcolor rather than backcolor

Browse Source
This commit is contained in:
Zeno Rogue 2018-11-11 12:21:22 +01:00
parent 9ca5fafa9b
commit f1b395ce52
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config.cpp
View File

@ -1285,9 +1285,6 @@ void show3D() {
dialog::addBreak(50); dialog::addBreak(50);
dialog::addSelItem(XLAT("model used"), conformal::get_model_name(pmodel), 'M'); dialog::addSelItem(XLAT("model used"), conformal::get_model_name(pmodel), 'M');
if(sphere)
dialog::addSelItem(XLAT("brightness behind the sphere"), fts3(backbrightness), 'i');
dialog::addBreak(50); dialog::addBreak(50);
if(!(wmspatial || mmspatial)) if(!(wmspatial || mmspatial))
dialog::addInfo(XLAT("set 3D monsters or walls in basic config first")); dialog::addInfo(XLAT("set 3D monsters or walls in basic config first"));
@ -1367,9 +1364,6 @@ void show3D() {
); );
else if(uni == 'b') else if(uni == 'b')
config_camera_rotation(); config_camera_rotation();
else if(uni == 'i')
dialog::editNumber(backbrightness, 0, 1, .01, 0.25, XLAT("brightness behind the sphere"),
"brightness behind the sphere");
else if(uni == 'M') else if(uni == 'M')
pushScreen(conformal::model_menu); pushScreen(conformal::model_menu);
else if(doexiton(sym, uni)) else if(doexiton(sym, uni))
@ -1499,6 +1493,9 @@ void show_color_dialog() {
dialog::addColorItem(XLAT("projection background"), modelcolor, 'c'); dialog::addColorItem(XLAT("projection background"), modelcolor, 'c');
dialog::add_action([] () { dialog::openColorDialog(modelcolor); dialog::dialogflags |= sm::SIDE; }); dialog::add_action([] () { dialog::openColorDialog(modelcolor); dialog::dialogflags |= sm::SIDE; });
dialog::addSelItem(XLAT("brightness behind the sphere"), fts3(backbrightness), 'i');
dialog::add_action([] () { dialog::editNumber(backbrightness, 0, 1, .01, 0.25, XLAT("brightness behind the sphere"), "brightness behind the sphere"); });
dialog::addColorItem(XLAT("projection period"), periodcolor, 'p'); dialog::addColorItem(XLAT("projection period"), periodcolor, 'p');
dialog::add_action([] () { dialog::openColorDialog(periodcolor); dialog::dialogflags |= sm::SIDE; }); dialog::add_action([] () { dialog::openColorDialog(periodcolor); dialog::dialogflags |= sm::SIDE; });

2
polygons.cpp
View File

@ -1293,7 +1293,7 @@ color_t darken_color(color_t& color, bool outline) {
if(outline && alpha < 255) if(outline && alpha < 255)
return color - alpha + int(backbrightness * alpha); return color - alpha + int(backbrightness * alpha);
else else
return (gradient(backcolor, color>>8, 0, backbrightness, 1)<<8) | 0xFF; return (gradient(modelcolor>>8, color>>8, 0, backbrightness, 1)<<8) | 0xFF;
} }
} }