Skip to content

Add Campaign Animation Set editor #384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
donkeyProgramming merged 1 commit into from
Aug 9, 2026
Merged

Add Campaign Animation Set editor #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions AssetEditor.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.CampaignAnimationCreat
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.CoreLog", "Shared\Logging\Shared.Core.Logging\Shared.CoreLog.csproj", "{C79EDB14-ED00-4474-B59F-9EED0AF39459}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CampaignAnimationSetEditor", "CampaignAnimationSetEditor", "{AA14F125-E7D2-8CBC-FC94-A1A6F78D9FAF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Editors.CampaignAnimationSetEditor", "Editors\CampaignAnimationSetEditor\Editors.CampaignAnimationSetEditor\Editors.CampaignAnimationSetEditor.csproj", "{417FAB39-3269-4D1C-981B-DD9965E1B26C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.CampaignAnimationSetEditor", "Editors\CampaignAnimationSetEditor\Test.CampaignAnimationSetEditor\Test.CampaignAnimationSetEditor.csproj", "{32582784-3E26-44C1-9375-ECE044B4CB4A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -648,6 +654,30 @@ Global
{C79EDB14-ED00-4474-B59F-9EED0AF39459}.Release|x64.Build.0 = Release|Any CPU
{C79EDB14-ED00-4474-B59F-9EED0AF39459}.Release|x86.ActiveCfg = Release|Any CPU
{C79EDB14-ED00-4474-B59F-9EED0AF39459}.Release|x86.Build.0 = Release|Any CPU
{417FAB39-3269-4D1C-981B-DD9965E1B26C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{417FAB39-3269-4D1C-981B-DD9965E1B26C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{417FAB39-3269-4D1C-981B-DD9965E1B26C}.Debug|x64.ActiveCfg = Debug|Any CPU
{417FAB39-3269-4D1C-981B-DD9965E1B26C}.Debug|x64.Build.0 = Debug|Any CPU
{417FAB39-3269-4D1C-981B-DD9965E1B26C}.Debug|x86.ActiveCfg = Debug|Any CPU
{417FAB39-3269-4D1C-981B-DD9965E1B26C}.Debug|x86.Build.0 = Debug|Any CPU
{417FAB39-3269-4D1C-981B-DD9965E1B26C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{417FAB39-3269-4D1C-981B-DD9965E1B26C}.Release|Any CPU.Build.0 = Release|Any CPU
{417FAB39-3269-4D1C-981B-DD9965E1B26C}.Release|x64.ActiveCfg = Release|Any CPU
{417FAB39-3269-4D1C-981B-DD9965E1B26C}.Release|x64.Build.0 = Release|Any CPU
{417FAB39-3269-4D1C-981B-DD9965E1B26C}.Release|x86.ActiveCfg = Release|Any CPU
{417FAB39-3269-4D1C-981B-DD9965E1B26C}.Release|x86.Build.0 = Release|Any CPU
{32582784-3E26-44C1-9375-ECE044B4CB4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{32582784-3E26-44C1-9375-ECE044B4CB4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{32582784-3E26-44C1-9375-ECE044B4CB4A}.Debug|x64.ActiveCfg = Debug|Any CPU
{32582784-3E26-44C1-9375-ECE044B4CB4A}.Debug|x64.Build.0 = Debug|Any CPU
{32582784-3E26-44C1-9375-ECE044B4CB4A}.Debug|x86.ActiveCfg = Debug|Any CPU
{32582784-3E26-44C1-9375-ECE044B4CB4A}.Debug|x86.Build.0 = Debug|Any CPU
{32582784-3E26-44C1-9375-ECE044B4CB4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{32582784-3E26-44C1-9375-ECE044B4CB4A}.Release|Any CPU.Build.0 = Release|Any CPU
{32582784-3E26-44C1-9375-ECE044B4CB4A}.Release|x64.ActiveCfg = Release|Any CPU
{32582784-3E26-44C1-9375-ECE044B4CB4A}.Release|x64.Build.0 = Release|Any CPU
{32582784-3E26-44C1-9375-ECE044B4CB4A}.Release|x86.ActiveCfg = Release|Any CPU
{32582784-3E26-44C1-9375-ECE044B4CB4A}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -710,6 +740,9 @@ Global
{438E6F1B-F5A9-49F3-8516-CB5E9D316C81} = {ED432A81-F5C7-0469-2ED7-3AF47D036060}
{91617891-AD16-423F-B56F-AC0D2CE82B95} = {ED432A81-F5C7-0469-2ED7-3AF47D036060}
{C79EDB14-ED00-4474-B59F-9EED0AF39459} = {58F19D12-FE6E-A99A-941B-96C21567964E}
{AA14F125-E7D2-8CBC-FC94-A1A6F78D9FAF} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
{417FAB39-3269-4D1C-981B-DD9965E1B26C} = {AA14F125-E7D2-8CBC-FC94-A1A6F78D9FAF}
{32582784-3E26-44C1-9375-ECE044B4CB4A} = {AA14F125-E7D2-8CBC-FC94-A1A6F78D9FAF}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {AB5968F3-98ED-4AFF-98EA-0DBEDCACADF2}
Expand Down
1 change: 1 addition & 0 deletions AssetEditor/AssetEditor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<ProjectReference Include="..\Editors\TwuiEditor\Editor.Twui\Editors.Twui.csproj" />
<ProjectReference Include="..\Editors\BmdEditor\Editors.BmdEditor.csproj" />
<ProjectReference Include="..\Editors\CscEditor\Editors.CscEditor\Editors.CscEditor.csproj" />
<ProjectReference Include="..\Editors\CampaignAnimationSetEditor\Editors.CampaignAnimationSetEditor\Editors.CampaignAnimationSetEditor.csproj" />
<ProjectReference Include="..\GameWorld\GameWorldCore\GameWorld.Core\GameWorld.Core.csproj" />
<ProjectReference Include="..\Shared\EmbeddedResources\Shared.EmbeddedResources.csproj" />
<ProjectReference Include="..\Shared\SharedUI\Shared.Ui\Shared.Ui.csproj" />
Expand Down
1 change: 1 addition & 0 deletions AssetEditor/Services/DependencyInjectionConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public DependencyInjectionConfig(bool loadResources = true)
new Editors.Ipc.DependencyInjectionContainer(),
new Editors.BmdEditor.DependencyInjectionContainer(),
new Editors.CscEditor.DependencyInjectionContainer(),
new Editors.CampaignAnimationSetEditor.DependencyInjectionContainer(),

// Host application
new DependencyInjectionContainer(),
Expand Down
2 changes: 1 addition & 1 deletion AssetEditor/Themes/Controls.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3587,7 +3587,7 @@
</Style>

<Style TargetType="{x:Type DataGridCell}">
<Setter Property="Foreground" Value="{DynamicResource DataGrid.CellItem.Static.Background}"/>
<Setter Property="Foreground" Value="{DynamicResource ABrush.Foreground.Static}"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="Transparent"/>
<Setter Property="BorderThickness" Value="0"/>
Expand Down
78 changes: 0 additions & 78 deletions ...entEditor/Editor.AnimationFragmentEditor/CampaignAnimBin/CampaignAnimBinToXmlConverter.cs
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions ...rs/AnimationFragmentEditor/Editor.AnimationFragmentEditor/DependencyInjectionContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using CommonControls.Editors.TextEditor;
using Editors.AnimationFragmentEditor.AnimationFilePreviewEditor;
using Editors.AnimationFragmentEditor.AnimationPack.Commands;
using Editors.AnimationFragmentEditor.CampaignAnimBin;
using Microsoft.Extensions.DependencyInjection;
using Shared.Core.DependencyInjection;
using Shared.Core.DevConfig;
Expand All @@ -27,7 +26,6 @@ public override void Register(IServiceCollection services)
services.AddTransient<RenameSelectedFileCommand>();

RegisterAnimPack(services);
RegisterCampaignAnimBin(services);
RegisterAnimFileViewer(services);
RegisterBatchConverter(services);

Expand All @@ -41,12 +39,6 @@ public override void RegisterTools(IEditorDatabase database)
.AddExtention(".animpack", EditorPriorites.High)
.Build(database);

EditorInfoBuilder
.Create<TextEditorViewModel<CampaignAnimBinToXmlConverter>, TextEditorView>(EditorEnums.XML_CampaginBin_Edtior)
.AddExtention(".bin", EditorPriorites.High)
.ValidForFoldersContaining(@"animations\campaign\database")
.Build(database);

EditorInfoBuilder
.Create<TextEditorViewModel<AnimFileToTextConverter>, TextEditorView>(EditorEnums.XML_Anim_Editor)
.AddExtention(".anim", EditorPriorites.Default)
Expand All @@ -64,12 +56,6 @@ public override void RegisterTools(IEditorDatabase database)
.Build(database);
}

private static void RegisterCampaignAnimBin(IServiceCollection services)
{
services.AddTransient<CampaignAnimBinToXmlConverter>();
services.AddTransient<TextEditorViewModel<CampaignAnimBinToXmlConverter>>();
}

private static void RegisterAnimFileViewer(IServiceCollection services)
{
services.AddTransient<AnimFileToTextConverter>();
Expand Down
36 changes: 36 additions & 0 deletions ...aignAnimationSetEditor/Editors.CampaignAnimationSetEditor/DependencyInjectionContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using Editors.CampaignAnimationSetEditor.Services;
using Editors.CampaignAnimationSetEditor.ViewModels;
using Editors.CampaignAnimationSetEditor.Views;
using Microsoft.Extensions.DependencyInjection;
using Shared.Core.DependencyInjection;
using Shared.Core.ToolCreation;

namespace Editors.CampaignAnimationSetEditor
{
public class DependencyInjectionContainer : DependencyContainer
{
public override void Register(IServiceCollection serviceCollection)
{
// Views
serviceCollection.AddTransient<CampaignAnimationSetEditorView>();

// ViewModels
serviceCollection.AddScoped<CampaignAnimationSetEditorViewModel>();
serviceCollection.AddScoped<IEditorInterface, CampaignAnimationSetEditorViewModel>();

// Services
serviceCollection.AddTransient<FreezeRootBoneCommand>();
serviceCollection.AddTransient<CampaignAnimationSetGeneratorService>();
}

public override void RegisterTools(IEditorDatabase editorDatabase)
{
EditorInfoBuilder
.Create<CampaignAnimationSetEditorViewModel, CampaignAnimationSetEditorView>(EditorEnums.XML_CampaginBin_Edtior)
.AddExtention(".bin", EditorPriorites.High)
.ValidForFoldersContaining(@"animations\campaign\database")
.AddToToolbar("Campaign Animation Set Editor", true)
.Build(editorDatabase);
}
}
}
20 changes: 20 additions & 0 deletions ...ionSetEditor/Editors.CampaignAnimationSetEditor/Editors.CampaignAnimationSetEditor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net10.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<InternalsVisibleTo Include="Test.CampaignAnimationSetEditor" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\GameWorld\GameWorldCore\GameWorld.Core\GameWorld.Core.csproj" />
<ProjectReference Include="..\..\..\Shared\SharedCore\Shared.Core\Shared.Core.csproj" />
<ProjectReference Include="..\..\..\Shared\GameFiles\Shared.GameFormats.csproj" />
<ProjectReference Include="..\..\..\Shared\SharedUI\Shared.Ui\Shared.Ui.csproj" />
<ProjectReference Include="..\..\Shared\Editors.Shared.Core\Editors.Shared.Core.csproj" />
</ItemGroup>

</Project>
2 changes: 2 additions & 0 deletions Editors/CampaignAnimationSetEditor/Editors.CampaignAnimationSetEditor/GlobalUsings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
global using Shared.CoreLog;
global using Serilog;
Loading
Loading