t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reduce hitches and do some other changes to FSW

Browse Source
This commit is contained in:
Stanley Dimant
2024-02-15 11:22:18 +01:00
committed by Loporrit
parent e98d5ce1ea
commit f9ca55db43
17 changed files with 140 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MareSynchronos/UI/CompactUI.cs
View File

@@ -59,7 +59,9 @@ public class CompactUi : WindowMediatorSubscriberBase
private bool _wasOpen;
public CompactUi(ILogger<CompactUi> logger, UiSharedService uiShared, MareConfigService configService, ApiController apiController, PairManager pairManager, ChatService chatService,
ServerConfigurationManager serverManager, MareMediator mediator, FileUploadManager fileTransferManager, UidDisplayHandler uidDisplayHandler) : base(logger, mediator, "###LoporritSyncMainUI")
ServerConfigurationManager serverManager, MareMediator mediator, FileUploadManager fileTransferManager, UidDisplayHandler uidDisplayHandler,
PerformanceCollectorService performanceCollectorService)
: base(logger, mediator, "###LoporritSyncMainUI", performanceCollectorService)
{
_uiShared = uiShared;
_configService = configService;
@@ -101,7 +103,7 @@ public class CompactUi : WindowMediatorSubscriberBase
};
}
public override void Draw()
protected override void DrawInternal()
{
/*if (_apiController.ServerInfo.AccentColor.HasValue)
{

7
MareSynchronos/UI/Components/Popup/PopupHandler.cs
View File

@@ -2,6 +2,7 @@
using Dalamud.Interface.Utility;
using Dalamud.Interface.Utility.Raii;
using ImGuiNET;
using MareSynchronos.Services;
using MareSynchronos.Services.Mediator;
using Microsoft.Extensions.Logging;
using System.Numerics;
@@ -14,8 +15,8 @@ public class PopupHandler : WindowMediatorSubscriberBase
private readonly HashSet<IPopupHandler> _handlers;
private IPopupHandler? _currentHandler = null;
public PopupHandler(ILogger<PopupHandler> logger, MareMediator mediator, IEnumerable<IPopupHandler> popupHandlers)
: base(logger, mediator, "MarePopupHandler")
public PopupHandler(ILogger<PopupHandler> logger, MareMediator mediator, IEnumerable<IPopupHandler> popupHandlers, PerformanceCollectorService performanceCollectorService)
: base(logger, mediator, "MarePopupHandler", performanceCollectorService)
{
Flags = ImGuiWindowFlags.NoBringToFrontOnFocus
| ImGuiWindowFlags.NoDecoration
@@ -46,7 +47,7 @@ public class PopupHandler : WindowMediatorSubscriberBase
});
}
public override void Draw()
protected override void DrawInternal()
{
if (_currentHandler == null) return;

5
MareSynchronos/UI/DataAnalysisUi.cs
View File

@@ -31,7 +31,8 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
private ObjectKind _selectedObjectTab;
private bool _showModal = false;
public DataAnalysisUi(ILogger<DataAnalysisUi> logger, MareMediator mediator, CharacterAnalyzer characterAnalyzer, IpcManager ipcManager) : base(logger, mediator, "Mare Character Data Analysis")
public DataAnalysisUi(ILogger<DataAnalysisUi> logger, MareMediator mediator, CharacterAnalyzer characterAnalyzer, IpcManager ipcManager, PerformanceCollectorService performanceCollectorService)
: base(logger, mediator, "Mare Character Data Analysis", performanceCollectorService)
{
_characterAnalyzer = characterAnalyzer;
_ipcManager = ipcManager;
@@ -56,7 +57,7 @@ public class DataAnalysisUi : WindowMediatorSubscriberBase
_conversionProgress.ProgressChanged += ConversionProgress_ProgressChanged;
}
public override void Draw()
protected override void DrawInternal()
{
if (_conversionTask != null && !_conversionTask.IsCompleted)
{

5
MareSynchronos/UI/DownloadUi.cs
View File

@@ -22,7 +22,8 @@ public class DownloadUi : WindowMediatorSubscriberBase
private readonly ConcurrentDictionary<GameObjectHandler, bool> _uploadingPlayers = new();
public DownloadUi(ILogger<DownloadUi> logger, DalamudUtilService dalamudUtilService, MareConfigService configService,
FileUploadManager fileTransferManager, MareMediator mediator, UiSharedService uiShared) : base(logger, mediator, "Loporrit Downloads")
FileUploadManager fileTransferManager, MareMediator mediator, UiSharedService uiShared, PerformanceCollectorService performanceCollectorService)
: base(logger, mediator, "Loporrit Downloads", performanceCollectorService)
{
_dalamudUtilService = dalamudUtilService;
_configService = configService;
@@ -66,7 +67,7 @@ public class DownloadUi : WindowMediatorSubscriberBase
});
}
public override void Draw()
protected override void DrawInternal()
{
if (_configService.Current.ShowTransferWindow)
{

5
MareSynchronos/UI/EditProfileUi.cs
View File

@@ -36,7 +36,8 @@ public class EditProfileUi : WindowMediatorSubscriberBase
public EditProfileUi(ILogger<EditProfileUi> logger, MareMediator mediator,
ApiController apiController, IUiBuilder uiBuilder, UiSharedService uiSharedService,
FileDialogManager fileDialogManager, ServerConfigurationManager serverConfigurationManager,
MareProfileManager mareProfileManager) : base(logger, mediator, "Loporrit Edit Profile###LoporritSyncEditProfileUI")
MareProfileManager mareProfileManager, PerformanceCollectorService performanceCollectorService)
: base(logger, mediator, "Loporrit Edit Profile###LoporritSyncEditProfileUI", performanceCollectorService)
{
IsOpen = false;
this.SizeConstraints = new()
@@ -64,7 +65,7 @@ public class EditProfileUi : WindowMediatorSubscriberBase
});
}
public override void Draw()
protected override void DrawInternal()
{
_uiSharedService.BigText("Current Profile (as saved on server)");

5
MareSynchronos/UI/GposeUi.cs
View File

@@ -20,7 +20,8 @@ public class GposeUi : WindowMediatorSubscriberBase
public GposeUi(ILogger<GposeUi> logger, MareCharaFileManager mareCharaFileManager,
DalamudUtilService dalamudUtil, FileDialogManager fileDialogManager, MareConfigService configService,
MareMediator mediator) : base(logger, mediator, "Loporrit Gpose Import UI###LoporritSyncGposeUI")
MareMediator mediator, PerformanceCollectorService performanceCollectorService)
: base(logger, mediator, "Loporrit Gpose Import UI###LoporritSyncGposeUI", performanceCollectorService)
{
_mareCharaFileManager = mareCharaFileManager;
_dalamudUtil = dalamudUtil;
@@ -37,7 +38,7 @@ public class GposeUi : WindowMediatorSubscriberBase
};
}
public override void Draw()
protected override void DrawInternal()
{
if (!_dalamudUtil.IsInGpose) IsOpen = false;

6
MareSynchronos/UI/IntroUI.cs
View File

@@ -7,6 +7,7 @@ using MareSynchronos.FileCache;
using MareSynchronos.Localization;
using MareSynchronos.MareConfiguration;
using MareSynchronos.MareConfiguration.Models;
using MareSynchronos.Services;
using MareSynchronos.Services.Mediator;
using MareSynchronos.Services.ServerConfiguration;
using MareSynchronos.WebAPI;
@@ -41,7 +42,8 @@ public class IntroUi : WindowMediatorSubscriberBase
private RegisterReplyDto? _registrationReply;
public IntroUi(ILogger<IntroUi> logger, UiSharedService uiShared, MareConfigService configService, ApiController apiController,
CacheMonitor fileCacheManager, ServerConfigurationManager serverConfigurationManager, MareMediator mareMediator) : base(logger, mareMediator, "Loporrit Setup")
CacheMonitor fileCacheManager, ServerConfigurationManager serverConfigurationManager, MareMediator mareMediator,
PerformanceCollectorService performanceCollectorService) : base(logger, mareMediator, "Loporrit Setup", performanceCollectorService)
{
_uiShared = uiShared;
_configService = configService;
@@ -69,7 +71,7 @@ public class IntroUi : WindowMediatorSubscriberBase
});
}
public override void Draw()
protected override void DrawInternal()
{
if (_uiShared.IsInGpose) return;

6
MareSynchronos/UI/PermissionWindowUI.cs
View File

@@ -4,6 +4,7 @@ using ImGuiNET;
using MareSynchronos.API.Data.Enum;
using MareSynchronos.API.Data.Extensions;
using MareSynchronos.PlayerData.Pairs;
using MareSynchronos.Services;
using MareSynchronos.Services.Mediator;
using MareSynchronos.Utils;
using MareSynchronos.WebAPI;
@@ -20,7 +21,8 @@ public class PermissionWindowUI : WindowMediatorSubscriberBase
private UserPermissions _ownPermissions;
public PermissionWindowUI(ILogger<PermissionWindowUI> logger, Pair pair, MareMediator mediator, UiSharedService uiSharedService,
ApiController apiController) : base(logger, mediator, "Permissions for " + pair.UserData.AliasOrUID + "###LoporritSyncPermissions" + pair.UserData.UID)
ApiController apiController, PerformanceCollectorService performanceCollectorService)
: base(logger, mediator, "Permissions for " + pair.UserData.AliasOrUID + "###LoporritSyncPermissions" + pair.UserData.UID, performanceCollectorService)
{
Pair = pair;
_uiSharedService = uiSharedService;
@@ -35,7 +37,7 @@ public class PermissionWindowUI : WindowMediatorSubscriberBase
IsOpen = true;
}
public override void Draw()
protected override void DrawInternal()
{
var paused = _ownPermissions.IsPaused();
var disableSounds = _ownPermissions.IsDisableSounds();

4
MareSynchronos/UI/PopoutProfileUi.cs
View File

@@ -30,7 +30,7 @@ public class PopoutProfileUi : WindowMediatorSubscriberBase
public PopoutProfileUi(ILogger<PopoutProfileUi> logger, MareMediator mediator, UiSharedService uiSharedService,
ServerConfigurationManager serverManager, MareConfigService mareConfigService,
MareProfileManager mareProfileManager, PairManager pairManager) : base(logger, mediator, "###LoporritSyncPopoutProfileUI")
MareProfileManager mareProfileManager, PairManager pairManager, PerformanceCollectorService performanceCollectorService) : base(logger, mediator, "###LoporritSyncPopoutProfileUI", performanceCollectorService)
{
_uiSharedService = uiSharedService;
_serverManager = serverManager;
@@ -78,7 +78,7 @@ public class PopoutProfileUi : WindowMediatorSubscriberBase
IsOpen = false;
}
public override void Draw()
protected override void DrawInternal()
{
if (_pair == null) return;

4
MareSynchronos/UI/SettingsUi.cs
View File

@@ -81,7 +81,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
FileTransferOrchestrator fileTransferOrchestrator,
FileCacheManager fileCacheManager,
FileCompactor fileCompactor, ApiController apiController,
IpcManager ipcManager, CacheMonitor cacheMonitor) : base(logger, mediator, "Loporrit Settings")
IpcManager ipcManager, CacheMonitor cacheMonitor) : base(logger, mediator, "Loporrit Settings", performanceCollector)
{
_configService = configService;
_mareCharaFileManager = mareCharaFileManager;
@@ -120,7 +120,7 @@ public class SettingsUi : WindowMediatorSubscriberBase
public CharacterData? LastCreatedCharacterData { private get; set; }
private ApiController ApiController => _uiShared.ApiController;
public override void Draw()
protected override void DrawInternal()
{
_ = _uiShared.DrawOtherPluginState();

7
MareSynchronos/UI/StandaloneProfileUi.cs
View File

@@ -26,8 +26,9 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase
private IDalamudTextureWrap? _textureWrap;
public StandaloneProfileUi(ILogger<StandaloneProfileUi> logger, MareMediator mediator, UiSharedService uiBuilder,
ServerConfigurationManager serverManager, MareProfileManager mareProfileManager, PairManager pairManager, Pair pair)
: base(logger, mediator, "Profile of " + pair.UserData.AliasOrUID + "##LoporritSyncStandaloneProfileUI" + pair.UserData.AliasOrUID)
ServerConfigurationManager serverManager, MareProfileManager mareProfileManager, PairManager pairManager, Pair pair,
PerformanceCollectorService performanceCollector)
: base(logger, mediator, "Profile of " + pair.UserData.AliasOrUID + "##LoporritSyncStandaloneProfileUI" + pair.UserData.AliasOrUID, performanceCollector)
{
_uiSharedService = uiBuilder;
_serverManager = serverManager;
@@ -45,7 +46,7 @@ public class StandaloneProfileUi : WindowMediatorSubscriberBase
public Pair Pair { get; init; }
public override void Draw()
protected override void DrawInternal()
{
try
{

7
MareSynchronos/UI/SyncshellAdminUI.cs
View File

@@ -7,6 +7,7 @@ using MareSynchronos.API.Data.Enum;
using MareSynchronos.API.Data.Extensions;
using MareSynchronos.API.Dto.Group;
using MareSynchronos.PlayerData.Pairs;
using MareSynchronos.Services;
using MareSynchronos.Services.Mediator;
using MareSynchronos.WebAPI;
using Microsoft.Extensions.Logging;
@@ -31,8 +32,8 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
private int _pruneDays = 14;
public SyncshellAdminUI(ILogger<SyncshellAdminUI> logger, MareMediator mediator, ApiController apiController,
UiSharedService uiSharedService, PairManager pairManager, GroupFullInfoDto groupFullInfo)
: base(logger, mediator, "Syncshell Admin Panel (" + groupFullInfo.GroupAliasOrGID + ")")
UiSharedService uiSharedService, PairManager pairManager, GroupFullInfoDto groupFullInfo, PerformanceCollectorService performanceCollectorService)
: base(logger, mediator, "Syncshell Admin Panel (" + groupFullInfo.GroupAliasOrGID + ")", performanceCollectorService)
{
GroupFullInfo = groupFullInfo;
_apiController = apiController;
@@ -53,7 +54,7 @@ public class SyncshellAdminUI : WindowMediatorSubscriberBase
public GroupFullInfoDto GroupFullInfo { get; private set; }
public override void Draw()
protected override void DrawInternal()
{
if (!_isModerator && !_isOwner) return;