6 Commits
Author SHA1 Message Date
Simon Lübeß fa3f734341 Fixed benchmark 2026-10-23 23:04:24 +02:00
Simon Lübeß a7d0ef830b Allow suspension of script assembly watcher and reload after rebuild 2026-10-23 23:03:50 +02:00
Simon Lübeß 1b10e98f8c Remove debug logs 2026-10-23 23:02:31 +02:00
Simon Lübeß 4488bd7d9c Build script project from editor
- Added `ContinueWith` to BackgroundTask
- Added setting for Path to `dotnet` executable
- Added detection and check of installed .Net SDKs
2026-10-23 22:21:16 +02:00
Simon Lübeß 9c90b6bb3f ImGui extension for InputText that works on a mutable String directly 2026-10-23 22:11:38 +02:00
Simon Lübeß d392eb5ba5 ImGui extension to push GlitchyEngine color types (and scoped push) 2026-10-23 22:11:11 +02:00
19 changed files with 836 additions and 36 deletions
@@ -178,7 +178,7 @@ namespace GlitchyEditor.EditWindows
float2 buttonSize = ImGui.GetTextLineHeight().XX; float2 buttonSize = ImGui.GetTextLineHeight().XX;
ImGui.PushStyleColor(.Button, .(0, 0, 0, 0)); ImGui.PushStyleColor(.Button, ColorRGBA(0, 0, 0, 0));
if (showComponentContextMenu != null) if (showComponentContextMenu != null)
{ {
+5 -4
View File
@@ -10,6 +10,7 @@ using GlitchyEngine;
using GlitchyEditor.CodeEditors; using GlitchyEditor.CodeEditors;
using System.IO; using System.IO;
using GlitchyEditor.Settings; using GlitchyEditor.Settings;
using GlitchyEngine.Math;
namespace GlitchyEditor.EditWindows; namespace GlitchyEditor.EditWindows;
@@ -138,7 +139,7 @@ class LogWindow : EditorWindow
if (_visibleMessageTypes.HasFlag(.Trace)) if (_visibleMessageTypes.HasFlag(.Trace))
ImGui.PushStyleColor(.Button, *col); ImGui.PushStyleColor(.Button, *col);
else else
ImGui.PushStyleColor(.Button, .(0, 0, 0, 0)); ImGui.PushStyleColor(.Button, ColorRGBA(0, 0, 0, 0));
if (ImGui.ImageButtonEx(1, s_TraceIcon, buttonSize, .Zero, .Ones)) if (ImGui.ImageButtonEx(1, s_TraceIcon, buttonSize, .Zero, .Ones))
_visibleMessageTypes ^= .Trace; _visibleMessageTypes ^= .Trace;
@@ -148,7 +149,7 @@ class LogWindow : EditorWindow
if (_visibleMessageTypes.HasFlag(.Info)) if (_visibleMessageTypes.HasFlag(.Info))
ImGui.PushStyleColor(.Button, *col); ImGui.PushStyleColor(.Button, *col);
else else
ImGui.PushStyleColor(.Button, .(0, 0, 0, 0)); ImGui.PushStyleColor(.Button, ColorRGBA(0, 0, 0, 0));
if (ImGui.ImageButtonEx(2, s_InfoIcon, buttonSize, .Zero, .Ones)) if (ImGui.ImageButtonEx(2, s_InfoIcon, buttonSize, .Zero, .Ones))
_visibleMessageTypes ^= .Info; _visibleMessageTypes ^= .Info;
@@ -158,7 +159,7 @@ class LogWindow : EditorWindow
if (_visibleMessageTypes.HasFlag(.Warning)) if (_visibleMessageTypes.HasFlag(.Warning))
ImGui.PushStyleColor(.Button, *col); ImGui.PushStyleColor(.Button, *col);
else else
ImGui.PushStyleColor(.Button, .(0, 0, 0, 0)); ImGui.PushStyleColor(.Button, ColorRGBA(0, 0, 0, 0));
if (ImGui.ImageButtonEx(3, s_WarningIcon, buttonSize, .Zero, .Ones)) if (ImGui.ImageButtonEx(3, s_WarningIcon, buttonSize, .Zero, .Ones))
_visibleMessageTypes ^= .Warning; _visibleMessageTypes ^= .Warning;
@@ -168,7 +169,7 @@ class LogWindow : EditorWindow
if (_visibleMessageTypes.HasFlag(.Error)) if (_visibleMessageTypes.HasFlag(.Error))
ImGui.PushStyleColor(.Button, *col); ImGui.PushStyleColor(.Button, *col);
else else
ImGui.PushStyleColor(.Button, .(0, 0, 0, 0)); ImGui.PushStyleColor(.Button, ColorRGBA(0, 0, 0, 0));
if (ImGui.ImageButtonEx(4, s_ErrorIcon, buttonSize, .Zero, .Ones)) if (ImGui.ImageButtonEx(4, s_ErrorIcon, buttonSize, .Zero, .Ones))
+31
View File
@@ -7,6 +7,9 @@ using GlitchyEditor.EditWindows;
using GlitchyEngine; using GlitchyEngine;
using GlitchyEditor.Assets; using GlitchyEditor.Assets;
using GlitchyEditor.CodeEditors; using GlitchyEditor.CodeEditors;
using GlitchyEditor.Settings;
using GlitchyEditor.Multithreading;
using GlitchyEngine.Scripting;
namespace GlitchyEditor namespace GlitchyEditor
{ {
@@ -227,5 +230,33 @@ namespace GlitchyEditor
IdeAdapter.OpenScriptProject(); IdeAdapter.OpenScriptProject();
} }
} }
/// Rebuilds the C# scripts.
public BuildScriptsBackgroundTask BuildScripts(bool reloadAfterBuild = true)
{
ScriptEngine.SuspendAssemblyWatcher();
BuildScriptsBackgroundTask task = new .(EditorApp.Instance.Settings.ScriptSettings.DotNetExecutablePath, EditorApp.Instance.EditorLayer.CurrentProject, false){ DeleteWhenEnded = true };
task.ContinueWith(new (task) => {
ScriptEngine.ResumeAssemblyWatcher();
if (reloadAfterBuild)
{
EditorApp.Instance.InvokeOnMainThread(new () => {
ScriptEngine.ReloadAssemblies(retainScriptData: true);
return true;
});
}
});
EditorApp.Instance.BackgroundTaskManager.StartBackgroundTask(task);
return task;
}
public void ReloadScripts()
{
ScriptEngine.ReloadAssemblies(retainScriptData: true);
}
} }
} }
+39 -3
View File
@@ -820,10 +820,28 @@ namespace GlitchyEditor
append ScriptInstanceSerializer _scriptSerializer = .(); append ScriptInstanceSerializer _scriptSerializer = .();
/// Starts the play mode for the current scene /// Starts the play mode for the current scene
private void OnScenePlay(SceneState newSceneState) private void OnScenePlay(SceneState newSceneState, bool allowRebuild = true)
{ {
Debug.Profiler.ProfileFunction!(); Debug.Profiler.ProfileFunction!();
if (allowRebuild && EditorApp.Instance.Settings.ScriptSettings.RebuildOnPlay)
{
// Don't immediately reload the scripts after the build, because SetActiveScene will do that anyway.
var task = _editor.BuildScripts(reloadAfterBuild: false);
task.ContinueWith(new (t) => {
// Continuations run in worker threads, invoke play on main thread!
EditorApp.Instance.InvokeOnMainThread(new () => {
// Remember not to rebuild this time!
OnScenePlay(newSceneState, allowRebuild: false);
return true;
});
}, .RunOnFinished);
// Don't play just yet, the continuation will do that.
return;
}
Runtime.Assert(newSceneState == .Play || newSceneState == .Simulate, "newSceneState must either be Play or Simulate"); Runtime.Assert(newSceneState == .Play || newSceneState == .Simulate, "newSceneState must either be Play or Simulate");
Log.EngineLogger.AssertDebug(_scriptSerializer.SerializedObjectCount == 0, "Somehow some entities are serialized."); Log.EngineLogger.AssertDebug(_scriptSerializer.SerializedObjectCount == 0, "Somehow some entities are serialized.");
@@ -1520,8 +1538,15 @@ namespace GlitchyEditor
if(ImGui.BeginMenu("Tools", true)) if(ImGui.BeginMenu("Tools", true))
{ {
if(ImGui.MenuItem("Reload Scripts")) if(ImGui.MenuItem("Build Scripts", "Ctrl+B"))
ScriptEngine.ReloadAssemblies(retainScriptData: true); _editor.BuildScripts();
ImGui.AttachTooltip("Compiles the C# script project.");
if(ImGui.MenuItem("Reload Scripts", "Ctrl+Shift+R"))
_editor.ReloadScripts();
ImGui.AttachTooltip("Unloads and reloads the compiled scripts.");
#if GE_EDITOR_IMGUI_DEMO #if GE_EDITOR_IMGUI_DEMO
ImGui.Checkbox("Show ImGui Demo", &_showImguiDemoWindow); ImGui.Checkbox("Show ImGui Demo", &_showImguiDemoWindow);
@@ -1624,6 +1649,17 @@ namespace GlitchyEditor
// "Save Scene" // "Save Scene"
SaveCurrentScene(); SaveCurrentScene();
return true;
case .B:
// "Compile scripts"
_editor.BuildScripts();
return true;
case .R:
if (shift)
// "Compile scripts"
_editor.ReloadScripts();
return true; return true;
default: default:
} }
+66
View File
@@ -535,6 +535,35 @@ namespace ImGui
ImGui.EndTooltip(); ImGui.EndTooltip();
} }
/// Provides a text input field that allows to edit the given string directly. The string will grow as needed.
/// Returns true if the text was changed.
public static bool InputText(char8* label, String str, InputTextFlags flags = .None)
{
return ImGui.InputText(label, str.CStr(), (.)str.AllocSize, flags | .CallbackResize, => StringResizeCallback, Internal.UnsafeCastToPtr(str));
}
private static int StringResizeCallback(InputTextCallbackData* data)
{
if (data.EventFlag != .CallbackResize)
return 0;
String str = (String)Internal.UnsafeCastToObject(data.UserData);
int newLength = data.BufTextLen;
// PrepareBuffer increases the length and reserves room for the null terminator.
if (newLength > str.Length)
str.PrepareBuffer(newLength - str.Length);
else
str.Length = newLength;
// The string might have been reallocated.
data.Buf = str.Ptr;
data.BufSize = (.)str.AllocSize;
return 0;
}
[Comptime] [Comptime]
private static DataType GetDataType<T>() private static DataType GetDataType<T>()
{ {
@@ -744,6 +773,43 @@ namespace ImGui
} }
} }
public static mixin PushScopedStyleColor(ImGui.Col idx, uint32 color)
{
PushStyleColor(idx, color);
defer:mixin PopStyleColor();
}
public static mixin PushScopedStyleColor(ImGui.Col idx, Vec4 color)
{
PushStyleColor(idx, color);
defer:mixin PopStyleColor();
}
public static mixin PushScopedStyleColor(ImGui.Col idx, GlitchyEngine.Math.Color color)
{
PushStyleColor(idx, color);
defer:mixin PopStyleColor();
}
public static void PushStyleColor(ImGui.Col idx, GlitchyEngine.Math.Color color)
{
#unwarn
uint32 bitColor = *(uint32*)(void*)&color;
ImGui.PushStyleColor(.Text, bitColor);
}
public static mixin PushScopedStyleColor(ImGui.Col idx, GlitchyEngine.Math.ColorRGBA color)
{
PushStyleColor(idx, color);
defer:mixin PopStyleColor();
}
public static void PushStyleColor(ImGui.Col idx, GlitchyEngine.Math.ColorRGBA color)
{
ImGui.PushStyleColor(.Text, ((Color)color).Value);
}
public struct DisabledScope : IDisposable public struct DisabledScope : IDisposable
{ {
public this(bool disabled = true) public this(bool disabled = true)
@@ -17,6 +17,15 @@ abstract class BackgroundTask
internal BackgroundTaskManager _taskManager; internal BackgroundTaskManager _taskManager;
public delegate void Continuation(BackgroundTask);
internal append List<(TaskContinuationOptions ContinuationOptions, Continuation Continuation)> _continuations = .() ~ {
for (let entry in _)
{
delete entry.Continuation;
}
};
public enum RunState public enum RunState
{ {
Ready, Ready,
@@ -24,7 +33,8 @@ abstract class BackgroundTask
Paused, Paused,
Running, Running,
Aborted, Aborted,
Finished Finished,
Failed
} }
public enum RunResult public enum RunResult
@@ -34,9 +44,11 @@ abstract class BackgroundTask
/// The task gives up it's runtime, because it cannot continue without user intervention through the UI. /// The task gives up it's runtime, because it cannot continue without user intervention through the UI.
Pause, Pause,
/// The task finished and wont run again. /// The task finished and wont run again.
Finished, Finish,
/// The operation was aborted, the task will not run again. /// The operation was aborted, the task will not run again.
Abort Abort,
/// The task failed and wont run again.
Fail
} }
public RunState State { get; internal set; } = .Ready; public RunState State { get; internal set; } = .Ready;
@@ -46,9 +58,10 @@ abstract class BackgroundTask
public bool Blocked => State == .Blocked; public bool Blocked => State == .Blocked;
public bool Running => State == .Running; public bool Running => State == .Running;
public bool Aborted => State == .Aborted; public bool Aborted => State == .Aborted;
public bool Failed => State == .Failed;
public bool Finished => State == .Finished; public bool Finished => State == .Finished;
public bool Ended => Finished || Aborted; public bool Ended => Finished || Aborted || Failed;
public bool DeleteWhenEnded { get; set; } public bool DeleteWhenEnded { get; set; }
@@ -70,4 +83,36 @@ abstract class BackgroundTask
{ {
_taskManager.AbortTask(this); _taskManager.AbortTask(this);
} }
public enum TaskContinuationOptions
{
/// Same as Default
None = 0,
RunOnFinished = 1,
RunOnFailed = 2,
RunOnAborted = 4,
Default = RunOnFinished | RunOnFailed | RunOnAborted
}
/// Creates a continuation that executes when the target Task completes.
public void ContinueWith(Continuation ownContinuation, TaskContinuationOptions continuationOptions = .Default)
{
var continuationOptions;
if (continuationOptions == .None)
{
continuationOptions = .Default;
}
if (Ended)
{
ownContinuation(this);
}
else
{
_continuations.Add((continuationOptions, ownContinuation));
}
}
} }
@@ -9,7 +9,7 @@ class BackgroundTaskList
{ {
BackgroundTask _sentinel = new BackgroundTask() BackgroundTask _sentinel = new BackgroundTask()
{ {
public override BackgroundTask.RunResult Run() => .Finished; public override BackgroundTask.RunResult Run() => .Finish;
public override void OnRenderPopup() { } public override void OnRenderPopup() { }
_next = _, _next = _,
_previous = _, _previous = _,
@@ -59,7 +59,7 @@ class BackgroundTaskManager
if (_deferredStateChanges.TryGetValue(task, let desiredState)) if (_deferredStateChanges.TryGetValue(task, let desiredState))
{ {
// If the task already finished or aborted by itself, we don't care about the desired state, because it no longer applies. // If the task already finished or aborted by itself, we don't care about the desired state, because it no longer applies.
if (runResult != .Finished && runResult != .Abort) if (runResult != .Finish && runResult != .Abort && runResult != .Fail)
{ {
switch (desiredState) switch (desiredState)
{ {
@@ -75,6 +75,8 @@ class BackgroundTaskManager
_deferredStateChanges.Remove(task); _deferredStateChanges.Remove(task);
} }
BackgroundTask.TaskContinuationOptions endStateFlag = .None;
switch (runResult) switch (runResult)
{ {
case .Continue: case .Continue:
@@ -89,15 +91,27 @@ class BackgroundTaskManager
{ {
_waitingTasks.AddLast(task); _waitingTasks.AddLast(task);
} }
case .Finished: case .Finish:
task.State = .Finished; task.State = .Finished;
endStateFlag = .RunOnFinished;
if (task.DeleteWhenEnded)
{
delete task;
}
case .Abort: case .Abort:
task.State = .Aborted; task.State = .Aborted;
endStateFlag = .RunOnAborted;
case .Fail:
task.State = .Failed;
endStateFlag = .RunOnFailed;
}
if (task.Ended)
{
// Run the appropriate continuations
for (let (options, continuation) in task._continuations)
{
if (options.HasFlag(endStateFlag))
{
continuation(task);
}
}
if (task.DeleteWhenEnded) if (task.DeleteWhenEnded)
{ {
@@ -0,0 +1,131 @@
using GlitchyEngine;
using System.Collections;
using GlitchyEditor.CodeEditors;
using System.IO;
using System;
using System.Diagnostics;
using ImGui;
using GlitchyEditor.Multithreading;
using GlitchyEngine.Scripting;
using GlitchyEditor.Settings;
using System.Threading;
namespace GlitchyEditor.Multithreading;
class BuildScriptsBackgroundTask : BackgroundTask
{
private bool _isAborting = false;
private Project _project;
private bool _releaseBuild;
private StringView _dotnetPath;
private String _buildLog = new .() ~ delete _;
private SpawnedProcess _process ~ delete _;
public this(StringView dotnetPath, Project project, bool releaseBuild)
{
_dotnetPath = dotnetPath;
_project = project;
_releaseBuild = releaseBuild;
}
public override RunResult Run()
{
return BuildScripts();
}
public override void OnRenderPopup()
{
if (ImGui.Begin(!_isAborting ? "Compiling scripts..." : "Aborting compilation...", null, .NoDocking | .NoCollapse | .Modal | .NoResize | .AlwaysAutoResize))
{
if (ImGui.BeginChild("##BuildLog", .(550, ImGui.GetTextLineHeightWithSpacing() * 6), .None, .HorizontalScrollbar))
{
ImGui.TextUnformatted(_buildLog);
}
if (ImGui.GetScrollY() >= ImGui.GetScrollMaxY())
ImGui.SetScrollHereY(1.0f);
ImGui.EndChild();
if (ImGui.Button("Cancel"))
{
_isAborting = true;
_process.Kill();
}
ImGui.End();
}
}
private RunResult BuildScripts()
{
RunResult result;
Log.EngineLogger.Info($"Building Scripts ({(_releaseBuild ? "Release" : "Debug")})...");
String exeFile = scope .();
Environment.GetExecutableFilePath(exeFile);
String exeDirectory = scope .();
Path.GetDirectoryPath(exeFile, exeDirectory);
ProcessStartInfo processInfo = scope .();
processInfo.UseShellExecute = false;
processInfo.RedirectStandardOutput = true;
processInfo.CreateNoWindow = true;
processInfo.SetWorkingDirectory(_project.WorkspacePath);
processInfo.SetFileName(EditorApp.Instance.Settings.ScriptSettings.DotNetExecutablePath);
// -sc|--self-contained... Publish the .NET runtime with your application so the runtime doesn't need to be installed on the target machine.
// -> This might be useful to build the final game
// -o|--ouput <OUTPUT_DIRECTORY>... might be useful for building the final game
processInfo.SetArguments(scope $"build -c {(_releaseBuild ? "Release" : "Debug")}");
_process = new SpawnedProcess();
if (_process.Start(processInfo) case .Ok)
{
FileStream outputStream = scope FileStream();
_process.AttachStandardOutput(outputStream);
StreamReader outputReader = scope .(outputStream);
while (!_process.HasExited)
{
outputReader.ReadToEnd(_buildLog).IgnoreError();
}
_process.WaitFor(-1);
if (_isAborting)
{
Log.EngineLogger.Warning($"Build was aborted:\n{_buildLog}");
result = .Abort;
}
else if (_process.ExitCode == 0)
{
Log.EngineLogger.Info($"Scripts compiled successfully:\n{_buildLog}");
result = .Finish;
}
else
{
Log.EngineLogger.Error($"Script compilation failed:\n{_buildLog}");
result = .Fail;
}
DeleteAndNullify!(_process);
}
else
{
Log.EngineLogger.Error("Failed to execute `dotnet build`");
result = .Fail;
}
return result;
}
}
@@ -249,7 +249,7 @@ class CopyBackgroundTask : BackgroundTask
delete currentPath; delete currentPath;
} }
return .Finished; return .Finish;
} }
private Result<void, CopyError> CopyPath(CopyInfo copyInfo) private Result<void, CopyError> CopyPath(CopyInfo copyInfo)
@@ -141,7 +141,7 @@ class DeleteBackgroundTask : BackgroundTask
delete currentPath; delete currentPath;
} }
return .Finished; return .Finish;
} }
private Result<void, DeleteError> DeletePath(StringView deletePath) private Result<void, DeleteError> DeletePath(StringView deletePath)
@@ -252,7 +252,7 @@ class MoveFilesBackgroundTask : BackgroundTask
delete currentPath; delete currentPath;
} }
return .Finished; return .Finish;
} }
private Result<void, CopyError> MovePath(CopyInfo copyInfo) private Result<void, CopyError> MovePath(CopyInfo copyInfo)
@@ -0,0 +1,267 @@
using GlitchyEngine;
using System.Collections;
using GlitchyEditor.CodeEditors;
using System.IO;
using System;
using System.Diagnostics;
using ImGui;
using GlitchyEditor.Multithreading;
using GlitchyEngine.Scripting;
using GlitchyEditor.Settings;
namespace GlitchyEditor.Multithreading;
class TestDotnetBackgroundTask : BackgroundTask
{
private ScriptSettings _settings;
private Project _project;
public enum TestResult
{
None,
Ok,
Timeout,
FailedToExecute,
NoSdksFound,
TooOld
}
private TestResult _testResult;
public TestResult TestResult => _testResult;
public this(ScriptSettings settings, Project project)
{
_settings = settings;
_project = project;
}
public override RunResult Run()
{
if (QueryAvailableSdks() case .Err)
{
return .Fail;
}
if (CheckMinimumVersion() case .Err)
{
return .Fail;
}
if (_project != null)
{
CheckProjectVersion();
}
_testResult = .Ok;
return .Finish;
}
public override void OnRenderPopup()
{
if (ImGui.Begin("Testing .Net Installation...", null, .NoDocking | .NoCollapse | .Modal | .NoResize | .AlwaysAutoResize))
{
ImGui.Text("...");
ImGui.End();
}
}
private Result<void> QueryAvailableSdks()
{
_settings.DotNetSdks.Clear();
Log.EngineLogger.Info("Listing .Net SDKs...");
String exeFile = scope .();
Environment.GetExecutableFilePath(exeFile);
String exeDirectory = scope .();
Path.GetDirectoryPath(exeFile, exeDirectory);
ProcessStartInfo processInfo = scope .();
processInfo.UseShellExecute = false;
processInfo.RedirectStandardOutput = true;
processInfo.CreateNoWindow = true;
processInfo.SetFileName(_settings.DotNetExecutablePath);
// Lists all installed sdks
StringView argumentList = "--list-sdks";
processInfo.SetArguments(argumentList);
let process = scope SpawnedProcess();
if (process.Start(processInfo) case .Ok)
{
FileStream outputStream = scope FileStream();
process.AttachStandardOutput(outputStream);
if (!process.WaitFor(1000))
{
Log.EngineLogger.Error($"`dotnet --list-sdks` timed out.");
process.Kill();
_testResult = .Timeout;
return .Err;
}
StreamReader sr = scope .(outputStream);
String line = scope .(256);
while (sr.ReadLine(line..Clear()) case .Ok)
{
Log.EngineLogger.Info($"Detecting .Net SDK version from line: {line}");
// A line for a normal verion looks like this:
// 10.0.402 [C:\Program Files\dotnet\sdk]
// A line for a snapshot looks like this:
// 9.0.100-preview.7.24407.12 [C:\Program Files\dotnet\sdk]
// A line for a release candidate looks like this:
// 11.0.100-rc.2.26504.105 [C:\Program Files\dotnet\sdk]
// We must have a number at the start so we can at least grab a major version.
if (!line[0].IsDigit)
{
Log.EngineLogger.Error("This line doesn't appear to show an SDK version.");
continue;
}
DotNetVersion detectedVersion = default;
int indexOfSpace = line.IndexOf(' ');
int indexOfDash = line.IndexOf('-');
int versionNumberEnd = line.Length;
if (indexOfDash > 0)
versionNumberEnd = indexOfDash;
else if (indexOfSpace > 0)
versionNumberEnd = indexOfSpace;
StringView versionString = line.Substring(0, versionNumberEnd);
List<StringView> versionSplits = scope .(versionString.Split('.'));
if (versionSplits.IsEmpty)
{
Log.EngineLogger.Error("Line doesn't contain a valid version number.");
continue;
}
if (versionSplits.Count >= 1 && int.Parse(versionSplits[0]) not case .Ok(out detectedVersion.Major))
{
Log.EngineLogger.Error($"Failed to parse \"major\" part of version ({versionSplits[0]}).");
continue;
}
if (versionSplits.Count >= 2 && int.Parse(versionSplits[1]) not case .Ok(out detectedVersion.Minor))
{
Log.EngineLogger.Error($"Failed to parse \"minor\" part of version ({versionSplits[1]}).");
continue;
}
if (versionSplits.Count >= 3 && int.Parse(versionSplits[2]) not case .Ok(out detectedVersion.Patch))
{
Log.EngineLogger.Error($"Failed to parse \"patch\" part of version ({versionSplits[2]}).");
continue;
}
if (indexOfDash > 0)
{
StringView previewString = line.Substring(indexOfDash + 1);
int previewNumberStart = previewString.IndexOf('.') + 1;
int secondDot = previewString.IndexOf('.', previewNumberStart);
int previewNumber = 0;
if (previewNumberStart > 0)
{
int length = previewString.Length - previewNumberStart;
if (secondDot > 0)
{
length = secondDot - previewNumberStart;
}
StringView previewNumberString = previewString.Substring(previewNumberStart, length);
if (int.Parse(previewNumberString) not case .Ok(out previewNumber))
{
Log.EngineLogger.Warning("Could not determine the preview number.");
}
}
if (previewString.StartsWith("preview"))
{
detectedVersion.Type = .Preview(previewNumber);
}
else if (previewString.StartsWith("rc"))
{
detectedVersion.Type = .ReleaseCandidate(previewNumber);
}
else
{
detectedVersion.Type = .Unknown;
Log.EngineLogger.Warning("Could not determine the preview-type for SDK.");
}
}
else
{
detectedVersion.Type = .Normal;
}
Log.EngineLogger.Info($"Detected .Net SDK: {detectedVersion}.");
_settings.DotNetSdks.Add(detectedVersion);
}
}
else
{
Log.EngineLogger.Error($"Failed to execute `{_settings.DotNetExecutablePath} {argumentList}`");
_testResult = .FailedToExecute;
return .Err;
}
if (_settings.DotNetSdks.Count == 0)
{
_testResult = .NoSdksFound;
return .Err;
}
return .Ok;
}
/// Checks if one of the detected SDKs is at least the minimum required dotnet version.
private Result<void> CheckMinimumVersion()
{
DotNetVersion maxVersion = _settings.GetLatestInstalledDotNetVersion();
if (maxVersion < ScriptEngine.MinDotNetVersion)
{
Log.EngineLogger.Error($"The latest detected .Net SDK ({maxVersion}) is older than the required minimum Version ({ScriptEngine.MinDotNetVersion}). Please install a newer .Net SDK or configure the dotnet executable in the settings.");
_testResult = .TooOld;
return .Err;
}
else
{
Log.EngineLogger.Info($"Latest detected .Net SDK: {maxVersion}.");
return .Ok;
}
}
/// Checks if one of the detected SDKs is at least the minimum required dotnet version for the current project.
void CheckProjectVersion()
{
/*DotNetVersion maxVersion = GetMaxVersion();
if (maxVersion < ScriptEngine.MinDotNetVersion)
{
Log.EngineLogger.Error($"The latest detected .Net SDK ({maxVersion}) is older than the required minimum Version ({ScriptEngine.MinDotNetVersion}). Please install a newer .Net SDK or configure the dotnet executable in the settings.");
}
else
{
Log.EngineLogger.Info($"Latest detected .Net SDK: {maxVersion}.");
}*/
}
}
@@ -51,7 +51,7 @@ class DetectIDEsBackgroundTask : BackgroundTask
_stage = .SearchRider; _stage = .SearchRider;
FindRider(); FindRider();
return .Finished; return .Finish;
} }
public override void OnRenderPopup() public override void OnRenderPopup()
+105 -3
View File
@@ -6,6 +6,9 @@ using Bon;
using GlitchyEngine; using GlitchyEngine;
using System.Threading; using System.Threading;
using System.Linq; using System.Linq;
using GlitchyEngine.Scripting;
using GlitchyEditor.Multithreading;
using GlitchyEngine.Math;
using static GlitchyEditor.SettingsWindow; using static GlitchyEditor.SettingsWindow;
@@ -239,6 +242,19 @@ class IdeInstallation
[Reflect] [Reflect]
class ScriptSettings class ScriptSettings
{ {
private List<DotNetVersion> _dotNetSdks = new .() ~ delete _;
public List<DotNetVersion> DotNetSdks => _dotNetSdks;
[BonInclude]
private String _dotnetExePath = new .("dotnet") ~ delete _;
private TestDotnetBackgroundTask.TestResult _dotnetTestResult = .None;
public StringView DotNetExecutablePath
{
get => _dotnetExePath;
set => String.NewOrSet!(_dotnetExePath, value);
}
[BonInclude] [BonInclude]
private List<IdeInstallation> _ideInstallations = new .() ~ DeleteContainerAndItems!(_); private List<IdeInstallation> _ideInstallations = new .() ~ DeleteContainerAndItems!(_);
@@ -254,6 +270,13 @@ class ScriptSettings
private bool _lookedForVs = false; private bool _lookedForVs = false;
private bool _lookedForRider = false; private bool _lookedForRider = false;
[Setting("Tools", "Rebuild scripts on play", "If active, the scripts will be rebuilt every time the user presses play."), BonInclude]
public bool RebuildOnPlay = true;
[Setting("Tools", "Automatically rebuild changed scripts", "If active, the scripts will be rebuilt every time the user presses play."), BonInclude]
public bool AutoRebuildOnChange = true;
/// Enters the lock and gets the list of Ide installations. /// Enters the lock and gets the list of Ide installations.
public Monitor.MonitorLockInstance EnterAndGetIdeInstallations(out List<IdeInstallation> ideInstallations) public Monitor.MonitorLockInstance EnterAndGetIdeInstallations(out List<IdeInstallation> ideInstallations)
{ {
@@ -275,6 +298,18 @@ class ScriptSettings
} }
} }
} }
if (_dotNetSdks.Count == 0)
{
TestDotnetInstallation();
}
}
private TestDotnetBackgroundTask TestDotnetInstallation()
{
TestDotnetBackgroundTask task = new TestDotnetBackgroundTask(this, null){ DeleteWhenEnded = true };
EditorApp.Instance.BackgroundTaskManager.StartBackgroundTask(task);
return task;
} }
[CustomSettingRenderer("Tools")] [CustomSettingRenderer("Tools")]
@@ -282,7 +317,16 @@ class ScriptSettings
{ {
bool settingsChanged = false; bool settingsChanged = false;
ImGui.Text("IDE:"); ImGui.Text("IDE");
ImGui.SameLine(ImGui.GetContentRegionAvail().x - ImGui.CalcTextSize("Detect IDEs...").x - 2 * ImGui.GetStyle().FramePadding.x);
if (ImGui.Button("Detect IDEs..."))
{
EditorApp.Instance.BackgroundTaskManager.StartBackgroundTask(new DetectIDEsBackgroundTask(this){ DeleteWhenEnded = true });
}
ImGui.TableNextColumn();
if (ImGui.BeginCombo("##ide", ActiveIde?.Name.ToScopeCStr!())) if (ImGui.BeginCombo("##ide", ActiveIde?.Name.ToScopeCStr!()))
{ {
@@ -327,13 +371,71 @@ class ScriptSettings
ImGui.EndCombo(); ImGui.EndCombo();
} }
if (ImGui.Button("Detect IDEs...")) ImGui.TableNextRow();
ImGui.TableNextColumn();
ImGui.Text("DotNet Executable Path");
ImGui.SameLine(ImGui.GetContentRegionAvail().x - ImGui.CalcTextSize("Test").x - 2 * ImGui.GetStyle().FramePadding.x);
if (ImGui.Button("Test"))
{ {
EditorApp.Instance.BackgroundTaskManager.StartBackgroundTask(new DetectIDEsBackgroundTask(this){ DeleteWhenEnded = true }); _dotnetTestResult = .None;
TestDotnetInstallation().ContinueWith(new (task) => {
_dotnetTestResult = ((TestDotnetBackgroundTask)task).TestResult;
});
}
ImGui.TableNextColumn();
if (ImGui.InputText("##dotnetPath", _dotnetExePath))
{
settingsChanged = true;
}
switch (_dotnetTestResult)
{
case .None:
// Nothing to do.
case .Ok:
ImGui.PushStyleColor(.Text, ColorRGBA.Green);
ImGui.TextUnformatted(scope $"Dotnet works and found latest version: {GetLatestInstalledDotNetVersion()}");
ImGui.PopStyleColor();
case .Timeout:
ImGui.PushStyleColor(.Text, ColorRGBA.Red);
ImGui.TextUnformatted(scope $"Dotnet timed out.");
ImGui.PopStyleColor();
case .FailedToExecute:
ImGui.PushStyleColor(.Text, ColorRGBA.Red);
ImGui.TextUnformatted(scope $"Failed to execute dotnet.");
ImGui.PopStyleColor();
case .NoSdksFound:
ImGui.PushStyleColor(.Text, ColorRGBA.Red);
ImGui.TextUnformatted(scope $"Dotnet works but no SDK found.");
ImGui.PopStyleColor();
case .TooOld:
ImGui.PushStyleColor(.Text, ColorRGBA.Red);
ImGui.TextUnformatted(scope $"Dotnet works but latest installed version {GetLatestInstalledDotNetVersion()} is too old.");
ImGui.PopStyleColor();
} }
return settingsChanged; return settingsChanged;
} }
public DotNetVersion GetLatestInstalledDotNetVersion()
{
DotNetVersion maxVersion = .(-1, -1, -1, .Unknown);
for (DotNetVersion version in _dotNetSdks)
{
if (version > maxVersion)
{
maxVersion = version;
}
}
return maxVersion;
}
} }
[Reflect] [Reflect]
+3 -4
View File
@@ -106,8 +106,6 @@ namespace GlitchyEditor
void ScanForSettings(Object container) void ScanForSettings(Object container)
{ {
Log.EngineLogger.Info($"Visiting type: {container.GetType().GetName(.. scope .())}");
Type type = container.GetType(); Type type = container.GetType();
for (var field in type.GetFields()) for (var field in type.GetFields())
@@ -138,8 +136,6 @@ namespace GlitchyEditor
for (let method in type.GetMethods(.Instance | .Static | .Public | .NonPublic)) for (let method in type.GetMethods(.Instance | .Static | .Public | .NonPublic))
{ {
Log.EngineLogger.Info($"Visiting method: {method.Name}");
Result<CustomSettingRendererAttribute> rendererResult = method.GetCustomAttribute<CustomSettingRendererAttribute>(); Result<CustomSettingRendererAttribute> rendererResult = method.GetCustomAttribute<CustomSettingRendererAttribute>();
if (rendererResult case .Ok(let rendererInfo)) if (rendererResult case .Ok(let rendererInfo))
@@ -420,6 +416,9 @@ namespace GlitchyEditor
for (let methodBinding in category._methodBindings) for (let methodBinding in category._methodBindings)
{ {
ImGui.TableNextRow();
ImGui.TableNextColumn();
if (methodBinding.Method.Invoke(methodBinding.Method.IsStatic ? null : methodBinding.SettingsObject, category) case .Ok(var returnValue)) if (methodBinding.Method.Invoke(methodBinding.Method.IsStatic ? null : methodBinding.SettingsObject, category) case .Ok(var returnValue))
{ {
_settingsChanged |= returnValue.Get<bool>(); _settingsChanged |= returnValue.Get<bool>();
@@ -17,7 +17,7 @@ class BasicBenchmark
Console.WriteLine(Directory.GetCurrentDirectory(.. scope .())); Console.WriteLine(Directory.GetCurrentDirectory(.. scope .()));
ScriptEngine.Init(); ScriptEngine.Init();
ScriptEngine.SetAppAssemblyPath(@"..\GlitchyEngine.Test\content\TestProject\.cache\bin\TestProject.dll"); ScriptEngine.SetAppAssemblyPath(@"..\GlitchyEngine.Test\content\TestProject\.cache\bin\TestProject.dll", false);
} }
protected static void Shutdown() protected static void Shutdown()
@@ -0,0 +1,87 @@
using System;
namespace GlitchyEngine.Scripting;
enum DotNetVersionType
{
case Normal;
case Preview(int Number);
case ReleaseCandidate(int Number);
case Unknown;
public int GetSortingOrder()
{
switch (this)
{
case .Normal:
return 3;
case .ReleaseCandidate:
return 2;
case .Preview:
return 1;
case .Unknown:
return 0;
}
}
}
struct DotNetVersion
{
public int Major;
public int Minor;
public int Patch;
public DotNetVersionType Type;
public this()
{
this = default;
}
public this(int major, int minor, int patch, DotNetVersionType type)
{
Major = major;
Minor = minor;
Patch = patch;
Type = type;
}
public override void ToString(String outBuffer)
{
outBuffer.AppendF($"{Major}.{Minor}.{Patch}");
switch (Type)
{
case .Normal:
// Nothing to do.
case .Preview(int Number):
outBuffer.AppendF($" (Preview {Number})");
case .ReleaseCandidate(int Number):
outBuffer.AppendF($" (Release Candidate {Number})");
case .Unknown:
outBuffer.Append(" (Unknown release type)");
}
}
public static int operator <=>(DotNetVersion lhs, DotNetVersion rhs)
{
if (lhs.Major != rhs.Major)
if (lhs.Major > rhs.Major)
return 1;
else
return -1;
if (lhs.Minor != rhs.Minor)
if (lhs.Minor > rhs.Minor)
return 1;
else
return -1;
if (lhs.Patch != rhs.Patch)
if (lhs.Patch > rhs.Patch)
return 1;
else
return -1;
return lhs.Type.GetSortingOrder() <=> rhs.Type.GetSortingOrder();
}
}
+23 -2
View File
@@ -89,6 +89,9 @@ static class ScriptEngine
// This would probably require a separate small project that just handles the script-engine interface. // This would probably require a separate small project that just handles the script-engine interface.
public const String ScriptCorePath = "Resources/Scripts/ScriptCore.dll"; public const String ScriptCorePath = "Resources/Scripts/ScriptCore.dll";
/// The minimum supported .Net Version.
public const DotNetVersion MinDotNetVersion = .(10, 0, 0, .Normal);
private static Scene s_Context ~ _?.ReleaseRef(); private static Scene s_Context ~ _?.ReleaseRef();
private static EngineClasses _classes = new .() ~ delete _; private static EngineClasses _classes = new .() ~ delete _;
@@ -209,6 +212,22 @@ static class ScriptEngine
} }
static bool _requestingReload = false; static bool _requestingReload = false;
static bool _assemblyWatcherSuspended = false;
public static void SuspendAssemblyWatcher()
{
Log.EngineLogger.Trace("Suspending assembly watching");
_assemblyWatcherSuspended = true;
_userAssemblyWatcher?.StopRaisingEvents();
}
public static void ResumeAssemblyWatcher()
{
Log.EngineLogger.Trace("Resuming assembly watching");
_assemblyWatcherSuspended = false;
_userAssemblyWatcher?.StartRaisingEvents();
}
static void InitAssemblyWatcher() static void InitAssemblyWatcher()
{ {
@@ -241,7 +260,8 @@ static class ScriptEngine
ReloadAssemblies(retainScriptData: true); ReloadAssemblies(retainScriptData: true);
_requestingReload = false; _requestingReload = false;
_userAssemblyWatcher.StartRaisingEvents(); if (_assemblyWatcherSuspended)
_userAssemblyWatcher.StartRaisingEvents();
return true; return true;
}); });
@@ -249,7 +269,8 @@ static class ScriptEngine
}); });
} }
_userAssemblyWatcher.StartRaisingEvents(); if (_assemblyWatcherSuspended)
_userAssemblyWatcher.StartRaisingEvents();
} }
static void LoadScriptAssemblies() static void LoadScriptAssemblies()