Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions bin/bc5.ini
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,12 @@ RADAR_AngularRes_Max=1024
RADAR_AngularRes_Max_DESC="Maximum radar angular resolution (will limit own ship settings)"
RADAR_RangeRes_Max=1024
RADAR_RangeRes_Max_DESC="Maximum pixels per scanline (will limit own ship settings)"
RADAR_InitialGain=50
RADAR_InitialGain_DESC="Initial setting for radar gain (0-100)"
RADAR_InitialRainClutter=0
RADAR_InitialRainClutter_DESC="Initial setting for radar rain clutter reduction (0-100)"
RADAR_InitialSeaClutter=0
RADAR_InitialSeaClutter_DESC="Initial setting for radar sea clutter reduction (0-100)"

[Network]
udp_send_port=18304
Expand Down
22 changes: 15 additions & 7 deletions src/RadarCalculation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,8 @@

////using namespace irr;

RadarCalculation::RadarCalculation() : rangeResolution(128), angularResolution(360)
RadarCalculation::RadarCalculation() : rangeResolution(128), angularResolution(360), radarGain(50), radarRainClutterReduction(0), radarSeaClutterReduction(0)
{

//Initial values for controls, all 0-100:
radarGain = 50;
radarRainClutterReduction=0;
radarSeaClutterReduction=0;

currentRadarColourChoice=0;

EBLRangeNm=0;
Expand Down Expand Up @@ -108,6 +102,20 @@ void RadarCalculation::load(std::string radarConfigFile, irr::IrrlichtDevice* de
irr::u32 rangeResolution_max = IniFile::iniFileTou32(iniFilename, "RADAR_RangeRes_Max");
irr::u32 angularResolution_max = IniFile::iniFileTou32(iniFilename, "RADAR_AngularRes_Max");

//Initial values for controls, all 0-100:
radarGain = IniFile::iniFileTof32(iniFilename, "RADAR_InitialGain", radarGain);
radarRainClutterReduction = IniFile::iniFileTof32(iniFilename, "RADAR_InitialRainClutter", radarRainClutterReduction);
radarSeaClutterReduction = IniFile::iniFileTof32(iniFilename, "RADAR_InitialSeaClutter", radarSeaClutterReduction);

if (radarGain > 100) { radarGain = 100; }
if (radarGain < 0) { radarGain = 0; }

if (radarRainClutterReduction > 100) { radarRainClutterReduction = 100; }
if (radarRainClutterReduction < 0) { radarRainClutterReduction = 0; }

if (radarSeaClutterReduction > 100) { radarSeaClutterReduction = 100; }
if (radarSeaClutterReduction < 0) { radarSeaClutterReduction = 0; }

//Load parameters from the radarConfig file (if it exists)
irr::u32 numberOfRadarRanges = IniFile::iniFileTou32(radarConfigFile,"NumberOfRadarRanges");
if (numberOfRadarRanges==0) {
Expand Down
Loading