aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/graph/graph_manager.hpp60
-rw-r--r--src/graph/graph_util.hpp63
-rw-r--r--src/graph/window_render_target.hpp49
-rw-r--r--src/platform_win/CMakeLists.txt7
-rw-r--r--src/platform_win/debug.cpp2
-rw-r--r--src/platform_win/dpi_util.hpp32
-rw-r--r--src/platform_win/graph_manager.cpp (renamed from src/graph/graph_manager.cpp)46
-rw-r--r--src/platform_win/win_application.cpp13
-rw-r--r--src/platform_win/win_brush.cpp21
-rw-r--r--src/platform_win/win_geometry.cpp65
-rw-r--r--src/platform_win/win_graph_factory.cpp31
-rw-r--r--src/platform_win/win_native_window.cpp14
-rw-r--r--src/platform_win/window_render_target.cpp (renamed from src/graph/window_render_target.cpp)42
-rw-r--r--src/ui/d2d_util.hpp82
-rw-r--r--src/util/com_util.hpp22
16 files changed, 197 insertions, 354 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5048020d..75e6a0c2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,4 @@
add_library(cru_ui STATIC
- graph/graph_manager.cpp
- graph/window_render_target.cpp
ui/content_control.cpp
ui/control.cpp
ui/input_util.cpp
diff --git a/src/graph/graph_manager.hpp b/src/graph/graph_manager.hpp
deleted file mode 100644
index 4a1e7153..00000000
--- a/src/graph/graph_manager.hpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-#include "pre.hpp"
-
-#include <memory>
-
-#include "base.hpp"
-
-struct ID3D11Device;
-struct ID3D11DeviceContext;
-struct ID2D1Factory1;
-struct ID2D1DeviceContext;
-struct IDXGIFactory2;
-struct IDWriteFontCollection;
-struct IDWriteFactory;
-
-struct ID2D1RenderTarget;
-
-namespace cru::graph {
-class WindowRenderTarget;
-
-class GraphManager final : public Object {
- public:
- static GraphManager* GetInstance();
-
- private:
- GraphManager();
-
- public:
- GraphManager(const GraphManager& other) = delete;
- GraphManager(GraphManager&& other) = delete;
- GraphManager& operator=(const GraphManager& other) = delete;
- GraphManager& operator=(GraphManager&& other) = delete;
- ~GraphManager() override = default;
-
- public:
- ID2D1Factory1* GetD2D1Factory() const { return d2d1_factory_.get(); }
-
- ID2D1DeviceContext* GetD2D1DeviceContext() const {
- return d2d1_device_context_.get();
- }
-
- ID3D11Device* GetD3D11Device() const { return d3d11_device_.get(); }
-
- IDXGIFactory2* GetDxgiFactory() const { return dxgi_factory_.get(); }
-
- IDWriteFactory* GetDWriteFactory() const { return dwrite_factory_.get(); }
-
- IDWriteFontCollection* GetSystemFontCollection() const {
- return dwrite_system_font_collection_.get();
- }
-
- private:
- std::shared_ptr<ID3D11Device> d3d11_device_;
- std::shared_ptr<ID2D1Factory1> d2d1_factory_;
- std::shared_ptr<ID2D1DeviceContext> d2d1_device_context_;
- std::shared_ptr<IDXGIFactory2> dxgi_factory_;
- std::shared_ptr<IDWriteFactory> dwrite_factory_;
- std::shared_ptr<IDWriteFontCollection> dwrite_system_font_collection_;
-};
-} // namespace cru::graph
diff --git a/src/graph/graph_util.hpp b/src/graph/graph_util.hpp
deleted file mode 100644
index 2d5be5f3..00000000
--- a/src/graph/graph_util.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-#include "pre.hpp"
-
-#include <d2d1_1.h>
-#include <functional>
-
-#include "exception.hpp"
-#include "graph_manager.hpp"
-
-namespace cru::graph {
-struct Dpi {
- float x;
- float y;
-};
-
-inline Dpi GetDpi() {
- Dpi dpi;
- GraphManager::GetInstance()->GetD2D1Factory()->GetDesktopDpi(&dpi.x, &dpi.y);
- return dpi;
-}
-
-inline int DipToPixelInternal(const float dip, const float dpi) {
- return static_cast<int>(dip * dpi / 96.0f);
-}
-
-inline int DipToPixelX(const float dip_x) {
- return DipToPixelInternal(dip_x, GetDpi().x);
-}
-
-inline int DipToPixelY(const float dip_y) {
- return DipToPixelInternal(dip_y, GetDpi().y);
-}
-
-inline float DipToPixelInternal(const int pixel, const float dpi) {
- return static_cast<float>(pixel) * 96.0f / dpi;
-}
-
-inline float PixelToDipX(const int pixel_x) {
- return DipToPixelInternal(pixel_x, GetDpi().x);
-}
-
-inline float PixelToDipY(const int pixel_y) {
- return DipToPixelInternal(pixel_y, GetDpi().y);
-}
-
-inline void WithTransform(
- ID2D1RenderTarget* render_target, const D2D1_MATRIX_3X2_F matrix,
- const std::function<void(ID2D1RenderTarget*)>& action) {
- D2D1_MATRIX_3X2_F old_transform;
- render_target->GetTransform(&old_transform);
- render_target->SetTransform(old_transform * matrix);
- action(render_target);
- render_target->SetTransform(old_transform);
-}
-
-inline ID2D1SolidColorBrush* CreateSolidColorBrush(const D2D1_COLOR_F& color) {
- ID2D1SolidColorBrush* brush;
- ThrowIfFailed(GraphManager::GetInstance()
- ->GetD2D1DeviceContext()
- ->CreateSolidColorBrush(color, &brush));
- return brush;
-}
-} // namespace cru::graph
diff --git a/src/graph/window_render_target.hpp b/src/graph/window_render_target.hpp
deleted file mode 100644
index 9b93df19..00000000
--- a/src/graph/window_render_target.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#pragma once
-#include "pre.hpp"
-
-#include <Windows.h>
-#include <memory>
-
-#include "base.hpp"
-
-struct IDXGISwapChain1;
-struct ID2D1Bitmap1;
-
-namespace cru::graph {
-class GraphManager;
-
-// Represents a window render target.
-class WindowRenderTarget : public Object {
- public:
- WindowRenderTarget(GraphManager* graph_manager, HWND hwnd);
- WindowRenderTarget(const WindowRenderTarget& other) = delete;
- WindowRenderTarget(WindowRenderTarget&& other) = delete;
- WindowRenderTarget& operator=(const WindowRenderTarget& other) = delete;
- WindowRenderTarget& operator=(WindowRenderTarget&& other) = delete;
- ~WindowRenderTarget() override = default;
-
- public:
- // Get the graph manager that created the render target.
- GraphManager* GetGraphManager() const { return graph_manager_; }
-
- // Get the target bitmap which can be set as the ID2D1DeviceContext's target.
- ID2D1Bitmap1* GetTargetBitmap() const { return target_bitmap_.get(); }
-
- // Resize the underlying buffer.
- void ResizeBuffer(int width, int height);
-
- // Set this render target as the d2d device context's target.
- void SetAsTarget();
-
- // Present the data of the underlying buffer to the window.
- void Present();
-
- private:
- void CreateTargetBitmap();
-
- private:
- GraphManager* graph_manager_;
- std::shared_ptr<IDXGISwapChain1> dxgi_swap_chain_;
- std::shared_ptr<ID2D1Bitmap1> target_bitmap_;
-};
-} // namespace cru::graph
diff --git a/src/platform_win/CMakeLists.txt b/src/platform_win/CMakeLists.txt
index 9e7d8a89..40c9d85a 100644
--- a/src/platform_win/CMakeLists.txt
+++ b/src/platform_win/CMakeLists.txt
@@ -2,11 +2,16 @@ add_library(cru_platform_win STATIC
debug.cpp
exception.cpp
god_window.cpp
+ graph_manager.cpp
timer.cpp
win_application.cpp
+ win_brush.cpp
+ win_geometry.cpp
+ win_graph_factory.cpp
win_native_window.cpp
window_class.cpp
- window_manager.cpp)
+ window_manager.cpp
+ window_render_target.cpp)
target_include_directories(cru_platform_win PUBLIC ${PROJECT_SOURCE_DIR}/include .)
target_link_libraries(cru_platform_win PRIVATE D3D11 D2d1 DWrite)
target_compile_definitions(cru_platform_win PUBLIC UNICODE _UNICODE) # use unicode
diff --git a/src/platform_win/debug.cpp b/src/platform_win/debug.cpp
index cdff7963..f52d41bd 100644
--- a/src/platform_win/debug.cpp
+++ b/src/platform_win/debug.cpp
@@ -3,7 +3,7 @@
#include "cru/platform/debug.hpp"
-namespace cru::debug {
+namespace cru::platform::debug {
void DebugMessage(const std::wstring_view& message) {
::OutputDebugStringW(message.data());
}
diff --git a/src/platform_win/dpi_util.hpp b/src/platform_win/dpi_util.hpp
new file mode 100644
index 00000000..92819e0f
--- /dev/null
+++ b/src/platform_win/dpi_util.hpp
@@ -0,0 +1,32 @@
+#pragma once
+
+// The dpi awareness needs to be implemented in the future. Currently we use 96
+// as default.
+
+namespace cru::platform {
+inline Dpi GetDpi() { return Dpi{96.0f, 96.0f}; }
+
+inline int DipToPixelInternal(const float dip, const float dpi) {
+ return static_cast<int>(dip * dpi / 96.0f);
+}
+
+inline int DipToPixelX(const float dip_x) {
+ return DipToPixelInternal(dip_x, GetDpi().x);
+}
+
+inline int DipToPixelY(const float dip_y) {
+ return DipToPixelInternal(dip_y, GetDpi().y);
+}
+
+inline float DipToPixelInternal(const int pixel, const float dpi) {
+ return static_cast<float>(pixel) * 96.0f / dpi;
+}
+
+inline float PixelToDipX(const int pixel_x) {
+ return DipToPixelInternal(pixel_x, GetDpi().x);
+}
+
+inline float PixelToDipY(const int pixel_y) {
+ return DipToPixelInternal(pixel_y, GetDpi().y);
+}
+} // namespace cru::platform
diff --git a/src/graph/graph_manager.cpp b/src/platform_win/graph_manager.cpp
index ecc60915..4961867b 100644
--- a/src/graph/graph_manager.cpp
+++ b/src/platform_win/graph_manager.cpp
@@ -1,23 +1,8 @@
-#include "graph_manager.hpp"
+#include "cru/platform/win/graph_manager.hpp"
-#include <d2d1_2.h>
-#include <d3d11.h>
-#include <dwrite.h>
-#include <dxgi1_2.h>
-#include <wrl/client.h>
-
-#include "application.hpp"
-#include "exception.hpp"
-#include "util/com_util.hpp"
-#include "window_render_target.hpp"
-
-namespace cru::graph {
-
-GraphManager* GraphManager::GetInstance() {
- return Application::GetInstance()->ResolveSingleton<GraphManager>(
- [](auto) { return new GraphManager{}; });
-}
+#include "cru/platform/win/exception.hpp"
+namespace cru::platform::win {
GraphManager::GraphManager() {
UINT creation_flags = D3D11_CREATE_DEVICE_BGRA_SUPPORT;
@@ -31,49 +16,36 @@ GraphManager::GraphManager() {
D3D_FEATURE_LEVEL_9_1};
Microsoft::WRL::ComPtr<ID3D11DeviceContext> d3d11_device_context;
- ID3D11Device* d3d11_device;
ThrowIfFailed(D3D11CreateDevice(
nullptr, D3D_DRIVER_TYPE_HARDWARE, nullptr, creation_flags,
feature_levels, ARRAYSIZE(feature_levels), D3D11_SDK_VERSION,
- &d3d11_device, nullptr, &d3d11_device_context));
- this->d3d11_device_ = util::CreateComSharedPtr(d3d11_device);
+ &d3d11_device_, nullptr, &d3d11_device_context));
Microsoft::WRL::ComPtr<IDXGIDevice> dxgi_device;
ThrowIfFailed(d3d11_device_->QueryInterface(dxgi_device.GetAddressOf()));
- ID2D1Factory1* d2d1_factory;
ThrowIfFailed(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED,
- IID_PPV_ARGS(&d2d1_factory)));
- this->d2d1_factory_ = util::CreateComSharedPtr(d2d1_factory);
+ IID_PPV_ARGS(&d2d1_factory_)));
Microsoft::WRL::ComPtr<ID2D1Device> d2d1_device;
ThrowIfFailed(d2d1_factory_->CreateDevice(dxgi_device.Get(), &d2d1_device));
- ID2D1DeviceContext* d2d1_device_context;
ThrowIfFailed(d2d1_device->CreateDeviceContext(
- D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &d2d1_device_context));
- this->d2d1_device_context_ = util::CreateComSharedPtr(d2d1_device_context);
+ D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &d2d1_device_context_));
// Identify the physical adapter (GPU or card) this device is runs on.
Microsoft::WRL::ComPtr<IDXGIAdapter> dxgi_adapter;
ThrowIfFailed(dxgi_device->GetAdapter(&dxgi_adapter));
- IDXGIFactory2* dxgi_factory;
// Get the factory object that created the DXGI device.
- ThrowIfFailed(dxgi_adapter->GetParent(IID_PPV_ARGS(&dxgi_factory)));
- this->dxgi_factory_ = util::CreateComSharedPtr(dxgi_factory);
+ ThrowIfFailed(dxgi_adapter->GetParent(IID_PPV_ARGS(&dxgi_factory_)));
- IDWriteFactory* dwrite_factory;
ThrowIfFailed(
DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory),
- reinterpret_cast<IUnknown**>(&dwrite_factory)));
- this->dwrite_factory_ = util::CreateComSharedPtr(dwrite_factory);
+ reinterpret_cast<IUnknown**>(dwrite_factory_.GetAddressOf())));
- IDWriteFontCollection* font_collection;
- ThrowIfFailed(dwrite_factory_->GetSystemFontCollection(&font_collection));
- this->dwrite_system_font_collection_ =
- util::CreateComSharedPtr(font_collection);
+ ThrowIfFailed(dwrite_factory_->GetSystemFontCollection(&dwrite_system_font_collection_));
}
} // namespace cru::graph
diff --git a/src/platform_win/win_application.cpp b/src/platform_win/win_application.cpp
index d96fd8d1..ce85dc67 100644
--- a/src/platform_win/win_application.cpp
+++ b/src/platform_win/win_application.cpp
@@ -1,17 +1,20 @@
#include "cru/platform/win/win_application.hpp"
-#include <VersionHelpers.h>
-
#include "cru/platform/win/exception.hpp"
#include "cru/platform/win/god_window.hpp"
+#include "cru/platform/win/graph_manager.hpp"
+#include "cru/platform/win/win_graph_factory.hpp"
#include "god_window_message.hpp"
#include "timer.hpp"
+#include "window_manager.hpp"
+
+#include <VersionHelpers.h>
namespace cru::platform {
UiApplication* UiApplication::GetInstance() {
return win::WinApplication::GetInstance();
}
-}
+} // namespace cru::platform
namespace cru::platform::win {
WinApplication* WinApplication::instance_ = nullptr;
@@ -33,6 +36,9 @@ WinApplication::WinApplication(HINSTANCE h_instance) : h_instance_(h_instance) {
god_window_ = std::make_shared<GodWindow>(this);
timer_manager_ = std::make_shared<TimerManager>(god_window_.get());
+ window_manager_ = std::make_shared<WindowManager>(this);
+ graph_manager_ = std::make_shared<GraphManager>();
+ graph_factory_ = std::make_shared<GraphFactory>(graph_manager_.get());
}
WinApplication::~WinApplication() { instance_ = nullptr; }
@@ -73,4 +79,5 @@ unsigned long WinApplication::SetInterval(
void WinApplication::CancelTimer(unsigned long id) {
timer_manager_->KillTimer(static_cast<UINT_PTR>(id));
}
+GraphFactory* WinApplication::GetGraphFactory() { return graph_factory_.get(); }
} // namespace cru::platform::win
diff --git a/src/platform_win/win_brush.cpp b/src/platform_win/win_brush.cpp
new file mode 100644
index 00000000..189dfd57
--- /dev/null
+++ b/src/platform_win/win_brush.cpp
@@ -0,0 +1,21 @@
+#include "cru/platform/win/win_brush.hpp"
+
+#include "cru/platform/win/d2d_util.hpp"
+#include "cru/platform/win/exception.hpp"
+
+#include <cassert>
+
+namespace cru::platform::win {
+WinSolidColorBrush::WinSolidColorBrush(
+ Microsoft::WRL::ComPtr<ID2D1SolidColorBrush> brush) {
+ assert(brush);
+ brush_ = std::move(brush);
+}
+
+ui::Color cru::platform::win::WinSolidColorBrush::GetColor() {
+ return util::Convert(brush_->GetColor());
+}
+void WinSolidColorBrush::SetColor(const ui::Color& color) {
+ brush_->SetColor(util::Convert(color));
+}
+} // namespace cru::platform::win
diff --git a/src/platform_win/win_geometry.cpp b/src/platform_win/win_geometry.cpp
new file mode 100644
index 00000000..1078700b
--- /dev/null
+++ b/src/platform_win/win_geometry.cpp
@@ -0,0 +1,65 @@
+#include "cru/platform/win/win_geometry.hpp"
+
+#include "cru/platform/win/d2d_util.hpp"
+#include "cru/platform/win/exception.hpp"
+
+#include <cassert>
+
+namespace cru::platform::win {
+WinGeometryBuilder::WinGeometryBuilder(
+ Microsoft::WRL::ComPtr<ID2D1PathGeometry> geometry) {
+ assert(geometry);
+ ThrowIfFailed(geometry->Open(&geometry_sink_));
+ geometry_ = std::move(geometry);
+}
+
+WinGeometryBuilder::~WinGeometryBuilder() {
+ if (geometry_sink_) {
+ ThrowIfFailed(geometry_sink_->Close());
+ }
+}
+
+void WinGeometryBuilder::BeginFigure(const ui::Point& point) {
+ assert(IsValid());
+ geometry_sink_->BeginFigure(util::Convert(point), D2D1_FIGURE_BEGIN_FILLED);
+}
+
+void WinGeometryBuilder::LineTo(const ui::Point& point) {
+ assert(IsValid());
+ geometry_sink_->AddLine(util::Convert(point));
+}
+
+void WinGeometryBuilder::QuadraticBezierTo(const ui::Point& control_point,
+ const ui::Point& end_point) {
+ assert(IsValid());
+ geometry_sink_->AddQuadraticBezier(D2D1::QuadraticBezierSegment(
+ util::Convert(control_point), util::Convert(end_point)));
+}
+
+void WinGeometryBuilder::CloseFigure(bool close) {
+ assert(IsValid());
+ geometry_sink_->EndFigure(close ? D2D1_FIGURE_END_CLOSED
+ : D2D1_FIGURE_END_OPEN);
+}
+
+Geometry* WinGeometryBuilder::Build() {
+ assert(IsValid());
+ ThrowIfFailed(geometry_sink_->Close());
+ geometry_sink_ = nullptr;
+ const auto geometry = new WinGeometry(geometry_);
+ geometry_ = nullptr;
+ return geometry;
+}
+
+WinGeometry::WinGeometry(Microsoft::WRL::ComPtr<ID2D1PathGeometry> geometry) {
+ assert(geometry);
+ geometry_ = std::move(geometry);
+}
+
+bool WinGeometry::FillContains(const ui::Point& point) {
+ BOOL result;
+ ThrowIfFailed(geometry_->FillContainsPoint(
+ util::Convert(point), D2D1::Matrix3x2F::Identity(), &result));
+ return result != 0;
+}
+} // namespace cru::platform::win
diff --git a/src/platform_win/win_graph_factory.cpp b/src/platform_win/win_graph_factory.cpp
new file mode 100644
index 00000000..b21c58d5
--- /dev/null
+++ b/src/platform_win/win_graph_factory.cpp
@@ -0,0 +1,31 @@
+#include "cru/platform/win/win_graph_factory.hpp"
+
+#include "cru/platform/win/d2d_util.hpp"
+#include "cru/platform/win/exception.hpp"
+#include "cru/platform/win/graph_manager.hpp"
+#include "cru/platform/win/win_brush.hpp"
+#include "cru/platform/win/win_geometry.hpp"
+
+#include <cassert>
+
+namespace cru::platform::win {
+WinGraphFactory::WinGraphFactory(GraphManager* graph_manager) {
+ assert(graph_manager);
+ graph_manager_ = graph_manager;
+}
+
+SolidColorBrush* WinGraphFactory::CreateSolidColorBrush(
+ const ui::Color& color) {
+ Microsoft::WRL::ComPtr<ID2D1SolidColorBrush> brush;
+ ThrowIfFailed(graph_manager_->GetD2D1DeviceContext()->CreateSolidColorBrush(
+ util::Convert(color), &brush));
+ return new WinSolidColorBrush(std::move(brush));
+}
+
+GeometryBuilder* WinGraphFactory::CreateGeometryBuilder() {
+ Microsoft::WRL::ComPtr<ID2D1PathGeometry> geometry;
+ ThrowIfFailed(
+ graph_manager_->GetD2D1Factory()->CreatePathGeometry(&geometry));
+ return new WinGeometryBuilder(std::move(geometry));
+}
+} // namespace cru::platform::win
diff --git a/src/platform_win/win_native_window.cpp b/src/platform_win/win_native_window.cpp
index 74d9466f..5c159290 100644
--- a/src/platform_win/win_native_window.cpp
+++ b/src/platform_win/win_native_window.cpp
@@ -1,9 +1,9 @@
#include "cru/platform/win/win_native_window.hpp"
-#include "cru/platform/dpi_util.hpp"
#include "cru/platform/win/exception.hpp"
#include "cru/platform/win/win_application.hpp"
#include "cru/platform/win/window_class.hpp"
+#include "dpi_util.hpp"
#include "window_manager.hpp"
#include <assert.h>
@@ -309,8 +309,7 @@ void WinNativeWindow::OnMouseUpInternal(MouseButton button, POINT point) {
mouse_up_event_.Raise(button, dip_point);
}
-void WinNativeWindow::OnMouseWheelInternal(short delta, POINT point) {
-}
+void WinNativeWindow::OnMouseWheelInternal(short delta, POINT point) {}
void WinNativeWindow::OnKeyDownInternal(int virtual_code) {
key_down_event_.Raise(virtual_code);
@@ -320,12 +319,9 @@ void WinNativeWindow::OnKeyUpInternal(int virtual_code) {
key_up_event_.Raise(virtual_code);
}
-void WinNativeWindow::OnCharInternal(wchar_t c) {
-}
+void WinNativeWindow::OnCharInternal(wchar_t c) {}
-void WinNativeWindow::OnActivatedInternal() {
-}
+void WinNativeWindow::OnActivatedInternal() {}
-void WinNativeWindow::OnDeactivatedInternal() {
-}
+void WinNativeWindow::OnDeactivatedInternal() {}
} // namespace cru::platform::win
diff --git a/src/graph/window_render_target.cpp b/src/platform_win/window_render_target.cpp
index a36e0faf..f4836d17 100644
--- a/src/graph/window_render_target.cpp
+++ b/src/platform_win/window_render_target.cpp
@@ -1,16 +1,12 @@
-#include "window_render_target.hpp"
+#include "cru/platform/win/window_render_target.hpp"
-#include <d2d1_1.h>
-#include <d3d11.h>
-#include <dxgi1_2.h>
-#include <wrl/client.h>
+#include "cru/platform/win/exception.hpp"
+#include "cru/platform/win/graph_manager.hpp"
+#include "dpi_util.hpp"
-#include "exception.hpp"
-#include "graph_manager.hpp"
-#include "graph_util.hpp"
-#include "util/com_util.hpp"
+#include <cassert>
-namespace cru::graph {
+namespace cru::platform::win {
WindowRenderTarget::WindowRenderTarget(GraphManager* graph_manager, HWND hwnd) {
this->graph_manager_ = graph_manager;
@@ -33,12 +29,10 @@ WindowRenderTarget::WindowRenderTarget(GraphManager* graph_manager, HWND hwnd) {
DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL; // all apps must use this SwapEffect
swap_chain_desc.Flags = 0;
- IDXGISwapChain1* dxgi_swap_chain;
// Get the final swap chain for this window from the DXGI factory.
- ThrowIfFailed(
- dxgi_factory->CreateSwapChainForHwnd(d3d11_device, hwnd, &swap_chain_desc,
- nullptr, nullptr, &dxgi_swap_chain));
- this->dxgi_swap_chain_ = util::CreateComSharedPtr(dxgi_swap_chain);
+ ThrowIfFailed(dxgi_factory->CreateSwapChainForHwnd(
+ d3d11_device, hwnd, &swap_chain_desc, nullptr, nullptr,
+ &dxgi_swap_chain_));
CreateTargetBitmap();
}
@@ -47,24 +41,24 @@ void WindowRenderTarget::ResizeBuffer(const int width, const int height) {
const auto graph_manager = graph_manager_;
const auto d2d1_device_context = graph_manager->GetD2D1DeviceContext();
- ID2D1Image* old_target;
+ Microsoft::WRL::ComPtr<ID2D1Image> old_target;
d2d1_device_context->GetTarget(&old_target);
- const auto target_this = old_target == this->target_bitmap_.get();
+ const auto target_this = old_target == this->target_bitmap_;
if (target_this) d2d1_device_context->SetTarget(nullptr);
- util::SafeRelease(old_target);
- target_bitmap_.reset();
+ old_target = nullptr;
+ target_bitmap_ = nullptr;
ThrowIfFailed(dxgi_swap_chain_->ResizeBuffers(0, width, height,
DXGI_FORMAT_UNKNOWN, 0));
CreateTargetBitmap();
- if (target_this) d2d1_device_context->SetTarget(target_bitmap_.get());
+ if (target_this) d2d1_device_context->SetTarget(target_bitmap_.Get());
}
void WindowRenderTarget::SetAsTarget() {
- graph_manager_->GetD2D1DeviceContext()->SetTarget(target_bitmap_.get());
+ graph_manager_->GetD2D1DeviceContext()->SetTarget(target_bitmap_.Get());
}
void WindowRenderTarget::Present() {
@@ -86,12 +80,10 @@ void WindowRenderTarget::CreateTargetBitmap() {
D2D1::PixelFormat(DXGI_FORMAT_B8G8R8A8_UNORM, D2D1_ALPHA_MODE_IGNORE),
dpi.x, dpi.y);
- ID2D1Bitmap1* bitmap;
// Get a D2D surface from the DXGI back buffer to use as the D2D render
// target.
ThrowIfFailed(
graph_manager_->GetD2D1DeviceContext()->CreateBitmapFromDxgiSurface(
- dxgi_back_buffer.Get(), &bitmap_properties, &bitmap));
- this->target_bitmap_ = util::CreateComSharedPtr(bitmap);
+ dxgi_back_buffer.Get(), &bitmap_properties, &target_bitmap_));
}
-} // namespace cru::graph
+} // namespace cru::platform::win
diff --git a/src/ui/d2d_util.hpp b/src/ui/d2d_util.hpp
deleted file mode 100644
index 2ec8ba98..00000000
--- a/src/ui/d2d_util.hpp
+++ /dev/null
@@ -1,82 +0,0 @@
-#pragma once
-#include "pre.hpp"
-
-#include <d2d1.h>
-
-#include "ui_base.hpp"
-
-namespace cru::ui {
-inline D2D1_POINT_2F Convert(const Point& point) {
- return D2D1::Point2F(point.x, point.y);
-}
-
-inline D2D1_RECT_F Convert(const Rect& rect) {
- return D2D1::RectF(rect.left, rect.top, rect.left + rect.width,
- rect.top + rect.height);
-}
-
-inline D2D1_ROUNDED_RECT Convert(const RoundedRect& rounded_rect) {
- return D2D1::RoundedRect(Convert(rounded_rect.rect), rounded_rect.radius_x,
- rounded_rect.radius_y);
-}
-
-inline D2D1_ELLIPSE Convert(const Ellipse& ellipse) {
- return D2D1::Ellipse(Convert(ellipse.center), ellipse.radius_x,
- ellipse.radius_y);
-}
-
-inline Point Convert(const D2D1_POINT_2F& point) {
- return Point(point.x, point.y);
-}
-
-inline Rect Convert(const D2D1_RECT_F& rect) {
- return Rect(rect.left, rect.top, rect.right - rect.left,
- rect.bottom - rect.top);
-}
-
-inline RoundedRect Convert(const D2D1_ROUNDED_RECT& rounded_rect) {
- return RoundedRect(Convert(rounded_rect.rect), rounded_rect.radiusX,
- rounded_rect.radiusY);
-}
-
-inline Ellipse Convert(const D2D1_ELLIPSE& ellipse) {
- return Ellipse(Convert(ellipse.point), ellipse.radiusX, ellipse.radiusY);
-}
-
-inline bool operator==(const D2D1_POINT_2F& left, const D2D1_POINT_2F& right) {
- return left.x == right.x && left.y == right.y;
-}
-
-inline bool operator!=(const D2D1_POINT_2F& left, const D2D1_POINT_2F& right) {
- return !(left == right);
-}
-
-inline bool operator==(const D2D1_RECT_F& left, const D2D1_RECT_F& right) {
- return left.left == right.left && left.top == right.top &&
- left.right == right.right && left.bottom == right.bottom;
-}
-
-inline bool operator!=(const D2D1_RECT_F& left, const D2D1_RECT_F& right) {
- return !(left == right);
-}
-
-inline bool operator==(const D2D1_ROUNDED_RECT& left,
- const D2D1_ROUNDED_RECT& right) {
- return left.rect == right.rect && left.radiusX == right.radiusX &&
- left.radiusY == right.radiusY;
-}
-
-inline bool operator!=(const D2D1_ROUNDED_RECT& left,
- const D2D1_ROUNDED_RECT& right) {
- return !(left == right);
-}
-
-inline bool operator==(const D2D1_ELLIPSE& left, const D2D1_ELLIPSE& right) {
- return left.point == right.point && left.radiusX == right.radiusX &&
- left.radiusY == right.radiusY;
-}
-
-inline bool operator!=(const D2D1_ELLIPSE& left, const D2D1_ELLIPSE& right) {
- return !(left == right);
-}
-} // namespace cru::ui
diff --git a/src/util/com_util.hpp b/src/util/com_util.hpp
deleted file mode 100644
index bbaf1c27..00000000
--- a/src/util/com_util.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-#include "pre.hpp"
-
-#include <memory>
-
-namespace cru::util {
-
-template <typename TInterface>
-std::shared_ptr<TInterface> CreateComSharedPtr(TInterface* p) {
- return std::shared_ptr<TInterface>(p, [](TInterface* ptr) {
- if (ptr != nullptr) ptr->Release();
- });
-}
-
-template <class TInterface>
-void SafeRelease(TInterface*& p) {
- if (p != nullptr) {
- p->Release();
- p = nullptr;
- }
-}
-} // namespace cru::util
generated by cgit v1.2.3 (git 2.46.0) at 2025-09-28 20:52:02 +0000