diff --git a/CMSceneGraph b/CMSceneGraph index 4949c2e3..4129ab24 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 4949c2e3e82c8a88a783579aff120617c4ecfdab +Subproject commit 4129ab24175c44fdb3d00608b80548c2b874fdd8 diff --git a/example/Basic/rf_test.cpp b/example/Basic/rf_test.cpp index 6e47375f..b7a18d20 100644 --- a/example/Basic/rf_test.cpp +++ b/example/Basic/rf_test.cpp @@ -87,20 +87,15 @@ private: public: TestApp(RenderFramework *rf):WorkObject(rf) - {} - - bool Init() { if(!InitAutoMaterial()) - return(false); + return; if(!InitPipeline()) - return(false); + return; if(!InitVBO()) - return(false); - - return(true); + return; } void Tick(double)override @@ -157,10 +152,5 @@ int main(int,char **) WorkManager wm(&rf); - TestApp *test=new TestApp(&rf); - - if(!test->Init()) - return(-2); - - wm.Start(test); + wm.Start(new TestApp(&rf)); } diff --git a/inc/hgl/graph/RenderFramework.h b/inc/hgl/graph/RenderFramework.h index 52e2e587..1eae71b6 100644 --- a/inc/hgl/graph/RenderFramework.h +++ b/inc/hgl/graph/RenderFramework.h @@ -27,12 +27,6 @@ class RenderFramework:public io::WindowEvent RenderResource * render_resource =nullptr; -private: - - double last_time =0; - double cur_time =0; - int64 frame_count =0; - protected: GraphModuleManager * module_manager =nullptr; @@ -79,16 +73,6 @@ public: // event virtual void OnActive(bool); virtual void OnClose(); -protected: - - virtual void BeginFrame(); - virtual void EndFrame(); - - virtual bool RunFrame(RenderModule *); - -public: - - virtual bool Run(RenderModule *); };//class RenderFramework VK_NAMESPACE_END diff --git a/src/SceneGraph/RenderFramework.cpp b/src/SceneGraph/RenderFramework.cpp index 51edf9c7..e8f9a7fa 100644 --- a/src/SceneGraph/RenderFramework.cpp +++ b/src/SceneGraph/RenderFramework.cpp @@ -116,36 +116,6 @@ bool RenderFramework::Init(uint w,uint h) return(true); } -bool RenderFramework::Run(RenderModule *rm) -{ - if(!rm) - return(false); - - if(!win) - return(false); - - if(!sc_module) - return(false); - - while(win->Update()) - { - if(win->IsVisible()) - { - ++frame_count; - last_time=cur_time; - - cur_time=GetDoubleTime(); - - if(!RunFrame(rm)) - return(false); - } - - device->WaitIdle(); - } - - return(true); -} - void RenderFramework::OnResize(uint w,uint h) { io::WindowEvent::OnResize(w,h); @@ -163,36 +133,4 @@ void RenderFramework::OnClose() { } -void RenderFramework::BeginFrame() -{ -} - -void RenderFramework::EndFrame() -{ -} - -bool RenderFramework::RunFrame(RenderModule *rm) -{ - bool result=true; - - BeginFrame(); - - sc_module->BeginFrame(); - { - RenderCmdBuffer *rcb=sc_module->RecordCmdBuffer(); - - if(rcb) - { - result=rm->OnFrameRender(cur_time,rcb); - - rcb->End(); - } - } - sc_module->EndFrame(); - - EndFrame(); - - return result; -} - VK_NAMESPACE_END