From aff169862ff3f86401bc88891b16cc6ae6b97d44 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Thu, 12 Jul 2018 03:23:17 +1000 Subject: [PATCH] fix opengl build --- ClassicalSharp/Game/Game.Init.cs | 2 +- ClassicalSharp/Game/Game.cs | 4 +--- ClassicalSharp/GraphicsAPI/OpenGLApi.cs | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ClassicalSharp/Game/Game.Init.cs b/ClassicalSharp/Game/Game.Init.cs index d0c1eee38..24cba2a0b 100644 --- a/ClassicalSharp/Game/Game.Init.cs +++ b/ClassicalSharp/Game/Game.Init.cs @@ -30,7 +30,7 @@ namespace ClassicalSharp { #if ANDROID Graphics = new OpenGLESApi(); #elif !USE_DX - Graphics = new OpenGLApi(); + Graphics = new OpenGLApi(window.WindowInfo); #else Graphics = new Direct3D9Api(this); #endif diff --git a/ClassicalSharp/Game/Game.cs b/ClassicalSharp/Game/Game.cs index 70cc696c3..9b5759380 100644 --- a/ClassicalSharp/Game/Game.cs +++ b/ClassicalSharp/Game/Game.cs @@ -252,9 +252,7 @@ namespace ClassicalSharp { Gui.OnResize(); } - void OnClosed(object sender, EventArgs e) { - Dispose(); - } + void OnClosed(object sender, EventArgs e) { isExiting = true; } void OnNewMapCore(object sender, EventArgs e) { for (int i = 0; i < Components.Count; i++) diff --git a/ClassicalSharp/GraphicsAPI/OpenGLApi.cs b/ClassicalSharp/GraphicsAPI/OpenGLApi.cs index cd3681d22..296672ae8 100644 --- a/ClassicalSharp/GraphicsAPI/OpenGLApi.cs +++ b/ClassicalSharp/GraphicsAPI/OpenGLApi.cs @@ -594,7 +594,7 @@ namespace ClassicalSharp.GraphicsAPI { public override void OnWindowResize(Game game) { GL.Viewport(0, 0, game.Width, game.Height); - glContext.Update(game.window); + glContext.Update(game.window.WindowInfo); } public override void Dispose() {