Brio 0.6.0 part 1

Brio/Brio.cs

@@ -20,6 +20,7 @@
 using Brio.MCDF.Game.Services;
 using Brio.Resources;
 using Brio.UI;
+using Brio.UI.Controls.Stateless;
 using Brio.UI.Windows;
 using Brio.UI.Windows.Specialized;
 using Brio.Web;
@@ -33,7 +34,7 @@ namespace Brio;
 
 public class Brio : IDalamudPlugin
 {
-    public const string Name = "Brio";
+    public const string Name = "BRIO DEV";
 
     private static ServiceProvider? _services = null;
 
@@ -119,13 +120,16 @@ private static ServiceCollection SetupServices(DalamudServices dalamudServices)
         serviceCollection.AddSingleton<ResourceProvider>();
         serviceCollection.AddSingleton<GameDataProvider>();
         serviceCollection.AddSingleton<WelcomeService>();
-        serviceCollection.AddSingleton<InputService>();
+        serviceCollection.AddSingleton<InputManagerService>();
         serviceCollection.AddSingleton<SceneService>();
         serviceCollection.AddSingleton<ProjectSystem>();
         serviceCollection.AddSingleton<AutoSaveService>();
+        serviceCollection.AddSingleton<HistoryService>();
         serviceCollection.AddSingleton<FileCacheService>();
         serviceCollection.AddSingleton<MCDFService>();
         serviceCollection.AddSingleton<TransientResourceService>();
+        serviceCollection.AddSingleton<ActorLookAtService>();
+        serviceCollection.AddSingleton<CharacterHandlerService>();
 
         // IPC
         serviceCollection.AddSingleton<BrioIPCService>();
@@ -145,6 +149,7 @@ private static ServiceCollection SetupServices(DalamudServices dalamudServices)
         serviceCollection.AddSingleton<ActorSpawnService>();
         serviceCollection.AddSingleton<ActorRedrawService>();
         serviceCollection.AddSingleton<ActorAppearanceService>();
+        serviceCollection.AddSingleton<ActorVFXService>();
         serviceCollection.AddSingleton<ActionTimelineService>();
         serviceCollection.AddSingleton<GPoseService>();
         serviceCollection.AddSingleton<CommandHandlerService>();
@@ -161,7 +166,8 @@ private static ServiceCollection SetupServices(DalamudServices dalamudServices)
         serviceCollection.AddSingleton<PhysicsService>();
         serviceCollection.AddSingleton<GameInputService>();
         serviceCollection.AddSingleton<VirtualCameraManager>();
-
+        serviceCollection.AddSingleton<AutoSaveWindow>();
+        serviceCollection.AddSingleton<MCDFWindow>();
         serviceCollection.AddSingleton<CutsceneManager>();
 
         // Library
@@ -195,6 +201,7 @@ private static ServiceCollection SetupServices(DalamudServices dalamudServices)
         serviceCollection.AddSingleton<PosingTransformWindow>();
         serviceCollection.AddSingleton<CameraWindow>();
         serviceCollection.AddSingleton<PosingGraphicalWindow>();
+        serviceCollection.AddSingleton<ImBrioText>();
 
         return serviceCollection;
     }

Brio/Capabilities/Actor/ActorAppearanceCapability.cs

@@ -28,6 +28,8 @@ public class ActorAppearanceCapability : ActorCharacterCapability
     private readonly CustomizePlusService _customizePlusService;
     private readonly GlamourerService _glamourerService;
 
+    private readonly CharacterHandlerService _characterHandlerService;
+
     private readonly GPoseService _gposeService;
     private readonly IFramework _framework;
     private readonly MCDFService _mCDFService;
@@ -71,9 +73,11 @@ public class ActorAppearanceCapability : ActorCharacterCapability
     public bool CanMCDF => _mCDFService.IsIPCAvailable;
     public bool IsSelf => _targetService.IsSelf(GameObject);
 
+    public bool IsAnyMCDFLoading => _mCDFService.IsApplyingMCDF;
+
     public bool IsHidden => CurrentAppearance.ExtendedAppearance.Transparency == 0;
 
-    public ActorAppearanceCapability(ActorEntity parent, MCDFService mCDFService, IFramework framework, ActorAppearanceService actorAppearanceService,
+    public ActorAppearanceCapability(ActorEntity parent,CharacterHandlerService characterHandlerService, MCDFService mCDFService, IFramework framework, ActorAppearanceService actorAppearanceService,
         CustomizePlusService customizePlusService, PenumbraService penumbraService, TargetService targetService, GlamourerService glamourerService,
         GPoseService gPoseService) : base(parent)
     {
@@ -85,17 +89,24 @@ public ActorAppearanceCapability(ActorEntity parent, MCDFService mCDFService, IF
         _framework = framework;
         _mCDFService = mCDFService;
         _targetService = targetService;
+        _characterHandlerService = characterHandlerService;
 
         Widget = new ActorAppearanceWidget(this);
 
         _gposeService.OnGPoseStateChange += OnGPoseStateChanged;
         _penumbraService.OnPenumbraRedraw += OnPenumbraRedraw;
     }
 
-    public async Task LoadMcdf(string path)
+    public async Task LoadMCDF(string path)
     {
         try
         {
+            if(_mCDFService.IsApplyingMCDF)
+            {
+                Brio.NotifyError("Another MCDF is loading, Please wait for it to finish.");
+                return;
+            }
+
             Entity.LoadingDescription = "Loading MCDF...";
             Entity.IsLoading = true;
 
@@ -139,15 +150,15 @@ public void SetCollection(Guid collection)
         if(!IsCollectionOverridden)
             _oldCollection = old.ToString();
 
-        _ = _actorAppearanceService.Redraw(Character);
+        _ = _actorAppearanceService.Redraw(Character, HasMCDF);
     }
     public void ResetCollection()
     {
         if(IsCollectionOverridden)
         {
             _penumbraService.SetCollectionForObject(Character, Guid.Parse(_oldCollection!));
             _oldCollection = null;
-            _ = _actorAppearanceService.Redraw(Character);
+            _ = _actorAppearanceService.Redraw(Character, HasMCDF);
         }
     }
 
@@ -334,8 +345,9 @@ public Task ApplyEmperors()
     }
 
     public async Task Redraw()
-    {
-        await _actorAppearanceService.Redraw(Character);
+    {           
+        await _actorAppearanceService.Redraw(Character, HasMCDF);
+
         ApplyShaderOverride();
 
         if(Entity is ActorEntity actor && actor.IsProp == true)
@@ -351,7 +363,7 @@ public async Task ResetAppearance()
     {
         if(HasMCDF)
         {
-            _ = _actorAppearanceService.RevertMCDF(GameObject);
+            _ = _characterHandlerService.Revert(GameObject);
             HasMCDF = false;
         }
         else

Brio/Capabilities/Actor/ActorDebugCapability.cs

@@ -1,6 +1,7 @@
 using Brio.Capabilities.Posing;
 using Brio.Config;
 using Brio.Entities.Actor;
+using Brio.Game.Actor;
 using Brio.UI.Widgets.Actor;
 using System.Collections.Generic;
 
@@ -12,10 +13,12 @@ public class ActorDebugCapability : ActorCharacterCapability
     public bool IsDebug => _configService.IsDebug;
 
     private readonly ConfigurationService _configService;
+    private readonly ActorVFXService _vfxService;
 
-    public ActorDebugCapability(ActorEntity parent, ConfigurationService configService) : base(parent)
+    public ActorDebugCapability(ActorEntity parent, ConfigurationService configService, ActorVFXService actorVFXService) : base(parent)
     {
         _configService = configService;
+        _vfxService = actorVFXService;
 
         Widget = new ActorDebugWidget(this);
     }
@@ -30,4 +33,6 @@ public Dictionary<string, int> SkeletonStacks
             return [];
         }
     }
+
+    public ActorVFXService VFXService => _vfxService;
 }

Brio/Capabilities/Actor/ActorDynamicPoseCapability.cs

@@ -1,30 +1,71 @@
 using Brio.Entities.Actor;
 using Brio.Game.Actor;
+using Brio.Game.Actor.Extensions;
+using Brio.Game.Camera;
 using Brio.Game.GPose;
 using Brio.UI.Widgets.Actor;
+using Dalamud.Game.ClientState.Objects.Types;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Numerics;
+using static Brio.Capabilities.Actor.CompanionCapability;
 
 namespace Brio.Capabilities.Actor;
 public class ActorDynamicPoseCapability : ActorCharacterCapability
 {
+    private readonly ActorLookAtService _actorLookAtService;
     private readonly ActorAppearanceService _actorAppearanceService;
     private readonly GPoseService _gposeService;
+    private readonly VirtualCameraManager _virtualCameraManager;
 
-    public ActorDynamicPoseCapability(ActorEntity parent, ActorAppearanceService actorAppearanceService, GPoseService gPoseService) : base(parent)
+    public VirtualCamera? Camera => _virtualCameraManager.CurrentCamera;
+
+    public ActorDynamicPoseCapability(ActorEntity parent, ActorLookAtService actorLookAtService, VirtualCameraManager virtualCameraManager, ActorAppearanceService actorAppearanceService, GPoseService gPoseService) : base(parent)
     {
+        _actorLookAtService = actorLookAtService;
         _actorAppearanceService = actorAppearanceService;
         _gposeService = gPoseService;
+        _virtualCameraManager = virtualCameraManager;
 
         Widget = new ActorDynamicPoseWidget(this);
     }
 
-    public unsafe void TESTactorlook()
+    public unsafe void StartLookAt()
     {
-        _actorAppearanceService.TESTactorlook(GameObject);
+        _actorLookAtService.AddObjectToLook(GameObject);
     }
 
-    public unsafe void TESTactorlookClear()
+    public unsafe void StopLookAt()
     {
-        _actorAppearanceService.TESTactorlookClear(GameObject);
+        _actorLookAtService.RemoveObjectFromLook(GameObject);
+    }
+
+    public unsafe void SetMode(LookAtTargetMode lookAtTargetMode)
+    {
+        _actorLookAtService.SetTargetMode(GameObject, lookAtTargetMode);
+    }
+
+    public void SetTargetLock(bool doLock, LookAtTargetType targetType, Vector3 target)
+    {
+        _actorLookAtService.SetTargetLock(GameObject, doLock, targetType, target);
+    }
+
+    public void SetTargetType(LookAtTargetType lookAtTarget)
+    {
+        _actorLookAtService.SetTargetType(GameObject, lookAtTarget);
+    }
+
+    public LookAtDataHolder? GetData()
+    {
+        return _actorLookAtService.GetTargetDataHolder(GameObject);
+    }
+
+    public static ActorDynamicPoseCapability? CreateIfEligible(IServiceProvider provider, ActorEntity entity)
+    {
+        if(entity.GameObject is IBattleChara)
+            return ActivatorUtilities.CreateInstance<ActorDynamicPoseCapability>(provider, entity);
+
+        return null;
     }
 
 }

Brio/Capabilities/Camera/BrioCameraCapability.cs

@@ -13,12 +13,12 @@ public class BrioCameraCapability : CameraCapability
     private readonly CameraWindow _cameraWindow;
     private readonly VirtualCameraManager _virtualCameraService;
 
-    public BrioCameraCapability(CameraEntity parent, VirtualCameraManager virtualCameraService, CutsceneManager _cutsceneManager, ConfigurationService _configService, GPoseService gPoseService, CameraWindow cameraWindow) : base(parent, gPoseService)
+    public BrioCameraCapability(CameraEntity parent, VirtualCameraManager virtualCameraService, GPoseService gPoseService, CameraWindow cameraWindow) : base(parent, gPoseService)
     {
         _virtualCameraService = virtualCameraService;
         _cameraWindow = cameraWindow;
 
-        Widget = new BrioCameraWidget(this, _cutsceneManager, _configService);
+        Widget = new BrioCameraWidget(this);
     }
 
     public override void OnEntitySelected()