Crappy hot reloading of textures and Properties editor for textures

GlitchyEditor/src/Editor.bf

@@ -12,16 +12,14 @@ namespace GlitchyEditor
 	class Editor
 	{
 		private Scene _scene;
-		
+
+		private EditorContentManager _contentManager;
+
 		private EntityHierarchyWindow _entityHierarchyWindow ~ delete _;
 		private ComponentEditWindow _componentEditWindow ~ delete _;
-		private SceneViewportWindow _sceneViewportWindow = new .(this) ~ delete _;
+		private SceneViewportWindow _sceneViewportWindow~ delete _;
 		private ContentBrowserWindow _contentBrowserWindow ~ delete _;
-
-		public EntityHierarchyWindow EntityHierarchyWindow => _entityHierarchyWindow;
-		public ComponentEditWindow ComponentEditWindow => _componentEditWindow;
-		public SceneViewportWindow SceneViewportWindow => _sceneViewportWindow;
-		public ContentBrowserWindow ContentBrowserWindow => _contentBrowserWindow;
+		private PropertiesWindow _propertiesWindow ~ delete _;
 
 		public Scene CurrentScene
 		{
@@ -33,27 +31,43 @@ namespace GlitchyEditor
 			}
 		}
 
+		public EditorContentManager ContentManager => _contentManager;
+		
+		public EntityHierarchyWindow EntityHierarchyWindow => _entityHierarchyWindow;
+		public ComponentEditWindow ComponentEditWindow => _componentEditWindow;
+		public SceneViewportWindow SceneViewportWindow => _sceneViewportWindow;
+		public ContentBrowserWindow ContentBrowserWindow => _contentBrowserWindow;
+		public PropertiesWindow PropertiesWindow => _propertiesWindow;
+
 		public EditorCamera* CurrentCamera { get; set; }
 
 		public Event<EventHandler<StringView>> RequestOpenScene ~ _.Dispose();
 
 		/// Creates a new editor for the given world
-		public this(Scene scene)
+		public this(Scene scene, EditorContentManager contentManager)
 		{
+			_scene = scene;
+			_contentManager = contentManager;
+
+			InitWindows();
+		}
+
+		private void InitWindows()
+		{
+			_sceneViewportWindow = new SceneViewportWindow(this);
 			_entityHierarchyWindow = new EntityHierarchyWindow(this, _scene);
-			CurrentScene = scene;
-
 			_componentEditWindow = new ComponentEditWindow(_entityHierarchyWindow);
-
 			_contentBrowserWindow = new ContentBrowserWindow((.)Application.Get().ContentManager);
+			_propertiesWindow = new PropertiesWindow(this);
 		}
 
 		public void Update()
 		{
+			_sceneViewportWindow.Show();
 			_entityHierarchyWindow.Show();
 			_componentEditWindow.Show();
-			_sceneViewportWindow.Show();
 			_contentBrowserWindow.Show();
+			_propertiesWindow.Show();
 		}
 	}
 }