created ULRE.Work contains WorkObject/WorkManager

CMakeLists.txt

@@ -23,6 +23,7 @@ SET(ULRE    CMCore
             CMAssetsManage
             CMSceneGraph
             CMUtil
+	    ULRE.Work
             ULRE.Util
             ULRE.ShaderGen
             ULRE.SceneGraph

example/Basic/CMakeLists.txt

@@ -10,7 +10,7 @@
     set_property(TARGET ${name} PROPERTY FOLDER "ULRE/Example/Basic")
 endmacro()
 
-CreateProject(00_RenderFrameworkTest            rf_test.cpp ${WORK_FILES})
+CreateProject(00_RenderFrameworkTest            rf_test.cpp)
 CreateProject(01_draw_triangle_in_NDC           draw_triangle_in_NDC.cpp)
 CreateProject(02_draw_triangle_use_UBO          draw_triangle_use_UBO.cpp)
 CreateProject(03_auto_instance                  auto_instance.cpp)

example/Basic/rf_test.cpp

@@ -1,9 +1,9 @@
 // 该范例主要演示使用NDC坐标系直接绘制一个渐变色的三角形
-
+#include<hgl/WorkManager.h>
-#include"WorkManager.h"
 #include<hgl/math/HalfFloat.h>
 #include<hgl/graph/VKVertexInputConfig.h>
 #include<hgl/graph/PrimitiveCreater.h>
+#include<hgl/graph/VKRenderResource.h>
 #include<hgl/graph/mtl/Material2DCreateConfig.h>
 #include<hgl/graph/VKMaterialInstance.h>
 

example/CMakeLists.txt

@@ -2,13 +2,6 @@
 
 SET(VULKAN_APP_FRAMEWORK    ${CMAKE_CURRENT_SOURCE_DIR}/common/VulkanAppFramework.h)
 
-
-SET(WORK_FILES  ${CMAKE_CURRENT_SOURCE_DIR}/common/WorkObject.h
-                ${CMAKE_CURRENT_SOURCE_DIR}/common/WorkManager.h
-                ${CMAKE_CURRENT_SOURCE_DIR}/common/WorkManager.cpp)
-
-SOURCE_GROUP("Work" FILES ${WORK_FILES})
-
 add_subdirectory(Basic)
 add_subdirectory(Texture)
 add_subdirectory(LightBasic)

inc/hgl/WorkObject.h

@@ -1,8 +1,5 @@
 #pragma once
 #include<hgl/graph/RenderFramework.h>
-#include<hgl/graph/module/SwapchainModule.h>
-#include<hgl/graph/VKRenderResource.h>
-#include<hgl/graph/VKRenderTarget.h>
 #include<hgl/type/object/TickObject.h>
 #include<hgl/Time.h>
 //#include<iostream>
@@ -47,47 +44,10 @@ namespace hgl
         WorkObject()=default;
         virtual ~WorkObject()=default;
 
-        virtual void Join(graph::RenderFramework *rf,graph::IRenderTarget *rt)
+        virtual void Join(graph::RenderFramework *rf,graph::IRenderTarget *rt);
-        {
-            if(!rf)return;
-            if(render_framework==rf)return;
-
-            render_framework=rf;
-            cur_render_target=rt;
-            db=rf->GetRenderResource();
-        }
 
         virtual void Render(double delta_time,graph::RenderCmdBuffer *cmd)=0;
 
-        virtual void Render(double delta_time)
+        virtual void Render(double delta_time);
-        {
-            if(!cur_render_target)
-            {
-                //std::cerr<<"WorkObject::Render,cur_render_target=nullptr"<<std::endl;
-                return;
-            }
-
-            //std::cout<<"WorkObject::Render begin, render_dirty="<<(render_dirty?"true":"false")<<std::endl;
-
-            if(render_dirty)
-            {
-                graph::RenderCmdBuffer *cmd=cur_render_target->BeginRender();
-
-                if(!cmd)
-                {
-                    //std::cerr<<"WorkObject::Render,cur_render_target->BeginRender()=nullptr"<<std::endl;
-                    return;
-                }
-
-                Render(delta_time,cmd);
-
-                cur_render_target->EndRender();
-                cur_render_target->Submit();
-
-                render_dirty=false;
-            }
-
-            //std::cout<<"WorkObject::Render End"<<std::endl;
-        }
     };//class WorkObject
 }//namespcae hgl

src/CMakeLists.txt

@@ -1,6 +1,7 @@
 add_subdirectory(Util)
 add_subdirectory(ShaderGen)
 add_subdirectory(SceneGraph)
+add_subdirectory(Work)
 #add_subdirectory(Tools)
-add_subdirectory(GUI)
+#add_subdirectory(GUI)
 add_subdirectory(JoltPhysics/Build)

src/Work/CMakeLists.txt

@@ -0,0 +1,8 @@
+SET(WORK_INCLUDE_PATH ${ROOT_INCLUDE_PATH}/hgl)
+
+SET(WORK_SOURCE	${WORK_INCLUDE_PATH}/WorkObject.h
+                ${WORK_INCLUDE_PATH}/WorkManager.h
+                WorkObject.cpp
+                WorkManager.cpp)
+
+add_cm_library(ULRE.Work "ULRE" ${WORK_SOURCE})

src/Work/WorkManager.cpp

@@ -1,5 +1,5 @@
 #pragma once
-#include"WorkManager.h"
+#include<hgl/WorkManager.h>
 #include<hgl/graph/VKRenderTarget.h>
 
 namespace hgl

src/Work/WorkObject.cpp

@@ -0,0 +1,52 @@
+#include<hgl/WorkObject.h>
+#include<hgl/graph/RenderFramework.h>
+#include<hgl/graph/module/SwapchainModule.h>
+#include<hgl/graph/VKRenderResource.h>
+#include<hgl/graph/VKRenderTarget.h>
+#include<hgl/type/object/TickObject.h>
+#include<hgl/Time.h>
+//#include<iostream>
+
+namespace hgl
+{
+    void WorkObject::Join(graph::RenderFramework *rf,graph::IRenderTarget *rt)
+    {
+        if(!rf)return;
+        if(render_framework==rf)return;
+
+        render_framework=rf;
+        cur_render_target=rt;
+        db=rf->GetRenderResource();
+    }
+
+    void WorkObject::Render(double delta_time)
+    {
+        if(!cur_render_target)
+        {
+            //std::cerr<<"WorkObject::Render,cur_render_target=nullptr"<<std::endl;
+            return;
+        }
+
+        //std::cout<<"WorkObject::Render begin, render_dirty="<<(render_dirty?"true":"false")<<std::endl;
+
+        if(render_dirty)
+        {
+            graph::RenderCmdBuffer *cmd=cur_render_target->BeginRender();
+
+            if(!cmd)
+            {
+                //std::cerr<<"WorkObject::Render,cur_render_target->BeginRender()=nullptr"<<std::endl;
+                return;
+            }
+
+            Render(delta_time,cmd);
+
+            cur_render_target->EndRender();
+            cur_render_target->Submit();
+
+            render_dirty=false;
+        }
+
+        //std::cout<<"WorkObject::Render End"<<std::endl;
+    }
+}//namespcae hgl