Skip to content

Fix campaginAnimationTool #340

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 3 commits into from
May 9, 2026
Merged

Fix campaginAnimationTool #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6dd154
Mostly working
donkeyProgramming May 9, 2026
89a0f66
Code
donkeyProgramming May 9, 2026
d41a981
Fixes and unit tests
donkeyProgramming May 9, 2026
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
3 changes: 2 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"chat.tools.terminal.autoApprove": {
"ForEach-Object": true,
"dotnet restore": true,
"Set-Content": true
"Set-Content": true,
"dotnet sln": true
}
}
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 @@ -118,6 +118,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bmd", "Bmd", "{1D70E263-412
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Editors.BmdEditor", "Editors\BmdEditor\Editors.BmdEditor.csproj", "{9CFEEAF2-8260-F2F5-50FB-8FDA9BD12CF9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CampaignAnimationCreator", "CampaignAnimationCreator", "{97B5B2CE-D2E8-68AD-DABB-9986A92AD539}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Editor.CampaignAnimationCreator", "Editors\CampaignAnimationCreator\Editor.CampaignAnimationCreator\Editor.CampaignAnimationCreator.csproj", "{438E6F1B-F5A9-49F3-8516-CB5E9D316C81}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.CampaignAnimationCreator", "Editors\CampaignAnimationCreator\Test.CampaignAnimationCreator\Test.CampaignAnimationCreator.csproj", "{91617891-AD16-423F-B56F-AC0D2CE82B95}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -560,6 +566,30 @@ Global
{9CFEEAF2-8260-F2F5-50FB-8FDA9BD12CF9}.Release|x64.Build.0 = Release|Any CPU
{9CFEEAF2-8260-F2F5-50FB-8FDA9BD12CF9}.Release|x86.ActiveCfg = Release|Any CPU
{9CFEEAF2-8260-F2F5-50FB-8FDA9BD12CF9}.Release|x86.Build.0 = Release|Any CPU
{438E6F1B-F5A9-49F3-8516-CB5E9D316C81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{438E6F1B-F5A9-49F3-8516-CB5E9D316C81}.Debug|Any CPU.Build.0 = Debug|Any CPU
{438E6F1B-F5A9-49F3-8516-CB5E9D316C81}.Debug|x64.ActiveCfg = Debug|Any CPU
{438E6F1B-F5A9-49F3-8516-CB5E9D316C81}.Debug|x64.Build.0 = Debug|Any CPU
{438E6F1B-F5A9-49F3-8516-CB5E9D316C81}.Debug|x86.ActiveCfg = Debug|Any CPU
{438E6F1B-F5A9-49F3-8516-CB5E9D316C81}.Debug|x86.Build.0 = Debug|Any CPU
{438E6F1B-F5A9-49F3-8516-CB5E9D316C81}.Release|Any CPU.ActiveCfg = Release|Any CPU
{438E6F1B-F5A9-49F3-8516-CB5E9D316C81}.Release|Any CPU.Build.0 = Release|Any CPU
{438E6F1B-F5A9-49F3-8516-CB5E9D316C81}.Release|x64.ActiveCfg = Release|Any CPU
{438E6F1B-F5A9-49F3-8516-CB5E9D316C81}.Release|x64.Build.0 = Release|Any CPU
{438E6F1B-F5A9-49F3-8516-CB5E9D316C81}.Release|x86.ActiveCfg = Release|Any CPU
{438E6F1B-F5A9-49F3-8516-CB5E9D316C81}.Release|x86.Build.0 = Release|Any CPU
{91617891-AD16-423F-B56F-AC0D2CE82B95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{91617891-AD16-423F-B56F-AC0D2CE82B95}.Debug|Any CPU.Build.0 = Debug|Any CPU
{91617891-AD16-423F-B56F-AC0D2CE82B95}.Debug|x64.ActiveCfg = Debug|Any CPU
{91617891-AD16-423F-B56F-AC0D2CE82B95}.Debug|x64.Build.0 = Debug|Any CPU
{91617891-AD16-423F-B56F-AC0D2CE82B95}.Debug|x86.ActiveCfg = Debug|Any CPU
{91617891-AD16-423F-B56F-AC0D2CE82B95}.Debug|x86.Build.0 = Debug|Any CPU
{91617891-AD16-423F-B56F-AC0D2CE82B95}.Release|Any CPU.ActiveCfg = Release|Any CPU
{91617891-AD16-423F-B56F-AC0D2CE82B95}.Release|Any CPU.Build.0 = Release|Any CPU
{91617891-AD16-423F-B56F-AC0D2CE82B95}.Release|x64.ActiveCfg = Release|Any CPU
{91617891-AD16-423F-B56F-AC0D2CE82B95}.Release|x64.Build.0 = Release|Any CPU
{91617891-AD16-423F-B56F-AC0D2CE82B95}.Release|x86.ActiveCfg = Release|Any CPU
{91617891-AD16-423F-B56F-AC0D2CE82B95}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -614,6 +644,9 @@ Global
{BB9F2AC1-680E-4289-B212-88744460383E} = {D84249ED-B24C-F001-6275-6713CC04DE13}
{1D70E263-4123-4F00-A6AB-A42611732697} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
{9CFEEAF2-8260-F2F5-50FB-8FDA9BD12CF9} = {1D70E263-4123-4F00-A6AB-A42611732697}
{97B5B2CE-D2E8-68AD-DABB-9986A92AD539} = {07AC615B-A8FC-4E1A-BDD5-BC11452429A0}
{438E6F1B-F5A9-49F3-8516-CB5E9D316C81} = {97B5B2CE-D2E8-68AD-DABB-9986A92AD539}
{91617891-AD16-423F-B56F-AC0D2CE82B95} = {97B5B2CE-D2E8-68AD-DABB-9986A92AD539}
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 @@ -16,6 +16,7 @@

<ItemGroup>
<ProjectReference Include="..\Editors\AnimationEditor\Editors.AnimationVisualEditors.csproj" />
<ProjectReference Include="..\Editors\CampaignAnimationCreator\Editor.CampaignAnimationCreator\Editor.CampaignAnimationCreator.csproj" />
<ProjectReference Include="..\Editors\AnimationFragmentEditor\Editor.AnimationFragmentEditor\Editors.AnimationFragmentEditor.csproj" />
<ProjectReference Include="..\Editors\AnimationReTarget\Editors.AnimatioReTarget\Editors.AnimatioReTarget.csproj" />
<ProjectReference Include="..\Editors\Audio\Editors.Audio.csproj" />
Expand Down
5 changes: 5 additions & 0 deletions AssetEditor/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@
"commandName": "Project",
"commandLineArgs": "-devcfg TwuiToolEditor",
"nativeDebugging": false
},
"AE-CampaignAnimationDamsel": {
"commandName": "Project",
"commandLineArgs": "-devcfg CampaignAnimationDamsel",
"nativeDebugging": false
}
}
}
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 @@ -30,6 +30,7 @@ public DependencyInjectionConfig(bool loadResources = true)
new Editors.Audio.DependencyInjectionContainer(),
new Editors.TextureEditor.DependencyInjectionContainer(),
new Editors.AnimationVisualEditors.DependencyInjectionContainer(),
new Editor.CampaignAnimationCreator.DependencyInjectionContainer(),
new Editors.ImportExport.DependencyInjectionContainer(),
new Editor.VisualSkeletonEditor.DependencyInjectionContainer(),
new Editors.AnimatioReTarget.DependencyInjectionContainer(),
Expand Down
116 changes: 0 additions & 116 deletions Editors/AnimationEditor/CampaignAnimationCreator/CampaignAnimationCreatorViewModel.cs
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions Editors/AnimationEditor/CampaignAnimationCreator/DevConfig/CampaignAnimation_Damsel.cs
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions Editors/AnimationEditor/CampaignAnimationCreator/EditorView.xaml
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions Editors/AnimationEditor/CampaignAnimationCreator/EditorView.xaml.cs
View file
Open in desktop

This file was deleted.

11 changes: 1 addition & 10 deletions Editors/AnimationEditor/DependencyInjectionContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using AnimationEditor.CampaignAnimationCreator;
using AnimationEditor.Common.BaseControl;
using AnimationEditor.Common.BaseControl;
using AnimationEditor.MountAnimationCreator;
using Editors.AnimationVisualEditors.AnimationKeyframeEditor;
using Editors.Shared.Core.Common.BaseControl;
Expand All @@ -14,9 +13,6 @@ public class DependencyInjectionContainer : DependencyContainer
{
public override void Register(IServiceCollection serviceCollection)
{
serviceCollection.AddScoped<EditorHost<CampaignAnimationCreatorViewModel>>();
serviceCollection.AddScoped<CampaignAnimationCreatorViewModel>();

serviceCollection.AddScoped<EditorHost<MountAnimationCreatorViewModel>>();
serviceCollection.AddScoped<MountAnimationCreatorViewModel>();

Expand All @@ -32,11 +28,6 @@ public override void RegisterTools(IEditorDatabase database)
.Create<EditorHost<MountAnimationCreatorViewModel>, EditorHostView>(EditorEnums.MountTool_Editor)
.AddToToolbar("Mount Tool", false)
.Build(database);

EditorInfoBuilder
.Create<EditorHost<CampaignAnimationCreatorViewModel>, EditorHostView>(EditorEnums.CampaginAnimation_Editor)
.AddToToolbar("Campagin Aanimation Tool", false)
.Build(database);

EditorInfoBuilder
.Create<EditorHost<AnimationKeyframeEditorViewModel>, EditorHostView>(EditorEnums.AnimationKeyFrame_Editor)
Expand Down
Loading
Loading