Skip to content
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

Jump to bottom

Fixes for issue #206 (BetterUndoRedo) #210

Merged
merged 3 commits into from
Apr 4, 2024
Merged

Fixes for issue #206 (BetterUndoRedo) #210

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5437bd2
WIP fixes for issue #206
gotmachine Mar 2, 2024
7d9cc09
All cases fixed
gotmachine Mar 2, 2024
da6c234
Keep calling `GameEvents.onEditorShipModified` after actions when cre…
gotmachine Mar 3, 2024
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
145 changes: 144 additions & 1 deletion KSPCommunityFixes/QoL/BetterEditorUndoRedo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// see https://github.com/KSPModdingLibs/KSPCommunityFixes/issues/172
// see https://github.com/KSPModdingLibs/KSPCommunityFixes/issues/172 for initial implementation
// and https://github.com/KSPModdingLibs/KSPCommunityFixes/pull/210 for following fixes

// In stock, undo state is captured after part events are complete, and undoing will restore that state captured before that.
// This make the user experience quite poor as undoing will loose all PAW tweaks made in between attach/detach actions.
Expand Down Expand Up @@ -26,6 +27,8 @@
using System.Reflection;
using System.Reflection.Emit;
using UnityEngine;
using EditorGizmos;
using KSP.UI.Screens;

namespace KSPCommunityFixes.QoL
{
Expand Down Expand Up @@ -63,6 +66,61 @@ protected override void ApplyPatches(List<PatchInfo> patches)
AccessTools.Method(typeof(EditorLogic), nameof(EditorLogic.SetupFSM)),
this));

// Create backup before moving a part with the rotate/offset tools, instead of after
patches.Add(new PatchInfo(
PatchMethodType.Prefix,
AccessTools.Method(typeof(GizmoOffset), nameof(GizmoOffset.OnHandleMoveStart)),
this));

patches.Add(new PatchInfo(
PatchMethodType.Prefix,
AccessTools.Method(typeof(GizmoRotate), nameof(GizmoRotate.OnHandleRotateStart)),
this));

patches.Add(new PatchInfo(
PatchMethodType.Transpiler,
AccessTools.Method(typeof(EditorLogic), nameof(EditorLogic.onRotateGizmoUpdated)),
this, nameof(CallModifiedInsteadOfBackupTranspiler)));

patches.Add(new PatchInfo(
PatchMethodType.Transpiler,
AccessTools.Method(typeof(EditorLogic), nameof(EditorLogic.onOffsetGizmoUpdated)),
this, nameof(CallModifiedInsteadOfBackupTranspiler)));

// Create backup before selecting a variant, instead of after

patches.Add(new PatchInfo(
PatchMethodType.Prefix,
AccessTools.Method(typeof(UIPartActionVariantSelector), nameof(UIPartActionVariantSelector.SelectVariant)),
this));

patches.Add(new PatchInfo(
PatchMethodType.Transpiler,
AccessTools.Method(typeof(ModulePartVariants), nameof(ModulePartVariants.onVariantChanged)),
this, nameof(CallModifiedInsteadOfBackupTranspiler)));

// Move backup creation at the begining of the following methods :

patches.Add(new PatchInfo(
PatchMethodType.Transpiler,
AccessTools.Method(typeof(Part), nameof(Part.RemoveFromSymmetry)),
this, nameof(MoveSetBackupAtStartTranspiler)));

patches.Add(new PatchInfo(
PatchMethodType.Transpiler,
AccessTools.Method(typeof(EditorActionGroups), nameof(EditorActionGroups.ResetPart), new []{typeof(EditorActionPartSelector)}),
this, nameof(MoveSetBackupAtStartTranspiler)));

patches.Add(new PatchInfo(
PatchMethodType.Transpiler,
AccessTools.Method(typeof(EditorActionGroups), nameof(EditorActionGroups.AddActionToGroup)),
this, nameof(MoveSetBackupAtStartTranspiler)));

patches.Add(new PatchInfo(
PatchMethodType.Transpiler,
AccessTools.Method(typeof(EditorActionGroups), nameof(EditorActionGroups.RemoveActionFromGroup)),
this, nameof(MoveSetBackupAtStartTranspiler)));

#if BEUR_DEBUG
patches.Add(new PatchInfo(
PatchMethodType.Postfix,
Expand Down Expand Up @@ -125,6 +183,91 @@ static void EditorLogic_SetupFSM_Postfix(EditorLogic __instance)
#endif
}

static IEnumerable<CodeInstruction> CallModifiedInsteadOfBackupTranspiler(IEnumerable<CodeInstruction> instructions)
{
foreach (CodeInstruction instruction in instructions)
{
if (instruction.Calls(m_EditorLogic_SetBackup))
instruction.operand = m_EditorShipModifiedGameEvent;

yield return instruction;
}
}

static void GizmoOffset_OnHandleMoveStart_Prefix(GizmoOffset __instance)
{
if (!HighLogic.LoadedSceneIsEditor)
return;

EditorLogic elInstance = EditorLogic.fetch;

if (elInstance.gizmoOffset.RefNotEquals(__instance))
return;

if (!elInstance.ship.Contains(elInstance.selectedPart))
return;

EditorLogicSetBackupNoShipModifiedEvent();
}

static void GizmoRotate_OnHandleRotateStart_Prefix(GizmoRotate __instance)
{
if (!HighLogic.LoadedSceneIsEditor)
return;

EditorLogic elInstance = EditorLogic.fetch;

if (elInstance.gizmoRotate.RefNotEquals(__instance))
return;

if (!elInstance.ship.Contains(elInstance.selectedPart))
return;

EditorLogicSetBackupNoShipModifiedEvent();
}

static void UIPartActionVariantSelector_SelectVariant_Prefix(UIPartActionVariantSelector __instance)
{
if (!HighLogic.LoadedSceneIsEditor)
return;

EditorLogic elInstance = EditorLogic.fetch;

if (!elInstance.ship.Contains(__instance.part))
return;

EditorLogicSetBackupNoShipModifiedEvent();
}

static IEnumerable<CodeInstruction> MoveSetBackupAtStartTranspiler(IEnumerable<CodeInstruction> instructions, ILGenerator ilGen)
{
FieldInfo f_HighLogic_LoadedSceneIsEditor = AccessTools.Field(typeof(HighLogic), nameof(HighLogic.LoadedSceneIsEditor));

Label jmp = ilGen.DefineLabel();
yield return new CodeInstruction(OpCodes.Ldsfld, f_HighLogic_LoadedSceneIsEditor);
yield return new CodeInstruction(OpCodes.Brfalse_S, jmp);
yield return new CodeInstruction(OpCodes.Call, m_EditorLogicSetBackupNoShipModifiedEvent);

bool labelAdded = false;

foreach (CodeInstruction instruction in instructions)
{
if (labelAdded == false)
{
instruction.labels.Add(jmp);
labelAdded = true;
}

if (instruction.Calls(m_EditorLogic_SetBackup))
{
instruction.opcode = OpCodes.Call;
instruction.operand = m_EditorShipModifiedGameEvent;
}

yield return instruction;
}
}

/// <summary>
/// Reimplementation of the EditorLogic.RefreshCrewAssignment() method using the live ship state
/// instead of the last serialized ship state found at ShipConstruction.ShipManifest
Expand Down
Loading