Change: Remove bitmap from Route Viewer loading screen

#911

Author: leezer3

source/RouteViewer/LoadingR.cs

@@ -54,15 +54,16 @@ internal static bool Cancel
 		internal static bool JobAvailable;
 
 		// load
-		internal static void Load(string RouteFile, Encoding RouteEncoding, Bitmap bitmap = null)
+		internal static void Load(string RouteFile, Encoding RouteEncoding, byte[] textureBytes)
 		{
 			Program.currentGameWindow.TargetRenderFrequency = 0;
 			// reset
 			Game.Reset();
 			Program.Renderer.Loading.InitLoading(Program.FileSystem.GetDataFolder("In-game"), typeof(NewRenderer).Assembly.GetName().Version.ToString(), Interface.CurrentOptions.LoadingLogo, Interface.CurrentOptions.LoadingProgressBar);
-			if (bitmap != null)
+			if (textureBytes != null)
 			{
-				Program.Renderer.Loading.SetLoadingBkg(Program.Renderer.TextureManager.RegisterTexture(bitmap, new TextureParameters(null, null)));
+				Texture t = new Texture(Program.Renderer.Screen.Width, Program.Renderer.Screen.Height, PixelFormat.RGBAlpha, textureBytes, null);
+				Program.Renderer.Loading.SetLoadingBkg(t);
 			}
 			// members
 			Cancel = false;

source/RouteViewer/ProgramR.cs

@@ -27,6 +27,7 @@
 using OpenBveApi.Colors;
 using OpenBveApi.Hosts;
 using OpenBveApi.Objects;
+using Buffer = System.Buffer;
 using ButtonState = OpenTK.Input.ButtonState;
 using LibRender2.Menu;
 using LibRender2.Screens;
@@ -180,7 +181,7 @@ internal static void Main(string[] args)
 		}
 
 		// load route
-		internal static bool LoadRoute(Bitmap bitmap = null) {
+		internal static bool LoadRoute(byte[] textureBytes = null) {
 			if (string.IsNullOrEmpty(CurrentRouteFile))
 			{
 				return false;
@@ -190,7 +191,7 @@ internal static bool LoadRoute(Bitmap bitmap = null) {
 			try
 			{
 				Encoding encoding = TextEncoding.GetSystemEncodingFromFile(CurrentRouteFile);
-				Loading.Load(CurrentRouteFile, encoding, bitmap);
+				Loading.Load(CurrentRouteFile, encoding, textureBytes);
 				result = true;
 			} catch (Exception ex) {
 				MessageBox.Show(ex.Message, Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Hand);
@@ -419,25 +420,33 @@ internal static void keyDownEvent(object sender, KeyboardKeyEventArgs e)
 					{
 						return;
 					}
+					byte[] textureBytes = {};
 					if (CurrentRouteFile != null && CurrentlyLoading == false)
 					{
-						
-						Bitmap bitmap = null;
 						CurrentlyLoading = true;
 						Renderer.OptionInterface = false;
 						if (!Interface.CurrentOptions.LoadingBackground)
 						{
 							Renderer.RenderScene(0.0);
 							currentGameWindow.SwapBuffers();
-							bitmap = new Bitmap(Renderer.Screen.Width, Renderer.Screen.Height, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
-							BitmapData bData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.ReadWrite, bitmap.PixelFormat);
-							GL.ReadPixels(0, 0, Renderer.Screen.Width, Renderer.Screen.Height, OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, bData.Scan0);
-							bitmap.UnlockBits(bData);
-							bitmap.RotateFlip(RotateFlipType.RotateNoneFlipY);
+							textureBytes = new byte[Renderer.Screen.Width * Renderer.Screen.Height * 4];
+							GL.ReadPixels(0, 0, Renderer.Screen.Width, Renderer.Screen.Height, OpenTK.Graphics.OpenGL.PixelFormat.Rgba, PixelType.UnsignedByte, textureBytes);
+							// GL.ReadPixels is reversed for what it wants as a texture, so we've got to flip it
+							byte[] tmp = new byte[Renderer.Screen.Width * 4]; // temp row
+							int currentLine = 0;
+							while (currentLine < Renderer.Screen.Height / 2)
+							{
+								int start = currentLine * Renderer.Screen.Width * 4;
+								int flipStart = (Renderer.Screen.Height - currentLine - 1) * Renderer.Screen.Width * 4;
+								Buffer.BlockCopy(textureBytes, start, tmp, 0, Renderer.Screen.Width * 4);
+								Buffer.BlockCopy(textureBytes, flipStart, textureBytes, start, Renderer.Screen.Width * 4);
+								Buffer.BlockCopy(tmp, 0, textureBytes, flipStart, Renderer.Screen.Width * 4);
+								currentLine++;
+							}
 						}
 						Renderer.Reset();
 						CameraAlignment a = Renderer.Camera.Alignment;
-						if (LoadRoute(bitmap))
+						if (LoadRoute(textureBytes))
 						{
 							Renderer.Camera.Alignment = a;
 							Program.Renderer.CameraTrackFollower.UpdateAbsolute(-1.0, true, false);
@@ -454,10 +463,6 @@ internal static void keyDownEvent(object sender, KeyboardKeyEventArgs e)
 						}
 						CurrentlyLoading = false;
 						Renderer.OptionInterface = true;
-						if (bitmap != null)
-						{
-							bitmap.Dispose();
-						}
 						GCSettings.LargeObjectHeapCompactionMode =  GCLargeObjectHeapCompactionMode.CompactOnce; 
 						GC.Collect();