Skip to content

Commit caaabcc

Browse files
donkeyProgrammingdonkeyProgramming
authored
Merge pull request #298 from donkeyProgramming/Metadata-update
Update to animationMeta tool
2 parents 59ce697 + 69d0a46 commit caaabcc

108 files changed

Lines changed: 1760 additions & 974 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AssetEditor.sln‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Editors.TextureEditor", "Ed
3535
EndProject
3636
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Editors.Audio", "Editors\Audio\Editors.Audio.csproj", "{410AC3F4-021C-4993-BCCA-1810D153075D}"
3737
EndProject
38-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Editors.AnimationMeta", "Editors\AnimationMeta\Editors.AnimationMeta.csproj", "{4FA1E72D-8764-4E6E-8C3A-B6BFE0821B5C}"
39-
EndProject
4038
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Editors.AnimationVisualEditors", "Editors\AnimationEditor\Editors.AnimationVisualEditors.csproj", "{F513A090-CC3F-4DB4-8332-50EB3FDA5A37}"
4139
EndProject
4240
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.E2EVerification", "Testing\E2EVerification\Test.E2EVerification.csproj", "{0B14A236-AAE0-4E9B-A41E-4AF9DD976BA7}"
@@ -94,6 +92,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AnimationFragmentEditor", "
9492
EndProject
9593
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Editors.AnimationFragmentEditor", "Editors\AnimationFragmentEditor\Editor.AnimationFragmentEditor\Editors.AnimationFragmentEditor.csproj", "{37C9C29E-1353-1519-BBC0-D7827A8AF636}"
9694
EndProject
95+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MetaDataEditor", "MetaDataEditor", "{3123DC8F-5FAD-45A9-8DCC-7C5E0E61FAEB}"
96+
EndProject
97+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Editors.AnimationMeta", "Editors\MetaDataEditor\AnimationMeta\Editors.AnimationMeta.csproj", "{0FCE7A0E-6478-A603-6491-6FE675F54000}"
98+
EndProject
99+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.AnimationMeta", "Editors\AnimationMeta\Test.AnimationMeta\Test.AnimationMeta.csproj", "{E759BE6D-E0A4-46B8-A02A-E8573F579E2F}"
100+
EndProject
97101
Global
98102
GlobalSection(SolutionConfigurationPlatforms) = preSolution
99103
Debug|Any CPU = Debug|Any CPU
@@ -144,10 +148,6 @@ Global
144148
{410AC3F4-021C-4993-BCCA-1810D153075D}.Debug|Any CPU.Build.0 = Debug|Any CPU
145149
{410AC3F4-021C-4993-BCCA-1810D153075D}.Release|Any CPU.ActiveCfg = Release|Any CPU
146150
{410AC3F4-021C-4993-BCCA-1810D153075D}.Release|Any CPU.Build.0 = Release|Any CPU
147-
{4FA1E72D-8764-4E6E-8C3A-B6BFE0821B5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
148-
{4FA1E72D-8764-4E6E-8C3A-B6BFE0821B5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
149-
{4FA1E72D-8764-4E6E-8C3A-B6BFE0821B5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
150-
{4FA1E72D-8764-4E6E-8C3A-B6BFE0821B5C}.Release|Any CPU.Build.0 = Release|Any CPU
151151
{F513A090-CC3F-4DB4-8332-50EB3FDA5A37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
152152
{F513A090-CC3F-4DB4-8332-50EB3FDA5A37}.Debug|Any CPU.Build.0 = Debug|Any CPU
153153
{F513A090-CC3F-4DB4-8332-50EB3FDA5A37}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -220,6 +220,14 @@ Global
220220
{37C9C29E-1353-1519-BBC0-D7827A8AF636}.Debug|Any CPU.Build.0 = Debug|Any CPU
221221
{37C9C29E-1353-1519-BBC0-D7827A8AF636}.Release|Any CPU.ActiveCfg = Release|Any CPU
222222
{37C9C29E-1353-1519-BBC0-D7827A8AF636}.Release|Any CPU.Build.0 = Release|Any CPU
223+
{0FCE7A0E-6478-A603-6491-6FE675F54000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
224+
{0FCE7A0E-6478-A603-6491-6FE675F54000}.Debug|Any CPU.Build.0 = Debug|Any CPU
225+
{0FCE7A0E-6478-A603-6491-6FE675F54000}.Release|Any CPU.ActiveCfg = Release|Any CPU
226+
{0FCE7A0E-6478-A603-6491-6FE675F54000}.Release|Any CPU.Build.0 = Release|Any CPU
227+
{E759BE6D-E0A4-46B8-A02A-E8573F579E2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
228+
{E759BE6D-E0A4-46B8-A02A-E8573F579E2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
229+
{E759BE6D-E0A4-46B8-A02A-E8573F579E2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
230+
{E759BE6D-E0A4-46B8-A02A-E8573F579E2F}.Release|Any CPU.Build.0 = Release|Any CPU
223231
EndGlobalSection
224232
GlobalSection(SolutionProperties) = preSolution
225233
HideSolutionNode = FALSE
@@ -236,7 +244,6 @@ Global
236244
{EAFBC3D8-A146-4BA3-8024-DE4E20D3C884} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
237245
{8E55B123-C8E5-4D65-AAAA-C4DC4713CB8E} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
238246
{410AC3F4-021C-4993-BCCA-1810D153075D} = {4D35FFE2-8490-4694-8981-654016F2BD3D}
239-
{4FA1E72D-8764-4E6E-8C3A-B6BFE0821B5C} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
240247
{F513A090-CC3F-4DB4-8332-50EB3FDA5A37} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
241248
{0B14A236-AAE0-4E9B-A41E-4AF9DD976BA7} = {18424B6A-CB8A-4CE1-935C-72459F31521B}
242249
{E604D1EB-02AC-4E31-9161-531F8830BFDB} = {18424B6A-CB8A-4CE1-935C-72459F31521B}
@@ -263,6 +270,9 @@ Global
263270
{328485AF-4B94-47CE-B9EF-5D267F9E3F74} = {786DB586-5DF5-4CF9-A485-A20A7BC184F7}
264271
{9859545E-76FC-4790-AF99-E1BCB1D4739D} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
265272
{37C9C29E-1353-1519-BBC0-D7827A8AF636} = {9859545E-76FC-4790-AF99-E1BCB1D4739D}
273+
{3123DC8F-5FAD-45A9-8DCC-7C5E0E61FAEB} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
274+
{0FCE7A0E-6478-A603-6491-6FE675F54000} = {3123DC8F-5FAD-45A9-8DCC-7C5E0E61FAEB}
275+
{E759BE6D-E0A4-46B8-A02A-E8573F579E2F} = {3123DC8F-5FAD-45A9-8DCC-7C5E0E61FAEB}
266276
EndGlobalSection
267277
GlobalSection(ExtensibilityGlobals) = postSolution
268278
SolutionGuid = {AB5968F3-98ED-4AFF-98EA-0DBEDCACADF2}

‎AssetEditor/AssetEditor.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<ApplicationIcon>AssetEditorIcon.ico</ApplicationIcon>
88
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
99
<EnableNETAnalyzers>true</EnableNETAnalyzers>
10+
<Nullable>enable</Nullable>
1011
</PropertyGroup>
1112
<ItemGroup>
1213
<None Remove="AssetEditorIcon.png" />
@@ -15,11 +16,11 @@
1516
<ItemGroup>
1617
<ProjectReference Include="..\Editors\AnimationEditor\Editors.AnimationVisualEditors.csproj" />
1718
<ProjectReference Include="..\Editors\AnimationFragmentEditor\Editor.AnimationFragmentEditor\Editors.AnimationFragmentEditor.csproj" />
18-
<ProjectReference Include="..\Editors\AnimationMeta\Editors.AnimationMeta.csproj" />
1919
<ProjectReference Include="..\Editors\AnimationReTarget\Editors.AnimatioReTarget\Editors.AnimatioReTarget.csproj" />
2020
<ProjectReference Include="..\Editors\Audio\Editors.Audio.csproj" />
2121
<ProjectReference Include="..\Editors\ImportExportEditor\Editors.ImportExport\Editors.ImportExport.csproj" />
2222
<ProjectReference Include="..\Editors\Kitbashing\KitbasherEditor\Editors.KitbasherEditor.csproj" />
23+
<ProjectReference Include="..\Editors\MetaDataEditor\AnimationMeta\Editors.AnimationMeta.csproj" />
2324
<ProjectReference Include="..\Editors\Reports\Editors.Reports.csproj" />
2425
<ProjectReference Include="..\Editors\SkeletonEditor\Editor.VisualSkeletonEditor\Editor.VisualSkeletonEditor.csproj" />
2526
<ProjectReference Include="..\Editors\TextureEditor\Editors.TextureEditor.csproj" />

‎AssetEditor/DependencyInjectionContainer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
using Shared.Core.DependencyInjection;
88
using Shared.Core.DevConfig;
99
using Shared.Core.ErrorHandling.Exceptions;
10+
using Shared.Core.Events.Global;
1011
using Shared.Core.ToolCreation;
11-
using Shared.Ui.Events.UiCommands;
1212

1313
namespace AssetEditor
1414
{

‎AssetEditor/ViewModels/EditorShortcutViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using CommunityToolkit.Mvvm.Input;
22
using Shared.Core.Events;
3+
using Shared.Core.Events.Global;
34
using Shared.Core.ToolCreation;
4-
using Shared.Ui.Events.UiCommands;
55

66
namespace AssetEditor.ViewModels
77
{

‎AssetEditor/ViewModels/MainViewModel.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using Shared.Ui.BaseDialogs.PackFileTree;
1414
using Shared.Ui.BaseDialogs.PackFileTree.ContextMenu;
1515
using Shared.Ui.Common;
16-
using Shared.Ui.Events.UiCommands;
1716

1817
namespace AssetEditor.ViewModels
1918
{

‎Editors/AnimationEditor/Editors.AnimationVisualEditors.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFramework>net10.0-windows</TargetFramework>
4-
<UseWPF>true</UseWPF>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
</PropertyGroup>
2+
<PropertyGroup>
3+
<TargetFramework>net10.0-windows</TargetFramework>
4+
<ImplicitUsings>enable</ImplicitUsings>
5+
<UseWPF>true</UseWPF>
6+
<Nullable>enable</Nullable>
7+
</PropertyGroup>
88

99
<ItemGroup>
1010
<ProjectReference Include="..\..\GameWorld\View3D\GameWorld.Core.csproj" />

‎Editors/AnimationEditor/MountAnimationCreator/MountAnimationCreatorViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
using Shared.Ui.Common;
1616
using MessageBox = System.Windows.Forms.MessageBox;
1717
using Clipboard = System.Windows.Clipboard;
18-
using Shared.Ui.Events.UiCommands;
1918
using Shared.Core.Events;
2019
using GameWorld.Core.Components.Selection;
2120
using GameWorld.Core.Animation;
@@ -27,6 +26,7 @@
2726
using Editors.AnimationVisualEditors.MountAnimationCreator.Services;
2827
using GameWorld.Core.Services;
2928
using Shared.Core.Services;
29+
using Shared.Core.Events.Global;
3030

3131

3232
namespace AnimationEditor.MountAnimationCreator

‎Editors/AnimationFragmentEditor/Editor.AnimationFragmentEditor/AnimationPack/AnimPackViewModel.cs‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public partial class AnimPackViewModel : NotifyPropertyChangedImpl, IEditorInter
2929
private ITextConverter? _activeConverter;
3030
private readonly ApplicationSettingsService _appSettings;
3131
private readonly IFileSaveService _packFileSaveService;
32-
private readonly MetaDataTagDeSerializer _metaDataTagDeSerializer;
32+
private readonly MetaDataFileParser _metaDataFileParser;
3333

3434
public string DisplayName { get; set; } = "Not set";
3535

@@ -40,15 +40,19 @@ public partial class AnimPackViewModel : NotifyPropertyChangedImpl, IEditorInter
4040
SimpleTextEditorViewModel _selectedItemViewModel;
4141
public SimpleTextEditorViewModel SelectedItemViewModel { get => _selectedItemViewModel; set => SetAndNotify(ref _selectedItemViewModel, value); }
4242

43-
public AnimPackViewModel(IUiCommandFactory uiCommandFactory, IPackFileService pfs, ISkeletonAnimationLookUpHelper skeletonAnimationLookUpHelper, ApplicationSettingsService appSettings, IFileSaveService packFileSaveService, MetaDataTagDeSerializer metaDataTagDeSerializer)
43+
public AnimPackViewModel(IUiCommandFactory uiCommandFactory,
44+
IPackFileService pfs,
45+
ISkeletonAnimationLookUpHelper skeletonAnimationLookUpHelper,
46+
ApplicationSettingsService appSettings,
47+
IFileSaveService packFileSaveService,
48+
MetaDataFileParser metaDataFileParser)
4449
{
4550
_uiCommandFactory = uiCommandFactory;
4651
_pfs = pfs;
4752
_skeletonAnimationLookUpHelper = skeletonAnimationLookUpHelper;
4853
_appSettings = appSettings;
4954
_packFileSaveService = packFileSaveService;
50-
_metaDataTagDeSerializer = metaDataTagDeSerializer;
51-
55+
_metaDataFileParser = metaDataFileParser;
5256
AnimationPackItems = new FilterCollection<IAnimationPackFile>(new List<IAnimationPackFile>(), OnItemSelected, BeforeItemSelected)
5357
{
5458
SearchFilter = (value, rx) => { return rx.Match(value.FileName).Success; }
@@ -83,7 +87,7 @@ void OnItemSelected(IAnimationPackFile seletedFile)
8387
else if (seletedFile is AnimationBin typedBin)
8488
_activeConverter = new AnimationBinFileToXmlConverter();
8589
else if (seletedFile is AnimationBinWh3 wh3Bin)
86-
_activeConverter = new AnimationBinWh3FileToXmlConverter(_skeletonAnimationLookUpHelper, _metaDataTagDeSerializer, CurrentFile);
90+
_activeConverter = new AnimationBinWh3FileToXmlConverter(_skeletonAnimationLookUpHelper, _metaDataFileParser, CurrentFile);
8791

8892
if (seletedFile == null || _activeConverter == null || seletedFile.IsUnknownFile)
8993
{

‎Editors/AnimationFragmentEditor/Editor.AnimationFragmentEditor/AnimationPack/Converters/AnimationBinWh3Converter/AnimationBinWh3FileToXmlConverter.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ namespace Editors.AnimationFragmentEditor.AnimationPack.Converters.AnimationBinW
1616
public class AnimationBinWh3FileToXmlConverter : XmlToBinaryConverter<XmlFormat, AnimationBinWh3>
1717
{
1818
private readonly ISkeletonAnimationLookUpHelper _skeletonAnimationLookUpHelper;
19-
private readonly MetaDataTagDeSerializer _metaDataTagDeSerializer;
19+
private readonly MetaDataFileParser _metaDataTagDeSerializer;
2020

2121
private string _animationPersistanceMetaFileName = "";
2222
private readonly Dictionary<string, uint> _animationsVersionFoundInPersistenceMeta = [];
2323

2424
private readonly PackFile _animPackToValidate;
2525

26-
public AnimationBinWh3FileToXmlConverter(ISkeletonAnimationLookUpHelper skeletonAnimationLookUpHelper, MetaDataTagDeSerializer metaDataTagDeSerializer, PackFile animPackToValidate)
26+
public AnimationBinWh3FileToXmlConverter(ISkeletonAnimationLookUpHelper skeletonAnimationLookUpHelper, MetaDataFileParser metaDataTagDeSerializer, PackFile animPackToValidate)
2727
{
2828
_skeletonAnimationLookUpHelper = skeletonAnimationLookUpHelper;
2929
_metaDataTagDeSerializer = metaDataTagDeSerializer;
@@ -286,7 +286,7 @@ private bool CheckForAnimationVersionsInMeta(string mainAnimationFile, string me
286286
return false;
287287
}
288288
var data = theFile.DataSource.ReadData();
289-
var parsed = new MetaDataFileParser().ParseFile(data, _metaDataTagDeSerializer);
289+
var parsed = _metaDataTagDeSerializer.ParseFile(data);
290290

291291
var mainAnimationHeader = GetAnimationHeader(mainAnimationFile, pfs);
292292
if (mainAnimationHeader == null)
@@ -297,7 +297,7 @@ private bool CheckForAnimationVersionsInMeta(string mainAnimationFile, string me
297297

298298
var mainAnimationVersion = mainAnimationHeader.Version;
299299

300-
var metaItems = parsed.Items;
300+
var metaItems = parsed.Attributes;
301301

302302
foreach (var item in metaItems)
303303
{

‎Editors/AnimationFragmentEditor/Editor.AnimationFragmentEditor/DevConfig/AnimPack_WH3.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
using Shared.Core.DevConfig;
22
using Shared.Core.Events;
3+
using Shared.Core.Events.Global;
34
using Shared.Core.PackFiles;
45
using Shared.Core.PackFiles.Utility;
56
using Shared.Core.Settings;
67
using Shared.Core.ToolCreation;
78
using Shared.EmbeddedResources;
8-
using Shared.Ui.Events.UiCommands;
99

1010
namespace Editors.AnimationFragmentEditor.DevConfig
1111
{

0 commit comments

Comments
 (0)