Fix init when pasting in a programmable block
All checks were successful
Build / Compute Version (push) Successful in 6s
Build / Build Nuget package (CringeBootstrap.Abstractions) (push) Successful in 1m30s
Build / Build Nuget package (SharedCringe) (push) Successful in 1m45s
Build / Build Nuget package (NuGet) (push) Successful in 1m47s
Build / Build Nuget package (CringePlugins) (push) Successful in 1m58s
Build / Build Launcher (push) Successful in 2m24s
All checks were successful
Build / Compute Version (push) Successful in 6s
Build / Build Nuget package (CringeBootstrap.Abstractions) (push) Successful in 1m30s
Build / Build Nuget package (SharedCringe) (push) Successful in 1m45s
Build / Build Nuget package (NuGet) (push) Successful in 1m47s
Build / Build Nuget package (CringePlugins) (push) Successful in 1m58s
Build / Build Launcher (push) Successful in 2m24s
Improvements for imgui input handling
This commit is contained in:
@@ -10,6 +10,7 @@ using CringePlugins.Render;
|
|||||||
using ImGuiNET;
|
using ImGuiNET;
|
||||||
using SharpDX.Direct3D11;
|
using SharpDX.Direct3D11;
|
||||||
using static ImGuiNET.ImGui;
|
using static ImGuiNET.ImGui;
|
||||||
|
using VRage;
|
||||||
|
|
||||||
namespace CringeLauncher;
|
namespace CringeLauncher;
|
||||||
|
|
||||||
@@ -91,6 +92,10 @@ internal class ImGuiHandler : IDisposable
|
|||||||
[UnmanagedCallersOnly(CallConvs = [typeof(CallConvStdcall)])]
|
[UnmanagedCallersOnly(CallConvs = [typeof(CallConvStdcall)])]
|
||||||
private static unsafe int WndProcHook(HWND hWnd, int msg, nint wParam, nint lParam)
|
private static unsafe int WndProcHook(HWND hWnd, int msg, nint wParam, nint lParam)
|
||||||
{
|
{
|
||||||
|
//ignore input if mouse is hidden
|
||||||
|
if (MyVRage.Platform?.Input?.ShowCursor == false && Instance?.DrawMouse != true)
|
||||||
|
return CallWindowProc(_wndproc, hWnd, msg, wParam, lParam);
|
||||||
|
|
||||||
var hookResult = ImGui_ImplWin32_WndProcHandler(hWnd, msg, wParam, lParam);
|
var hookResult = ImGui_ImplWin32_WndProcHandler(hWnd, msg, wParam, lParam);
|
||||||
|
|
||||||
if (hookResult != 0)
|
if (hookResult != 0)
|
||||||
@@ -101,16 +106,12 @@ internal class ImGuiHandler : IDisposable
|
|||||||
if (!_init)
|
if (!_init)
|
||||||
return CallWindowProc(_wndproc, hWnd, msg, wParam, lParam);
|
return CallWindowProc(_wndproc, hWnd, msg, wParam, lParam);
|
||||||
|
|
||||||
//todo: block GetKeyStatesAsync or something related, find mouse input code in sharpDx
|
|
||||||
var blockMessage = (msg is >= 256 and <= 265 && io.WantTextInput)
|
var blockMessage = (msg is >= 256 and <= 265 && io.WantTextInput)
|
||||||
|| (msg is >= 512 and <= 526 && io.WantCaptureMouse);
|
|| (msg is >= 512 and <= 526 && io.WantCaptureMouse);
|
||||||
|
|
||||||
/*if (!blockMessage)
|
|
||||||
Console.WriteLine($"{msg} - M:{io.WantCaptureMouse}, K:{io.WantTextInput}");*/
|
|
||||||
|
|
||||||
return blockMessage ? hookResult : CallWindowProc(_wndproc, hWnd, msg, wParam, lParam);
|
return blockMessage ? hookResult : CallWindowProc(_wndproc, hWnd, msg, wParam, lParam);
|
||||||
}
|
}
|
||||||
|
|
||||||
[DllImport("USER32.dll", ExactSpelling = true, EntryPoint = "CallWindowProcW")]
|
[DllImport("USER32.dll", ExactSpelling = true, EntryPoint = "CallWindowProcW")]
|
||||||
[DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
|
[DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
|
||||||
[SupportedOSPlatform("windows5.0")]
|
[SupportedOSPlatform("windows5.0")]
|
||||||
|
@@ -1,23 +1,28 @@
|
|||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
|
using Sandbox.Graphics;
|
||||||
using VRage;
|
using VRage;
|
||||||
using VRage.Input;
|
using VRage.Input;
|
||||||
using VRage.Input.Keyboard;
|
using VRage.Input.Keyboard;
|
||||||
using VRage.Platform.Windows.Input;
|
using VRage.Platform.Windows.Input;
|
||||||
|
using VRageMath;
|
||||||
|
|
||||||
namespace CringeLauncher.Patches;
|
namespace CringeLauncher.Patches;
|
||||||
|
|
||||||
[HarmonyPatch]
|
[HarmonyPatch]
|
||||||
internal static class InputPatch
|
internal static class InputPatch
|
||||||
{
|
{
|
||||||
[HarmonyPrefix, HarmonyPatch(typeof(MyDirectInput), nameof(MyDirectInput.GetMouseState))]
|
[HarmonyPostfix, HarmonyPatch(typeof(MyDirectInput), nameof(MyDirectInput.GetMouseState))]
|
||||||
private static bool GetMouseStatePrefix(ref MyMouseState state)
|
private static void GetMouseStatePostfix(ref MyMouseState state)
|
||||||
{
|
{
|
||||||
if (ImGuiHandler.Instance?.BlockMouse == true && (MyVRage.Platform.Input.ShowCursor || ImGuiHandler.Instance.DrawMouse))
|
if (ImGuiHandler.Instance?.BlockMouse == true && (MyVRage.Platform.Input.ShowCursor || ImGuiHandler.Instance.DrawMouse))
|
||||||
{
|
{
|
||||||
state = default;
|
state.LeftButton = false;
|
||||||
return false;
|
state.RightButton = false;
|
||||||
|
state.MiddleButton = false;
|
||||||
|
state.XButton1 = false;
|
||||||
|
state.XButton2 = false;
|
||||||
|
state.ScrollWheelValue = 0;
|
||||||
}
|
}
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[HarmonyPrefix, HarmonyPatch(typeof(MyGuiLocalizedKeyboardState), nameof(MyGuiLocalizedKeyboardState.GetCurrentState))]
|
[HarmonyPrefix, HarmonyPatch(typeof(MyGuiLocalizedKeyboardState), nameof(MyGuiLocalizedKeyboardState.GetCurrentState))]
|
||||||
@@ -30,4 +35,15 @@ internal static class InputPatch
|
|||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[HarmonyPrefix, HarmonyPatch(typeof(MyGuiManager), nameof(MyGuiManager.MouseCursorPosition), MethodType.Getter)]
|
||||||
|
private static bool GetMouseCursorPositionPrefix(ref Vector2 __result)
|
||||||
|
{
|
||||||
|
if (ImGuiHandler.Instance?.BlockMouse == true && (MyVRage.Platform.Input.ShowCursor || ImGuiHandler.Instance.DrawMouse))
|
||||||
|
{
|
||||||
|
__result = Vector2.Zero;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -21,6 +21,7 @@ using System.Runtime.CompilerServices;
|
|||||||
using System.Runtime.Loader;
|
using System.Runtime.Loader;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using VRage;
|
using VRage;
|
||||||
|
using VRage.Collections;
|
||||||
using VRage.ModAPI;
|
using VRage.ModAPI;
|
||||||
using VRage.Scripting;
|
using VRage.Scripting;
|
||||||
using Message = VRage.Scripting.Message;
|
using Message = VRage.Scripting.Message;
|
||||||
@@ -30,6 +31,8 @@ namespace CringeLauncher.Patches;
|
|||||||
[HarmonyPatch]
|
[HarmonyPatch]
|
||||||
public static class ModScriptCompilerPatch
|
public static class ModScriptCompilerPatch
|
||||||
{
|
{
|
||||||
|
internal static readonly MyConcurrentHashSet<MyProgrammableBlock> CompilingPbs = [];
|
||||||
|
|
||||||
private static readonly Logger Log = LogManager.GetCurrentClassLogger();
|
private static readonly Logger Log = LogManager.GetCurrentClassLogger();
|
||||||
private static ModAssemblyLoadContext _modContext;
|
private static ModAssemblyLoadContext _modContext;
|
||||||
private static readonly HashSet<string> LoadedModAssemblyNames = [];
|
private static readonly HashSet<string> LoadedModAssemblyNames = [];
|
||||||
@@ -87,7 +90,7 @@ public static class ModScriptCompilerPatch
|
|||||||
ref MyProgrammableBlock.ScriptTerminationReason ___m_terminationReason,
|
ref MyProgrammableBlock.ScriptTerminationReason ___m_terminationReason,
|
||||||
MyIngameScriptComponent ___m_scriptComponent)
|
MyIngameScriptComponent ___m_scriptComponent)
|
||||||
{
|
{
|
||||||
if (!MySession.Static.EnableIngameScripts || __instance.CubeGrid is { IsPreview: true } or { CreatePhysics: false })
|
if (!MySession.Static.EnableIngameScripts || __instance.CubeGrid is { IsPreview: true } or { CreatePhysics: false } || !CompilingPbs.Add(__instance))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
___m_terminationReason = MyProgrammableBlock.ScriptTerminationReason.None;
|
___m_terminationReason = MyProgrammableBlock.ScriptTerminationReason.None;
|
||||||
@@ -164,13 +167,13 @@ public static class ModScriptCompilerPatch
|
|||||||
string storage,
|
string storage,
|
||||||
bool instantiate, MyIngameScriptComponent scriptComponent)
|
bool instantiate, MyIngameScriptComponent scriptComponent)
|
||||||
{
|
{
|
||||||
scriptComponent.NeedsUpdate = MyEntityUpdateEnum.NONE;
|
|
||||||
scriptComponent.UpdateFrequency = UpdateFrequency.None;
|
|
||||||
|
|
||||||
SetDetailedInfoMethod.Invoke(block, ["Compiling..."]);
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
scriptComponent.NeedsUpdate = MyEntityUpdateEnum.NONE;
|
||||||
|
scriptComponent.UpdateFrequency = UpdateFrequency.None;
|
||||||
|
|
||||||
|
SetDetailedInfoMethod.Invoke(block, ["Compiling..."]);
|
||||||
|
|
||||||
if (LoadContexts.TryGetValue(block, out var context))
|
if (LoadContexts.TryGetValue(block, out var context))
|
||||||
{
|
{
|
||||||
AccessTools.FieldRefAccess<MyProgrammableBlock, IMyGridProgram?>(block, InstanceField) = null;
|
AccessTools.FieldRefAccess<MyProgrammableBlock, IMyGridProgram?>(block, InstanceField) = null;
|
||||||
@@ -203,6 +206,10 @@ public static class ModScriptCompilerPatch
|
|||||||
SetDetailedInfoMethod.Invoke(block, [e.ToString()]);
|
SetDetailedInfoMethod.Invoke(block, [e.ToString()]);
|
||||||
Log.Error(e);
|
Log.Error(e);
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
CompilingPbs.Remove(block);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static async Task<Assembly?> CompileAsync(AssemblyLoadContext context, MyApiTarget target,
|
private static async Task<Assembly?> CompileAsync(AssemblyLoadContext context, MyApiTarget target,
|
||||||
|
36
CringeLauncher/Patches/PbInstantiatePatch.cs
Normal file
36
CringeLauncher/Patches/PbInstantiatePatch.cs
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
using HarmonyLib;
|
||||||
|
using Sandbox.Game.Entities.Blocks;
|
||||||
|
using System.Reflection.Emit;
|
||||||
|
|
||||||
|
namespace CringeLauncher.Patches;
|
||||||
|
|
||||||
|
[HarmonyPatch(typeof(MyProgrammableBlock), "UpdateBeforeSimulation")]
|
||||||
|
internal static class PbInstantiatePatch
|
||||||
|
{
|
||||||
|
[HarmonyTranspiler]
|
||||||
|
public static List<CodeInstruction> UpdateBeforeSimulationTranspiler(IEnumerable<CodeInstruction> instructions)
|
||||||
|
{
|
||||||
|
var list = instructions.ToList();
|
||||||
|
|
||||||
|
var index = list.FindIndex(b => b.opcode == OpCodes.Brfalse);
|
||||||
|
|
||||||
|
//get second brfase
|
||||||
|
index = list.FindIndex(index, b => b.opcode == OpCodes.Brfalse);
|
||||||
|
|
||||||
|
var jump = new CodeInstruction(list[index])
|
||||||
|
{
|
||||||
|
opcode = OpCodes.Brtrue
|
||||||
|
};
|
||||||
|
|
||||||
|
index++;
|
||||||
|
|
||||||
|
list.Insert(index++, new CodeInstruction(OpCodes.Ldarg_0));
|
||||||
|
list.Insert(index++, CodeInstruction.CallClosure(PveMethod));
|
||||||
|
list.Insert(index, jump);
|
||||||
|
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
|
//IMPORTANT: if you reference CompilingPbs in the transpiler, ModScriptCompilerPatch will cause static init of MyScriptWhitelist, crashing the game
|
||||||
|
private static bool PveMethod(MyProgrammableBlock block) => ModScriptCompilerPatch.CompilingPbs.Contains(block);
|
||||||
|
}
|
Reference in New Issue
Block a user