diff --git a/config.cpp b/config.cpp index d8e5882d..f85c78c8 100644 --- a/config.cpp +++ b/config.cpp @@ -1285,9 +1285,6 @@ void show3D() { dialog::addBreak(50); 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); if(!(wmspatial || mmspatial)) dialog::addInfo(XLAT("set 3D monsters or walls in basic config first")); @@ -1367,9 +1364,6 @@ void show3D() { ); else if(uni == 'b') 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') pushScreen(conformal::model_menu); else if(doexiton(sym, uni)) @@ -1499,6 +1493,9 @@ void show_color_dialog() { dialog::addColorItem(XLAT("projection background"), modelcolor, 'c'); 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::add_action([] () { dialog::openColorDialog(periodcolor); dialog::dialogflags |= sm::SIDE; }); diff --git a/polygons.cpp b/polygons.cpp index d87ffed4..280ec17d 100644 --- a/polygons.cpp +++ b/polygons.cpp @@ -1293,7 +1293,7 @@ color_t darken_color(color_t& color, bool outline) { if(outline && alpha < 255) return color - alpha + int(backbrightness * alpha); else - return (gradient(backcolor, color>>8, 0, backbrightness, 1)<<8) | 0xFF; + return (gradient(modelcolor>>8, color>>8, 0, backbrightness, 1)<<8) | 0xFF; } }