Merge branch 'master' into release

Author: leezer3

makefile

@@ -6,6 +6,7 @@ MIN_NUGET_VERSION:= "2.16.0"
 NUGET_VERSION:= $(shell nuget help 2> /dev/null | awk '/Version:/ { print $$3; exit 0}')
 GreaterVersion = $(shell printf '%s\n' $(1) $(2) | sort -t. -k 1,1nr -k 2,2nr -k 3,3nr -k 4,4nr | head -n 1)
 PROGRAM_VERSION = $(shell git describe --tags --exact-match 2> /dev/null)
+ROOT_DIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
 
 # Directories
 DEBUG_DIR   := bin_debug
@@ -209,5 +210,5 @@ ifeq (, $(PROGRAM_VERSION))
 else
 	@echo This is a $(COLOR_YELLOW)Tagged Release build$(COLOR_END)
 	@echo Final filename: $(COLOR_RED)OpenBVE-$(PROGRAM_VERSION).deb(COLOR_END)
-	@mv installers/debian.deb OpenBVE-$(PROGRAM_VERSION).deb
+	@mv "$(ROOT_DIR)/installers/debian.deb" OpenBVE-$(PROGRAM_VERSION).deb
 endif

source/LibRender2/Menu/MenuEntries/MenuOption.cs

@@ -160,6 +160,8 @@ public void Flip()
 									DisplayDevice.Default.ChangeResolution(currentResolution);
 									BaseMenu.Renderer.SetWindowState(WindowState.Fullscreen);
 									BaseMenu.Renderer.SetWindowSize((int)(currentResolution.Width * DisplayDevice.Default.ScaleFactor.X), (int)(currentResolution.Height * DisplayDevice.Default.ScaleFactor.Y));
+									BaseMenu.CurrentOptions.FullscreenWidth = currentResolution.Width;
+									BaseMenu.CurrentOptions.FullscreenHeight = currentResolution.Height;
 									return;
 								}
 								catch
@@ -169,6 +171,11 @@ public void Flip()
 							}
 						}
 					}
+					else
+					{
+						BaseMenu.CurrentOptions.WindowWidth = res.Width;
+						BaseMenu.CurrentOptions.WindowHeight = res.Height;
+					}
 					BaseMenu.ComputePosition();
 					break;
 				case OptionType.FullScreen:

source/ObjectViewer/InterfaceS.cs

@@ -1,7 +1,4 @@
 using System.Collections.Generic;
-using ObjectViewer.Graphics;
-using OpenBveApi;
-using OpenBveApi.Input;
 using OpenBveApi.Interface;
 using OpenBveApi.Objects;
 using TrainManager.Trains;
@@ -42,59 +39,7 @@ internal static class Interface {
 		internal static void AddMessage(MessageType Type, bool FileNotFound, string Text) {
 			LogMessages.Add(new LogMessage(Type, FileNotFound, Text));
 		}
-		/// <summary>Holds the program specific options</summary>
-		internal class Options : BaseOptions
-		{
-			private ObjectOptimizationMode objectOptimizationMode;
-
-			internal string ObjectSearchDirectory;
-
-			internal Key CameraMoveLeft;
-
-			internal Key CameraMoveRight;
-
-			internal Key CameraMoveUp;
-
-			internal Key CameraMoveDown;
-
-			internal Key CameraMoveForward;
-
-			internal Key CameraMoveBackward;
-
-			/// <summary>
-			/// The mode of optimization to be performed on an object
-			/// </summary>
-			internal ObjectOptimizationMode ObjectOptimizationMode
-			{
-				get => objectOptimizationMode;
-				set
-				{
-					objectOptimizationMode = value;
-
-					switch (value)
-					{
-						case ObjectOptimizationMode.None:
-							ObjectOptimizationBasicThreshold = 0;
-							ObjectOptimizationFullThreshold = 0;
-							break;
-						case ObjectOptimizationMode.Low:
-							ObjectOptimizationBasicThreshold = 1000;
-							ObjectOptimizationFullThreshold = 250;
-							break;
-						case ObjectOptimizationMode.High:
-							ObjectOptimizationBasicThreshold = 10000;
-							ObjectOptimizationFullThreshold = 1000;
-							break;
-					}
-				}
-			}
-
-			internal Options()
-			{
-				ObjectOptimizationMode = ObjectOptimizationMode.Low;
-			}
-		}
-
+		
 		/// <summary>The current options in use</summary>
 		internal static Options CurrentOptions;
 	}