No CoreCLR... for now

.gitignore

@@ -8,4 +8,3 @@ imgui.ini
 GlitchyEditor/resources/scripts/ScriptCore.dll
 GlitchyEditor/resources/scripts/ScriptCore.pdb
 GlitchyEditor/settings.bon
-GlitchyEditor/MonoDebugger.log

.gitmodules

@@ -30,4 +30,7 @@
 	url = https://github.com/jazzbre/box2d-beef.git
 [submodule "GlitchyEngine/vendor/Beef.Linq"]
 	path = GlitchyEngine/vendor/Beef.Linq
-	url = https://github.com/aharabada/Beef.Linq.git
+	url = https://github.com/aharabada/Beef.Linq.git
+[submodule "GlitchyEngine/vendor/NetHostBeef"]
+	path = GlitchyEngine/vendor/NetHostBeef
+	url = https://github.com/aharabada/NetHostBeef.git

BeefSpace.toml

@@ -1,7 +1,7 @@
 FileVersion = 1
-Projects = {Sandbox = {Path = "Sandbox"}, GlitchyEngine = {Path = "GlitchyEngine"}, GlitchLog = {Path = "GlitchLog"}, DirectX = {Path = "GlitchyEngine/vendor/directx/DirectX"}, LodePng = {Path = "vendor/lodepng-beef/lodepng-beef"}, FreeType = {Path = "GlitchyEngine/vendor/freetype"}, cgltf-beef = {Path = "GlitchyEngine/vendor/gltf/cgltf-beef"}, GlitchyEditor = {Path = "GlitchyEditor"}, msdfgen-beef = {Path = "GlitchyEngine/vendor/msdfgen/msdfgen-beef"}, ImGui = {Path = "GlitchyEngine/vendor/imgui/ImGui"}, ImGuiImplDX11 = {Path = "GlitchyEngine/vendor/imgui/ImGuiImplDX11"}, ImGuiImplWin32 = {Path = "GlitchyEngine/vendor/imgui/ImGuiImplWin32"}, ImGuizmo = {Path = "GlitchyEngine/vendor/imgui/ImGuizmo"}, GlitchyEngineHelper = {Path = "GlitchyEngineHelper"}, bon = {Path = "GlitchyEngine/vendor/bon"}, box2d-beef = {Path = "GlitchyEngine/vendor/box2D"}, "Beef.Linq" = {Path = "GlitchyEngine/vendor/Beef.Linq/src"}, ScriptCore = {Path = "ScriptCore"}}
+Projects = {Sandbox = {Path = "Sandbox"}, GlitchyEngine = {Path = "GlitchyEngine"}, GlitchLog = {Path = "GlitchLog"}, DirectX = {Path = "GlitchyEngine/vendor/directx/DirectX"}, LodePng = {Path = "vendor/lodepng-beef/lodepng-beef"}, FreeType = {Path = "GlitchyEngine/vendor/freetype"}, cgltf-beef = {Path = "GlitchyEngine/vendor/gltf/cgltf-beef"}, GlitchyEditor = {Path = "GlitchyEditor"}, msdfgen-beef = {Path = "GlitchyEngine/vendor/msdfgen/msdfgen-beef"}, ImGui = {Path = "GlitchyEngine/vendor/imgui/ImGui"}, ImGuiImplDX11 = {Path = "GlitchyEngine/vendor/imgui/ImGuiImplDX11"}, ImGuiImplWin32 = {Path = "GlitchyEngine/vendor/imgui/ImGuiImplWin32"}, ImGuizmo = {Path = "GlitchyEngine/vendor/imgui/ImGuizmo"}, GlitchyEngineHelper = {Path = "GlitchyEngineHelper"}, bon = {Path = "GlitchyEngine/vendor/bon"}, box2d-beef = {Path = "GlitchyEngine/vendor/box2D"}, "Beef.Linq" = {Path = "GlitchyEngine/vendor/Beef.Linq/src"}, ScriptCore = {Path = "ScriptCore"}, NetHostBeef = {Path = "GlitchyEngine/vendor/NetHostBeef/NetHostBeef"}}
 Unlocked = ["corlib"]
-WorkspaceFolders = {GlitchyEngine = ["GlitchyEngine", "GlitchLog", "GlitchyEngineHelper", "ScriptCore"], "GlitchyEngine/Dependencies" = ["cgltf-beef", "DirectX", "FreeType", "ImGui", "ImGuiImplDX11", "ImGuiImplWin32", "ImGuizmo", "LodePng", "msdfgen-beef", "bon", "box2d-beef", "Beef.Linq"]}
+WorkspaceFolders = {GlitchyEngine = ["GlitchyEngine", "GlitchLog", "GlitchyEngineHelper", "ScriptCore"], "GlitchyEngine/Dependencies" = ["cgltf-beef", "DirectX", "FreeType", "ImGui", "ImGuiImplDX11", "ImGuiImplWin32", "ImGuizmo", "LodePng", "msdfgen-beef", "bon", "box2d-beef", "Beef.Linq", "NetHostBeef"]}
 
 [Workspace]
 StartupProject = "GlitchyEditor"

GlitchyEditor/BeefProj.toml

@@ -7,4 +7,4 @@ TargetType = "BeefGUIApplication"
 StartupObject = "GlitchyEngine.Program"
 
 [Configs.Debug.Win64]
-DebugCommandArguments = "\"D:\\Development\\Projects\\Beef\\GlitchyEngine\\GlitchyEditor\\SandboxProject\""
+DebugCommandArguments = "\"content\\Scenes\\physics2D.scene\""

GlitchyEditor/SandboxProject/.gitignore

@@ -1 +0,0 @@
-project_user.bon

GlitchyEditor/SandboxProject/Assets/Scripts/Camera.cs

@@ -15,32 +15,39 @@ public class Camera : Entity
 
     public float DontFollowRadius = 3.0f;
 
-    void OnUpdate(float deltaTime)
+    void OnCreate()
     {
-        Entity player = FindEntityWithName("Player");
+        Log.Info("Camera Create");
+    }
 
-        if (player != null)
+    public void OnUpdate(float deltaTime)
-        {
+    {
-            float2 playerPosition = player.Transform.Translation.XY;
+        Log.Info($"Camera Update {deltaTime}");
 
-            float2 cameraPosition = Transform.Translation.XY;
+        //Entity player = FindEntityWithName("Player");
 
-            float2 distanceVector = playerPosition - cameraPosition;
+        //if (player != null)
+        //{
+        //    float2 playerPosition = player.Transform.Translation.XY;
 
-            float distance = length(distanceVector);
+        //    float2 cameraPosition = Transform.Translation.XY;
 
-            float2 neededMovement = float2.Zero;
+        //    float2 distanceVector = playerPosition - cameraPosition;
 
-            if (distance > DontFollowRadius)
+        //    float distance = length(distanceVector);
-            {
-                neededMovement = distanceVector - (distanceVector / distance) * DontFollowRadius;
-            }
 
-            Transform.Translation = new float3(cameraPosition + neededMovement, DistanceFromPlayer);
+        //    float2 neededMovement = float2.Zero;
-        }
+
-        else
+        //    if (distance > DontFollowRadius)
-        {
+        //    {
-            Log.Error("Player not found!");
+        //        neededMovement = distanceVector - (distanceVector / distance) * DontFollowRadius;
-        }
+        //    }
+
+        //    Transform.Translation = new float3(cameraPosition + neededMovement, DistanceFromPlayer);
+        //}
+        //else
+        //{
+        //    Log.Error("Player not found!");
+        //}
     }
 }

GlitchyEditor/SandboxProject/Assets/Scripts/MyTestEntity.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.Remoting.Metadata.W3cXsd2001;
 using GlitchyEngine;
 using GlitchyEngine.Editor;
 using GlitchyEngine.Math;
@@ -11,9 +10,9 @@ namespace Sandbox
 
     public enum MyEnum
     {
-        Yes = 1,
+        Yes,
         No,
-        Maybe = 1337
+        Maybe
     }
 
     public struct MyStruct
@@ -25,38 +24,36 @@ namespace Sandbox
 
     class MyTestEntity : Entity
     {
-        [ShowInEditor]
+        //[ShowInEditor]
         RigidBody2D _rigidBody;
 
-        //public bool Bo;
+        public bool Bo;
 
-        //public byte By;
+        public byte By;
-        //public ushort Us;
+        public ushort Us;
-        //public uint Ui;
+        public uint Ui;
-        //public ulong Ul;
+        public ulong Ul;
 
-        //public sbyte Sb;
+        public sbyte Sb;
-        //public short Sh;
+        public short Sh;
-        //public int In;
+        public int In;
-        //public long Lo;
+        public long Lo;
 
-        //public float Fl;
+        public float Fl;
-        //public double Do;
+        public double Do;
-        //public float2 V2;
+        public float2 V2;
-        //public float3 V3;
+        public float3 V3;
-        //public float4 V4;
+        public float4 V4;
 
         public Entity TheEntity;
 
         public float JumpForce = 2000;
         [ShowInEditor] float MoveForce = 1000;
         [ShowInEditor] private int MyNumber = 1337;
-        //[ShowInEditor] public double MyDouble = 1000.0f;
+        [ShowInEditor] public double MyDouble = 1000.0f;
 
         public MyStruct AStruct;
 
-        public MyEnum AEnum = MyEnum.Maybe;
-        
         public Camera Camera;
 
         /// <summary>
@@ -70,37 +67,12 @@ namespace Sandbox
 
             //_rigidBody ??= GetComponent<RigidBody2D>() ?? AddComponent<RigidBody2D>();
 
-            if (_rigidBody == null)
+            //Camera = FindEntityWithName("Camera").As<Camera>();
-            {
-                Log.Error("_rigidBody was not set in editor.");
-            }
 
-            if (Camera == null)
+            //if (Camera == null)
-            {
+            //{
-                Log.Warning("Camera wasn't set in editor. Searching...");
+            //    Log.Error("Camera not found.");
-                Camera = FindEntityWithName("Camera").As<Camera>();
+            //}
-                
-                if (Camera == null)
-                {
-                    Log.Error("Camera not found.");
-                }
-            }
-            Log.Warning("Achtung.");
-
-            try
-            {
-                SubVoid();
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e);
-                throw e;
-            }
-        }
-
-        void SubVoid()
-        {
-            throw new Exception("Ouha!", new IndexOutOfRangeException("Bist du jecke2?!", new AccessViolationException("Haleluja")));
         }
 
         /// <summary>
@@ -109,39 +81,38 @@ namespace Sandbox
         /// <param name="deltaTime"></param>
         void OnUpdate(float deltaTime)
         {
-            float2 force = float2.Zero;
+            Log.Info($"On update: {deltaTime}");
 
-            if (Input.IsKeyPressed(Key.A))
+            //float2 force = float2.Zero;
-            {
-                force.X -= MoveForce * deltaTime;
-            }
 
-            if (Input.IsKeyPressed(Key.D))
+            //if (Input.IsKeyPressed(Key.A))
-            {
+            //{
-                force.X += MoveForce * deltaTime;
+            //    force.X -= MoveForce * deltaTime;
-            }
+            //}
 
-            if (Input.IsKeyPressed(Key.Q))
+            //if (Input.IsKeyPressed(Key.D))
-                Camera.DistanceFromPlayer -= deltaTime;
+            //{
+            //    force.X += MoveForce * deltaTime;
+            //}
 
-            if (Input.IsKeyPressed(Key.E))
+            //if (Input.IsKeyPressed(Key.Q))
-                Camera.DistanceFromPlayer += deltaTime;
+            //    Camera.DistanceFromPlayer -= deltaTime;
-            
-            if (Input.IsKeyPressing(Key.Space))
-            {
-                force.Y += JumpForce;
-            }
-            
-            if (Input.IsKeyPressing(Key.N))
-                SubVoid();
 
-            _rigidBody.ApplyForceToCenter(force);
+            //if (Input.IsKeyPressed(Key.E))
+            //    Camera.DistanceFromPlayer += deltaTime;
 
-            if (Input.IsMouseButtonReleasing(MouseButton.MiddleButton))
+            //if (Input.IsKeyPressing(Key.Space))
-            {
+            //{
-                Log.Info($"Ouha! {MyNumber}");
+            //    force.Y += JumpForce;
-                Physics2D.Gravity *= new float2(1, -1);
+            //}
-            }
+
+            //_rigidBody.ApplyForceToCenter(force);
+
+            //if (Input.IsMouseButtonReleasing(MouseButton.MiddleButton))
+            //{
+            //    Log.Info($"Ouha! {MyNumber}");
+            //    Physics2D.Gravity *= new float2(1, -1);
+            //}
         }
 
         /// <summary>

GlitchyEditor/SandboxProject/Assets/Scripts/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// Allgemeine Informationen über eine Assembly werden über die folgenden
-// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-// die einer Assembly zugeordnet sind.
-[assembly: AssemblyTitle("SandboxProject")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SandboxProject")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
-// für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von
-// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
-[assembly: ComVisible(false)]
-
-// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
-[assembly: Guid("7a70819c-5317-402a-8553-95c5a001e370")]
-
-// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
-//
-//      Hauptversion
-//      Nebenversion
-//      Buildnummer
-//      Revision
-//
-// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
-// indem Sie "*" wie unten gezeigt eingeben:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

GlitchyEditor/SandboxProject/Assets/Scripts/Properties/launchSettings.json

@@ -0,0 +1,11 @@
+{
+  "profiles": {
+    "Start Editor": {
+      "commandName": "Executable",
+      "executablePath": "D:\\Development\\Projects\\Beef\\GlitchyEngine\\build\\Debug_Win64\\GlitchyEditor\\GlitchyEditor.exe",
+      "commandLineArgs": "\"content\\Scenes\\physics2D.scene\"",
+      "workingDirectory": "D:\\Development\\Projects\\Beef\\GlitchyEngine\\GlitchyEditor",
+      "nativeDebugging": true
+    }
+  }
+}

GlitchyEditor/SandboxProject/Assets/Scripts/Sandbox - Kopie.csproj

@@ -7,15 +7,15 @@
     <ProjectGuid>{7A70819C-5317-402A-8553-95C5A001E370}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>SandboxProject</RootNamespace>
+    <RootNamespace>Sandbox</RootNamespace>
-    <AssemblyName>SandboxProject</AssemblyName>
+    <AssemblyName>Sandbox</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
+    <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>

GlitchyEditor/SandboxProject/Assets/Scripts/Sandbox.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+	  <TargetFramework>net7.0</TargetFramework>
+	  <LangVersion>latest</LangVersion>
+	  <OutputPath>bin</OutputPath>
+	  <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+  
+		<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+		<EnableDynamicLoading>true</EnableDynamicLoading>
+	  <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\ScriptCore\ScriptCore.csproj" />
+  </ItemGroup>
+
+</Project>

GlitchyEditor/SandboxProject/Assets/Scripts/Sandbox.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33205.214
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SandboxProject", "SandboxProject.csproj", "{7A70819C-5317-402A-8553-95C5A001E370}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sandbox", "Sandbox.csproj", "{7A70819C-5317-402A-8553-95C5A001E370}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScriptCore", "..\..\..\..\ScriptCore\ScriptCore.csproj", "{6222C226-FC78-498C-80BA-5CF10AC9123C}"
 EndProject

GlitchyEditor/SandboxProject/Assets/Scripts/TestClass.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using GlitchyEngine;
+
+namespace Sandbox;
+
+public static class TestClass
+{
+    [UnmanagedCallersOnly]
+    public static void TestFunction()
+    {
+        Console.WriteLine("Hello from the second Assembly!");
+    }
+
+    public static void InternalTest()
+    {
+        Console.WriteLine("Ja, ich existiere in der Tat");
+
+        Log.Info("Yeah!");
+        //Console.WriteLine("Und nun bin ich anders");
+    }
+
+    public static int Test(IntPtr arg, int sizeofArg)
+    {
+        Console.WriteLine($"YUPPYPLASDPASDOIUZASD");
+        return 7;
+    }
+}

GlitchyEditor/SandboxProject/Assets/Textures/RocketMaterial.mat

@@ -1,31 +0,0 @@
-{
-	Effect = "Resources/Shaders/myEffect.hlsl",
-	Textures = [
-		"AlbedoTexture": "Assets/Textures/rocket.png",
-		"NormalTexture": "Assets/Textures/TestMat/rustediron2_normal.png",
-		"MetallicTexture": "Assets/Textures/TestMat/rustediron2_metallic.png",
-		"RoughnessTexture": "Assets/Textures/TestMat/rustediron2_roughness.png"
-	],
-	Variables = [
-		"AlbedoColor": .ColorRGBA{
-			Value = {
-				R = 1,
-				G = 1,
-				B = 1,
-				A = 1
-			}
-		},
-		"NormalScaling": .Float2{
-			Value = {
-				X = 1,
-				Y = 1
-			}
-		},
-		"MetallicFactor": .Float{
-			Value = 0
-		},
-		"RoughnessFactor": .Float{
-			Value = 1
-		}
-	]
-}

GlitchyEditor/SandboxProject/project.gep

@@ -1 +0,0 @@
-{_projectName="SandboxProject"}

GlitchyEditor/content/Scenes/Simple3D.scene

@@ -30,10 +30,10 @@
 				}
 			},
 			MeshComponent = {
-				Mesh = "Assets/Models/sphere.glb"
+				Mesh = "Models/sphere.glb"
 			},
 			MeshRendererComponent = {
-				Material = "Assets/Textures/TestMaterial.mat"
+				Material = "Textures/TestMaterial.mat"
 			}
 		},
 		{
@@ -49,12 +49,12 @@
 				},
 				Rotation = {
 					X = 0.614328027,
-					Y = 0.23977606,
+					Y = 0.239776045,
 					Z = 0.0315669999,
-					W = 0.751073778
+					W = 0.751073837
 				},
 				Scale = {
-					X = 0.999998808,
+					X = 0.999998868,
 					Y = 1,
 					Z = 1.00000095
 				},
@@ -70,7 +70,7 @@
 				Color = {
 					R = 1,
 					G = 0.991771996,
-					B = 0.74086231
+					B = 0.74086225
 				}
 			}
 		},
@@ -103,10 +103,10 @@
 				}
 			},
 			MeshComponent = {
-				Mesh = "Assets/Models/plane.glb"
+				Mesh = "Models/plane.glb"
 			},
 			MeshRendererComponent = {
-				Material = "Assets/Textures/TestMaterial.mat"
+				Material = "Textures/TestMaterial.mat"
 			}
 		},
 		{
@@ -146,7 +146,7 @@
 				OrthographicHeight = 10,
 				OrthographicNearPlane = 0,
 				OrthographicFarPlane = 10,
-				AspectRatio = 1.87453413,
+				AspectRatio = 2.19888878,
 				FixedAspectRatio = false
 			}
 		},
@@ -164,7 +164,7 @@
 				Rotation = {
 					X = 0.18301262,
 					Y = -0.683013558,
-					Z = 0.683012187,
+					Z = 0.683012128,
 					W = 0.183013007
 				},
 				Scale = {
@@ -173,13 +173,13 @@
 					Z = 1
 				},
 				EditorEulerRotation = {
-					X = 1.57079458,
+					X = 1.57079446,
-					Y = -2.61799288,
+					Y = -2.61799312,
 					Z = 0
 				}
 			},
 			MeshComponent = {
-				Mesh = ""
+				Mesh = "Models/plane.glb"
 			},
 			MeshRendererComponent = {
 				Material = ""
@@ -192,32 +192,32 @@
 			},
 			TransformComponent = {
 				Position = {
-					X = 2.37353563,
+					X = 2.37353587,
 					Y = 0.629615188,
 					Z = -1.34831977
 				},
 				Rotation = {
 					X = 0.270598024,
-					Y = -0.65328151,
+					Y = -0.65328145,
 					Z = 0.65328151,
 					W = 0.270598054
 				},
 				Scale = {
-					X = 0.999999821,
+					X = 0.999999881,
-					Y = 0.999999762,
+					Y = 0.999999821,
 					Z = 0.999999702
 				},
 				EditorEulerRotation = {
-					X = 1.57079649,
+					X = 1.57079637,
-					Y = -2.35619426,
+					Y = -2.3561945,
-					Z = 8.94069601e-08
+					Z = 8.94069743e-08
 				}
 			},
 			MeshComponent = {
-				Mesh = "Assets/Models/plane.glb"
+				Mesh = "Models/plane.glb"
 			},
 			MeshRendererComponent = {
-				Material = "Assets/Textures/RocketMaterial.mat"
+				Material = "Textures/RocketMaterial.mat"
 			}
 		}
 	]

GlitchyEditor/content/Scenes/physics2D.scene

@@ -13,7 +13,7 @@
 					B = 0.32878688,
 					A = 1
 				},
-				Sprite = "Assets/Textures/TestMat/rustediron2_albedo.png",
+				Sprite = "Textures/TestMat/rustediron2_albedo.png",
 				UvTransform = {
 					X = 0,
 					Y = 0,
@@ -71,8 +71,8 @@
 			SpriteRendererComponent = {
 				Color = {
 					R = 1,
-					G = 0.941887021,
+					G = 0.941886961,
-					B = 0.401484489,
+					B = 0.401484549,
 					A = 1
 				},
 				Sprite = "",
@@ -162,7 +162,7 @@
 				OrthographicHeight = 10,
 				OrthographicNearPlane = 0,
 				OrthographicFarPlane = 10,
-				AspectRatio = 2.05582929,
+				AspectRatio = 0.884925187,
 				FixedAspectRatio = false
 			},
 			ScriptComponent = {
@@ -195,8 +195,8 @@
 			},
 			TransformComponent = {
 				Position = {
-					X = -0.121203206,
+					X = -0.121203184,
-					Y = 0.660161078,
+					Y = 0.660160959,
 					Z = 0
 				},
 				Rotation = {
@@ -234,12 +234,37 @@
 			ScriptComponent = {
 				ScriptClass = "Sandbox.MyTestEntity",
 				Fields = [
-					_rigidBody = (Component)15710354273720487680,
+					Bo = (Bool)false,
+					By = (Byte)0,
+					Us = (UShort)57,
+					Ui = (UInt)54,
+					Ul = (ULong)53,
+					Sb = (SByte)-128,
+					Sh = (Short)95,
+					In = (Int)-149,
+					Lo = (Long)82,
+					Fl = (Float)-98.122963,
+					Do = (Double)118,
+					V2 = (float2){
+						X = 11,
+						Y = 12
+					},
+					V3 = (float3){
+						X = 13,
+						Y = 14,
+						Z = 15
+					},
+					V4 = (float4){
+						X = 14,
+						Y = 17,
+						Z = 18,
+						W = 19
+					},
 					TheEntity = (Entity)0,
 					JumpForce = (Float)200,
 					MoveForce = (Float)148,
 					MyNumber = (Int)22,
-					Camera = (Entity)1491484622542812645
+					MyDouble = (Double)23
 				]			}
 		},
 		{
@@ -276,7 +301,7 @@
 				Color = {
 					R = 0.985467017,
 					G = 1,
-					B = 0.569977939
+					B = 0.569978058
 				}
 			}
 		},
@@ -309,10 +334,10 @@
 				}
 			},
 			MeshComponent = {
-				Mesh = "Assets/Models/sphere.glb"
+				Mesh = "Models/sphere.glb"
 			},
 			MeshRendererComponent = {
-				Material = "Assets/Textures/TestMaterial.mat"
+				Material = "Textures/TestMaterial.mat"
 			}
 		},
 		{
@@ -323,8 +348,8 @@
 			SpriteRendererComponent = {
 				Color = {
 					R = 0.425658971,
-					G = 0.855207443,
+					G = 0.855207562,
-					B = 0.0558161177,
+					B = 0.0558161102,
 					A = 1
 				},
 				Sprite = "",
@@ -338,14 +363,14 @@
 			TransformComponent = {
 				Position = {
 					X = 6.74610233,
-					Y = -2.03225946,
+					Y = -2.03225899,
 					Z = 0
 				},
 				Rotation = {
 					X = 0,
 					Y = 0,
 					Z = -0.331792623,
-					W = 0.94335258
+					W = 0.943352342
 				},
 				Scale = {
 					X = 5.29557419,
@@ -384,7 +409,7 @@
 			},
 			SpriteRendererComponent = {
 				Color = {
-					R = 0.666117013,
+					R = 0.666116953,
 					G = 0.0600316115,
 					B = 1,
 					A = 1
@@ -399,8 +424,8 @@
 			},
 			TransformComponent = {
 				Position = {
-					X = 15.2321281,
+					X = 15.2321301,
-					Y = -1.98709273,
+					Y = -1.98709249,
 					Z = 0
 				},
 				Rotation = {
@@ -410,7 +435,7 @@
 					W = 0.990847468
 				},
 				Scale = {
-					X = 13.9764528,
+					X = 13.9764566,
 					Y = 1,
 					Z = 1
 				},
@@ -446,7 +471,7 @@
 			},
 			SpriteRendererComponent = {
 				Color = {
-					R = 0.176544309,
+					R = 0.176544324,
 					G = 0.666713238,
 					B = 0.687030852,
 					A = 1
@@ -462,24 +487,24 @@
 			TransformComponent = {
 				Position = {
 					X = -6.27842855,
-					Y = 2.62550163,
+					Y = 2.62550211,
 					Z = 0
 				},
 				Rotation = {
 					X = 0,
 					Y = 0,
-					Z = 0.187087879,
+					Z = 0.187087834,
 					W = 0.982343197
 				},
 				Scale = {
-					X = 0.999999464,
+					X = 0.999999523,
 					Y = 6.49634314,
 					Z = 1
 				},
 				EditorEulerRotation = {
 					X = 0,
 					Y = 0,
-					Z = 0.376393616
+					Z = 0.376393586
 				}
 			},
 			Rigidbody2D = {
@@ -497,7 +522,7 @@
 				},
 				Density = 1,
 				Friction = 0.5,
-				Restitution = 0.899999857,
+				Restitution = 0.899999976,
 				RestitutionThreshold = 0.5
 			}
 		}

GlitchyEditor/content/Textures/RocketMaterial.mat

@@ -0,0 +1,31 @@
+{
+	Effect = "Shaders/myEffect.hlsl",
+	Textures = [
+		"AlbedoTexture": "Textures/rocket.png",
+		"NormalTexture": "Textures/TestMat/rustediron2_normal.png",
+		"MetallicTexture": "Textures/TestMat/rustediron2_metallic.png",
+		"RoughnessTexture": "Textures/TestMat/rustediron2_roughness.png"
+	],
+	Variables = [
+		"AlbedoColor": .ColorRGBA{
+			Value = {
+				R = 1,
+				G = 1,
+				B = 1,
+				A = 1
+			}
+		},
+		"NormalScaling": .Float2{
+			Value = {
+				X = 1,
+				Y = 1
+			}
+		},
+		"MetallicFactor": .Float{
+			Value = 0
+		},
+		"RoughnessFactor": .Float{
+			Value = 1
+		}
+	]
+}

GlitchyEditor/content/Textures/TestMaterial.mat

@@ -1,11 +1,11 @@
 {
-	Effect = "Resources/Shaders/myEffect.hlsl",
+	Effect = "Shaders/myEffect.hlsl",
 	Textures = [
-		"AlbedoTexture": "Assets/Textures/TestMat/rustediron2_albedo.png",
+		"AlbedoTexture": "Textures/TestMat/rustediron2_albedo.png",
-		"NormalTexture": "Assets/Textures/TestMat/rustediron2_normal.png",
+		"NormalTexture": "Textures/TestMat/rustediron2_normal.png",
-		"MetallicTexture": "Assets/Textures/TestMat/rustediron2_metallic.png",
+		"MetallicTexture": "Textures/TestMat/rustediron2_metallic.png",
-		"RoughnessTexture": "Assets/Textures/TestMat/rustediron2_roughness.png",
+		"RoughnessTexture": "Textures/TestMat/rustediron2_roughness.png",
-		"EmissiveTexture": "Assets/Textures/rocket.png"
+		"EmissiveTexture": "Textures/rocket.png"
 	],
 	Variables = [
 		"AlbedoColor": .ColorRGBA{

GlitchyEditor/content/Textures/White.png.ass

@@ -9,8 +9,8 @@
 			AddressModeU = .Clamp,
 			AddressModeV = .Clamp,
 			AddressModeW = .Clamp,
-			MipMinLOD = -3.40282347e+38,
+			MipMinLOD = -340282346638528859811704183484516925440,
-			MipMaxLOD = 3.40282347e+38,
+			MipMaxLOD = 340282346638528859811704183484516925440,
 			MaxAnisotropy = 1,
 			BorderColor = {
 				R = 1,

GlitchyEditor/resources/ProjectTemplate/.gitignore

@@ -1 +0,0 @@
-project_user.bon

GlitchyEditor/resources/ProjectTemplate/Assets/Scripts/.gitignore

@@ -1,398 +0,0 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-##
-## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
-
-# User-specific files
-*.rsuser
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Mono auto generated files
-mono_crash.*
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-[Ww][Ii][Nn]32/
-[Aa][Rr][Mm]/
-[Aa][Rr][Mm]64/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-[Ll]ogs/
-
-# Visual Studio 2015/2017 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# Visual Studio 2017 auto generated files
-Generated\ Files/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUnit
-*.VisualState.xml
-TestResult.xml
-nunit-*.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# Benchmark Results
-BenchmarkDotNet.Artifacts/
-
-# .NET Core
-project.lock.json
-project.fragment.lock.json
-artifacts/
-
-# ASP.NET Scaffolding
-ScaffoldingReadMe.txt
-
-# StyleCop
-StyleCopReport.xml
-
-# Files built by Visual Studio
-*_i.c
-*_p.c
-*_h.h
-*.ilk
-*.meta
-*.obj
-*.iobj
-*.pch
-*.pdb
-*.ipdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*_wpftmp.csproj
-*.log
-*.tlog
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# Visual Studio Trace Files
-*.e2e
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# AxoCover is a Code Coverage Tool
-.axoCover/*
-!.axoCover/settings.json
-
-# Coverlet is a free, cross platform Code Coverage Tool
-coverage*.json
-coverage*.xml
-coverage*.info
-
-# Visual Studio code coverage results
-*.coverage
-*.coveragexml
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# Note: Comment the next line if you want to checkin your web deploy settings,
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# NuGet Symbol Packages
-*.snupkg
-# The packages folder can be ignored because of Package Restore
-**/[Pp]ackages/*
-# except build/, which is used as an MSBuild target.
-!**/[Pp]ackages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/[Pp]ackages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-*.appx
-*.appxbundle
-*.appxupload
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!?*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.jfm
-*.pfx
-*.publishsettings
-orleans.codegen.cs
-
-# Including strong name files can present a security risk
-# (https://github.com/github/gitignore/pull/2483#issue-259490424)
-#*.snk
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-ServiceFabricBackup/
-*.rptproj.bak
-
-# SQL Server files
-*.mdf
-*.ldf
-*.ndf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-*.rptproj.rsuser
-*- [Bb]ackup.rdl
-*- [Bb]ackup ([0-9]).rdl
-*- [Bb]ackup ([0-9][0-9]).rdl
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-node_modules/
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
-*.vbw
-
-# Visual Studio 6 auto-generated project file (contains which files were open etc.)
-*.vbp
-
-# Visual Studio 6 workspace and project file (working project files containing files to include in project)
-*.dsw
-*.dsp
-
-# Visual Studio 6 technical files
-*.ncb
-*.aps
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# CodeRush personal settings
-.cr/personal
-
-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc
-
-# Cake - Uncomment if you are using it
-# tools/**
-# !tools/packages.config
-
-# Tabs Studio
-*.tss
-
-# Telerik's JustMock configuration file
-*.jmconfig
-
-# BizTalk build output
-*.btp.cs
-*.btm.cs
-*.odx.cs
-*.xsd.cs
-
-# OpenCover UI analysis results
-OpenCover/
-
-# Azure Stream Analytics local run output
-ASALocalRun/
-
-# MSBuild Binary and Structured Log
-*.binlog
-
-# NVidia Nsight GPU debugger configuration file
-*.nvuser
-
-# MFractors (Xamarin productivity tool) working folder
-.mfractor/
-
-# Local History for Visual Studio
-.localhistory/
-
-# Visual Studio History (VSHistory) files
-.vshistory/
-
-# BeatPulse healthcheck temp database
-healthchecksdb
-
-# Backup folder for Package Reference Convert tool in Visual Studio 2017
-MigrationBackup/
-
-# Ionide (cross platform F# VS Code tools) working folder
-.ionide/
-
-# Fody - auto-generated XML schema
-FodyWeavers.xsd
-
-# VS Code files for those working on multiple tools
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-*.code-workspace
-
-# Local History for Visual Studio Code
-.history/
-
-# Windows Installer files from build outputs
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# JetBrains Rider
-*.sln.iml

GlitchyEditor/resources/ProjectTemplate/Assets/Scripts/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// Allgemeine Informationen über eine Assembly werden über die folgenden
-// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-// die einer Assembly zugeordnet sind.
-[assembly: AssemblyTitle("[ProjectName]")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("[ProjectName]")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
-// für COM-Komponenten unsichtbar.  Wenn Sie auf einen Typ in dieser Assembly von
-// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
-[assembly: ComVisible(false)]
-
-// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
-[assembly: Guid("7a70819c-5317-402a-8553-95c5a001e370")]
-
-// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
-//
-//      Hauptversion
-//      Nebenversion
-//      Buildnummer
-//      Revision
-//
-// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
-// indem Sie "*" wie unten gezeigt eingeben:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

GlitchyEditor/resources/ProjectTemplate/Assets/Scripts/TemplateProject.csproj

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7A70819C-5317-402A-8553-95C5A001E370}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>[ProjectName]</RootNamespace>
-    <AssemblyName>[ProjectName]</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <LangVersion>default</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <LangVersion>default</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="ScriptCore, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>[CoreLibPath]</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

GlitchyEditor/resources/ProjectTemplate/Assets/Scripts/TemplateProject.sln

@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.4.33205.214
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "[ProjectName]", "[ProjectName].csproj", "{7A70819C-5317-402A-8553-95C5A001E370}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7A70819C-5317-402A-8553-95C5A001E370}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7A70819C-5317-402A-8553-95C5A001E370}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7A70819C-5317-402A-8553-95C5A001E370}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7A70819C-5317-402A-8553-95C5A001E370}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {B5D43D8D-D80B-41AA-BE40-1DC507D87148}
-	EndGlobalSection
-EndGlobal

GlitchyEditor/resources/scripts/ScriptCore.deps.json

@@ -1,34 +1,15 @@
 {
   "runtimeTarget": {
-    "name": ".NETStandard,Version=v2.0/",
+    "name": ".NETCoreApp,Version=v7.0",
     "signature": ""
   },
   "compilationOptions": {},
   "targets": {
-    ".NETStandard,Version=v2.0": {},
+    ".NETCoreApp,Version=v7.0": {
-    ".NETStandard,Version=v2.0/": {
       "ScriptCore/1.0.0": {
-        "dependencies": {
-          "Half": "1.0.0",
-          "NETStandard.Library": "2.0.3"
-        },
         "runtime": {
           "ScriptCore.dll": {}
         }
-      },
-      "Half/1.0.0": {
-        "runtime": {
-          "lib/netstandard2.0/System.Half.dll": {
-            "assemblyVersion": "1.0.0.0",
-            "fileVersion": "1.0.0.0"
-          }
-        }
-      },
-      "Microsoft.NETCore.Platforms/1.1.0": {},
-      "NETStandard.Library/2.0.3": {
-        "dependencies": {
-          "Microsoft.NETCore.Platforms": "1.1.0"
-        }
       }
     }
   },
@@ -37,27 +18,6 @@
       "type": "project",
       "serviceable": false,
       "sha512": ""
-    },
-    "Half/1.0.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-EPLLPQA1UjF9QM3ymNhWLhgcnBNc8e1po4qWRWTD3Hd9xiohYlkCob0QjDIbJs6Nvfd4eAbsjxIwRyh7httyXA==",
-      "path": "half/1.0.0",
-      "hashPath": "half.1.0.0.nupkg.sha512"
-    },
-    "Microsoft.NETCore.Platforms/1.1.0": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==",
-      "path": "microsoft.netcore.platforms/1.1.0",
-      "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512"
-    },
-    "NETStandard.Library/2.0.3": {
-      "type": "package",
-      "serviceable": true,
-      "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
-      "path": "netstandard.library/2.0.3",
-      "hashPath": "netstandard.library.2.0.3.nupkg.sha512"
     }
   }
 }

GlitchyEditor/resources/scripts/ScriptCore.runtimeconfig.dev.json

@@ -0,0 +1,9 @@
+{
+  "runtimeOptions": {
+    "additionalProbingPaths": [
+      "C:\\Users\\Simon\\.dotnet\\store\\|arch|\\|tfm|",
+      "C:\\Users\\Simon\\.nuget\\packages",
+      "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
+    ]
+  }
+}

GlitchyEditor/resources/scripts/ScriptCore.runtimeconfig.json

@@ -0,0 +1,10 @@
+{
+  "runtimeOptions": {
+    "tfm": "net7.0",
+    "rollForward": "LatestMinor",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "7.0.0"
+    }
+  }
+}

GlitchyEditor/src/Assets/AssetHierarchy.bf

@@ -12,7 +12,6 @@ public class AssetNode
 {
 	public String Name ~ delete _;
 	public String Path ~ delete _;
-	public String Identifier ~ delete _;
 
 	public bool IsDirectory;
 
@@ -39,43 +38,14 @@ public static class AssetIdentifier
 {
 	public const char8 DirectorySeparatorChar = '/';
 
-	// TODO: Asset identifiers and paths have little to do with each other and already caused a bit of pain, we should consider not using String for both.
-	/// Removes or unifies potential platform specific or file-path related stuff in the given asset identifier
 	public static void Fixup(String assetIdentifier)
 	{
-		int dotIndex = 0;
+		const String DotSeperator = $".{DirectorySeparatorChar}";
+		const String SeperatorDot = $"{DirectorySeparatorChar}.";
 
 		assetIdentifier.Replace('\\', DirectorySeparatorChar);
-		
+		assetIdentifier.Replace(DotSeperator, "");
-		// Replace /./ stuff
+		assetIdentifier.Replace(SeperatorDot, "");
-		while ((dotIndex = assetIdentifier.IndexOf('.', dotIndex)) != -1)
-		{
-			char8 lastChar = '\0';
-			char8 nextChar = '\0';
-
-			int nextIndex = dotIndex + 1;
-			if (nextIndex < assetIdentifier.Length)
-				nextChar = assetIdentifier[nextIndex];
-
-			int lastIndex = dotIndex - 1;
-			if (lastIndex < assetIdentifier.Length)
-				lastChar = assetIdentifier[nextIndex];
-
-			// We either need to have a slash on both sides, or we have to be at the start or end of the string
-			if ((lastChar == '\0' || lastChar == DirectorySeparatorChar) &&
-				(lastChar == '\0' || lastChar == DirectorySeparatorChar))
-			{
-				if (lastChar != '\0')
-					assetIdentifier.Remove(lastIndex, 2);
-				else
-					assetIdentifier.Remove(dotIndex, 2);
-			}
-			else
-			{
-				// Skip the dot
-				dotIndex++;
-			}
-		}
 
 		if (assetIdentifier.StartsWith(DirectorySeparatorChar))
 			assetIdentifier.Remove(0, 1);
@@ -91,124 +61,32 @@ class AssetHierarchy
 	
 	bool _fileSystemDirty = false;
 	
-	internal TreeNode<AssetNode> _assetRootNode = null ~ DeleteTreeAndChildren!(_);
+	internal TreeNode<AssetNode> _assetHierarchy = null ~ DeleteTreeAndChildren!(_);
-	internal TreeNode<AssetNode> _resourcesDirectoryNode = null;
-	internal TreeNode<AssetNode> _assetsDirectoryNode = null;
 	private append Dictionary<StringView, TreeNode<AssetNode>> _pathToAssetNode = .();
-	private append Dictionary<StringView, TreeNode<AssetNode>> _identifierToAssetNode = .();
 	
-	private append String _resourcesDirectory = .();
+	private append String _contentDirectory = .();
-	private append String _assetsDirectory = .();
 
 	private EditorContentManager _contentManager;
 
-	public TreeNode<AssetNode> RootNode => _assetRootNode;
+	public StringView ContentDirectory
-
-	public StringView ResourcesDirectory
 	{
-		get => _resourcesDirectory;
+		get => _contentDirectory;
 		private set
 		{
-			_resourcesDirectory.Set(value);
+			_contentDirectory.Clear();
-			Path.Fixup(_resourcesDirectory);
+			_contentDirectory.Append(value);
-		}
+			Path.Fixup(_contentDirectory);
-	}
-
-	public StringView AssetsDirectory
-	{
-		get => _assetsDirectory;
-		private set
-		{
-			_assetsDirectory.Set(value);
-			Path.Fixup(_assetsDirectory);
 		}
 	}
 
 	public this(EditorContentManager contentManager)
 	{
 		_contentManager = contentManager;
-
-		// Create a root node that will contain all Asset directory nodes.
-		_assetRootNode = new TreeNode<AssetNode>(new AssetNode());
-		_assetRootNode->Path = new String();
-		_assetRootNode->Name = new String();
-		_assetRootNode->IsDirectory = true;
-
-		Log.EngineLogger.Trace($"Created root node");
 	}
 
-	public void SetResourcesDirectory(StringView fileName)
+	public void SetContentDirectory(StringView contentDirectory)
 	{
-		ResourcesDirectory = fileName;
+		ContentDirectory = contentDirectory;
-
-		_resourcesDirectoryNode?.ForEach(scope (node) => {
-			_pathToAssetNode.Remove(node->Path);
-			_identifierToAssetNode.Remove(node->Identifier);
-		});
-		_assetRootNode.RemoveChild(_resourcesDirectoryNode);
-		DeleteTreeAndChildren!(_resourcesDirectoryNode);
-		_resourcesDirectoryNode = null;
-
-		if (!Directory.Exists(ResourcesDirectory))
-		{
-			Log.EngineLogger.Error($"Resources directory \"{ResourcesDirectory}\" doesn't exist.");
-			return;
-		}
-		
-		AssetNode assetNode = new AssetNode();
-		assetNode.Path = new String(ResourcesDirectory);
-		assetNode.Name = new String();
-		assetNode.Identifier = new String("###resources");
-		assetNode.IsDirectory = true;
-		Path.GetFileName(assetNode.Path, assetNode.Name);
-
-		_resourcesDirectoryNode = _assetRootNode.AddChild(assetNode);
-		_pathToAssetNode.Add(assetNode.Path, _resourcesDirectoryNode);
-		_identifierToAssetNode.Add(assetNode.Identifier, _resourcesDirectoryNode);
-
-		Log.EngineLogger.Trace($"Created directory node for: \"{ResourcesDirectory}\"");
-
-		_fileSystemDirty = true;
-
-		// TODO: Watch resources folder?
-		//SetupResourcesFileSystemWatcher();
-
-		Update();
-	}
-
-	public void SetAssetsDirectory(StringView fileName)
-	{
-		AssetsDirectory = fileName;
-		
-		_assetsDirectoryNode?.ForEach(scope (node) => {
-			_pathToAssetNode.Remove(node->Path);
-			_identifierToAssetNode.Remove(node->Identifier);
-		});
-		_assetRootNode.RemoveChild(_assetsDirectoryNode);
-		DeleteTreeAndChildren!(_assetsDirectoryNode);
-		_assetsDirectoryNode = null;
-		
-		if (!Directory.Exists(AssetsDirectory))
-		{
-			// TODO: This is not an error, if no project is loaded
-			Log.EngineLogger.Warning($"Assets directory \"{AssetsDirectory}\" doesn't exist.");
-			return;
-		}
-		
-
-		AssetNode assetNode = new AssetNode();
-		assetNode.Path = new String(AssetsDirectory);
-		assetNode.Name = new String();
-		assetNode.Identifier = new String("###assets");
-		assetNode.IsDirectory = true;
-		Path.GetFileName(assetNode.Path, assetNode.Name);
-
-		_assetsDirectoryNode = _assetRootNode.AddChild(assetNode);
-		_pathToAssetNode.Add(assetNode.Path, _assetsDirectoryNode);
-		_identifierToAssetNode.Add(assetNode.Identifier, _assetsDirectoryNode);
-
-		Log.EngineLogger.Trace($"Created directory node for: \"{AssetsDirectory}\"");
-
 
 		_fileSystemDirty = true;
 
@@ -221,7 +99,7 @@ class AssetHierarchy
 	private void SetupFileSystemWatcher()
 	{
 		delete fsw;
-		fsw = new FileSystemWatcher(_assetsDirectory);
+		fsw = new FileSystemWatcher(_contentDirectory);
 		fsw.IncludeSubdirectories = true;
 
 		fsw.OnChanged.Add(new (filename) => {
@@ -248,7 +126,15 @@ class AssetHierarchy
 		fsw.OnRenamed.Add(new (oldName, newName) => {
 			Log.EngineLogger.Trace($"File renamed (From \"{oldName}\" to \"{newName}\")");
 			
+			//_fileSystemDirty = true;
 			FileRenamed(oldName, newName);
+			/*String contentFilePath = scope String();
+
+			Path.InternalCombine(contentFilePath, ContentDirectory, oldName);
+
+			//_fileSystemDirty = true;
+			TreeNode<AssetNode> fileNode = GetNodeFromPath(contentFilePath);
+			fileNode->*/
 		});
 
 		fsw.StartRaisingEvents();
@@ -267,19 +153,6 @@ class AssetHierarchy
 		return .Err;
 	}
 
-	/// Gets the tree node for the given filePath or .Err, if the file/directory doesn't exist.
-	/// @param filePath the path for which to return the tree node.
-	/// @remarks Do not hold a reference to the TreeNode because it can become invalid when the file hierarchy changes.
-	public Result<TreeNode<AssetNode>> GetNodeFromIdentifier(StringView identifier)
-	{
-		if (_identifierToAssetNode.TryGetValue(identifier, let treeNode))
-		{
-			return treeNode;
-		}
-
-		return .Err;
-	}
-
 	public bool FileExists(StringView filePath)
 	{
 		return _pathToAssetNode.ContainsKey(filePath);
@@ -294,36 +167,33 @@ class AssetHierarchy
 		}
 	}
 	
-	/// Determines and set the Identfier for the given asset node.
-	private void DetermineIdentifier(TreeNode<AssetNode> assetNode)
-	{
-		if (assetNode->Identifier == null)
-			assetNode->Identifier = new String();
-
-		assetNode->Identifier.Clear();
-
-		// Get the Identifier which is simply the path relative to the asste root (either Resources- or Assets-Folder)
-		if (assetNode.IsInSubtree(_resourcesDirectoryNode))
-		{
-			Path.GetRelativePath(assetNode->Path, _resourcesDirectoryNode->Path, assetNode->Identifier);
-			assetNode->Identifier.Insert(0, "Resources/");
-		}
-		else if (assetNode.IsInSubtree(_assetsDirectoryNode))
-		{
-			Path.GetRelativePath(assetNode->Path, _assetsDirectoryNode->Path, assetNode->Identifier);
-			assetNode->Identifier.Insert(0, "Assets/");
-		}
-		AssetIdentifier.Fixup(assetNode->Identifier);
-	}
 
 	/// Rebuilds the asset file hierarchy.
 	private void UpdateFiles()
 	{
 		Log.EngineLogger.Trace($"Updating asset hierarchy");
 
+		if (_assetHierarchy == null)
+		{
+			// TODO: move to init?
+
+			_assetHierarchy = new TreeNode<AssetNode>(new AssetNode());
+			_assetHierarchy->Path = new String(ContentDirectory);
+			_assetHierarchy->Name = new String("Content");
+			_assetHierarchy->IsDirectory = true;
+
+			Log.EngineLogger.Trace($"Created directory node for: \"{_assetHierarchy->Path}\"");
+
+			_pathToAssetNode.Add(ContentDirectory, _assetHierarchy);
+		}
+
 		void HandleFile(AssetNode node)
 		{
-			node.AssetFile = new AssetFile(_contentManager, node.Identifier, node.Path, node.IsDirectory);
+			String identifier = scope .(node.Path.Length);
+			Path.GetRelativePath(node.Path, _contentDirectory, identifier);
+			AssetIdentifier.Fixup(identifier);
+
+			node.AssetFile = new AssetFile(_contentManager, identifier, node.Path, node.IsDirectory);
 		}
 
 		/// Determines the files that belong to the given directory and adds them to the tree.
@@ -342,7 +212,6 @@ class AssetHierarchy
 				entry.GetFilePath(filepathBuffer..Clear());
 
 				Path.GetExtension(filepathBuffer, .. extensionBuffer..Clear());
-				filepathBuffer.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
 
 				// Ignore meta files.
 				if (extensionBuffer.Equals(AssetFile.ConfigFileExtension, .OrdinalIgnoreCase))
@@ -356,15 +225,13 @@ class AssetHierarchy
 					assetNode.Name = new String();
 					Path.GetFileName(filepathBuffer, assetNode.Name);
 					
+					filepathBuffer.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+
 					assetNode.Path = new String(filepathBuffer);
 					assetNode.IsDirectory = false;
-					
-					treeNode = directory.AddChild(assetNode);
-					
-					DetermineIdentifier(treeNode);
 
+					treeNode = directory.AddChild(assetNode);
 					_pathToAssetNode.Add(assetNode.Path, treeNode);
-					_identifierToAssetNode.Add(assetNode.Identifier, treeNode);
 
 					//GrabSubAssets(node);
 					HandleFile(treeNode.Value);
@@ -376,6 +243,17 @@ class AssetHierarchy
 
 		void RemoveOrphanedEntries(TreeNode<AssetNode> node)
 		{
+			/// Removes the node and its children from _pathToAssetNode
+			void RemoveSubtree(TreeNode<AssetNode> tree)
+			{
+				_pathToAssetNode.Remove(tree->Path);
+
+				for (var child in tree.Children)
+				{
+					RemoveSubtree(child);
+				}
+			}
+
 			for (TreeNode<AssetNode> child in node.Children)
 			{
 				if (!Directory.Exists(child->Path) && !File.Exists(child->Path))
@@ -384,16 +262,13 @@ class AssetHierarchy
 
 					@child.Remove();
 
-					child.ForEach(scope (node) => {
+					RemoveSubtree(child);
-						_pathToAssetNode.Remove(node->Path);
-						_identifierToAssetNode.Remove(node->Identifier);
-					});
 
 					DeleteTreeAndChildren!(child);
 				}
 			}
 		}
-
+		
 		/// Adds the given directory to the specified tree.
 		/// Recursively adds all Files and Subdirectories.
 		void AddDirectoryToTree(String path, TreeNode<AssetNode> parentNode)
@@ -409,30 +284,11 @@ class AssetHierarchy
 				AssetNode assetNode = new AssetNode();
 				assetNode.Path = new String(path);
 				assetNode.Name = new String();
-				//assetNode.Identifier = new String();
 				assetNode.IsDirectory = true;
 				Path.GetFileName(assetNode.Path, assetNode.Name);
 
-				/*// Get the Identifier which is simply the path relative to the asste root (either Resources- or Assets-Folder)
-				if (parentNode == _resourcesDirectoryNode || parentNode.IsChildOf(_resourcesDirectoryNode))
-				{
-					Path.GetRelativePath(assetNode.Path, _resourcesDirectoryNode->Path, assetNode.Identifier);
-					assetNode.Identifier.Insert(0, "Resources/");
-				}
-				else
-				{
-					Path.GetRelativePath(assetNode.Path, _assetsDirectoryNode->Path, assetNode.Identifier);
-					assetNode.Identifier.Insert(0, "Assets/");
-				}
-				AssetIdentifier.Fixup(assetNode.Identifier);*/
-
 				treeNode = parentNode.AddChild(assetNode);
-				
-				DetermineIdentifier(treeNode);
-
 				_pathToAssetNode.Add(assetNode.Path, treeNode);
-				// No Identifiers for Directories, because we can't use directories as Assets anyways...
-				//_identifierToAssetNode.Add(assetNode.Identifier, treeNode);
 
 				Log.EngineLogger.Trace($"Created directory node for: \"{assetNode.Path}\"");
 			}
@@ -448,47 +304,14 @@ class AssetHierarchy
 
 				AddDirectoryToTree(directoryNameBuffer, treeNode);
 			}
-			
+
-			RemoveOrphanedEntries(treeNode);
 			AddFilesOfDirectory(treeNode);
-		}
 
-		if (!AssetsDirectory.IsWhiteSpace)
+			RemoveOrphanedEntries(treeNode);
-		{
-			String filter = scope $"{AssetsDirectory}/*";
-
-			String directoryNameBuffer = scope String(256);
-
-			for (var directory in Directory.Enumerate(filter, .Directories))
-			{
-				directory.GetFilePath(directoryNameBuffer..Clear());
-
-				AddDirectoryToTree(directoryNameBuffer, _assetsDirectoryNode);
-			}
-
-			RemoveOrphanedEntries(_assetsDirectoryNode);
-			AddFilesOfDirectory(_assetsDirectoryNode);
 		}
 		
-		if (!ResourcesDirectory.IsWhiteSpace)
+		String filter = scope $"{ContentDirectory}/*";
-		{
+		
-			String filter = scope $"{ResourcesDirectory}/*";
-
-			String directoryNameBuffer = scope String(256);
-	
-			for (var directory in Directory.Enumerate(filter, .Directories))
-			{
-				directory.GetFilePath(directoryNameBuffer..Clear());
-	
-				AddDirectoryToTree(directoryNameBuffer, _resourcesDirectoryNode);
-			}
-			
-			RemoveOrphanedEntries(_resourcesDirectoryNode);
-			AddFilesOfDirectory(_resourcesDirectoryNode);
-		}
-
-		//*String filter = scope $"{AssetsDirectory}/*";
-		/*
 		String directoryNameBuffer = scope String(256);
 
 		for (var directory in Directory.Enumerate(filter, .Directories))
@@ -498,7 +321,7 @@ class AssetHierarchy
 			AddDirectoryToTree(directoryNameBuffer, _assetHierarchy);
 		}
 		
-		RemoveOrphanedEntries(_assetHierarchy);*/
+		RemoveOrphanedEntries(_assetHierarchy);
 
 		_fileSystemDirty = false;
 	}
@@ -513,7 +336,7 @@ class AssetHierarchy
 			fileName.RemoveFromEnd(AssetFile.ConfigFileExtension.Length);
 
 		String fileNameWithContentRoot = scope .();
-		Path.InternalCombine(fileNameWithContentRoot, _assetsDirectory, fileName);
+		Path.InternalCombine(fileNameWithContentRoot, _contentDirectory, fileName);
 
 		var nodeResult = GetNodeFromPath(fileNameWithContentRoot);
 
@@ -543,10 +366,10 @@ class AssetHierarchy
 
 
 		String oldFileNameWithContentRoot = scope .();
-		Path.InternalCombine(oldFileNameWithContentRoot, _assetsDirectory, oldFilePath);
+		Path.InternalCombine(oldFileNameWithContentRoot, _contentDirectory, oldFilePath);
 		
 		String newFileNameWithContentRoot = scope .();
-		Path.InternalCombine(newFileNameWithContentRoot, _assetsDirectory, newFilePath);
+		Path.InternalCombine(newFileNameWithContentRoot, _contentDirectory, newFilePath);
 		
 		// Rename config file
 		{
@@ -574,13 +397,9 @@ class AssetHierarchy
 		}
 		
 		_pathToAssetNode.Remove(oldFileNameWithContentRoot);
-		_identifierToAssetNode.Remove(node->Identifier);
 
 		node->Path.Set(newFileNameWithContentRoot);
 		_pathToAssetNode.Add(node->Path, node);
-
-		DetermineIdentifier(node);
-		_identifierToAssetNode.Add(node->Identifier, node);
 		
 		node->Name.Clear();
 		Path.GetFileName(newFileNameWithContentRoot, node->Name);

GlitchyEditor/src/Assets/MaterialAssetLoader.bf

@@ -33,7 +33,7 @@ class MaterialAssetPropertiesEditor : AssetPropertiesEditor
 
 		if (ImGui.BeginDragDropTarget())
 		{
-			ImGui.Payload* payload = ImGui.AcceptDragDropPayload(.ContentBrowserItem);
+			ImGui.Payload* payload = ImGui.AcceptDragDropPayload("CONTENT_BROWSER_ITEM");
 			
 			if (payload != null)
 			{
@@ -78,7 +78,7 @@ class MaterialAssetPropertiesEditor : AssetPropertiesEditor
 
 			if (ImGui.BeginDragDropTarget())
 			{
-				ImGui.Payload* payload = ImGui.AcceptDragDropPayload(.ContentBrowserItem);
+				ImGui.Payload* payload = ImGui.AcceptDragDropPayload("CONTENT_BROWSER_ITEM");
 
 				if (payload != null)
 				{
@@ -120,7 +120,7 @@ class MaterialAssetPropertiesEditor : AssetPropertiesEditor
 
 						value = (float3)ColorRGB.LinearToSRGB((ColorRGB)value);
 
-						if (ImGui.ColorEdit3(displayName.Ptr, ref *(float[3]*)&value))
+						if (ImGui.ColorEdit3(displayName.Ptr, *(float[3]*)&value))
 						{
 							value = (float3)ColorRGB.SRgbToLinear((ColorRGB)value);
 							material.SetVariable(variable.Name, value);
@@ -132,7 +132,7 @@ class MaterialAssetPropertiesEditor : AssetPropertiesEditor
 						
 						value = (float4)ColorRGBA.LinearToSRGB((ColorRGBA)value);
 
-						if (ImGui.ColorEdit4(displayName.Ptr, ref *(float[4]*)&value))
+						if (ImGui.ColorEdit4(displayName.Ptr, *(float[4]*)&value))
 						{
 							value = (float4)ColorRGBA.SRgbToLinear((ColorRGBA)value);
 							material.SetVariable(variable.Name, value);
@@ -149,7 +149,7 @@ class MaterialAssetPropertiesEditor : AssetPropertiesEditor
 
 						value = (float3)ColorRGB.LinearToSRGB((ColorRGB)value);
 
-						if (ImGui.ColorEdit3(displayName.Ptr, ref *(float[3]*)&value, .HDR | .Float))
+						if (ImGui.ColorEdit3(displayName.Ptr, *(float[3]*)&value, .HDR | .Float))
 						{
 							value = (float3)ColorRGB.SRgbToLinear((ColorRGB)value);
 							material.SetVariable(variable.Name, value);
@@ -161,7 +161,7 @@ class MaterialAssetPropertiesEditor : AssetPropertiesEditor
 						
 						value = (float4)ColorRGBA.LinearToSRGB((ColorRGBA)value);
 
-						if (ImGui.ColorEdit4(displayName.Ptr, ref *(float[4]*)&value, .HDR | .Float))
+						if (ImGui.ColorEdit4(displayName.Ptr, *(float[4]*)&value, .HDR | .Float))
 						{
 							value = (float4)ColorRGBA.SRgbToLinear((ColorRGBA)value);
 							material.SetVariable(variable.Name, value);

GlitchyEditor/src/EditWindows/AssetViewer.bf

@@ -47,16 +47,20 @@ class AssetViewer : EditorWindow
 		    ImGui.TableSetColumnIndex(0);
 
 			if (ImGui.BeginChild("Assets"))
+			{
 				DrawAssetList();
 
-			ImGui.EndChild();
+				ImGui.EndChild();
+			}
 			
 			ImGui.TableNextColumn();
 			
 			if (ImGui.BeginChild("Files"))
+			{
 				DrawAssetViewer();
 
-			ImGui.EndChild();
+				ImGui.EndChild();
+			}
 
 			ImGui.EndTable();
 		}
@@ -175,8 +179,8 @@ class TexturererViewerer
 
 	public this()
 	{
-		_effect = Content.LoadAsset("Resources/Shaders/textureViewerShader.hlsl");
+		_effect = Content.LoadAsset("Shaders\\textureViewerShader.hlsl");
-		_renderTargetEffect = Content.LoadAsset("Resources/Shaders/RenderTargetGroupViewer.hlsl");
+		_renderTargetEffect = Content.LoadAsset("Shaders\\RenderTargetGroupViewer.hlsl");
 	}
 	
 	float2 _position;
@@ -207,7 +211,7 @@ class TexturererViewerer
 			
 			float maxDimension = max(width, height);
 
-			ImGui.SliderFloat2("Position", ref *(float[2]*)&_position, 2 * -maxDimension * _zoom, 2 * maxDimension * _zoom);
+			ImGui.SliderFloat2("Position", *(float[2]*)&_position, 2 * -maxDimension * _zoom, 2 * maxDimension * _zoom);
 
 			ImGui.Separator();
 

GlitchyEditor/src/EditWindows/ComponentEditWindow.bf

@@ -7,8 +7,6 @@ using GlitchyEngine.Renderer;
 using GlitchyEngine;
 using GlitchyEngine.Content;
 using GlitchyEngine.Scripting;
-using GlitchyEngine.Core;
-using Mono;
 
 namespace GlitchyEditor.EditWindows
 {
@@ -112,8 +110,7 @@ namespace GlitchyEditor.EditWindows
 
 			if (nodeOpen)
 			{
-				if (entity.TryGetComponent<TComponent>(let actualComponent))
+				showComponentEditor(entity, component);
-					showComponentEditor(entity, actualComponent);
 
 				ImGui.TreePop();
 			}
@@ -281,7 +278,7 @@ namespace GlitchyEditor.EditWindows
 
 			if (ImGui.BeginDragDropTarget())
 			{
-				ImGui.Payload* payload = ImGui.AcceptDragDropPayload(.ContentBrowserItem);
+				ImGui.Payload* payload = ImGui.AcceptDragDropPayload("CONTENT_BROWSER_ITEM");
 
 				if (payload != null)
 				{
@@ -309,7 +306,7 @@ namespace GlitchyEditor.EditWindows
 
 			if (ImGui.BeginDragDropTarget())
 			{
-				ImGui.Payload* payload = ImGui.AcceptDragDropPayload(.ContentBrowserItem);
+				ImGui.Payload* payload = ImGui.AcceptDragDropPayload("CONTENT_BROWSER_ITEM");
 
 				if (payload != null)
 				{
@@ -341,7 +338,7 @@ namespace GlitchyEditor.EditWindows
 
 			if (ImGui.BeginDragDropTarget())
 			{
-				ImGui.Payload* payload = ImGui.AcceptDragDropPayload(.ContentBrowserItem);
+				ImGui.Payload* payload = ImGui.AcceptDragDropPayload("CONTENT_BROWSER_ITEM");
 
 				if (payload != null)
 				{
@@ -456,7 +453,8 @@ namespace GlitchyEditor.EditWindows
 
 			StringView search = StringView();
 
-			char8* scriptLabel = scriptComponent.Instance?.ScriptClass.FullName.ToScopeCStr!() ?? "Select Script...";
+			//char8* scriptLabel = scriptComponent.Instance?.ScriptClass.FullName.ToScopeCStr!() ?? "Select Script...";
+			char8* scriptLabel = scriptComponent.Instance?.ScriptClass.FullName.CStr() ?? "Select Script...";
 
 			if (ImGui.Button(scriptLabel))
 				ImGui.OpenPopup("SelectScript");
@@ -481,13 +479,15 @@ namespace GlitchyEditor.EditWindows
 						//ScriptEngine.InitializeInstance(entity, scriptComponent);
 
 						scriptComponent.ScriptClassName = scriptClass.FullName;
-						
+
-						ScriptEngine.CreateScriptFieldMap(entity);
+						//ScriptEngine.CreateScriptFieldMap(entity);
 					}
 				}
 				ImGui.EndPopup();
 			}
 
+			/*
+
 			ScriptClass scriptClass = ScriptEngine.GetScriptClass(scriptComponent.ScriptClassName);
 
 			/*T GetFieldValue<T>()
@@ -515,89 +515,11 @@ namespace GlitchyEditor.EditWindows
 				scriptInstance.SetFieldValue<T>(scriptField, value);
 			}
 
-			T GetData<T>(void* instance, ScriptField scriptField)
-			{
-				T data = default;
-				Mono.mono_field_get_value((.)instance, scriptField.[Friend]_monoField, &data);
-
-				return data;
-			}
-
-			void GetData<T>(void* instance, ScriptField scriptField, T* data)
-			{
-				Mono.mono_field_get_value((.)instance, scriptField.[Friend]_monoField, data);
-			}
-
-			void SetData<T>(void* instance, ScriptField scriptField, in T value)
-			{
-				Mono.mono_field_set_value((.)instance, scriptField.[Friend]_monoField, &value);
-			}
-
-			void SetData<T>(void* instance, ScriptField scriptField, T* data)
-			{
-				Mono.mono_field_set_value((.)instance, scriptField.[Friend]_monoField, data);
-			}
-
 			if (scriptComponent.Instance?.IsInitialized == true)
 			{
 				SharpClass sharpClass = scriptComponent.Instance.ScriptClass;
 				ScriptInstance scriptInstance = scriptComponent.Instance;
 
-				/*void DoFunnyStuff(void* instance, SharpType sharpType)
-				{
-					for (let (fieldName, scriptField) in sharpType.Fields)
-					{
-						var monoField = scriptField.[Friend]_monoField;
-						
-						switch (scriptField.FieldType)
-						{
-						case .Float:
-							var value = GetData<float>(instance, scriptField);
-							if (ImGui.DragScalar(fieldName.ToScopeCStr!(), .Float, &value))
-								SetData(instance, scriptField, value);
-							
-						case .Struct:
-							{
-								var v = Mono.mono_field_get_value_object(ScriptEngine.[Friend]s_AppDomain, scriptField.[Friend]_monoField, (.)instance);
-
-								void* dataPtr = Mono.mono_object_unbox(v);
-
-								Span<uint8> data = .((.)dataPtr, scriptField.SizeInBytes);
-
-								if (ImGui.CollapsingHeader(fieldName.Ptr))
-								{
-									DoFunnyStuff(dataPtr, scriptField.SharpType);
-								}
-
-								SetData<MonoObject>(instance, scriptField, v);
-
-								//Mono.mono_field_set_value_object(ScriptEngine.[Friend]s_AppDomain, scriptField.[Friend]_monoField, (.)instance);
-								//uint8* data = ;
-
-								/*uint8[] data = scope .[scriptField.SizeInBytes];
-								
-								GetData(instance, scriptField, data.Ptr);
-
-								if (ImGui.CollapsingHeader(fieldName.Ptr))
-								{
-									DoFunnyStuff(data.Ptr, scriptField.SharpType);
-								}
-
-								MonoObject* boxed = Mono.mono_value_box(ScriptEngine.[Friend]s_AppDomain, ((SharpClass)scriptField.SharpType).[Friend]_monoClass, data.Ptr);
-
-								SetData<MonoObject>(instance, scriptField, boxed);*/
-								
-								//Mono.mono_field_get_value(instance, scriptField.[Friend]_monoField, data.Ptr);
-
-							}
-						default:
-							//Log.EngineLogger.Error($"Unhandled field type {scriptField.FieldType}");
-						}
-					}
-				}
-
-				DoFunnyStuff(scriptInstance.[Friend]_instance, sharpClass);*/
-
 				for (let (fieldName, scriptField) in sharpClass.Fields)
 				{
 					var monoField = scriptField.[Friend]_monoField;
@@ -673,22 +595,6 @@ namespace GlitchyEditor.EditWindows
 						// TODO!
 					case .Struct:
 						// TODO!
-						/*{
-							uint8[] data = scope .[scriptField.SizeInBytes];
-
-							Mono.mono_field_get_value(scriptInstance.[Friend]_instance, scriptField.[Friend]_monoField, data.Ptr);
-
-							//scriptField.
-
-							//scriptInstance.GetFieldValue();
-
-							//scriptInstance.ScriptClass.Fields[]
-						 /*
-						var value = GetFieldValue<double>(scriptInstance, scriptField);
-						if (ImGui.DragScalar(fieldName.ToScopeCStr!(), .Double, &value))
-							SetFieldValue(scriptInstance, scriptField, value);
-							*/
-						}*/
 					default:
 						Log.EngineLogger.Error($"Unhandled field type {scriptField.FieldType}");
 					}
@@ -698,311 +604,114 @@ namespace GlitchyEditor.EditWindows
 			{
 				let scriptFields = ScriptEngine.GetScriptFieldMap(entity);
 
-				for (var (fieldName, field) in ref scriptFields)
+				for (var (name, field) in ref scriptFields)
 				{
 					switch (field.Type)
 					{
 					case .Bool:
 						var value = field.GetData<bool>();
-						if (ImGui.Checkbox(fieldName.CStr(), &value))
+						if (ImGui.Checkbox(name.CStr(), &value))
 							field.SetData(value);
 
 					case .SByte:
 						var value = field.GetData<int8>();
-						if (ImGui.DragScalar(fieldName.CStr(), .S8, &value))
+						if (ImGui.DragScalar(name.CStr(), .S8, &value))
-							field.SetData(value);
-					case .Short:
-						var value = field.GetData<int16>();
-						if (ImGui.DragScalar(fieldName.CStr(), .S16, &value))
 							field.SetData(value);
+						case .Short:
+							var value = field.GetData<int16>();
+							if (ImGui.DragScalar(name.CStr(), .S16, &value))
+								field.SetData(value);
 					case .Int:
-						var value = field.GetData<int32>();
+							var value = field.GetData<int32>();
-						if (ImGui.DragScalar(fieldName.CStr(), .S32, &value))
+							if (ImGui.DragScalar(name.CStr(), .S32, &value))
-							field.SetData(value);
+								field.SetData(value);
 					case .Int2:
-						var value = field.GetData<int2>();
+							var value = field.GetData<int2>();
-						if (ImGui.DragScalarN(fieldName.CStr(), .S32, &value, 2))
+							if (ImGui.DragScalarN(name.CStr(), .S32, &value, 2))
-							field.SetData(value);
+								field.SetData(value);
 					case .Int3:
-						var value = field.GetData<int3>();
+							var value = field.GetData<int3>();
-						if (ImGui.DragScalarN(fieldName.CStr(), .S32, &value, 3))
+							if (ImGui.DragScalarN(name.CStr(), .S32, &value, 3))
-							field.SetData(value);
+								field.SetData(value);
 					case .Int4:
-						var value = field.GetData<int4>();
+							var value = field.GetData<int4>();
-						if (ImGui.DragScalarN(fieldName.CStr(), .S32, &value, 4))
+							if (ImGui.DragScalarN(name.CStr(), .S32, &value, 4))
-							field.SetData(value);
+								field.SetData(value);
 					case .Long:
-						var value = field.GetData<int64>();
+							var value = field.GetData<int64>();
-						if (ImGui.DragScalar(fieldName.CStr(), .S64, &value))
+							if (ImGui.DragScalar(name.CStr(), .S64, &value))
-							field.SetData(value);
+								field.SetData(value);
 
 					case .Byte:
-						var value = field.GetData<uint8>();
+							var value = field.GetData<uint8>();
-						if (ImGui.DragScalar(fieldName.CStr(), .U8, &value))
+							if (ImGui.DragScalar(name.CStr(), .U8, &value))
-							field.SetData(value);
+								field.SetData(value);
 					case .UShort:
-						var value = field.GetData<uint16>();
+							var value = field.GetData<uint16>();
-						if (ImGui.DragScalar(fieldName.CStr(), .U16, &value))
+							if (ImGui.DragScalar(name.CStr(), .U16, &value))
-							field.SetData(value);
+								field.SetData(value);
 					case .UInt:
-						var value = field.GetData<uint32>();
+							var value = field.GetData<uint32>();
-						if (ImGui.DragScalar(fieldName.CStr(), .U32, &value))
+							if (ImGui.DragScalar(name.CStr(), .U32, &value))
-							field.SetData(value);
+								field.SetData(value);
 					case .ULong:
-						var value = field.GetData<uint64>();
+							var value = field.GetData<uint64>();
-						if (ImGui.DragScalar(fieldName.CStr(), .U64, &value))
+							if (ImGui.DragScalar(name.CStr(), .U64, &value))
-							field.SetData(value);
+								field.SetData(value);
 
 					case .Float:
-						var value = field.GetData<float>();
+							var value = field.GetData<float>();
-						if (ImGui.DragScalar(fieldName.CStr(), .Float, &value))
+							if (ImGui.DragScalar(name.CStr(), .Float, &value))
-							field.SetData(value);
+								field.SetData(value);
 					case .float2:
-						var value = field.GetData<float2>();
+							var value = field.GetData<float2>();
-						if (ImGui.Editfloat2(fieldName, ref value))
+							if (ImGui.Editfloat2(name, ref value))
-							field.SetData(value);
+								field.SetData(value);
 					case .float3:
-						var value = field.GetData<float3>();
+							var value = field.GetData<float3>();
-						if (ImGui.Editfloat3(fieldName, ref value))
+							if (ImGui.Editfloat3(name, ref value))
-							field.SetData(value);
+								field.SetData(value);
 					case .float4:
-						var value = field.GetData<float4>();
+							var value = field.GetData<float4>();
-						if (ImGui.Editfloat4(fieldName, ref value))
+							if (ImGui.Editfloat4(name, ref value))
-							field.SetData(value);
+								field.SetData(value);
 
 					case .Double:
-						var value = field.GetData<double>();
+							var value = field.GetData<double>();
-						if (ImGui.DragScalar(fieldName.CStr(), .Double, &value))
+							if (ImGui.DragScalar(name.CStr(), .Double, &value))
-							field.SetData(value);
+								field.SetData(value);
 					case .Double2:
-						var value = field.GetData<double2>();
+							var value = field.GetData<double2>();
-						if (ImGui.DragScalarN(fieldName.CStr(), .Double, &value, 2))
+							if (ImGui.DragScalarN(name.CStr(), .Double, &value, 2))
-							field.SetData(value);
+								field.SetData(value);
 					case .Double3:
-						var value = field.GetData<double3>();
+							var value = field.GetData<double3>();
-						if (ImGui.DragScalarN(fieldName.CStr(), .Double, &value, 3))
+							if (ImGui.DragScalarN(name.CStr(), .Double, &value, 3))
-							field.SetData(value);
+								field.SetData(value);
 					case .Double4:
-						var value = field.GetData<double4>();
+							var value = field.GetData<double4>();
-						if (ImGui.DragScalarN(fieldName.CStr(), .Double, &value, 4))
+							if (ImGui.DragScalarN(name.CStr(), .Double, &value, 4))
-							field.SetData(value);
+								field.SetData(value);
 
 					case .Enum:
-						ShowEnumSelector(field, fieldName, scriptClass);
+						// TODO!
+						
 					//case .String:
 						// TODO!
 
 					case .Entity:
-						ShowEntityReceiver(field, fieldName, scriptClass);
+						// TODO!
-					case .Component:
-						ShowComponentReceiver(field, fieldName, scriptClass);
 
 					case .Struct:
 						// TODO!
 
-					case .Class:
-						// We don't support editing classes
-
 					default:
 						Log.EngineLogger.Error($"Unhandled field type {field.Type}");
 					}
 				}
 			}
-		}
 
-		private static void ShowEnumSelector(ScriptFieldInstance* field, StringView fieldName, ScriptClass scriptClass)
+			*/
-		{
-			ScriptField scriptField = scriptClass.Fields[fieldName];
-			SharpEnum enumType = scriptField.SharpType as SharpEnum;
-	
-			Log.EngineLogger.Assert(enumType != null, "Enum must have a SharpEnum!");
-	
-			// Simply get Enum as a uint64
-			var fieldValue = field.GetData<uint64>();
-	
-			StringView valueName = "<Invalid Value>";
-	
-			if (enumType.Values.TryGetValue(fieldValue, let enumValue))
-				valueName = enumValue.Name;
-	
-			if (ImGui.BeginCombo(fieldName.Ptr, valueName.Ptr))
-			{
-				for (let (entryValue, enumEntry) in enumType.Values)
-				{
-					if (ImGui.Selectable(enumEntry.Name.Ptr, fieldValue == entryValue))
-						field.SetData(entryValue);
-				}
-	
-				ImGui.EndCombo();
-			}
-		}
-
-		private static Entity? ShowEntitySelector()
-		{
-			static char8[128] entitySearch = .();
-
-			Entity? result = null;
-
-			if (ImGui.BeginPopup("ENTITY_SELECTOR"))
-			{
-				ImGui.TextUnformatted("Search:");
-				ImGui.SameLine();
-
-				if (ImGui.InputText("##entitySearcher", &entitySearch, (uint64)entitySearch.Count))
-				{
-
-				}
-
-				ImGui.EndPopup();
-			}
-
-			return result;
-		}
-
-		private static void ShowEntityReceiver(ScriptFieldInstance* field, StringView fieldName, ScriptClass scriptClass)
-		{
-			var entityId = field.GetData<UUID>();
-
-			Result<Entity> fieldEntity = Editor.Instance.CurrentScene.GetEntityByID(entityId);
-
-			String entityName = scope .(32);
-			
-			if (entityId == UUID(0))
-				entityName.Set("None");
-			else if (fieldEntity case .Ok(Entity e))
-				entityName.Set(e.Name);
-			else
-				entityName..Clear().AppendF($"Missing entity ({entityId})");
-
-			ImGui.Text($"{fieldName}: ");
-			ImGui.SameLine();
-
-			if (ImGui.Button(entityName))
-			{
-				if (fieldEntity case .Ok)
-					Editor.Instance.EntityHierarchyWindow.HighlightEntity(fieldEntity);
-			}
-
-			if (ImGui.BeginDragDropTarget())
-			{
-				ImGui.Payload* peekPayload = ImGui.AcceptDragDropPayload(.Entity, .AcceptPeekOnly);
-
-				bool allowDrop = false;
-
-				if (peekPayload != null)
-				{
-					Entity draggedEntity = *(Entity*)peekPayload.Data;
-
-					ScriptClass draggedScriptClass = ScriptEngine.[Friend]s_EntityRoot;
-
-					if (draggedEntity.TryGetComponent<ScriptComponent>(let draggedScript))
-					{
-						var draggedClassName = draggedScript.ScriptClassName;
-						draggedScriptClass = ScriptEngine.GetScriptClass(draggedClassName);
-
-					}
-
-					// TODO: I don't like the fact, that we are using mono directly
-
-					ScriptField scriptField = scriptClass.Fields[fieldName];
-					var fieldMonoClass = Mono.mono_type_get_class(scriptField.GetMonoType());
-
-					allowDrop = draggedScriptClass.[Friend]IsSubclass(fieldMonoClass);
-				}
-
-				if (allowDrop)
-				{
-					ImGui.Payload* payload = ImGui.AcceptDragDropPayload(.Entity);
-
-					if (payload != null)
-					{
-						Log.EngineLogger.AssertDebug(payload.DataSize == sizeof(Entity));
-
-						Entity droppedEntity = *(Entity*)payload.Data;
-
-						if (droppedEntity.IsValid)
-							field.SetData<UUID>(droppedEntity.UUID);
-					}
-				}
-
-				ImGui.EndDragDropTarget();
-			}
-		}
-
-		//private static Entity?  
-
-		private static void ShowComponentReceiver(ScriptFieldInstance* field, StringView fieldName, ScriptClass scriptClass)
-		{
-			var entityId = field.GetData<UUID>();
-
-			Result<Entity> fieldEntity = Editor.Instance.CurrentScene.GetEntityByID(entityId);
-
-			String entityName = scope .(32);
-
-			if (entityId == UUID(0))
-				entityName.Set("None");
-			else if (fieldEntity case .Ok(Entity e))
-				entityName.Set(e.Name);
-			else
-				entityName..Clear().AppendF($"Missing reference ({entityId})");
-
-			ImGui.Text($"{fieldName}: ");
-			ImGui.SameLine();
-
-			if (ImGui.Button(entityName))
-			{
-				if (fieldEntity case .Ok)
-					Editor.Instance.EntityHierarchyWindow.HighlightEntity(fieldEntity);
-			}
-
-			if (ImGui.BeginDragDropTarget())
-			{
-				ImGui.Payload* peekPayload = ImGui.AcceptDragDropPayload(.Entity, .AcceptPeekOnly);
-
-				bool allowDrop = false;
-
-				if (peekPayload != null)
-				{
-					Entity draggedEntity = *(Entity*)peekPayload.Data;
-
-					// TODO: I don't like the fact, that we are using mono directly
-
-					ScriptField scriptField = scriptClass.Fields[fieldName];
-
-					// For some reason we have to retrieve the MonoType like this. Using scriptField.GetMonoType() directly returns the wrong type...
-					MonoReflectionType* reflectionType = Mono.mono_type_get_object(ScriptEngine.[Friend]s_AppDomain, scriptField.GetMonoType());
-					MonoType* actualMonoType = Mono.mono_reflection_type_get_type(reflectionType);
-
-					// TODO: We shouldn't abuse the script glue like that.
-					// ScriptGlue should only be called by C#, not by Beef.
-					if (ScriptGlue.[Friend]s_HasComponentMethods.TryGetValue(actualMonoType, let has_component))
-					{
-						allowDrop = has_component(draggedEntity);
-					}
-					else
-					{
-						Log.EngineLogger.Warning($"No HasComponent-Function found for field {scriptField.Name}");
-						allowDrop = false;
-					}
-				}
-
-				if (allowDrop)
-				{
-					ImGui.Payload* payload = ImGui.AcceptDragDropPayload(.Entity);
-
-					if (payload != null)
-					{
-						Log.EngineLogger.AssertDebug(payload.DataSize == sizeof(Entity));
-
-						Entity droppedEntity = *(Entity*)payload.Data;
-
-						if (droppedEntity.IsValid)
-							field.SetData<UUID>(droppedEntity.UUID);
-					}
-				}
-
-				ImGui.EndDragDropTarget();
-			}
 		}
 
 		private static void LabelColumn(StringView label)
@@ -1069,7 +778,7 @@ namespace GlitchyEditor.EditWindows
 
 			if (ImGui.BeginDragDropTarget())
 			{
-				ImGui.Payload* payload = ImGui.AcceptDragDropPayload(.ContentBrowserItem);
+				ImGui.Payload* payload = ImGui.AcceptDragDropPayload("CONTENT_BROWSER_ITEM");
 
 				if (payload != null)
 				{

GlitchyEditor/src/EditWindows/ContentBrowserWindow.bf

@@ -1,7 +1,6 @@
 using ImGui;
 using System;
 using System.IO;
-using System.Linq;
 using GlitchyEngine.Collections;
 using System.Collections;
 using GlitchyEngine.Renderer;
@@ -13,35 +12,8 @@ namespace GlitchyEditor.EditWindows
 {
 	using internal GlitchyEditor.EditorContentManager;
 
-	class AssetCreator
-	{
-		private String _name ~ delete _;
-		private String _defaultFileName ~ delete _;
-		private CreateAssetFunc _doCreateAsset ~ delete _;
-
-		public delegate void CreateAssetFunc(StringView outputPath);
-
-		public StringView Name => _name;
-		public StringView DefaultFileName => _defaultFileName;
-
-		public CreateAssetFunc CreateAsset => _doCreateAsset;
-
-		public this(StringView name, StringView defaultFileName, CreateAssetFunc createAsset)
-		{
-			_name = new String(name);
-			_defaultFileName = new String(defaultFileName);
-			_doCreateAsset = createAsset;
-		}
-	}
-
 	class ContentBrowserWindow : EditorWindow
 	{
-		private append List<AssetCreator> _assetCreators = .() ~ ClearAndDeleteItems!(_);
-
-		private typealias AssetCreatorTree = TreeNode<(StringView Name, AssetCreator Creator)>;
-
-		private AssetCreatorTree _creatorTree = new AssetCreatorTree(("Create new Asset", null)) ~ delete _;
-
 		public const String s_WindowTitle = "Content Browser";
 
 		private append String _currentDirectory = .();
@@ -60,28 +32,6 @@ namespace GlitchyEditor.EditWindows
 			_manager = contentManager;
 		}
 
-		public void RegisterAssetCreator(AssetCreator assetCreator)
-		{
-			_assetCreators.Add(assetCreator);
-
-			AssetCreatorTree tree = _creatorTree;
-
-			for (StringView entryName in assetCreator.Name.Split('/'))
-			{
-				AssetCreatorTree nextNode = tree.Children.Where(scope (node) => node->Name == entryName).FirstOrDefault();
-
-				// Create new node if we didn't find it
-				nextNode ??= tree.AddChild((entryName, null));
-
-				tree = nextNode;
-			}
-
-			if (tree->Creator == null)
-			{
-				tree->Creator = assetCreator;
-			}
-		}
-
 		protected override void InternalShow()
 		{
 			_manager.Update();
@@ -89,7 +39,7 @@ namespace GlitchyEditor.EditWindows
 			// Make sure we are in an existing directory.
 			if (!_manager.AssetHierarchy.FileExists(_currentDirectory))
 			{
-				_currentDirectory.Set(_manager.AssetDirectory);
+				_currentDirectory.Set(_manager.ContentDirectory);
 			}
 
 			if(!ImGui.Begin(s_WindowTitle, &_open, .None))
@@ -170,69 +120,12 @@ namespace GlitchyEditor.EditWindows
 				if (Path.OpenFolder(_currentDirectory) case .Err)
 					Log.EngineLogger.Error("Failed to open directory in file browser.");
 			}
-
-			ImGui.Separator();
-
-			ShowCreateContextMenu(_creatorTree);
-		}
-
-		/// Shows the menu for the given asset creator tree.
-		private void ShowCreateContextMenu(AssetCreatorTree subtree)
-		{
-			if (subtree.Children.Count == 0)
-			{
-				if (ImGui.MenuItem(subtree->Name.ToScopeCStr!()))
-				{
-					CreateAsset(subtree->Creator);
-				}
-			}
-			else
-			{
-				if (ImGui.BeginMenu(subtree->Name.ToScopeCStr!()))
-				{
-					for (let node in subtree.Children)
-					{
-						ShowCreateContextMenu(node);
-					}
-
-					ImGui.EndMenu();
-				}
-			}
-		}
-
-		/// Creates a new asset with the given creator
-		private void CreateAsset(AssetCreator creator)
-		{
-			if (!Directory.Exists(_currentDirectory))
-			{
-				Log.EngineLogger.Error($"Directory {_currentDirectory} doesn't exist.");
-				return;
-			}
-			
-			String currentFile = scope String();
-			Path.Combine(currentFile, _currentDirectory, creator.DefaultFileName);
-			
-			String fileExtension = scope String();
-			Path.GetExtension(currentFile, fileExtension);
-
-			StringView fileWithoutExtension = currentFile[0...^(fileExtension.Length + 1)];
-
-			int i = 0;
-			while (File.Exists(currentFile))
-			{
-				i++;
-				currentFile.Set(fileWithoutExtension);
-				currentFile.AppendF($"({i})");
-				currentFile.Append(fileExtension);
-			}
-
-			creator.CreateAsset(currentFile);
 		}
 
 		/// Renders a sidebar that shows a tree of all directories in the asset folder.
 		private void DrawDirectorySideBar()
 		{
-			for(var child in _manager.AssetHierarchy.RootNode.Children)
+			for(var child in _manager.AssetHierarchy.[Friend]_assetHierarchy.Children)
 			{
 				ImGuiPrintEntityTree(child);
 			}
@@ -249,22 +142,17 @@ namespace GlitchyEditor.EditWindows
 
 			ImGui.TreeNodeFlags flags = .OpenOnArrow | .SpanAvailWidth;
 
-			if(tree.Children.Where(scope (node) => node->IsDirectory).Count() == 0)
+			if(tree.Children.Count == 0)
 				flags |= .Leaf;
 
 			if (tree->Path == _currentDirectory)
-				flags |= .Selected;
-
-			// TODO: this kinda works, but the user should be able to close the directory
-			/*if (_manager.AssetHierarchy.GetNodeFromPath(_currentDirectory) case .Ok(let currentTreeNode))
 			{
-				if (currentTreeNode.IsInSubtree(tree))
+				flags |= .Selected;
-					ImGui.SetNextItemOpen(true);
+			}
-			}*/
 
 			bool isOpen = ImGui.TreeNodeEx(name, flags, $"{name}");
 
-			if (!ImGui.IsItemToggledOpen() && ImGui.IsItemClicked(.Left))
+			if (ImGui.IsItemClicked(.Left))
 			{
 				_currentDirectory.Set(tree->Path);
 			}
@@ -298,7 +186,7 @@ namespace GlitchyEditor.EditWindows
 			if (_searchEverywhere && searchFilter.Length > 0)
 			{
 				files = scope:: List<TreeNode<AssetNode>>();
-				_manager.AssetHierarchy.[Friend]_assetRootNode.ForEach(scope (node) =>
+				_manager.AssetHierarchy.[Friend]_assetHierarchy.ForEach(scope (node) =>
 				{
 					if (node->Name.Contains(searchFilter, true))
 					{
@@ -364,24 +252,11 @@ namespace GlitchyEditor.EditWindows
 				ImGui.PopID();
 			}
 		}
-		
-		float _zoom = 1.0f;
-		static readonly float2 IconBaseSize = .(100, 100);
-
-		float2 IconSize => IconBaseSize * _zoom;
 
 		/// Renders the button for the given directory item.
 		private void DrawBackButton(TreeNode<AssetNode> entry)
 		{
-			ImGui.PushStyleVar(.WindowPadding, .(0, 0));
+			ImGui.BeginChild("item", (.)DirectoryItemSize);
-			ImGui.PushStyleVar(.FramePadding, .(0, 0));
-			ImGui.PushStyleVar(.ItemSpacing, .(0, 0));
-
-			defer {ImGui.PopStyleVar(3); }
-
-			float2 DirectoryItemSize = IconSize + (float2)ImGui.GetStyle().WindowPadding * 2 + float2(0, ImGui.GetFontSize());
-
-			ImGui.BeginChild("item", (.)DirectoryItemSize, false, .NoScrollbar);
 
 			if (entry->Path == _selectedFile)
 			{
@@ -395,7 +270,7 @@ namespace GlitchyEditor.EditWindows
 			
 			SubTexture2D image = s_FolderTexture;
 
-			ImGui.ImageButton("BackFolder", image, (.)IconSize);
+			ImGui.ImageButton(image, (.)(DirectoryItemSize - padding));
 
 			ImGui.PopStyleColor();
 
@@ -420,15 +295,7 @@ namespace GlitchyEditor.EditWindows
 		/// Renders the button for the given directory item.
 		private void DrawDirectoryItem(TreeNode<AssetNode> entry)
 		{
-			ImGui.PushStyleVar(.WindowPadding, .(0, 0));
+			ImGui.BeginChild("item", (.)DirectoryItemSize);
-			ImGui.PushStyleVar(.FramePadding, .(0, 0));
-			ImGui.PushStyleVar(.ItemSpacing, .(0, 0));
-
-			defer {ImGui.PopStyleVar(3); }
-
-			float2 DirectoryItemSize = IconSize + (float2)ImGui.GetStyle().WindowPadding * 2 + float2(0, ImGui.GetFontSize());
-
-			ImGui.BeginChild("item", (.)DirectoryItemSize, false, .NoScrollbar);
 
 			if (entry->Path == _selectedFile)
 			{
@@ -439,17 +306,25 @@ namespace GlitchyEditor.EditWindows
 			{
 				ImGui.PushStyleColor(.Button, ImGui.Vec4(0, 0, 0, 0));
 			}
-
+			
 			// TODO: preview images
 			SubTexture2D image = entry->IsDirectory ? s_FolderTexture : s_FileTexture;
 
-			ImGui.ImageButton("FileImage", image, (.)IconSize);
+			ImGui.ImageButton(image, (.)(DirectoryItemSize - padding));
 
 			ImGui.PopStyleColor();
 
 			if (ImGui.BeginDragDropSource())
 			{
-				ImGui.SetDragDropPayload(.ContentBrowserItem, entry->Identifier, (uint64)entry->Identifier.Length, .Once);
+				String fullpath = scope String(entry->Path);
+
+				// TODO: this is dirty
+				if (fullpath.StartsWith(_manager.ContentDirectory, .OrdinalIgnoreCase))
+					fullpath.Remove(0, _manager.ContentDirectory.Length);
+
+				Path.Fixup(fullpath);
+
+				ImGui.SetDragDropPayload("CONTENT_BROWSER_ITEM", fullpath.CStr(), (.)fullpath.Length, .Once);
 
 				ImGui.EndDragDropSource();
 			}
@@ -475,7 +350,6 @@ namespace GlitchyEditor.EditWindows
 			    ImGui.EndPopup();
 			}
 
-			// TODO: Sub assets are probably borked now... I don't know if they ever worked, didn't test them
 			if (entry->SubAssets?.Count > 0)
 			{
 				// Button for revealing sub assets (e.g. Meshes in 3D-Model)
@@ -496,8 +370,8 @@ namespace GlitchyEditor.EditWindows
 						String fullpath = scope String(entry->Path);
 						fullpath.AppendF($"#{subAsset.Name}");
 
-						ImGui.SetDragDropPayload(.ContentBrowserItem, fullpath.CStr(), (.)fullpath.Length, .Once);
+						ImGui.SetDragDropPayload("CONTENT_BROWSER_ITEM", fullpath.CStr(), (.)fullpath.Length, .Once);
-
+		
 						ImGui.EndDragDropSource();
 					}
 				}
@@ -506,10 +380,8 @@ namespace GlitchyEditor.EditWindows
 			}
 
 			DeleteItemPopup(entry);
-
+			
 			ImGui.EndChild();
-
-			ImGui.AttachTooltip(entry->Name);
 		}
 
 		private void DeleteItemPopup(TreeNode<AssetNode> fileOrFolder)

GlitchyEditor/src/EditWindows/EditorViewportWindow.bf

@@ -137,7 +137,7 @@ namespace GlitchyEditor.EditWindows
 		{
 			if (ImGui.BeginDragDropTarget())
 			{
-				ImGui.Payload* payload = ImGui.AcceptDragDropPayload(.ContentBrowserItem);
+				ImGui.Payload* payload = ImGui.AcceptDragDropPayload("CONTENT_BROWSER_ITEM");
 
 				if (payload != null)
 				{