imgui flow improvement

hw3d/App.cpp

@@ -10,8 +10,6 @@
 #include "Surface.h"
 #include "GDIPlusManager.h"
 #include "imgui/imgui.h"
-#include "imgui/imgui_impl_win32.h"
-#include "imgui/imgui_impl_dx11.h"
 
 GDIPlusManager gdipm;
 
@@ -82,25 +80,27 @@ App::App()
 void App::DoFrame()
 {
 	const auto dt = timer.Mark();
-	wnd.Gfx().ClearBuffer( 0.07f,0.0f,0.12f );
+
+	if( wnd.kbd.KeyIsPressed( VK_SPACE ) )
+	{
+		wnd.Gfx().DisableImgui();
+	}
+	else
+	{
+		wnd.Gfx().EnableImgui();
+	}
+	wnd.Gfx().BeginFrame( 0.07f,0.0f,0.12f );
+
 	for( auto& d : drawables )
 	{
 		d->Update( wnd.kbd.KeyIsPressed( VK_SPACE ) ? 0.0f : dt );
 		d->Draw( wnd.Gfx() );
 	}
 	   
-	// imgui stuff
-	ImGui_ImplDX11_NewFrame();
-	ImGui_ImplWin32_NewFrame();
-	ImGui::NewFrame();
-
-	static bool show_demo_window = true;
 	if( show_demo_window )
 	{
 		ImGui::ShowDemoWindow( &show_demo_window );
 	}
-	ImGui::Render();
-	ImGui_ImplDX11_RenderDrawData( ImGui::GetDrawData() );
 
 	// present
 	wnd.Gfx().EndFrame();

hw3d/App.h

@@ -17,5 +17,6 @@ private:
 	Window wnd;
 	ChiliTimer timer;
 	std::vector<std::unique_ptr<class Drawable>> drawables;
+	bool show_demo_window = true;
 	static constexpr size_t nDrawables = 180;
 };
\ No newline at end of file

hw3d/Graphics.cpp

@@ -6,6 +6,7 @@
 #include <DirectXMath.h>
 #include "GraphicsThrowMacros.h"
 #include "imgui/imgui_impl_dx11.h"
+#include "imgui/imgui_impl_win32.h"
 
 namespace wrl = Microsoft::WRL;
 namespace dx = DirectX;
@@ -115,6 +116,13 @@ Graphics::Graphics( HWND hWnd )
 
 void Graphics::EndFrame()
 {
+	// imgui frame end
+	if( imguiEnabled )
+	{
+		ImGui::Render();
+		ImGui_ImplDX11_RenderDrawData( ImGui::GetDrawData() );
+	}
+
 	HRESULT hr;
 #ifndef NDEBUG
 	infoManager.Set();
@@ -132,8 +140,16 @@ void Graphics::EndFrame()
 	}
 }
 
-void Graphics::ClearBuffer( float red,float green,float blue ) noexcept
+void Graphics::BeginFrame( float red,float green,float blue ) noexcept
 {
+	// imgui begin frame
+	if( imguiEnabled )
+	{
+		ImGui_ImplDX11_NewFrame();
+		ImGui_ImplWin32_NewFrame();
+		ImGui::NewFrame();
+	}
+
 	const float color[] = { red,green,blue,1.0f };
 	pContext->ClearRenderTargetView( pTarget.Get(),color );
 	pContext->ClearDepthStencilView( pDSV.Get(),D3D11_CLEAR_DEPTH,1.0f,0u );
@@ -154,6 +170,21 @@ DirectX::XMMATRIX Graphics::GetProjection() const noexcept
 	return projection;
 }
 
+void Graphics::EnableImgui() noexcept
+{
+	imguiEnabled = true;
+}
+
+void Graphics::DisableImgui() noexcept
+{
+	imguiEnabled = false;
+}
+
+bool Graphics::IsImguiEnabled() const noexcept
+{
+	return imguiEnabled;
+}
+
 
 // Graphics exception stuff
 Graphics::HrException::HrException( int line,const char * file,HRESULT hr,std::vector<std::string> infoMsgs ) noexcept

hw3d/Graphics.h

@@ -56,11 +56,15 @@ public:
 	Graphics& operator=( const Graphics& ) = delete;
 	~Graphics() = default;
 	void EndFrame();
-	void ClearBuffer( float red,float green,float blue ) noexcept;
+	void BeginFrame( float red,float green,float blue ) noexcept;
 	void DrawIndexed( UINT count ) noexcept(!IS_DEBUG);
 	void SetProjection( DirectX::FXMMATRIX proj ) noexcept;
 	DirectX::XMMATRIX GetProjection() const noexcept;
+	void EnableImgui() noexcept;
+	void DisableImgui() noexcept;
+	bool IsImguiEnabled() const noexcept;
 private:
+	bool imguiEnabled = true;
 	DirectX::XMMATRIX projection;
 #ifndef NDEBUG
 	DxgiInfoManager infoManager;