Merge pull request pioneerspacesim#5958 from mwerle/feat/radar_manual…

…_zoom

feat(radar): add manual zoom mode to scanner

data/fonts/UIFont.json

@@ -17,7 +17,7 @@
 		{
 			"svgFile": "icons/icons.svg",
 			"rangeBase": "0xF000",
-			"grid": [ 16, 20 ]
+			"grid": [ 16, 21 ]
 		}
 	]
 }

data/fonts/UIHeadingFont.json

@@ -17,7 +17,7 @@
 		{
 			"svgFile": "icons/icons.svg",
 			"rangeBase": "0xF000",
-			"grid": [ 16, 20 ]
+			"grid": [ 16, 21 ]
 		}
    ]
 }

data/fonts/UIIconFont.json

@@ -9,7 +9,7 @@
 		{
 			"svgFile": "icons/icons.svg",
 			"rangeBase": "0xF000",
-			"grid": [ 16, 20 ]
+			"grid": [ 16, 21 ]
 		}
 	]
 }

data/fonts/UIMonoFont.json

@@ -17,7 +17,7 @@
 		{
 			"svgFile": "icons/icons.svg",
 			"rangeBase": "0xF000",
-			"grid": [ 16, 20 ]
+			"grid": [ 16, 21 ]
 		}
    ]
 }

data/lang/input-core/en.json

@@ -131,6 +131,22 @@
     "description": "Descriptive name for the PrimaryFire action.",
     "message": "Primary Fire"
   },
+  "BIND_RADAR_TOGGLE_MODE": {
+    "description": "Descriptive name for the RadarToggle action.",
+    "message": "Toggle Radar Display Mode"
+  },
+  "BIND_RADAR_ZOOM_IN": {
+    "description": "Descriptive name for the RadarZoomIn action.",
+    "message": "Manual Zoom Radar In"
+  },
+  "BIND_RADAR_ZOOM_OUT": {
+    "description": "Descriptive name for the RadarZoomOut action.",
+    "message": "Manual Zoom Radar Out"
+  },
+  "BIND_RADAR_ZOOM_RESET": {
+    "description": "Descriptive name for the RadarZoomReset action.",
+    "message": "Reset Radar Zoom"
+  },
   "BIND_RADIAL_HORIZONTAL_SELECTION": {
     "description": "Input axis name to select in the radial menu.",
     "message": "Radial Menu Left/Right"
@@ -163,6 +179,10 @@
     "description": "Descriptive name for the SpeedControl axis.",
     "message": "Set Target Speed"
   },
+  "BIND_TARGET_RADIAL": {
+    "description": "Descriptive name for opening the TargetRadial popup.",
+    "message": "Open Target Radial Menu"
+  },
   "BIND_TARGET_OBJECT": {
     "description": "Descriptive name for the TargetObject action.",
     "message": "Target Object"
@@ -231,6 +251,10 @@
     "description": "Header for the GeneralViewControls input group.",
     "message": "General View Controls"
   },
+  "GROUP_RADAR_CONTROL": {
+    "description": "Group label for radar-related inputs",
+    "message": "Radar Control"
+  },
   "GROUP_LANDING_CONTROL": {
     "description": "Group label for landing-related inputs",
     "message": "Landing Control"
@@ -318,6 +342,10 @@
     "description": "Header for the ShipControls input page.",
     "message": "Ship - Controls"
   },
+  "PAGE_SHIP_HUD": {
+    "description": "Header for the ShipHUD input page.",
+    "message": "Ship - HUD"
+  },
   "PAGE_SHIP_VIEW": {
     "description": "Header for the ShipView input page.",
     "message": "Ship - View"

data/lang/ui-core/en.json

@@ -1159,6 +1159,18 @@
     "description": "Tooltip: Current distance of the radar.",
     "message": "Active radar distance"
   },
+  "HUD_RADAR_ZOOM_MODE_AUTOMATIC": {
+    "description": "Tooltip: Current radar zoom mode.",
+    "message": "Automatic zoom"
+  },
+  "HUD_RADAR_ZOOM_MODE_MANUAL": {
+    "description": "Tooltip: Current radar zoom mode.",
+    "message": "Manual zoom"
+  },
+  "HUD_RADAR_TOGGLE_MODE": {
+    "description": "Tooltip: Toggle radar mode.",
+    "message": "Toggle radar between 2D and 3D modes"
+  },
   "HUD_REQUEST_TIME_ACCEL": {
     "description": "Tooltip: Request time acceleration {time}",
     "message": "Request time acceleration: {time}"

data/pigui/libs/icons.lua

@@ -17,7 +17,7 @@ local function encode_icon(idx)
 end
 
 local iconsX = 16
-local iconsY = 20
+local iconsY = 21
 
 local icons_texture_small = pigui:LoadTextureFromSVG(pigui.DataDirPath({"icons", "icons.svg"}), iconsX * 24, iconsY * 24)
 local icons_texture_med = pigui:LoadTextureFromSVG(pigui.DataDirPath({"icons", "icons.svg"}), iconsX * 32, iconsY * 32)

data/pigui/modules/autopilot-window.lua

@@ -252,7 +252,8 @@ local function displayAutoPilotWindow()
 	local current_view = Game.CurrentView()
 	local window_h = mainButtonSize.y + smallButtonSize.y + ui.getWindowPadding().y * 2
 	local shift = smallButtonSize.y
-	local window_posx = ui.screenWidth/2 + ui.reticuleCircleRadius / 4 * 3
+	-- X starting position is the edge of the scanner display.
+	local window_posx = ui.screenWidth/2 + ui.reticuleCircleRadius
 	local window_posy = ui.screenHeight - window_h
 	ui.setNextWindowPos(Vector2(window_posx, window_posy) , "Always")
 	ui.window("AutoPilot", {"NoTitleBar", "NoResize", "NoFocusOnAppearing", "NoBringToFrontOnFocus", "NoSavedSettings", "AlwaysAutoResize"},