Skip to content

Commit

Permalink
Merge pull request #1433 from imchillin/testing
Browse files Browse the repository at this point in the history
  • Loading branch information
@StoiaCode
StoiaCode authored Jan 24, 2025
2 parents 0fb2678 + 3095b33 commit 3c1405e
Show file tree
Hide file tree
Showing 69 changed files with 4,390 additions and 2,208 deletions.
32 changes: 21 additions & 11 deletions Anamnesis/Actor/Pages/ActionPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
xmlns:XivToolsWpf="clr-namespace:XivToolsWpf.Controls;assembly=XivToolsWpf"
xmlns:anaMem="clr-namespace:Anamnesis.Memory"
xmlns:ana="clr-namespace:Anamnesis.Views"
xmlns:converters="clr-namespace:Anamnesis.Actor.Converters"
xmlns:converters="clr-namespace:Anamnesis.Actor.Converters"
xmlns:controls="clr-namespace:Anamnesis.Actor.Controls"
d:DesignHeight="600"
d:DesignHeight="600"
d:DesignWidth="1024"
DataContextChanged="OnDataContextChanged"
Loaded="OnLoaded"
Expand Down Expand Up @@ -460,15 +460,25 @@
Icon="User" />
</GroupBox.Header>

<controls:TransformEditor Value="{Binding Actor.ModelObject.Transform}">
<controls:TransformEditor.CanTranslate>
<MultiBinding Converter="{StaticResource AnyBoolIsFalseToBool}">
<Binding Path="Actor.IsMotionEnabled"/>
<Binding Path="PoseService.WorldPositionNotFrozen"/>
<Binding Path="GposeService.IsGpose"/>
</MultiBinding>
</controls:TransformEditor.CanTranslate>
</controls:TransformEditor>
<Grid>
<controls:TransformEditor ActorTransform="{Binding Actor.ModelObject.Transform}" IsEnabled="{Binding GposeService.IsGpose}">
<controls:TransformEditor.CanTranslateOverride>
<MultiBinding Converter="{StaticResource MultiBoolOr}">
<Binding Path="Actor.IsMotionDisabled"/>
<Binding Path="PoseService.FreezeWorldPosition"/>
</MultiBinding>
</controls:TransformEditor.CanTranslateOverride>
</controls:TransformEditor>

<XivToolsWpf:InfoControl Key="Pose_WarningNotFrozen" Margin="0,0,0,45">
<XivToolsWpf:InfoControl.Visibility>
<MultiBinding Converter="{StaticResource MultiBoolAndToVisibility}">
<Binding Path="Actor.IsMotionEnabled"/>
<Binding Path="PoseService.WorldPositionNotFrozen"/>
</MultiBinding>
</XivToolsWpf:InfoControl.Visibility>
</XivToolsWpf:InfoControl>
</Grid>
</GroupBox>
</Grid>
</Grid>
Expand Down
4 changes: 2 additions & 2 deletions Anamnesis/Actor/Pages/ActionPage.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ private void OnResumeAll()

AnimationService.Instance.SpeedControlEnabled = true;

foreach (var target in TargetService.Instance.PinnedActors)
foreach (var target in TargetService.Instance.PinnedActors.ToList())
{
if (target.IsValid && target.Memory != null && target.Memory.IsValid)
{
Expand All @@ -199,7 +199,7 @@ private void OnPauseAll()

AnimationService.Instance.SpeedControlEnabled = true;

foreach (var target in TargetService.Instance.PinnedActors)
foreach (var target in TargetService.Instance.PinnedActors.ToList())
{
if (target.IsValid && target.Memory != null && target.Memory.IsValid)
{
Expand Down
96 changes: 34 additions & 62 deletions Anamnesis/Actor/Pages/PosePage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,17 @@
x:Class="Anamnesis.Actor.Pages.PosePage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ana="clr-namespace:Anamnesis.Styles.Controls"
xmlns:anaUtils="clr-namespace:Anamnesis"
xmlns:controls="clr-namespace:Anamnesis.Actor.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:fa="http://schemas.awesome.incremented/wpf/xaml/fontawesome.sharp"
xmlns:local="clr-namespace:Anamnesis.Actor"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:views="clr-namespace:Anamnesis.Actor.Views"
xmlns:XivToolsWpf="clr-namespace:XivToolsWpf.Controls;assembly=XivToolsWpf"
xmlns:views1="clr-namespace:Anamnesis.Actor.Views"
d:DesignHeight="512"
d:DesignWidth="1024"
DataContextChanged="OnDataContextChanged"
Loaded="OnLoaded"
Unloaded="OnUnloaded"
mc:Ignorable="d">

<Grid x:Name="ContentArea">
Expand Down Expand Up @@ -57,26 +53,32 @@
<Grid Grid.Row="0" Grid.ColumnSpan="2" Margin="8, 4, 6, 3">

<TextBox
Text="{Binding Skeleton.CurrentBone.Tooltip, UpdateSourceTrigger=PropertyChanged}"
Text="{Binding SelectedBonesText}"
Margin="0"
Padding="1"
FontSize="10"
FontWeight="Bold"
BorderBrush="Transparent"
Visibility="{Binding Skeleton.CurrentBone, Converter={StaticResource NotNullToVisibilityConverter}}"
Style="{StaticResource MaterialDesignTextBox}"/>
Visibility="{Binding Skeleton.SelectedBones, Converter={StaticResource NotEmptyToVisibilityConverter}}"
IsReadOnly="{Binding IsMultipleBonesSelected}"
Style="{StaticResource MaterialDesignTextBox}">
<TextBox.ToolTip>
<XivToolsWpf:TextBlock Text="{Binding SelectedBonesTooltip, UpdateSourceTrigger=PropertyChanged}" />
</TextBox.ToolTip>
</TextBox>

<XivToolsWpf:TextBlock Style="{StaticResource Header}"
Text="{Binding Skeleton.CurrentBone.BoneName}"
Text="{Binding SelectedBoneName, UpdateSourceTrigger=PropertyChanged}"
HorizontalAlignment="Right"
FontSize="10"
VerticalAlignment="Top"/>
VerticalAlignment="Top"
Visibility="{Binding IsSingleBoneSelected, Converter={StaticResource B2V}}"/>

<XivToolsWpf:TextBlock
Key="Pose_NothingSelected"
HorizontalAlignment="Left"
Style="{StaticResource Header}"
Visibility="{Binding Skeleton.CurrentBone, Converter={StaticResource NullToVisibilityConverter}}" />
Visibility="{Binding Skeleton.SelectedBones, Converter={StaticResource IsEmptyToVisibilityConverter}}" />
</Grid>


Expand All @@ -89,24 +91,24 @@
Height="22"
MinWidth="32"
Style="{StaticResource TransparentIconToggleButton}"
IsEnabled="{Binding Skeleton.CurrentBone.LinkedBonesCount, Converter={StaticResource NotZeroToBool}, FallbackValue=False}"
IsChecked="{Binding Skeleton.CurrentBone.EnableLinkedBones}">
IsEnabled="{Binding Skeleton.SelectedLinkedCount, Mode=OneWay, Converter={StaticResource NotZeroToBool}, FallbackValue=False}"
IsChecked="{Binding Skeleton.SelectedEnableLinkedBones, Mode=OneWay}">
<StackPanel Orientation="Horizontal">
<XivToolsWpf:IconBlock Icon="Link" FontSize="11"/>
<XivToolsWpf:TextBlock Text="{Binding Skeleton.CurrentBone.LinkedBonesCount, FallbackValue=0}" Margin="4, 0, 0, 0"/>
<XivToolsWpf:TextBlock Text="{Binding Skeleton.SelectedLinkedCount, Mode=OneWay, FallbackValue=0}" Margin="4, 0, 0, 0"/>
</StackPanel>

<ToggleButton.ToolTip>
<StackPanel Orientation="Vertical" Width="256">
<XivToolsWpf:TextBlock Key="Pose_Linked" FontWeight="Bold"/>
<ItemsControl ItemsSource="{Binding Skeleton.CurrentBone.LinkedBones}"

<ItemsControl ItemsSource="{Binding Skeleton.SelectedLinkedBones, Mode=OneWay}"
Margin="10, 0, 0, 0">
<ItemsControl.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<XivToolsWpf:TextBlock Key="{Binding TooltipKey}"/>
<XivToolsWpf:TextBlock Text="{Binding BoneName, StringFormat=( {0:D} )}"
<XivToolsWpf:TextBlock Text="{Binding Name, StringFormat=( {0:D} )}"
Margin="6, 0, 0, 0"/>
</StackPanel>
</DataTemplate>
Expand All @@ -124,7 +126,7 @@
Padding="6,3"
Click="OnParentClicked"
Style="{StaticResource TransparentIconButton}"
IsEnabled="{Binding Skeleton.CurrentBone.Parent, Converter={StaticResource NotNullToBoolConverter}}"
IsEnabled="{Binding Skeleton.SelectedBonesParents, Mode=OneWay, Converter={StaticResource NotEmptyToVisibilityConverter}}"
anaUtils:Behaviours.Tooltip="Pose_SelectParent">
<XivToolsWpf:IconBlock Icon="ArrowCircleUp" />

Expand All @@ -151,59 +153,29 @@
</WrapPanel>


<!-- bone transform -->
<controls:TransformEditor
Grid.Row="2"
Grid.ColumnSpan="2"
IsEnabled="{Binding Skeleton.CanEditBone}"
Visibility="{Binding Skeleton.CurrentBone, Converter={StaticResource NotNullToVisibilityConverter}}"
Value="{Binding Skeleton.CurrentBone}" />


<Grid
Grid.Row="2"
Grid.ColumnSpan="2"
Visibility="{Binding Skeleton.CurrentBone, Converter={StaticResource NullToVisibilityConverter}}">

<Grid Visibility="{Binding GposeService.IsGpose, Converter={StaticResource B2V}}">
<controls:TransformEditor Value="{Binding TargetService.SelectedActor.ModelObject.Transform}">
<controls:TransformEditor.CanTranslate>
<MultiBinding Converter="{StaticResource AnyBoolIsFalseToBool}">
<Binding Path="TargetService.SelectedActor.IsMotionEnabled"/>
<Binding Path="PoseService.WorldPositionNotFrozen"/>
</MultiBinding>
</controls:TransformEditor.CanTranslate>
</controls:TransformEditor>

<XivToolsWpf:InfoControl
Key="Pose_WarningNotFrozen"
Margin="0,0,0,45">

<XivToolsWpf:InfoControl.Visibility>
<MultiBinding Converter="{StaticResource MultiBoolAndToVisibility}">
<Binding Path="TargetService.SelectedActor.IsMotionEnabled"/>
<Binding Path="PoseService.WorldPositionNotFrozen"/>
</MultiBinding>
</XivToolsWpf:InfoControl.Visibility>
</XivToolsWpf:InfoControl>
</Grid>

<!-- Actor transform -->
<Grid Visibility="{Binding GposeService.IsGpose, Converter={StaticResource !B2V}}">
<controls:TransformEditor Value="{Binding TargetService.SelectedActor.ModelObject.Transform}"/>
</Grid>
<!-- Transform editor -->
<Grid Grid.Row="2" Grid.ColumnSpan="2" IsEnabled="{Binding GposeService.IsGpose, Converter={StaticResource B2V}}">
<controls:TransformEditor Skeleton="{Binding Skeleton, Mode=OneWay}"/>

<XivToolsWpf:InfoControl Key="Pose_WarningNotFrozen" Margin="0,0,0,45">
<XivToolsWpf:InfoControl.Visibility>
<MultiBinding Converter="{StaticResource MultiBoolAndToVisibility}">
<Binding Path="TargetService.SelectedActor.IsMotionEnabled"/>
<Binding Path="PoseService.WorldPositionNotFrozen"/>
</MultiBinding>
</XivToolsWpf:InfoControl.Visibility>
</XivToolsWpf:InfoControl>
</Grid>
</Grid>
</Border>

<!-- save/load menu -->
<!-- Save/load menu -->
<Menu Grid.Row="1" Margin="2, 2, 0, 4" IsEnabled="{Binding GposeService.IsGpose}" Style="{StaticResource AnaMenu}">

<MenuItem Header="Common_ImportFile"
Icon="FileImport"
Style="{StaticResource ButtonMenuItemLeft}"
Width="76"
Width="74"
Click="OnImportClicked">

<MenuItem.ToolTip>
Expand Down Expand Up @@ -294,7 +266,7 @@
<MenuItem Header="Common_ExportFile"
Icon="FileExport"
Style="{StaticResource ButtonMenuItemLeft}"
Width="76"
Width="74"
Click="OnExportClicked"/>

<MenuItem Style="{StaticResource ButtonMenuItemRight}">
Expand Down
Loading

0 comments on commit 3c1405e

Please sign in to comment.