Refactor rendering architecture

engine/source/editor/CMakeLists.txt

@@ -10,6 +10,11 @@ add_executable(${TARGET_NAME} ${EDITOR_HEADERS} ${EDITOR_SOURCES} ${EDITOR_RESOU
 
 add_compile_definitions("PILOT_ROOT_DIR=${BINARY_ROOT_DIR}")
 
+target_include_directories(
+  ${TARGET_NAME} 
+  PUBLIC $<BUILD_INTERFACE:${THIRD_PARTY_DIR}/stb>
+)
+
 set_target_properties(${TARGET_NAME} PROPERTIES CXX_STANDARD 17 OUTPUT_NAME "PilotEditor")
 set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Engine")
 

engine/source/editor/include/axis.h

@@ -1,23 +1,28 @@
 #pragma once
-#include "runtime/function/render/include/render/framebuffer.h"
+
+#include "runtime/function/render/render_entity.h"
+#include "runtime/function/render/render_type.h"
 
 namespace Pilot
 {
-    class EditorTranslationAxis : public RenderMesh
+    class EditorTranslationAxis : public RenderEntity
     {
     public:
         EditorTranslationAxis();
+        RenderMeshData m_mesh_data;
     };
 
-    class EditorRotationAxis : public RenderMesh
+    class EditorRotationAxis : public RenderEntity
     {
     public:
         EditorRotationAxis();
+        RenderMeshData m_mesh_data;
     };
 
-    class EditorScaleAxis : public RenderMesh
+    class EditorScaleAxis : public RenderEntity
     {
     public:
         EditorScaleAxis();
+        RenderMeshData m_mesh_data;
     };
 } // namespace Pilot

engine/source/editor/include/editor.h

@@ -8,10 +8,8 @@
 namespace Pilot
 {
     class EditorUI;
-    class EditorSceneManager;
     class PilotEngine;
 
-
     class PilotEditor : public PublicSingleton<PilotEditor>
     {
         friend class EditorUI;

engine/source/editor/include/editor_global_context.h

@@ -2,13 +2,22 @@
 
 namespace Pilot
 {
+    struct EditorGlobalContextInitInfo
+    {
+        class WindowSystem* window_system;
+        class RenderSystem* render_system;
+    };
+
     class EditorGlobalContext
     {
     public:
         class EditorSceneManager* m_scene_manager{ nullptr };
         class EditorInputManager* m_input_manager{ nullptr };
+        class RenderSystem* m_render_system{ nullptr };
+        class WindowSystem* m_window_system{ nullptr };
+
     public:
-        void initialize();
+        void initialize(const EditorGlobalContextInitInfo& init_info);
         void clear();
     };
 

engine/source/editor/include/editor_input_manager.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <vector>
-#include <runtime/function/render/include/render/surface_io.h>
-#include "render/render_camera.h"
+//#include <runtime/function/render/include/render/surface_io.h>
+#include "runtime/function/render/render_camera.h"
 
 #include "runtime/core/math/vector2.h"
 
@@ -54,9 +54,6 @@ namespace Pilot
 		void setEngineWindowSize(Vector2 new_window_size) { m_engine_window_size = new_window_size; };
 		void resetEditorCommand() { m_editor_command = 0; }
 	private:
-		//PilotEditor* m_editor{ nullptr };
-		std::shared_ptr<SurfaceIO> m_io;
-
 		Vector2 m_engine_window_pos{ 0.0f, 0.0f };
 		Vector2 m_engine_window_size{ 1280.0f, 768.0f };
 		float   m_mouse_x{ 0.0f };

engine/source/editor/include/editor_scene_manager.h

@@ -1,14 +1,17 @@
 #pragma once
-#include "render/render_camera.h"
+
 #include "editor/include/axis.h"
-#include "runtime/function/render/include/render/vulkan_manager/vulkan_manager.h"
 
 #include "runtime/function/framework/object/object.h"
-#include "runtime/function/scene/scene_object.h"
+#include "runtime/function/render/render_object.h"
+
+#include <memory>
 
 namespace Pilot
 {
     class PilotEditor;
+    class RenderCamera;
+    class RenderEntity;
 
     enum class EditorAxisMode : int
     {
@@ -30,8 +33,8 @@ namespace Pilot
             Vector2 game_engine_window_size);
         void drawSelectedEntityAxis();
         std::weak_ptr<GObject> getSelectedGObject() const;
-        RenderMesh* getAxisMeshByType(EditorAxisMode axis_mode);
-        void onGObjectSelected(size_t selected_gobject_id);
+        RenderEntity* getAxisMeshByType(EditorAxisMode axis_mode);
+        void onGObjectSelected(GObjectID selected_gobject_id);
         void onDeleteSelectedGObject();
         void moveEntity(float     new_mouse_pos_x,
             float     new_mouse_pos_y,
@@ -41,30 +44,33 @@ namespace Pilot
             Vector2   engine_window_size,
             size_t    cursor_on_axis,
             Matrix4x4 model_matrix);
+
+        void setEditorCamera(std::shared_ptr<RenderCamera> camera) { m_camera = camera; }
+        void uploadAxisResource();
         size_t getGuidOfPickedMesh(const Vector2& picked_uv) const;
 
     public:
-        std::shared_ptr<PCamera> getEditorCamera() { return m_camera; };
+        std::shared_ptr<RenderCamera> getEditorCamera() { return m_camera; };
 
-        size_t getSelectedObjectID() { return m_selected_gobject_id; };
+        GObjectID getSelectedObjectID() { return m_selected_gobject_id; };
         Matrix4x4 getSelectedObjectMatrix() { return m_selected_object_matrix; }
         EditorAxisMode getEditorAxisMode() { return m_axis_mode; }
 
-        void setSelectedObjectID(size_t selected_gobject_id) { m_selected_gobject_id = selected_gobject_id; };
+        void setSelectedObjectID(GObjectID selected_gobject_id) { m_selected_gobject_id = selected_gobject_id; };
         void setSelectedObjectMatrix(Matrix4x4 new_object_matrix) { m_selected_object_matrix = new_object_matrix; }
         void setEditorAxisMode(EditorAxisMode new_axis_mode) { m_axis_mode = new_axis_mode; }
     private:
         EditorTranslationAxis m_translation_axis;
         EditorRotationAxis    m_rotation_axis;
         EditorScaleAxis       m_scale_aixs;
 
-        size_t    m_selected_gobject_id{ 0 };
+        GObjectID m_selected_gobject_id{ k_invalid_gobject_id };
         Matrix4x4 m_selected_object_matrix{ Matrix4x4::IDENTITY };
 
         EditorAxisMode m_axis_mode{ EditorAxisMode::TranslateMode };
-        std::shared_ptr<PCamera> m_camera;
+        std::shared_ptr<RenderCamera> m_camera;
 
-        size_t m_selected_axis;
+        size_t m_selected_axis{ 3 };
 
         bool   m_is_show_axis = true;
     };

engine/source/editor/include/editor_ui.h

@@ -5,8 +5,7 @@
 #include "runtime/core/math/vector2.h"
 
 #include "runtime/function/framework/object/object.h"
-#include "runtime/function/render/include/render/surface.h"
-#include "runtime/function/scene/scene_object.h"
+#include "runtime/function/ui/window_ui.h"
 
 #include "editor/include/editor_file_service.h"
 
@@ -17,12 +16,13 @@
 namespace Pilot
 {
     class PilotEditor;
+    class WindowSystem;
+    class RenderSystem;
 
-    class EditorUI : public SurfaceUI
+    class EditorUI : public WindowUI
     {
     public:
         EditorUI();
-        void onTick(UIState* uistate) override;
 
     private:
         void        onFileContentItemClicked(EditorFileNode* node);
@@ -39,6 +39,12 @@ namespace Pilot
         void showEditorGameWindow(bool* p_open);
         void showEditorDetailWindow(bool* p_open);
 
+        void setUIColorStyle();
+
+    public:
+        virtual void initialize(WindowUIInitInfo init_info) override final;
+        virtual void preRender() override final;
+
     private:
         std::unordered_map<std::string, std::function<void(std::string, void*)>> m_editor_ui_creator;
         std::unordered_map<std::string, unsigned int>                            m_new_object_index_map;