From 882d843083895f4905571dc273e801ee18fd5984 Mon Sep 17 00:00:00 2001 From: crupest Date: Wed, 12 Jan 2022 02:30:25 +0800 Subject: ... --- src/win/graphics/direct/Factory.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src/win/graphics/direct/Factory.cpp') diff --git a/src/win/graphics/direct/Factory.cpp b/src/win/graphics/direct/Factory.cpp index 6694801f..4c4f1a9a 100644 --- a/src/win/graphics/direct/Factory.cpp +++ b/src/win/graphics/direct/Factory.cpp @@ -27,7 +27,7 @@ void InitializeCom() { void UninitializeCom() { ::CoUninitialize(); } } // namespace -DirectGraphFactory::DirectGraphFactory() { +DirectGraphicsFactory::DirectGraphicsFactory() { // TODO! Detect repeated creation. Because I don't think we can create two d2d // and dwrite factory so we need to prevent the "probably dangerous" behavior. @@ -76,31 +76,33 @@ DirectGraphFactory::DirectGraphFactory() { &dwrite_system_font_collection_)); } -DirectGraphFactory::~DirectGraphFactory() { UninitializeCom(); } +DirectGraphicsFactory::~DirectGraphicsFactory() { UninitializeCom(); } Microsoft::WRL::ComPtr -DirectGraphFactory::CreateD2D1DeviceContext() { +DirectGraphicsFactory::CreateD2D1DeviceContext() { Microsoft::WRL::ComPtr d2d1_device_context; ThrowIfFailed(d2d1_device_->CreateDeviceContext( D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &d2d1_device_context)); return d2d1_device_context; } -std::unique_ptr DirectGraphFactory::CreateSolidColorBrush() { +std::unique_ptr +DirectGraphicsFactory::CreateSolidColorBrush() { return std::make_unique(this); } -std::unique_ptr DirectGraphFactory::CreateGeometryBuilder() { +std::unique_ptr +DirectGraphicsFactory::CreateGeometryBuilder() { return std::make_unique(this); } -std::unique_ptr DirectGraphFactory::CreateFont( - std::u16string font_family, float font_size) { +std::unique_ptr DirectGraphicsFactory::CreateFont(String font_family, + float font_size) { return std::make_unique(this, std::move(font_family), font_size); } -std::unique_ptr DirectGraphFactory::CreateTextLayout( - std::shared_ptr font, std::u16string text) { +std::unique_ptr DirectGraphicsFactory::CreateTextLayout( + std::shared_ptr font, String text) { return std::make_unique(this, std::move(font), std::move(text)); } -- cgit v1.2.3