Gottfried/glitchy-engine-beef
1
0
Fork 0
mirror of https://github.com/aharabada/glitchy-engine-beef.git synced 2026-09-05 13:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved Script Solution (.sln) to project root

Browse Source 
- Updated vswhere.exe
- Scripts created via Asset browser are now being added to the project
- Fixed Apply not being called for extended Settings
- Correctly wrap New File preview only when line full
- Create Project: Show warning, when target directory already exists
This commit is contained in:
Simon Lübeß
2023-10-27 22:29:10 +02:00
parent 3d8756ec42
commit 909012f518
14 changed files with 657 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEditor/src/EditorLayer.bf
+44 -7
View File
@@ -204,6 +204,34 @@ namespace GlitchyEditor
Log.EngineLogger.Error($"Failed to save script file to \"{path}\".");
return;
}
// Add to .csproj
String assetRelativePath = scope .();
Path.GetRelativePath(path, _currentProject.WorkspacePath, assetRelativePath);
String projectPath = scope .();
Editor.Instance.CurrentProject.PathInProject(projectPath, scope $"{Editor.Instance.CurrentProject.Name}.csproj");
String projectFile = scope .();
let loadProjectResult = File.ReadAllText(projectPath, projectFile, true);
if (loadProjectResult case .Err(let err))
{
Log.EngineLogger.Error($"Failed to open project file ({err}). Please add the file to the project manually.");
}
const String scriptFilesMarker = "<!-- Script Files -->";
int index = projectFile.IndexOf(scriptFilesMarker);
int lineEndIndex = projectFile.IndexOf('\n', index);
projectFile.Insert(lineEndIndex + 1, scope $" <Compile Include=\"{assetRelativePath}\" />\n");
let saveProjectResult = File.WriteAllText(projectPath, projectFile);
if (saveProjectResult case .Err(let err))
{
Log.EngineLogger.Error($"Failed to edit project file ({err}). Please add the file to the project manually.");
}
}));
}
@@ -577,13 +605,14 @@ namespace GlitchyEditor
private static Result<void> InitProject(Project project)
{
Try!(CopyTemplate(project));
Try!(MoveFile(project, "Assets/Scripts/TemplateProject.sln", scope $"Assets/Scripts/{project.Name}.sln"));
Try!(MoveFile(project, "Assets/Scripts/TemplateProject.csproj", scope $"Assets/Scripts/{project.Name}.csproj"));
Try!(FixupTemplateFile(project, scope $"Assets/Scripts/{project.Name}.sln"));
Try!(FixupTemplateFile(project, scope $"Assets/Scripts/{project.Name}.csproj"));
Try!(FixupTemplateFile(project, scope $"Assets/Scripts/Properties/AssemblyInfo.cs"));
// Rename files within project
Try!(MoveFile(project, "TemplateProject.sln", scope $"{project.Name}.sln"));
Try!(MoveFile(project, "TemplateProject.csproj", scope $"{project.Name}.csproj"));
Try!(FixupTemplateFile(project, scope $"{project.Name}.sln"));
Try!(FixupTemplateFile(project, scope $"{project.Name}.csproj"));
Try!(FixupTemplateFile(project, scope $"Properties/AssemblyInfo.cs"));
return .Ok;
}
@@ -703,6 +732,11 @@ namespace GlitchyEditor
ImGui.Text($"The Project will be in:\n{target}");
if (Directory.Exists(target))
{
ImGui.TextColored(.(1, 0, 0, 1), "The directory is not empty!");
}
ImGui.NewLine();
ImGui.BeginDisabled(directory.IsWhiteSpace || projectName.IsWhiteSpace);
@@ -775,10 +809,12 @@ namespace GlitchyEditor
_currentProject = project;
_editor.CurrentProject = _currentProject;
String appAssemblyPath = scope String();
_contentManager.SetAssetDirectory(_currentProject.AssetsFolder);
Path.Combine(appAssemblyPath, _currentProject.AssetsFolder, scope $"Scripts/bin/{_currentProject.Name}.dll");
_currentProject.PathInProject(appAssemblyPath, scope $"bin/{_currentProject.Name}.dll");
ScriptEngine.SetAppAssemblyPath(appAssemblyPath);
@@ -1288,6 +1324,7 @@ namespace GlitchyEditor
{
delete workspacePath;
@workspacePath.Remove();
continue;
}
if (ImGui.MenuItem(scope $"{i}: {workspacePath}"))