Skip to content

Radar screen brilliance #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bridgecommand merged 3 commits into from
Mar 3, 2026
Merged

Radar screen brilliance #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10d71c3
Set radar screen brilliance when rendering and drawing overlay.
bridgecommand Mar 3, 2026
4a9ff22
Set brilliance from GUI. Interface location needs to be corrected.
bridgecommand Mar 3, 2026
0d4be36
Set brilliance control positions.
bridgecommand Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bin/language-en.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ clear="Clear"
past="Past"
gain="Gain"
rain="Rain"
brill="Brill"
weather = "Weather"
visibility="Visibility"
windDirection="Wind direction"
Expand Down
1 change: 1 addition & 0 deletions bin/language-es.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ clear="Borrar"
past="Pasado"
gain="Ganancia"
rain="Lluvia"
brill="Brill"
weather ="Meteorología"
visibility="Visibilidad"
windDirection ="Dirección del viento"
Expand Down
1 change: 1 addition & 0 deletions bin/language-fr.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ clear="Effacer"
past="Passé"
gain="Gain"
rain="Pluie"
brill="Brill"
weather = "Météo"
visibility="Visibilité"
windDirection = "Direction du vent"
Expand Down
40 changes: 30 additions & 10 deletions src/GUIMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,12 +565,15 @@ void GUIMain::load(irr::IrrlichtDevice* device, Lang* language, std::vector<std:
radarGainScrollbar = new irr::gui::ScrollDial(irr::core::vector2d<irr::s32>(0.0850*su,0.040*sh),0.02*su,guienv,mainRadarTab,GUI_ID_RADAR_GAIN_SCROLL_BAR);
radarClutterScrollbar = new irr::gui::ScrollDial(irr::core::vector2d<irr::s32>(0.1425*su,0.040*sh),0.02*su,guienv,mainRadarTab,GUI_ID_RADAR_CLUTTER_SCROLL_BAR);
radarRainScrollbar = new irr::gui::ScrollDial(irr::core::vector2d<irr::s32>(0.2000*su,0.040*sh),0.02*su,guienv,mainRadarTab,GUI_ID_RADAR_RAIN_SCROLL_BAR);
radarBrillScrollbar = new irr::gui::ScrollDial(irr::core::vector2d<irr::s32>(0.2000 * su, 0.115 * sh), 0.01 * su, guienv, mainRadarTab, GUI_ID_RADAR_BRILL_SCROLL_BAR);
(guienv->addStaticText(language->translate("gain").c_str(),irr::core::rect<irr::s32>(0.0600*su,0.070*sh,0.1100*su,0.100*sh),false,true,mainRadarTab))->setTextAlignment(irr::gui::EGUIA_CENTER,irr::gui::EGUIA_CENTER);
(guienv->addStaticText(language->translate("clutter").c_str(),irr::core::rect<irr::s32>(0.1165*su,0.070*sh,0.1675*su,0.100*sh),false,true,mainRadarTab))->setTextAlignment(irr::gui::EGUIA_CENTER,irr::gui::EGUIA_CENTER);
(guienv->addStaticText(language->translate("rain").c_str(),irr::core::rect<irr::s32>(0.1750*su,0.070*sh,0.2250*su,0.100*sh),false,true,mainRadarTab))->setTextAlignment(irr::gui::EGUIA_CENTER,irr::gui::EGUIA_CENTER);
(guienv->addStaticText(language->translate("brill").c_str(), irr::core::rect<irr::s32>(0.1750 * su, 0.125 * sh, 0.2250 * su, 0.155 * sh), false, true, mainRadarTab))->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
radarGainScrollbar->setSmallStep(2);
radarClutterScrollbar->setSmallStep(2);
radarRainScrollbar->setSmallStep(2);
radarBrillScrollbar->setSmallStep(2);

eblLeftButton = guienv->addButton(irr::core::rect<irr::s32>(0.060*su,0.160*sh,0.115*su,0.190*sh),mainRadarTab,GUI_ID_RADAR_EBL_LEFT_BUTTON,language->translate("eblLeft").c_str());
eblRightButton = guienv->addButton(irr::core::rect<irr::s32>(0.170*su,0.160*sh,0.225*su,0.190*sh),mainRadarTab,GUI_ID_RADAR_EBL_RIGHT_BUTTON,language->translate("eblRight").c_str());
Expand All @@ -585,15 +588,18 @@ void GUIMain::load(irr::IrrlichtDevice* device, Lang* language, std::vector<std:
radarGainScrollbar2 = new irr::gui::ScrollDial(irr::core::vector2d<irr::s32>(0.040*radarSu,0.040*radarSu),0.03*radarSu,guienv,largeRadarControls,GUI_ID_RADAR_GAIN_SCROLL_BAR);
radarClutterScrollbar2 = new irr::gui::ScrollDial(irr::core::vector2d<irr::s32>(0.105*radarSu,0.040*radarSu),0.03*radarSu,guienv,largeRadarControls,GUI_ID_RADAR_CLUTTER_SCROLL_BAR);
radarRainScrollbar2 = new irr::gui::ScrollDial(irr::core::vector2d<irr::s32>(0.170*radarSu,0.040*radarSu),0.03*radarSu,guienv,largeRadarControls,GUI_ID_RADAR_RAIN_SCROLL_BAR);
radarBrillScrollbar2 = new irr::gui::ScrollDial(irr::core::vector2d<irr::s32>(radarTL.X + 0.050 * radarSu, radarTL.Y + 0.700 * radarSu), 0.03 * radarSu, guienv, guienv->getRootGUIElement(), GUI_ID_RADAR_BRILL_SCROLL_BAR);
radarBrillScrollbar2->setToolTipText(language->translate("brill").c_str());

radarGainScrollbar2->setSmallStep(2);
radarClutterScrollbar2->setSmallStep(2);
radarRainScrollbar2->setSmallStep(2);
radarBrillScrollbar2->setSmallStep(2);

(guienv->addStaticText(language->translate("gain").c_str(),irr::core::rect<irr::s32>(0.010*radarSu,0.070*radarSu,0.070*radarSu,0.100*radarSu),false,true,largeRadarControls))->setTextAlignment(irr::gui::EGUIA_CENTER,irr::gui::EGUIA_CENTER);
(guienv->addStaticText(language->translate("clutter").c_str(),irr::core::rect<irr::s32>(0.075*radarSu,0.070*radarSu,0.135*radarSu,0.100*radarSu),false,true,largeRadarControls))->setTextAlignment(irr::gui::EGUIA_CENTER,irr::gui::EGUIA_CENTER);
(guienv->addStaticText(language->translate("rain").c_str(),irr::core::rect<irr::s32>(0.140*radarSu,0.070*radarSu,0.200*radarSu,0.100*radarSu),false,true,largeRadarControls))->setTextAlignment(irr::gui::EGUIA_CENTER,irr::gui::EGUIA_CENTER);

guienv->addButton(irr::core::rect<irr::s32>(0.025*radarSu,0.110*radarSu,0.085*radarSu,0.160*radarSu),largeRadarControls,GUI_ID_RADAR_INCREASE_BUTTON,language->translate("increaserange").c_str());
guienv->addButton(irr::core::rect<irr::s32>(0.025*radarSu,0.165*radarSu,0.085*radarSu,0.210*radarSu),largeRadarControls,GUI_ID_RADAR_DECREASE_BUTTON,language->translate("decreaserange").c_str());

Expand Down Expand Up @@ -770,10 +776,12 @@ void GUIMain::load(irr::IrrlichtDevice* device, Lang* language, std::vector<std:
radarGainScrollbar->drop();
radarClutterScrollbar->drop();
radarRainScrollbar->drop();
radarBrillScrollbar->drop();

radarGainScrollbar2->drop();
radarClutterScrollbar2->drop();
radarRainScrollbar2->drop();
radarBrillScrollbar2->drop();

//largeRadarControls->drop();

Expand Down Expand Up @@ -952,6 +960,7 @@ void GUIMain::load(irr::IrrlichtDevice* device, Lang* language, std::vector<std:
radarCursorRightButton2->setVisible(radarLarge);
radarCursorUpButton2->setVisible(radarLarge);
radarCursorDownButton2->setVisible(radarLarge);
radarBrillScrollbar2->setVisible(radarLarge);

//weatherScrollbar->setVisible(showInterface);
//rainScrollbar->setVisible(showInterface);
Expand Down Expand Up @@ -1185,10 +1194,12 @@ void GUIMain::load(irr::IrrlichtDevice* device, Lang* language, std::vector<std:
radarGainScrollbar->setPos(Utilities::round(guiData->radarGain));
radarClutterScrollbar->setPos(Utilities::round(guiData->radarClutter));
radarRainScrollbar->setPos(Utilities::round(guiData->radarRain));
radarBrillScrollbar->setPos(Utilities::round(guiData->radarBrill * 100));

radarGainScrollbar2->setPos(Utilities::round(guiData->radarGain));
radarClutterScrollbar2->setPos(Utilities::round(guiData->radarClutter));
radarRainScrollbar2->setPos(Utilities::round(guiData->radarRain));
radarBrillScrollbar2->setPos(Utilities::round(guiData->radarBrill * 100));

weatherScrollbar->setPos(Utilities::round(guiData->weather*10.0)); //(Weather scroll bar is 0-120, weather is 0-12)
rainScrollbar->setPos(Utilities::round(guiData->rain*10.0)); //(Rain scroll bar is 0-100, rain is 0-10)
Expand Down Expand Up @@ -1686,6 +1697,8 @@ guiTideHeight = guiData->tideHeight;
irr::s32 centreY;
irr::s32 radius;

irr::f32 brilliance = model->getBrilliance();

if (radarLarge) {
centreX = largeRadarScreenCentreX;
centreY = largeRadarScreenCentreY;
Expand All @@ -1700,7 +1713,7 @@ guiTideHeight = guiData->tideHeight;

//If full screen radar, draw a 4:3 box around the radar display area
if (radarLarge) {
device->getVideoDriver()->draw2DRectangleOutline(radarLargeRect,irr::video::SColor(255,0,0,0));
device->getVideoDriver()->draw2DRectangleOutline(radarLargeRect,brill(irr::video::SColor(255,0,0,0), brilliance));
}

irr::f32 radarHeadingIndicator;
Expand All @@ -1713,7 +1726,7 @@ guiTideHeight = guiData->tideHeight;
irr::s32 deltaY = -1*radius*cos(irr::core::DEGTORAD*radarHeadingIndicator);
irr::core::position2d<irr::s32> radarCentre (centreX,centreY);
irr::core::position2d<irr::s32> radarHeading (centreX+deltaX,centreY+deltaY);
device->getVideoDriver()->draw2DLine(radarCentre,radarHeading,irr::video::SColor(255, 255, 255, 255)); //Todo: Make these colours configurable
device->getVideoDriver()->draw2DLine(radarCentre,radarHeading,brill(irr::video::SColor(255, 255, 255, 255), brilliance)); //Todo: Make these colours configurable

//draw a look direction line
if (radarHeadUp) {
Expand All @@ -1725,19 +1738,19 @@ guiTideHeight = guiData->tideHeight;
irr::s32 deltaYView = -1*radius*cos(irr::core::DEGTORAD*radarHeadingIndicator);
irr::core::position2d<irr::s32> lookInner (centreX + 0.9*deltaXView,centreY + 0.9*deltaYView);
irr::core::position2d<irr::s32> lookOuter (centreX + deltaXView,centreY + deltaYView);
device->getVideoDriver()->draw2DLine(lookInner,lookOuter,irr::video::SColor(255, 255, 0, 0)); //Todo: Make these colours configurable
device->getVideoDriver()->draw2DLine(lookInner,lookOuter,brill(irr::video::SColor(255, 255, 0, 0), brilliance)); //Todo: Make these colours configurable

//draw an EBL line
irr::s32 deltaXEBL = radius*sin(irr::core::DEGTORAD*guiRadarEBLBrg);
irr::s32 deltaYEBL = -1*radius*cos(irr::core::DEGTORAD*guiRadarEBLBrg);
irr::core::position2d<irr::s32> eblOuter (centreX + deltaXEBL,centreY + deltaYEBL);
device->getVideoDriver()->draw2DLine(radarCentre,eblOuter,irr::video::SColor(255, 255, 0, 0));
device->getVideoDriver()->draw2DLine(radarCentre,eblOuter,brill(irr::video::SColor(255, 255, 0, 0), brilliance));
//draw EBL range
if (guiRadarEBLRangeNm > 0 && guiRadarRangeNm >= guiRadarEBLRangeNm) {
irr::f32 eblRangePx = radius*guiRadarEBLRangeNm/guiRadarRangeNm;
irr::u8 noSegments = eblRangePx/2;
if (noSegments < 10) {noSegments=10;}
device->getVideoDriver()->draw2DPolygon(radarCentre,eblRangePx,irr::video::SColor(255, 255, 0, 0),noSegments); //An n segment polygon, to approximate a circle
device->getVideoDriver()->draw2DPolygon(radarCentre,eblRangePx,brill(irr::video::SColor(255, 255, 0, 0), brilliance),noSegments); //An n segment polygon, to approximate a circle
}

//draw radar cursor
Expand All @@ -1747,7 +1760,7 @@ guiTideHeight = guiData->tideHeight;
//Plot if within the display and not at zero range
if (cursorPixelRadius <= radius && guiRadarCursorRangeNm > 0) {
irr::core::position2d<irr::s32> cursorCentre (centreX + deltaXCursor,centreY + deltaYCursor);
device->getVideoDriver()->draw2DPolygon(cursorCentre,radius/20,irr::video::SColor(255, 255, 0, 0),4); //a 4 segment polygon, i.e. a square!
device->getVideoDriver()->draw2DPolygon(cursorCentre,radius/20,brill(irr::video::SColor(255, 255, 0, 0), brilliance),4); //a 4 segment polygon, i.e. a square!
}

//Draw compass rose around radar (?Rotate with radar in head up and course up?)
Expand All @@ -1772,7 +1785,7 @@ guiTideHeight = guiData->tideHeight;
irr::core::position2d<irr::s32> ticInner (centreX + scaling*deltaXTic,centreY + scaling*deltaYTic);
irr::core::position2d<irr::s32> ticOuter (centreX + deltaXTic,centreY + deltaYTic);

device->getVideoDriver()->draw2DLine(ticInner,ticOuter,irr::video::SColor(255, 128, 128, 128));
device->getVideoDriver()->draw2DLine(ticInner,ticOuter,brill(irr::video::SColor(255, 128, 128, 128), brilliance));

//Show the angle if needed
if (showValue) {
Expand All @@ -1785,7 +1798,7 @@ guiTideHeight = guiData->tideHeight;
irr::s32 textEndX = textStartX+textWidth;
irr::s32 textStartY = centreY + 0.8*deltaYTic-0.5*textHeight;
irr::s32 textEndY = textStartY+textHeight;
guienv->getSkin()->getFont()->draw(angleText,irr::core::rect<irr::s32>(textStartX,textStartY,textEndX,textEndY),irr::video::SColor(255,128,128,128));
guienv->getSkin()->getFont()->draw(angleText,irr::core::rect<irr::s32>(textStartX,textStartY,textEndX,textEndY),brill(irr::video::SColor(255,128,128,128), brilliance));
}

}
Expand All @@ -1802,7 +1815,7 @@ guiTideHeight = guiData->tideHeight;
for (unsigned int i = 1; i<rangeRings; i++) {
irr::f32 ringRadius = radius*i/(float)rangeRings;
irr::u8 noSegments = ringRadius/2;
device->getVideoDriver()->draw2DPolygon(radarCentre,ringRadius,irr::video::SColor(128, 128, 128, 128),noSegments);
device->getVideoDriver()->draw2DPolygon(radarCentre,ringRadius,brill(irr::video::SColor(128, 128, 128, 128), brilliance),noSegments);
}

}
Expand Down Expand Up @@ -1867,3 +1880,10 @@ guiTideHeight = guiData->tideHeight;
{
linesText->setText(irr::core::stringw(textToShow.c_str()).c_str());
}

irr::video::SColor GUIMain::brill(irr::video::SColor originalColour, irr::f32 brilliance) const
{
irr::video::SColor black = irr::video::SColor(255, 0, 0, 0);
return originalColour.getInterpolated(black, brilliance);

}
6 changes: 6 additions & 0 deletions src/GUIMain.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ struct GUIData {
irr::f32 radarGain;
irr::f32 radarClutter;
irr::f32 radarRain;
irr::f32 radarBrill;
irr::f32 guiRadarEBLBrg;
irr::f32 guiRadarEBLRangeNm;
irr::f32 guiRadarCursorBrg;
Expand Down Expand Up @@ -136,6 +137,7 @@ class GUIMain //Create, build and update GUI
GUI_ID_RADAR_GAIN_SCROLL_BAR,
GUI_ID_RADAR_CLUTTER_SCROLL_BAR,
GUI_ID_RADAR_RAIN_SCROLL_BAR,
GUI_ID_RADAR_BRILL_SCROLL_BAR,
GUI_ID_RADAR_EBL_LEFT_BUTTON,
GUI_ID_RADAR_EBL_RIGHT_BUTTON,
GUI_ID_RADAR_EBL_UP_BUTTON,
Expand Down Expand Up @@ -297,12 +299,15 @@ class GUIMain //Create, build and update GUI
irr::gui::IGUIScrollBar* radarGainScrollbar;
irr::gui::IGUIScrollBar* radarClutterScrollbar;
irr::gui::IGUIScrollBar* radarRainScrollbar;
irr::gui::IGUIScrollBar* radarBrillScrollbar;

irr::gui::IGUIRectangle* largeRadarControls; //Parent rectangle for large radar controls
irr::gui::IGUIRectangle* largeRadarPIControls; //Parent for PI controls on large radar
irr::gui::IGUIScrollBar* radarGainScrollbar2; //For large radar
irr::gui::IGUIScrollBar* radarClutterScrollbar2; //For large radar
irr::gui::IGUIScrollBar* radarRainScrollbar2; //For large radar
irr::gui::IGUIScrollBar* radarBrillScrollbar2; //For large radar

irr::gui::IGUIButton* eblLeftButton2;
irr::gui::IGUIButton* eblRightButton2;
irr::gui::IGUIButton* eblUpButton2;
Expand Down Expand Up @@ -432,6 +437,7 @@ class GUIMain //Create, build and update GUI
std::wstring f32To3dp(irr::f32 value);
bool manuallyTriggerClick(irr::gui::IGUIButton* button);
bool manuallyTriggerScroll(irr::gui::IGUIScrollBar* bar);
irr::video::SColor brill(irr::video::SColor originalColour, irr::f32 brilliance) const;

};

Expand Down
5 changes: 5 additions & 0 deletions src/MyEventReceiver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,11 @@ bool MyEventReceiver::OnEvent(const irr::SEvent &event)
{
model->setRadarRain(((irr::gui::IGUIScrollBar *)event.GUIEvent.Caller)->getPos());
}
if (id == GUIMain::GUI_ID_RADAR_BRILL_SCROLL_BAR)
{
irr::f32 value = ((irr::gui::IGUIScrollBar*)event.GUIEvent.Caller)->getPos() / 100.0; // Convert to from 0-100 to 0-1
model->setBrilliance(value);
}
if (id == GUIMain::GUI_ID_WEATHER_SCROLL_BAR)
{
model->setWeather(((irr::gui::IGUIScrollBar *)event.GUIEvent.Caller)->getPos() / 10.0); // Scroll bar 0-120, weather 0-12
Expand Down
4 changes: 2 additions & 2 deletions src/NumberToImage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace NumberToImage
const irr::u32 PADDING_PX = 1;
const irr::video::SColor BG_COLOUR = irr::video::SColor(0,0,0,0);

irr::video::IImage* getImage(irr::u32 number, irr::IrrlichtDevice* dev)
irr::video::IImage* getImage(irr::u32 number, irr::f32 brilliance, irr::IrrlichtDevice* dev)
{

irr::core::stringc numberString = irr::core::stringc(number);
Expand Down Expand Up @@ -73,7 +73,7 @@ namespace NumberToImage
for (irr::u32 character = 0; character<length; character++) {
if (numberImages[character]) {
irr::core::rect<irr::s32> sourceRect = irr::core::rect<irr::s32>(0,0,numberImages[character]->getDimension().Width,numberImages[character]->getDimension().Height);
numberImages[character]->copyToWithAlpha(numberImage,irr::core::vector2d<irr::s32>(nextXStart,0),sourceRect,irr::video::SColor(255,255,255,255));
numberImages[character]->copyToWithAlpha(numberImage,irr::core::vector2d<irr::s32>(nextXStart,0),sourceRect,irr::video::SColor(255,255 * brilliance,255 * brilliance,255 * brilliance));
nextXStart += numberImages[character]->getDimension().Width + PADDING_PX;
numberImages[character]->drop();
}
Expand Down
2 changes: 1 addition & 1 deletion src/NumberToImage.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
namespace NumberToImage
{

irr::video::IImage* getImage(irr::u32 number, irr::IrrlichtDevice* dev);
irr::video::IImage* getImage(irr::u32 number, irr::f32 brilliance, irr::IrrlichtDevice* dev);

}

Expand Down
Loading
Loading