Merge pull request #298 from ethanmoffat/resizable_display_3

Resizable in-game display. Rework GUI to be responsive to resize operations.
ethanmoffat · May 4, 2023 · b991303 · b991303
2 parents a39029f + 1126967
commit b991303
Show file tree

Hide file tree

Showing 97 changed files with 1,605 additions and 531 deletions.
diff --git a/EOLib.Config.Test/ConfigFileLoadActionsTest.cs b/EOLib.Config.Test/ConfigFileLoadActionsTest.cs
@@ -82,6 +82,8 @@ public void ValidConfigFile_LoadsSpecifiedSettings()
 ShowShadows=no
 ShowTransition=true
 EnableLogging=true
+InGameWidth=123
+InGameHeight=321
 [CUSTOM]
 NPCDropProtectTime=5000
 PlayerDropProtectTime=10000
@@ -115,6 +117,8 @@ public void ValidConfigFile_LoadsSpecifiedSettings()
             Assert.IsFalse(_configurationRepository.ShowShadows);
             Assert.IsFalse(_configurationRepository.ShowChatBubbles);
             Assert.IsTrue(_configurationRepository.ShowTransition);
+            Assert.AreEqual(123, _configurationRepository.InGameWidth);
+            Assert.AreEqual(321, _configurationRepository.InGameHeight);
 
             Assert.IsTrue(_configurationRepository.MusicEnabled);
             Assert.IsTrue(_configurationRepository.SoundEnabled);

diff --git a/EOLib.Config/ConfigFileLoadActions.cs b/EOLib.Config/ConfigFileLoadActions.cs
@@ -69,6 +69,9 @@ public void LoadConfigFile()
             string host;
             _configRepository.Host = configFile.GetValue(ConfigStrings.Connection, ConfigStrings.Host, out host) ? host : ConfigDefaults.Host;
             _configRepository.Port = configFile.GetValue(ConfigStrings.Connection, ConfigStrings.Port, out tempInt) ? tempInt : ConfigDefaults.Port;
+
+            _configRepository.InGameWidth = configFile.GetValue(ConfigStrings.Settings, ConfigStrings.InGameWidth, out tempInt) ? tempInt : 0;
+            _configRepository.InGameHeight = configFile.GetValue(ConfigStrings.Settings, ConfigStrings.InGameHeight, out tempInt) ? tempInt : 0;
         }
     }
 }
diff --git a/EOLib.Config/ConfigStrings.cs b/EOLib.Config/ConfigStrings.cs
@@ -24,6 +24,9 @@ public static class ConfigStrings
         public const string Sound = "Sound";
         public const string ShowBaloons = "ShowBaloons";
 
+        public const string InGameWidth = nameof(InGameWidth);
+        public static string InGameHeight = nameof(InGameHeight);
+
         public const string Custom = "CUSTOM";
         public const string NPCDropProtectTime = "NPCDropProtectTime";
         public const string PlayerDropProtectTime = "PlayerDropProtectTime";

diff --git a/EOLib.Config/IConfigurationRepository.cs b/EOLib.Config/IConfigurationRepository.cs
@@ -33,6 +33,9 @@ public interface IConfigurationRepository
         TimeSpan AccountCreateTimeout { get; set; }
 
         bool EnableLog { get; set; }
+
+        int InGameWidth { get; set; }
+        int InGameHeight { get; set; }
     }
 
     public interface IConfigurationProvider
@@ -65,6 +68,9 @@ public interface IConfigurationProvider
         TimeSpan AccountCreateTimeout { get; }
 
         bool EnableLog { get; }
+
+        int InGameWidth { get; }
+        int InGameHeight { get; }
     }
 
     [AutoMappedType(IsSingleton = true)]
@@ -98,5 +104,8 @@ public class ConfigurationRepository : IConfigurationRepository, IConfigurationP
         public TimeSpan AccountCreateTimeout { get; set; }
 
         public bool EnableLog { get; set; }
+
+        public int InGameWidth { get; set; }
+        public int InGameHeight { get; set; }
     }
 }
diff --git a/EOLib.Graphics/IGraphicsDeviceRepository.cs b/EOLib.Graphics/IGraphicsDeviceRepository.cs
@@ -1,22 +1,29 @@
 using AutomaticTypeMapper;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 
 namespace EOLib.Graphics
 {
     public interface IGraphicsDeviceRepository
     {
         GraphicsDevice GraphicsDevice { get; set; }
+
+        GraphicsDeviceManager GraphicsDeviceManager { get; set; }
     }
 
     public interface IGraphicsDeviceProvider
     {
         GraphicsDevice GraphicsDevice { get; }
+
+        GraphicsDeviceManager GraphicsDeviceManager { get; }
     }
 
     [MappedType(BaseType = typeof(IGraphicsDeviceRepository), IsSingleton = true)]
     [MappedType(BaseType = typeof(IGraphicsDeviceProvider), IsSingleton = true)]
     public class GraphicsDeviceRepository : IGraphicsDeviceRepository, IGraphicsDeviceProvider
     {
         public GraphicsDevice GraphicsDevice { get; set; }
+
+        public GraphicsDeviceManager GraphicsDeviceManager { get; set; }
     }
 }
diff --git a/EOLib/Domain/Character/Character.cs b/EOLib/Domain/Character/Character.cs
@@ -1,4 +1,5 @@
 using Amadevus.RecordGenerator;
+using EOLib.Domain.Extensions;
 using EOLib.Domain.Spells;
 
 namespace EOLib.Domain.Character
@@ -18,9 +19,13 @@ public sealed partial class Character : ISpellTargetable
 
         public int Index => ID;
 
-        public int X => RenderProperties.MapX;
+        public int X => RenderProperties.IsActing(CharacterActionState.Walking)
+            ? RenderProperties.GetDestinationX()
+            : RenderProperties.MapX;
 
-        public int Y => RenderProperties.MapY;
+        public int Y => RenderProperties.IsActing(CharacterActionState.Walking)
+            ? RenderProperties.GetDestinationY()
+            : RenderProperties.MapY;
 
         public string Name { get; }
 

diff --git a/EOLib/Domain/Character/CharacterSessionRepository.cs b/EOLib/Domain/Character/CharacterSessionRepository.cs
@@ -11,7 +11,7 @@ public interface ICharacterSessionRepository : IResettable
 
         int LastKillExp { get; set; }
 
-        int TodayTotalExp { get; set; }
+        ulong TodayTotalExp { get; set; }
     }
 
     public interface ICharacterSessionProvider : IResettable
@@ -22,7 +22,7 @@ public interface ICharacterSessionProvider : IResettable
 
         int LastKillExp { get; }
 
-        int TodayTotalExp { get; }
+        ulong TodayTotalExp { get; }
     }
 
     [AutoMappedType(IsSingleton = true)]
@@ -34,7 +34,7 @@ public class CharacterSessionRepository : ICharacterSessionRepository, ICharacte
 
         public int LastKillExp { get; set; }
 
-        public int TodayTotalExp { get; set; }
+        public ulong TodayTotalExp { get; set; }
 
         public CharacterSessionRepository()
         {

diff --git a/EOLib/PacketHandlers/NPC/NPCSpecHandler.cs b/EOLib/PacketHandlers/NPC/NPCSpecHandler.cs
@@ -92,7 +92,7 @@ public override bool HandlePacket(IPacket packet)
                 _characterSessionRepository.LastKillExp = expDifference;
                 if (expDifference > _characterSessionRepository.BestKillExp)
                     _characterSessionRepository.BestKillExp = expDifference;
-                _characterSessionRepository.TodayTotalExp += expDifference;
+                _characterSessionRepository.TodayTotalExp += Convert.ToUInt64(Math.Max(expDifference, 0));
             }
 
             if (droppedItemID > 0)

diff --git a/EOLib/misc.cs b/EOLib/misc.cs
@@ -50,6 +50,7 @@ public static class Constants
 
         public const string InventoryFile = "config/inventory.ini";
         public const string SpellsFile = "config/spells.ini";
+        public const string PanelLayoutFile = "config/layout.ini";
         public const string ChatLogFile = "chatlog.txt";
 
         //Should be easily customizable between different clients (based on graphics)

diff --git a/EndlessClient/ContentPipeline/HairClip.mgfx b/EndlessClient/ContentPipeline/HairClip.mgfx
diff --git a/EndlessClient/ControlSets/BackButtonControlSet.cs b/EndlessClient/ControlSets/BackButtonControlSet.cs
@@ -1,6 +1,7 @@
 using System;
 using EndlessClient.Content;
 using EndlessClient.Controllers;
+using EndlessClient.Rendering;
 using EOLib.Graphics;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
@@ -11,14 +12,16 @@ namespace EndlessClient.ControlSets
     public abstract class BackButtonControlSet : BaseControlSet
     {
         protected readonly IMainButtonController _mainButtonController;
-
+        private readonly IClientWindowSizeRepository _clientWindowSizeRepository;
         private Texture2D _backButtonTexture;
 
         private XNAButton _backButton;
 
-        protected BackButtonControlSet(IMainButtonController mainButtonController)
+        protected BackButtonControlSet(IMainButtonController mainButtonController,
+                                       IClientWindowSizeRepository clientWindowSizeRepository)
         {
             _mainButtonController = mainButtonController;
+            _clientWindowSizeRepository = clientWindowSizeRepository;
         }
 
         public override void InitializeResources(INativeGraphicsManager gfxManager, IContentProvider contentProvider)
@@ -39,7 +42,7 @@ private XNAButton GetBackButton()
         {
             var button = new XNAButton(
                 _backButtonTexture,
-                new Vector2(589, 0),
+                new Vector2(_clientWindowSizeRepository.Width - _backButtonTexture.Width, 0),
                 new Rectangle(0, 0, _backButtonTexture.Width, _backButtonTexture.Height / 2),
                 new Rectangle(0, _backButtonTexture.Height / 2, _backButtonTexture.Width, _backButtonTexture.Height / 2))
             {
@@ -49,6 +52,11 @@ private XNAButton GetBackButton()
             };
             button.OnClick += DoBackButtonClick;
 
+            _clientWindowSizeRepository.GameWindowSizeChanged += (o, e) =>
+            {
+                button.DrawPosition = new Vector2(_clientWindowSizeRepository.Width - _backButtonTexture.Width, 0);
+            };
+
             return button;
         }
 

diff --git a/EndlessClient/ControlSets/ControlSetFactory.cs b/EndlessClient/ControlSets/ControlSetFactory.cs
@@ -1,5 +1,4 @@
-using System;
-using AutomaticTypeMapper;
+using AutomaticTypeMapper;
 using EndlessClient.Content;
 using EndlessClient.Controllers;
 using EndlessClient.Dialogs;
@@ -12,6 +11,7 @@
 using EOLib.Config;
 using EOLib.Domain.Login;
 using EOLib.Graphics;
+using System;
 
 namespace EndlessClient.ControlSets
 {
@@ -28,7 +28,9 @@ public class ControlSetFactory : IControlSetFactory
         private readonly IEndlessGameProvider _endlessGameProvider;
         private readonly IUserInputRepository _userInputRepository;
         private readonly IActiveDialogRepository _activeDialogRepository;
+        private readonly IClientWindowSizeRepository _clientWindowSizeRepository;
         private readonly IFixedTimeStepRepository _fixedTimeStepRepository;
+
         private IMainButtonController _mainButtonController;
         private IAccountController _accountController;
         private ILoginController _loginController;
@@ -44,6 +46,7 @@ public class ControlSetFactory : IControlSetFactory
                                  IEndlessGameProvider endlessGameProvider,
                                  IUserInputRepository userInputRepository,
                                  IActiveDialogRepository activeDialogRepository,
+                                 IClientWindowSizeRepository clientWindowSizeRepository,
                                  IFixedTimeStepRepository fixedTimeStepRepository)
         {
             _nativeGraphicsManager = nativeGraphicsManager;
@@ -56,6 +59,7 @@ public class ControlSetFactory : IControlSetFactory
             _endlessGameProvider = endlessGameProvider;
             _userInputRepository = userInputRepository;
             _activeDialogRepository = activeDialogRepository;
+            _clientWindowSizeRepository = clientWindowSizeRepository;
             _fixedTimeStepRepository = fixedTimeStepRepository;
         }
 
@@ -88,7 +92,7 @@ private IControlSet GetSetBasedOnState(GameStates newState)
             {
                 case GameStates.Initial: return new InitialControlSet(_configProvider, _mainButtonController);
                 case GameStates.CreateAccount:
-                    return new CreateAccountControlSet(_mainButtonController, _accountController);
+                    return new CreateAccountControlSet(_mainButtonController, _accountController, _clientWindowSizeRepository);
                 case GameStates.Login:
                     return new LoginPromptControlSet(_configProvider, _mainButtonController, _loginController);
                 case GameStates.ViewCredits: return new ViewCreditsControlSet(_configProvider, _mainButtonController);
@@ -101,9 +105,10 @@ private IControlSet GetSetBasedOnState(GameStates newState)
                         _accountController,
                         _endlessGameProvider,
                         _userInputRepository,
-                        _fixedTimeStepRepository);
+                        _fixedTimeStepRepository,
+                        _clientWindowSizeRepository);
                 case GameStates.PlayingTheGame:
-                    return new InGameControlSet(_mainButtonController, _messageBoxFactory, _hudControlsFactory, _activeDialogRepository);
+                    return new InGameControlSet(_mainButtonController, _messageBoxFactory, _hudControlsFactory, _activeDialogRepository, _clientWindowSizeRepository);
                 default: throw new ArgumentOutOfRangeException(nameof(newState), newState, null);
             }
         }

diff --git a/EndlessClient/ControlSets/CreateAccountControlSet.cs b/EndlessClient/ControlSets/CreateAccountControlSet.cs
@@ -1,6 +1,8 @@
 using EndlessClient.Content;
 using EndlessClient.Controllers;
 using EndlessClient.GameExecution;
+using EndlessClient.Input;
+using EndlessClient.Rendering;
 using EOLib;
 using EOLib.Domain.Account;
 using EOLib.Graphics;
@@ -33,8 +35,9 @@ public class CreateAccountControlSet : IntermediateControlSet
         public override GameStates GameState => GameStates.CreateAccount;
 
         public CreateAccountControlSet(IMainButtonController mainButtonController,
-                                       IAccountController accountController)
-            : base(mainButtonController)
+                                       IAccountController accountController,
+                                       IClientWindowSizeRepository clientWindowSizeRepository)
+            : base(mainButtonController, clientWindowSizeRepository)
         {
             _accountController = accountController;
         }

diff --git a/EndlessClient/ControlSets/IHudControlProvider.cs b/EndlessClient/ControlSets/IHudControlProvider.cs
@@ -1,10 +1,10 @@
-using System;
-using System.Collections.Generic;
-using AutomaticTypeMapper;
+using AutomaticTypeMapper;
 using EndlessClient.GameExecution;
 using EndlessClient.HUD.Controls;
 using EndlessClient.HUD.Panels;
 using Microsoft.Xna.Framework;
+using System;
+using System.Collections.Generic;
 
 namespace EndlessClient.ControlSets
 {

diff --git a/EndlessClient/ControlSets/InGameControlSet.cs b/EndlessClient/ControlSets/InGameControlSet.cs
@@ -1,13 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using EndlessClient.Controllers;
+using EndlessClient.Controllers;
 using EndlessClient.Dialogs;
 using EndlessClient.Dialogs.Factories;
 using EndlessClient.GameExecution;
 using EndlessClient.HUD.Controls;
+using EndlessClient.Rendering;
 using EOLib.Localization;
 using Microsoft.Xna.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using XNAControls;
 
 namespace EndlessClient.ControlSets
@@ -24,8 +25,9 @@ public class InGameControlSet : BackButtonControlSet
         public InGameControlSet(IMainButtonController mainButtonController,
                                 IEOMessageBoxFactory messageBoxFactory,
                                 IHudControlsFactory hudControlsFactory,
-                                IActiveDialogRepository activeDialogRepository)
-            : base(mainButtonController)
+                                IActiveDialogRepository activeDialogRepository,
+                                IClientWindowSizeRepository clientWindowSizeRepository)
+            : base(mainButtonController, clientWindowSizeRepository)
         {
             _messageBoxFactory = messageBoxFactory;
             _hudControlsFactory = hudControlsFactory;

diff --git a/EndlessClient/ControlSets/IntermediateControlSet.cs b/EndlessClient/ControlSets/IntermediateControlSet.cs
@@ -2,6 +2,7 @@
 using EndlessClient.Content;
 using EndlessClient.Controllers;
 using EndlessClient.GameExecution;
+using EndlessClient.Rendering;
 using EOLib.Graphics;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
@@ -17,8 +18,9 @@ public abstract class IntermediateControlSet : BackButtonControlSet
         private IXNAButton _btnCreate;
         private IXNAPictureBox _person2Picture;
 
-        protected IntermediateControlSet(IMainButtonController mainButtonController)
-            : base(mainButtonController)
+        protected IntermediateControlSet(IMainButtonController mainButtonController,
+                                         IClientWindowSizeRepository clientWindowSizeRepository)
+            : base(mainButtonController, clientWindowSizeRepository)
         {
             _personSet2 = new Texture2D[8];
             _randomGen = new Random();

diff --git a/EndlessClient/ControlSets/LoggedInControlSet.cs b/EndlessClient/ControlSets/LoggedInControlSet.cs
@@ -36,8 +36,9 @@ public class LoggedInControlSet : IntermediateControlSet
                                   IAccountController accountController,
                                   IEndlessGameProvider endlessGameProvider,
                                   IUserInputRepository userInputRepository,
-                                  IFixedTimeStepRepository fixedTimeStepRepository)
-            : base(mainButtonController)
+                                  IFixedTimeStepRepository fixedTimeStepRepository,
+                                  IClientWindowSizeRepository clientWindowSizeRepository)
+            : base(mainButtonController, clientWindowSizeRepository)
         {
             _characterInfoPanelFactory = characterInfoPanelFactory;
             _characterSelectorProvider = characterSelectorProvider;

diff --git a/EndlessClient/Controllers/InventoryController.cs b/EndlessClient/Controllers/InventoryController.cs
@@ -5,6 +5,7 @@
 using EndlessClient.Dialogs.Factories;
 using EndlessClient.HUD;
 using EndlessClient.HUD.Controls;
+using EndlessClient.HUD.Panels;
 using EndlessClient.Rendering.Character;
 using EndlessClient.Rendering.Map;
 using EOLib;
@@ -199,11 +200,12 @@ public void UnequipItem(EquipLocation equipLocation)
         public void DropItem(EIFRecord itemData, InventoryItem inventoryItem)
         {
             var mapRenderer = _hudControlProvider.GetComponent<IMapRenderer>(HudControlIdentifier.MapRenderer);
+            var inventoryPanel = _hudControlProvider.GetComponent<InventoryPanel>(HudControlIdentifier.InventoryPanel);
             if (_activeDialogProvider.ActiveDialogs.Any(x => x.HasValue) && mapRenderer.MouseOver)
                 return;
 
             var rp = _characterProvider.MainCharacter.RenderProperties;
-            var dropPoint = mapRenderer.MouseOver
+            var dropPoint = mapRenderer.MouseOver && !inventoryPanel.MouseOver
                 ? mapRenderer.GridCoordinates
                 : new MapCoordinate(rp.MapX, rp.MapY);