Skip to content

Commit

Permalink
Update Brio IPC
Browse files Browse the repository at this point in the history 
Add:
`Brio.Actor.Pose.Reset`
`Brio.Actor.Exists`
`Brio.Actor.GetAll`
  • Loading branch information
@Minmoose
Minmoose committed Dec 31, 2024
1 parent d05a097 commit 383dbb5
Show file tree
Hide file tree
Showing 3 changed files with 133 additions and 30 deletions.
7 changes: 4 additions & 3 deletions Brio/Capabilities/Posing/PosingCapability.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ public void Snapshot(bool reset = true, bool reconcile = true, bool asExpression
_redoStack.Clear();
return;
}

_redoStack.Clear();

if(asExpression == true)
Expand Down Expand Up @@ -233,12 +233,13 @@ public void Undo()
}
}

public void Reset(bool generateSnapshot = true, bool reset = true)
public void Reset(bool generateSnapshot = true, bool reset = true, bool clearHistStack = true)
{
SkeletonPosing.ResetPose();
ModelPosing.ResetTransform();

_redoStack.Clear();
if(clearHistStack)
_redoStack.Clear();

if(generateSnapshot)
Snapshot(reset);
Expand Down
16 changes: 12 additions & 4 deletions Brio/Entities/EntityManager.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using Brio.Capabilities.Actor;
using FFXIVClientStructs.FFXIV.Client.Game.Object;


namespace Brio.Entities;
Expand Down Expand Up @@ -150,17 +151,24 @@ public bool SelectedHasCapability<T>(bool considerChildren = false, bool conside

public IEnumerable<ActorEntity> TryGetAllActors()
{
List<ActorEntity> actorEntities = [];

foreach(var entity in _entityMap.Values)
{
if(entity is ActorEntity actor)
{
actorEntities.Add(actor);
yield return actor;
}
}
}

return actorEntities;
public IEnumerable<IGameObject> TryGetAllActorsAsGameObject()
{
foreach(var entity in _entityMap.Values)
{
if(entity is ActorEntity actor)
{
yield return actor.GameObject;
}
}
}

public bool TryGetCapabilityFromSelectedEntity<T>([MaybeNullWhen(false)] out T capability, bool considerChildren = false, bool considerParents = true) where T : Capability
Expand Down
140 changes: 117 additions & 23 deletions Brio/IPC/BrioIPCService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
using Brio.Files;
using Brio.Game.Actor;
using Brio.Game.Actor.Extensions;
using Brio.Resources;
using Brio.Game.GPose;
using Dalamud.Game.ClientState.Objects.Types;
using Dalamud.Plugin;
using Dalamud.Plugin.Ipc;
using Dalamud.Plugin.Services;
using System;
using System.IO;
using System.Linq;
using System.Numerics;
using System.Threading.Tasks;

Expand Down Expand Up @@ -39,18 +39,18 @@ internal class BrioIPCService : IDisposable


public const string Actor_Despawn_IPCName = "Brio.Actor.Despawn";
private ICallGateProvider<IGameObject, bool>? Actor_DespawnActor_Ipc;
private ICallGateProvider<IGameObject, bool>? Actor_DespawnActor_IPC;

public const string Actor_DespawnAsync_IPCName = "Brio.Actor.DespawnAsync";
private ICallGateProvider<IGameObject, Task<bool>>? Actor_DespawnActorAsync_Ipc;
private ICallGateProvider<IGameObject, Task<bool>>? Actor_DespawnActorAsync_IPC;


public const string Actor_SetModelTransform_IPCName = "Brio.Actor.SetModelTransform";
private ICallGateProvider<IGameObject, Vector3, Quaternion, Vector3, bool>? Actor_SetModelTransform_IPC;
private ICallGateProvider<IGameObject, Vector3?, Quaternion?, Vector3?, bool, bool>? Actor_SetModelTransform_IPC;

public const string Actor_GetModelTransform_IPCName = "Brio.Actor.GetModelTransform";
private ICallGateProvider<IGameObject, (Vector3?, Quaternion?, Vector3?)>? Actor_GetModelTransform_IPC;

public const string Actor_ResetModelTransform_IPCName = "Brio.Actor.ResetModelTransform";
private ICallGateProvider<IGameObject, bool>? Actor_ResetModelTransform_IPC;

Expand All @@ -64,17 +64,28 @@ internal class BrioIPCService : IDisposable
public const string Actor_PoseGetAsJson_IPCName = "Brio.Actor.Pose.GetPoseAsJson";
private ICallGateProvider<IGameObject, string?>? Actor_Pose_GetFromJson_IPC;

public const string Actor_Pose_Reset_IPCName = "Brio.Actor.Pose.Reset";
private ICallGateProvider<IGameObject, bool, bool>? Actor_Pose_Reset_IPC;

public const string Actor_Exists_IPCName = "Brio.Actor.Exists";
private ICallGateProvider<IGameObject, bool>? Actor_Exists_IPC;

public const string Actor_GetAll_IPCName = "Brio.Actor.GetAll";
private ICallGateProvider<IGameObject[]?>? Actor_GetAll_IPC;

//

private readonly ActorSpawnService _actorSpawnService;
private readonly GPoseService _gPoseService;
private readonly ConfigurationService _configurationService;
private readonly EntityManager _entityManager;
private readonly IDalamudPluginInterface _pluginInterface;
private readonly IFramework _framework;

public BrioIPCService(ActorSpawnService actorSpawnService, ConfigurationService configurationService, EntityManager entityManager, IDalamudPluginInterface pluginInterface, IFramework framework)
public BrioIPCService(ActorSpawnService actorSpawnService, GPoseService gPoseService, ConfigurationService configurationService, EntityManager entityManager, IDalamudPluginInterface pluginInterface, IFramework framework)
{
_actorSpawnService = actorSpawnService;
_gPoseService = gPoseService;
_configurationService = configurationService;
_entityManager = entityManager;
_pluginInterface = pluginInterface;
Expand Down Expand Up @@ -105,19 +116,19 @@ private void CreateIPC()
Actor_Spawn_IPC = _pluginInterface.GetIpcProvider<IGameObject?>(Actor_Spawn_IPCName);
Actor_Spawn_IPC.RegisterFunc(SpawnActor);

Actor_SpawnAsync_IPC = _pluginInterface.GetIpcProvider<Task<IGameObject?>> (Actor_SpawnAsync_IPCName);
Actor_SpawnAsync_IPC = _pluginInterface.GetIpcProvider<Task<IGameObject?>>(Actor_SpawnAsync_IPCName);
Actor_SpawnAsync_IPC.RegisterFunc(SpawnActorAsync_Impl);

Actor_SpawnExAsync_IPC = _pluginInterface.GetIpcProvider<bool, bool, Task<IGameObject?>>(Actor_SpawnExAsync_IPCName);
Actor_SpawnExAsync_IPC.RegisterFunc(SpawnExAsync_Impl);

Actor_DespawnActor_Ipc = _pluginInterface.GetIpcProvider<IGameObject, bool>(Actor_Despawn_IPCName);
Actor_DespawnActor_Ipc.RegisterFunc(DespawnActor);
Actor_DespawnActor_IPC = _pluginInterface.GetIpcProvider<IGameObject, bool>(Actor_Despawn_IPCName);
Actor_DespawnActor_IPC.RegisterFunc(DespawnActor);

Actor_DespawnActorAsync_Ipc = _pluginInterface.GetIpcProvider<IGameObject, Task<bool>>(Actor_DespawnAsync_IPCName);
Actor_DespawnActorAsync_Ipc.RegisterFunc(DespawnActorAsync_Impl);
Actor_DespawnActorAsync_IPC = _pluginInterface.GetIpcProvider<IGameObject, Task<bool>>(Actor_DespawnAsync_IPCName);
Actor_DespawnActorAsync_IPC.RegisterFunc(DespawnActorAsync_Impl);

Actor_SetModelTransform_IPC = _pluginInterface.GetIpcProvider<IGameObject, Vector3, Quaternion, Vector3, bool>(Actor_SetModelTransform_IPCName);
Actor_SetModelTransform_IPC = _pluginInterface.GetIpcProvider<IGameObject, Vector3?, Quaternion?, Vector3?, bool, bool>(Actor_SetModelTransform_IPCName);
Actor_SetModelTransform_IPC.RegisterFunc(ActorSetModelTransform_Impl);

Actor_GetModelTransform_IPC = _pluginInterface.GetIpcProvider<IGameObject, (Vector3?, Quaternion?, Vector3?)>(Actor_GetModelTransform_IPCName);
Expand All @@ -135,6 +146,15 @@ private void CreateIPC()
Actor_Pose_GetFromJson_IPC = _pluginInterface.GetIpcProvider<IGameObject, string?>(Actor_PoseGetAsJson_IPCName);
Actor_Pose_GetFromJson_IPC.RegisterFunc(GetPoseAsJson_Impl);

Actor_Pose_Reset_IPC = _pluginInterface.GetIpcProvider<IGameObject, bool, bool>(Actor_Pose_Reset_IPCName);
Actor_Pose_Reset_IPC.RegisterFunc(ResetPose_Impl);

Actor_Exists_IPC = _pluginInterface.GetIpcProvider<IGameObject, bool>(Actor_Exists_IPCName);
Actor_Exists_IPC.RegisterFunc(ActorExists_Impl);

Actor_GetAll_IPC = _pluginInterface.GetIpcProvider<IGameObject[]?>(Actor_GetAll_IPCName);
Actor_GetAll_IPC.RegisterFunc(ActorGetAll_Impl);

IsIPCEnabled = true;
}
private void DisposeIPC()
Expand All @@ -145,8 +165,8 @@ private void DisposeIPC()
Actor_SpawnAsync_IPC?.UnregisterFunc();
Actor_SpawnExAsync_IPC?.UnregisterFunc();

Actor_DespawnActor_Ipc?.UnregisterFunc();
Actor_DespawnActorAsync_Ipc?.UnregisterFunc();
Actor_DespawnActor_IPC?.UnregisterFunc();
Actor_DespawnActorAsync_IPC?.UnregisterFunc();

Actor_SetModelTransform_IPC?.UnregisterFunc();
Actor_GetModelTransform_IPC?.UnregisterFunc();
Expand All @@ -161,8 +181,8 @@ private void DisposeIPC()
Actor_SpawnAsync_IPC = null;
Actor_SpawnExAsync_IPC = null;

Actor_DespawnActor_Ipc = null;
Actor_DespawnActorAsync_Ipc = null;
Actor_DespawnActor_IPC = null;
Actor_DespawnActorAsync_IPC = null;

Actor_SetModelTransform_IPC = null;
Actor_GetModelTransform_IPC = null;
Expand All @@ -181,17 +201,21 @@ private void DisposeIPC()
private Task<IGameObject?> SpawnActorAsync_Impl() => _framework.RunOnTick(SpawnActor);
private IGameObject? SpawnActor()
{
if(_actorSpawnService.CreateCharacter(out var character))
if(_gPoseService.IsGPosing == false) return null;

if(_actorSpawnService.CreateCharacter(out var character, SpawnFlags.Default, disableSpawnCompanion: true))
return character;

return null;
}

private async Task<IGameObject?> SpawnExAsync_Impl(bool spawnCompanion, bool selectInHierarchy) => await _framework.RunOnTick(() => SpawnEx(spawnCompanion, selectInHierarchy));
private IGameObject? SpawnEx(bool spawnCompanion, bool selectInHierarchy)
private IGameObject? SpawnEx(bool spawnCompanionSlot, bool selectInHierarchy)
{
if(_gPoseService.IsGPosing == false) return null;

SpawnFlags flags = SpawnFlags.Default;
if(spawnCompanion)
if(spawnCompanionSlot)
{
flags |= SpawnFlags.ReserveCompanionSlot;
}
Expand All @@ -211,22 +235,53 @@ private void DisposeIPC()
}

private Task<bool> DespawnActorAsync_Impl(IGameObject gameObject) => _framework.RunOnTick(() => DespawnActor(gameObject));
private bool DespawnActor(IGameObject gameObject) => _actorSpawnService.DestroyObject(gameObject);
private bool DespawnActor(IGameObject gameObject)
{
if(_gPoseService.IsGPosing == false) return false;

return _actorSpawnService.DestroyObject(gameObject);
}

private unsafe bool ActorSetModelTransform_Impl(IGameObject gameObject, Vector3 position, Quaternion rotation, Vector3 scale)
private unsafe bool ActorSetModelTransform_Impl(IGameObject gameObject, Vector3? position, Quaternion? rotation, Vector3? scale, bool additiveMode)
{
if(_gPoseService.IsGPosing == false) return false;

if(_entityManager.TryGetEntity(gameObject.Native(), out var entity))
{
if(entity.TryGetCapability<ModelPosingCapability>(out var transformCapability))
{
transformCapability.Transform = new Core.Transform { Position = position, Rotation = rotation, Scale = scale };
var transform = transformCapability.Transform;

if(additiveMode)
{
if(position.HasValue)
transform.Position += position.Value;
if(rotation.HasValue)
transform.Rotation += rotation.Value;
if(scale.HasValue)
transform.Scale += scale.Value;
}
else
{
if(position.HasValue)
transform.Position = position.Value;
if(rotation.HasValue)
transform.Rotation = rotation.Value;
if(scale.HasValue)
transform.Scale = scale.Value;
}

transformCapability.Transform = transform;

return true;
}
}
return false;
}
private unsafe (Vector3?, Quaternion?, Vector3?) ActorGetModelTransform_Impl(IGameObject gameObject)
{
if(_gPoseService.IsGPosing == false) return (null, null, null);

if(_entityManager.TryGetEntity(gameObject.Native(), out var entity))
{
if(entity.TryGetCapability<ModelPosingCapability>(out var transformCapability))
Expand All @@ -240,6 +295,8 @@ private unsafe (Vector3?, Quaternion?, Vector3?) ActorGetModelTransform_Impl(IGa
}
private unsafe bool ActorResetModelTransform_Impl(IGameObject gameObject)
{
if(_gPoseService.IsGPosing == false) return false;

if(_entityManager.TryGetEntity(gameObject.Native(), out var entity))
{
if(entity.TryGetCapability<ModelPosingCapability>(out var transformCapability))
Expand All @@ -253,6 +310,8 @@ private unsafe bool ActorResetModelTransform_Impl(IGameObject gameObject)

private unsafe bool LoadFromFile_Impl(IGameObject gameObject, string fileURI)
{
if(_gPoseService.IsGPosing == false) return false;

if(_entityManager.TryGetEntity(gameObject.Native(), out var entity))
{
if(entity.TryGetCapability<PosingCapability>(out var posingCapability))
Expand All @@ -265,6 +324,8 @@ private unsafe bool LoadFromFile_Impl(IGameObject gameObject, string fileURI)
}
private unsafe bool LoadFromJson_Impl(IGameObject gameObject, string json, bool isLegacyCMToolPose)
{
if(_gPoseService.IsGPosing == false) return false;

if(_entityManager.TryGetEntity(gameObject.Native(), out var entity))
{
if(entity.TryGetCapability<PosingCapability>(out var posingCapability))
Expand Down Expand Up @@ -295,6 +356,8 @@ private unsafe bool LoadFromJson_Impl(IGameObject gameObject, string json, bool
}
private unsafe string? GetPoseAsJson_Impl(IGameObject gameObject)
{
if(_gPoseService.IsGPosing == false) return null;

if(_entityManager.TryGetEntity(gameObject.Native(), out var entity))
{
if(entity.TryGetCapability<PosingCapability>(out var posingCapability))
Expand All @@ -307,6 +370,37 @@ private unsafe bool LoadFromJson_Impl(IGameObject gameObject, string json, bool
return null;
}

private unsafe bool ResetPose_Impl(IGameObject gameObject, bool clearRedoHistory)
{
if(_gPoseService.IsGPosing == false) return false;

if(_entityManager.TryGetEntity(gameObject.Native(), out var entity))
{
if(entity.TryGetCapability<PosingCapability>(out var posingCapability))
{
posingCapability.Reset(false, false, clearRedoHistory);

return true;
}
}

return false;
}

private unsafe bool ActorExists_Impl(IGameObject gameObject)
{
if(_gPoseService.IsGPosing == false) return false;

return _entityManager.EntityExists(gameObject.Native());
}

private unsafe IGameObject[]? ActorGetAll_Impl()
{
if(_gPoseService.IsGPosing == false) return null;

return _entityManager.TryGetAllActorsAsGameObject().ToArray();
}

public void Dispose()
{
_configurationService.OnConfigurationChanged -= OnConfigurationChanged;
Expand Down

0 comments on commit 383dbb5

Please sign in to comment.