title

Author: kavos113

CMakeLists.txt

@@ -26,12 +26,13 @@ macro(create_executable files)
     target_include_directories(h24w_23 PRIVATE include)
     target_include_directories(h24w_23 PRIVATE ThirdParty/aqua-engine-0.1.1/include)
     target_include_directories(h24w_23 PRIVATE $ENV{FBXSDK_DIR}/include)
-    target_link_libraries(h24w_23 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/aqua-engine-0.1.1/lib/aqua-engine.lib)
-    target_link_libraries(h24w_23 PRIVATE d2d1.lib)
-    target_link_libraries(h24w_23 PRIVATE dwrite.lib)
-    target_link_libraries(h24w_23 PRIVATE d3d12.lib)
-    target_link_libraries(h24w_23 PRIVATE dxgi.lib)
-    target_link_libraries(h24w_23 PRIVATE d3dcompiler.lib)
+    target_link_libraries(h24w_23 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/aqua-engine-0.1.1/lib/aqua-engine.lib)
+    target_link_libraries(h24w_23 PUBLIC d2d1.lib)
+    target_link_libraries(h24w_23 PUBLIC dwrite.lib)
+    target_link_libraries(h24w_23 PUBLIC d3d12.lib)
+    target_link_libraries(h24w_23 PUBLIC dxgi.lib)
+    target_link_libraries(h24w_23 PUBLIC d3dcompiler.lib)
+    target_link_libraries(h24w_23 PUBLIC d3d11.lib)
     target_link_libraries(h24w_23 PUBLIC $ENV{FBXSDK_DIR}/lib/x64/debug/libfbxsdk-md.lib)
     target_link_libraries(h24w_23 PUBLIC $ENV{FBXSDK_DIR}/lib/x64/debug/libxml2-md.lib)
     target_link_libraries(h24w_23 PUBLIC $ENV{FBXSDK_DIR}/lib/x64/debug/zlib-md.lib)

include/2d/D2DEngine.h

@@ -22,7 +22,7 @@ class D2DEngine
         UINT back_buffer_count,
         const std::vector<ID3D12Resource*>& back_buffers
     );
-    void RenderTItleText(UINT back_buffer_index);
+    void RenderTitleText(UINT back_buffer_index);
 
 private:
     void BeginRender(UINT back_buffer_index);

include/2d/Title.h

@@ -1,9 +1,8 @@
 #ifndef TITLE_H
 #define TITLE_H
-#include <d2d1.h>
-#include <wrl/client.h>
 
-#include "D2DEngine.h"
+#include <d2d1_3.h>
+#include <wrl/client.h>
 
 class Title
 {

include/3d/Engine.h

@@ -6,6 +6,8 @@
 
 #include <memory>
 
+#include "2d/D2DEngine.h"
+
 class Engine
 {
 public:
@@ -19,6 +21,8 @@ class Engine
     std::unique_ptr<AquaEngine::Command> m_command;
     std::unique_ptr<AquaEngine::Display> m_display;
 
+    std::unique_ptr<D2DEngine> m_d2dEngine;
+
     HWND m_hwnd;
     RECT m_wr;
 };

src/2d/D2DEngine.cpp

@@ -166,9 +166,11 @@ void D2DEngine::EndRender(UINT back_buffer_index)
     m_d3d11DeviceContext->Flush();
 }
 
-void D2DEngine::RenderTItleText(UINT back_buffer_index)
+// clear the back buffer and render the title text
+void D2DEngine::RenderTitleText(UINT back_buffer_index)
 {
     BeginRender(back_buffer_index);
+    m_d2dDeviceContext->Clear(D2D1::ColorF(D2D1::ColorF::White));
     m_title.Render(m_d2dDeviceContext, m_d2dBlackBrush);
     EndRender(back_buffer_index);
 }

src/2d/Title.cpp

@@ -1,5 +1,7 @@
 #include "2d/Title.h"
 
+#include <DWrite.h>
+
 void Title::Init(
     const Microsoft::WRL::ComPtr<IDWriteFactory>& dwriteFactory,
     const D2D1_RECT_F& textRect

src/3d/Engine.cpp

@@ -29,12 +29,17 @@ void Engine::Init()
     m_command = std::make_unique<AquaEngine::Command>();
     m_display = std::make_unique<AquaEngine::Display>(m_hwnd, m_wr, *m_command);
     m_display->SetBackgroundColor(1.0f, 1.0f, 0.0f, 1.0f);
+
+    m_d2dEngine = std::make_unique<D2DEngine>(m_hwnd, m_wr, m_command.get());
+    auto desc = m_display->GetSwapChainDesc();
+    m_d2dEngine->Init(desc.BufferCount, m_display->GetBackBufferResouces());
 }
 
 void Engine::Render() const
 {
     m_display->BeginRender();
     m_display->SetViewports();
+
     m_display->EndRender();
 
     HRESULT hr = m_command->Execute();
@@ -44,5 +49,7 @@ void Engine::Render() const
         return;
     }
 
+    m_d2dEngine->RenderTitleText(m_display->GetCurrentBackBufferIndex());
+
     m_display->Present();
 }

src/main.cpp

@@ -16,8 +16,6 @@ int WINAPI wWinMain(
     int nCmdShow
 )
 {
-    MessageBox(nullptr, "Hello, Windows Desktop!", "Aqua Engine", MB_OK);
-
     DialogBox(
         hInstance,
         MAKEINTRESOURCE(IDD_DIALOG1),