Merge pull request #1282 from AsgardXIV/brio3

Brio Despawn
imchillin · Jan 20, 2023 · 43f8afe · 43f8afe
2 parents e47e039 + 31ecb47
commit 43f8afe
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 10 deletions.
diff --git a/Anamnesis/Actor/Refresh/BrioActorRefresher.cs b/Anamnesis/Actor/Refresh/BrioActorRefresher.cs
@@ -26,11 +26,11 @@ public async Task RefreshActor(ActorMemory actor)
 		await Dispatch.MainThread();
 		bool isPosing = PoseService.Instance.IsEnabled;
 
-		RedrawType redrawType = RedrawType.AllowFull | RedrawType.PreservePosition | RedrawType.AllowOptimized;
+		RedrawType redrawType = RedrawType.AllowFull | RedrawType.PreservePosition | RedrawType.AllowOptimized | RedrawType.ForceAllowNPCAppearance;
 
-		if(actor.IsWeaponDirty && !isPosing)
+		if(actor.IsWeaponDirty)
 		{
-			redrawType |= RedrawType.RedrawWeaponsOnOptimized;
+			redrawType |= RedrawType.ForceRedrawWeaponsOnOptimized;
 		}
 
 		if (actor.IsWeaponDirty && isPosing)

diff --git a/Anamnesis/Brio/Brio.cs b/Anamnesis/Brio/Brio.cs
@@ -5,6 +5,7 @@ namespace Anamnesis.Brio;
 
 using System;
 using System.Threading.Tasks;
+using static Anamnesis.Penumbra.Penumbra.RedrawData;
 
 public static class Brio
 {
@@ -21,13 +22,24 @@ public static async Task<string> Redraw(int targetIndex, RedrawType redrawType)
 		return result;
 	}
 
-	public static async Task<int> Spawn()
+	public static async Task<int> Spawn(SpawnOptions options)
 	{
-		var resultRaw = await BrioApi.Post("/spawn", 0);
+		SpawnRequest data = new();
+		data.SpawnOptions = options;
+		var resultRaw = await BrioApi.Post("/spawn", data);
 		var resultId = int.Parse(resultRaw);
 		await Task.Delay(500);
 		return resultId;
 	}
+
+	public static async Task<bool> Despawn(int actorIndex)
+	{
+		DespawnData data = new();
+		data.ObjectIndex = actorIndex;
+		var resultRaw = await BrioApi.Post("/despawn", data);
+		var result = bool.Parse(resultRaw);
+		return result;
+	}
 }
 
 [Flags]
@@ -36,14 +48,32 @@ public enum RedrawType
 	None = 0,
 	AllowOptimized = 1,
 	AllowFull = 2,
-	RedrawWeaponsOnOptimized = 4,
+	ForceRedrawWeaponsOnOptimized = 4,
 	PreservePosition = 8,
+	ForceAllowNPCAppearance = 16,
 
-	All = AllowOptimized | AllowFull | RedrawWeaponsOnOptimized | PreservePosition,
+	All = AllowOptimized | AllowFull | ForceRedrawWeaponsOnOptimized | PreservePosition | ForceAllowNPCAppearance,
+}
+
+[Flags]
+public enum SpawnOptions
+{
+	None = 0,
+	ApplyModelPosition = 1,
 }
 
 public class RedrawData
 {
 	public int ObjectIndex { get; set; } = -1;
 	public RedrawType? RedrawType { get; set; } = Anamnesis.Brio.RedrawType.All;
-}
+}
+
+public class DespawnData
+{
+	public int ObjectIndex { get; set; } = -1;
+}
+
+public class SpawnRequest
+{
+	public SpawnOptions SpawnOptions { get; set; }
+}
diff --git a/Anamnesis/Files/CharacterFile.cs b/Anamnesis/Files/CharacterFile.cs
@@ -253,6 +253,7 @@ public async Task Apply(ActorMemory actor, SaveModes mode, bool allowRefresh = t
 			{
 				this.MainHand?.Write(actor.MainHand, true);
 				this.OffHand?.Write(actor.OffHand, false);
+				actor.IsWeaponDirty = true;
 			}
 
 			if (this.IncludeSection(SaveModes.EquipmentGear, mode))

diff --git a/Anamnesis/MainWindow.xaml b/Anamnesis/MainWindow.xaml
@@ -45,7 +45,12 @@
 									<MenuItem Visibility="{Binding IsValid, Converter={StaticResource B2V}}" 
 											  Click="OnTargetActorClicked"
 											  Header="Target" />
-								</ContextMenu>
+
+                                <MenuItem Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Path=SettingsService.Settings.UseExternalRefreshBrio, Converter={StaticResource B2V}}" 
+											  IsEnabled="{Binding IsGPoseActor}"
+											  Click="OnDespawnActorClicked"
+											  Header="Despawn" />
+                            </ContextMenu>
 							</ToggleButton.ContextMenu>
 
 						<Grid Margin="6,0">

diff --git a/Anamnesis/MainWindow.xaml.cs b/Anamnesis/MainWindow.xaml.cs
@@ -319,6 +319,20 @@ private void OnTargetActorClicked(object sender, RoutedEventArgs e)
 		}
 	}
 
+	private async void OnDespawnActorClicked(object sender, RoutedEventArgs e)
+	{
+		if (sender is FrameworkElement el && el.DataContext is PinnedActor actor)
+		{
+			if (!actor.IsValid || actor.Memory == null)
+				return;
+
+			if(await Brio.Brio.Despawn(actor.Memory.ObjectIndex))
+			{
+				TargetService.UnpinActor(actor);
+			}
+		}
+	}
+
 	private void OnActorPinPreviewMouseUp(object sender, MouseButtonEventArgs e)
 	{
 		if (e.ChangedButton == MouseButton.Middle)

diff --git a/Anamnesis/Views/TargetSelectorView.xaml.cs b/Anamnesis/Views/TargetSelectorView.xaml.cs
@@ -182,7 +182,11 @@ private void OnAddPlayerTargetActorClicked(object sender, RoutedEventArgs e)
 
 	private async void OnCreateActorClicked(object sender, RoutedEventArgs e)
 	{
-		var nextActorId = await Brio.Spawn();
+		SpawnOptions options = SpawnOptions.None;
+		if (PoseService.Instance.IsEnabled || PoseService.Instance.FreezeWorldPosition)
+			options |= SpawnOptions.ApplyModelPosition;
+
+		var nextActorId = await Brio.Spawn(options);
 		if(nextActorId != -1)
 		{
 			var actors = ActorService.Instance.GetAllActors(true);