From 48cebfe4477cea4d8cf6be1c0a39809476074eb7 Mon Sep 17 00:00:00 2001 From: Tim Sarbin Date: Thu, 22 Nov 2018 02:41:31 -0500 Subject: [PATCH] Added initial button rendering --- OpenDiablo2.SDL2/SDL2Sprite.cs | 6 +++--- OpenDiablo2.Scenes/MainMenu.cs | 13 ++++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/OpenDiablo2.SDL2/SDL2Sprite.cs b/OpenDiablo2.SDL2/SDL2Sprite.cs index 49d90ffd..abcaacd8 100644 --- a/OpenDiablo2.SDL2/SDL2Sprite.cs +++ b/OpenDiablo2.SDL2/SDL2Sprite.cs @@ -69,9 +69,9 @@ namespace OpenDiablo2.SDL2_ private Color AdjustColor(Color source) => Color.FromArgb( source.A, - (byte)Math.Min((float)source.R * 1.4, 255), - (byte)Math.Min((float)source.G * 1.4, 255), - (byte)Math.Min((float)source.B * 1.4, 255) + (byte)Math.Min((float)source.R * 1.0, 255), + (byte)Math.Min((float)source.G * 1.0, 255), + (byte)Math.Min((float)source.B * 1.0, 255) ); private IntPtr LoadFrame(ImageFrame frame, IntPtr renderer) diff --git a/OpenDiablo2.Scenes/MainMenu.cs b/OpenDiablo2.Scenes/MainMenu.cs index 0605126a..19def179 100644 --- a/OpenDiablo2.Scenes/MainMenu.cs +++ b/OpenDiablo2.Scenes/MainMenu.cs @@ -23,7 +23,7 @@ namespace OpenDiablo2.Scenes private readonly IMusicProvider musicProvider; private float logoFrame; - private ISprite backgroundSprite, diabloLogoLeft, diabloLogoRight, diabloLogoLeftBlack, diabloLogoRightBlack, mouseSprite; + private ISprite backgroundSprite, diabloLogoLeft, diabloLogoRight, diabloLogoLeftBlack, diabloLogoRightBlack, mouseSprite, wideButton; public MainMenu( IRenderWindow renderWindow, @@ -57,6 +57,9 @@ namespace OpenDiablo2.Scenes mouseSprite = renderWindow.LoadSprite(ImageSet.LoadFromStream(mpqProvider.GetStream("data\\global\\ui\\CURSOR\\ohand.DC6"))); mouseSprite.CurrentPalette = paletteProvider.PaletteTable["STATIC"]; + wideButton = renderWindow.LoadSprite(ImageSet.LoadFromStream(mpqProvider.GetStream("data\\global\\ui\\FrontEnd\\WideButtonBlank.dc6"))); + wideButton.CurrentPalette = paletteProvider.PaletteTable["ACT1"]; + logoFrame = 0f; diabloLogoLeft.Location = new Point(400, 120); @@ -111,6 +114,14 @@ namespace OpenDiablo2.Scenes diabloLogoRight.Frame = (int)((float)diabloLogoRight.TotalFrames * logoFrame); renderWindow.Draw(diabloLogoRight); + + wideButton.Location = new Point(260, 320); + wideButton.Frame = 0; + renderWindow.Draw(wideButton); + wideButton.Frame = 1; + wideButton.Location = new Point(260 + 256, 320); + renderWindow.Draw(wideButton); + mouseSprite.Location = new Point(mouseInfoProvider.MouseX, mouseInfoProvider.MouseY + mouseSprite.FrameSize.Height - 1); renderWindow.Draw(mouseSprite);