aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--demos/input_method/main.cpp2
-rw-r--r--demos/svg_path/main.cpp1
-rw-r--r--include/cru/platform/graphics/Painter.h4
-rw-r--r--include/cru/win/graphics/direct/Image.h2
-rw-r--r--include/cru/win/graphics/direct/ImageFactory.h2
-rw-r--r--include/cru/win/graphics/direct/Painter.h11
-rw-r--r--src/win/graphics/direct/Image.cpp7
-rw-r--r--src/win/graphics/direct/ImageFactory.cpp20
-rw-r--r--src/win/graphics/direct/Painter.cpp17
-rw-r--r--src/win/graphics/direct/WindowPainter.cpp11
10 files changed, 65 insertions, 12 deletions
diff --git a/demos/input_method/main.cpp b/demos/input_method/main.cpp
index 7d55f2db..abbbed2c 100644
--- a/demos/input_method/main.cpp
+++ b/demos/input_method/main.cpp
@@ -99,6 +99,8 @@ int main() {
cursor_lefttop.height},
brush.get());
}
+
+ painter->EndDraw();
});
window->KeyDownEvent()->AddHandler(
diff --git a/demos/svg_path/main.cpp b/demos/svg_path/main.cpp
index 970aa317..87c410e9 100644
--- a/demos/svg_path/main.cpp
+++ b/demos/svg_path/main.cpp
@@ -39,6 +39,7 @@ M6.5 0a.5.5 0 0 0 0 1H7v1.07a7.001 7.001 0 0 0-3.273 12.474l-.602.602a.5.5 0 0 0
painter->ConcatTransform(Matrix::Scale(10, 10));
painter->FillGeometry(geometry.get(), brush.get());
painter->PopState();
+ painter->EndDraw();
});
window->SetVisibility(WindowVisibilityType::Show);
diff --git a/include/cru/platform/graphics/Painter.h b/include/cru/platform/graphics/Painter.h
index 38ff8849..4268133e 100644
--- a/include/cru/platform/graphics/Painter.h
+++ b/include/cru/platform/graphics/Painter.h
@@ -3,6 +3,10 @@
namespace cru::platform::graphics {
+/**
+ * \brief Painter is a object to paint on something like window, bitmap and etc.
+ * \remarks Remember to call EndDraw() when you are done with painting.
+ */
struct CRU_PLATFORM_GRAPHICS_API IPainter : virtual IPlatformResource {
virtual Matrix GetTransform() = 0;
virtual void SetTransform(const Matrix& matrix) = 0;
diff --git a/include/cru/win/graphics/direct/Image.h b/include/cru/win/graphics/direct/Image.h
index 0b51f350..bcf2386b 100644
--- a/include/cru/win/graphics/direct/Image.h
+++ b/include/cru/win/graphics/direct/Image.h
@@ -20,6 +20,8 @@ class CRU_WIN_GRAPHICS_DIRECT_API Direct2DImage : public DirectGraphicsResource,
std::unique_ptr<IImage> CreateWithRect(const Rect& rect) override;
+ std::unique_ptr<IPainter> CreatePainter() override;
+
const Microsoft::WRL::ComPtr<ID2D1Bitmap1>& GetD2DBitmap() const {
return d2d_bitmap_;
}
diff --git a/include/cru/win/graphics/direct/ImageFactory.h b/include/cru/win/graphics/direct/ImageFactory.h
index 34d363b0..923e682f 100644
--- a/include/cru/win/graphics/direct/ImageFactory.h
+++ b/include/cru/win/graphics/direct/ImageFactory.h
@@ -19,6 +19,8 @@ class CRU_WIN_GRAPHICS_DIRECT_API WinImageFactory
public:
std::unique_ptr<IImage> DecodeFromStream(io::Stream* stream) override;
+ std::unique_ptr<IImage> CreateBitmap(int width, int height) override;
+
private:
DirectGraphicsFactory* graphics_factory_;
diff --git a/include/cru/win/graphics/direct/Painter.h b/include/cru/win/graphics/direct/Painter.h
index b1795395..da89ba5d 100644
--- a/include/cru/win/graphics/direct/Painter.h
+++ b/include/cru/win/graphics/direct/Painter.h
@@ -2,6 +2,7 @@
#include "ComResource.h"
#include "Resource.h"
+#include "cru/common/Base.h"
#include "cru/platform/graphics/Painter.h"
#include <vector>
@@ -11,13 +12,15 @@ class CRU_WIN_GRAPHICS_DIRECT_API D2DDeviceContextPainter
: public DirectResource,
public virtual IPainter,
public virtual IComResource<ID2D1DeviceContext1> {
+ CRU_DEFINE_CLASS_LOG_TAG(u"D2DDeviceContextPainter")
public:
- explicit D2DDeviceContextPainter(ID2D1DeviceContext1* device_context);
+ explicit D2DDeviceContextPainter(ID2D1DeviceContext1* device_context,
+ bool release = false);
CRU_DELETE_COPY(D2DDeviceContextPainter)
CRU_DELETE_MOVE(D2DDeviceContextPainter)
- ~D2DDeviceContextPainter() override = default;
+ ~D2DDeviceContextPainter() override;
public:
ID2D1DeviceContext1* GetComInterface() const override {
@@ -57,7 +60,7 @@ class CRU_WIN_GRAPHICS_DIRECT_API D2DDeviceContextPainter
void EndDraw() override final;
protected:
- virtual void DoEndDraw() = 0;
+ virtual void DoEndDraw() {}
private:
bool IsValid() { return is_drawing_; }
@@ -71,5 +74,7 @@ class CRU_WIN_GRAPHICS_DIRECT_API D2DDeviceContextPainter
drawing_state_stack_;
bool is_drawing_ = true;
+
+ bool release_;
};
} // namespace cru::platform::graphics::win::direct
diff --git a/src/win/graphics/direct/Image.cpp b/src/win/graphics/direct/Image.cpp
index 11f5e763..855098d7 100644
--- a/src/win/graphics/direct/Image.cpp
+++ b/src/win/graphics/direct/Image.cpp
@@ -3,6 +3,7 @@
#include "cru/win/graphics/direct/ConvertUtil.h"
#include "cru/win/graphics/direct/Exception.h"
#include "cru/win/graphics/direct/Factory.h"
+#include "cru/win/graphics/direct/Painter.h"
namespace cru::platform::graphics::win::direct {
Direct2DImage::Direct2DImage(DirectGraphicsFactory* graphics_factory,
@@ -29,4 +30,10 @@ std::unique_ptr<IImage> Direct2DImage::CreateWithRect(const Rect& rect) {
return std::make_unique<Direct2DImage>(GetDirectFactory(), std::move(bitmap));
}
+std::unique_ptr<IPainter> Direct2DImage::CreatePainter() {
+ auto device_context = GetDirectFactory()->CreateD2D1DeviceContext();
+ device_context->SetTarget(d2d_bitmap_.Get());
+ return std::make_unique<D2DDeviceContextPainter>(device_context.Detach(),
+ true);
+}
} // namespace cru::platform::graphics::win::direct
diff --git a/src/win/graphics/direct/ImageFactory.cpp b/src/win/graphics/direct/ImageFactory.cpp
index e7794aa5..76694e30 100644
--- a/src/win/graphics/direct/ImageFactory.cpp
+++ b/src/win/graphics/direct/ImageFactory.cpp
@@ -1,4 +1,5 @@
#include "cru/win/graphics/direct/ImageFactory.h"
+#include "cru/common/platform/win/Exception.h"
#include "cru/common/platform/win/StreamConvert.h"
#include "cru/win/graphics/direct/Exception.h"
#include "cru/win/graphics/direct/Factory.h"
@@ -42,4 +43,23 @@ std::unique_ptr<IImage> WinImageFactory::DecodeFromStream(io::Stream* stream) {
return std::make_unique<Direct2DImage>(graphics_factory_,
std::move(d2d_image));
}
+
+std::unique_ptr<IImage> WinImageFactory::CreateBitmap(int width, int height) {
+ if (width <= 0) throw Exception(u"Bitmap width must be greater than 0.");
+ if (height <= 0) throw Exception(u"Bitmap height must be greater than 0.");
+
+ Microsoft::WRL::ComPtr<ID2D1Bitmap> bitmap;
+
+ auto d2d_context = graphics_factory_->GetDefaultD2D1DeviceContext();
+ d2d_context->CreateBitmap(
+ D2D1::SizeU(width, height),
+ D2D1::BitmapProperties(D2D1::PixelFormat(DXGI_FORMAT_R8G8B8A8_TYPELESS,
+ D2D1_ALPHA_MODE_STRAIGHT)),
+ &bitmap);
+
+ Microsoft::WRL::ComPtr<ID2D1Bitmap1> bitmap1;
+ ThrowIfFailed(bitmap.As(&bitmap1), "Failed to convert bitmap to bitmap1.");
+
+ return std::make_unique<Direct2DImage>(graphics_factory_, std::move(bitmap1));
+}
} // namespace cru::platform::graphics::win::direct
diff --git a/src/win/graphics/direct/Painter.cpp b/src/win/graphics/direct/Painter.cpp
index 32386877..3e8bd5c1 100644
--- a/src/win/graphics/direct/Painter.cpp
+++ b/src/win/graphics/direct/Painter.cpp
@@ -1,5 +1,6 @@
#include "cru/win/graphics/direct/Painter.h"
+#include "cru/common/log/Logger.h"
#include "cru/platform/Check.h"
#include "cru/win/graphics/direct/Brush.h"
#include "cru/win/graphics/direct/ConvertUtil.h"
@@ -12,9 +13,22 @@
namespace cru::platform::graphics::win::direct {
D2DDeviceContextPainter::D2DDeviceContextPainter(
- ID2D1DeviceContext1* device_context) {
+ ID2D1DeviceContext1* device_context, bool release) {
Expects(device_context);
device_context_ = device_context;
+ release_ = release;
+ device_context->BeginDraw();
+}
+
+D2DDeviceContextPainter::~D2DDeviceContextPainter() {
+ if (is_drawing_) {
+ CRU_LOG_INFO(u"You may forget to call EndDraw before destroying painter.");
+ }
+
+ if (release_) {
+ device_context_->Release();
+ device_context_ = nullptr;
+ }
}
platform::Matrix D2DDeviceContextPainter::GetTransform() {
@@ -155,6 +169,7 @@ void D2DDeviceContextPainter::PopState() {
void D2DDeviceContextPainter::EndDraw() {
if (is_drawing_) {
is_drawing_ = false;
+ ThrowIfFailed(device_context_->EndDraw());
DoEndDraw();
}
}
diff --git a/src/win/graphics/direct/WindowPainter.cpp b/src/win/graphics/direct/WindowPainter.cpp
index 0f78119e..c0808887 100644
--- a/src/win/graphics/direct/WindowPainter.cpp
+++ b/src/win/graphics/direct/WindowPainter.cpp
@@ -7,14 +7,9 @@
namespace cru::platform::graphics::win::direct {
D2DWindowPainter::D2DWindowPainter(D2DWindowRenderTarget* render_target)
: D2DDeviceContextPainter(render_target->GetD2D1DeviceContext()),
- render_target_(render_target) {
- render_target_->GetD2D1DeviceContext()->BeginDraw();
-}
+ render_target_(render_target) {}
-D2DWindowPainter::~D2DWindowPainter() { EndDraw(); }
+D2DWindowPainter::~D2DWindowPainter() {}
-void D2DWindowPainter::DoEndDraw() {
- ThrowIfFailed(render_target_->GetD2D1DeviceContext()->EndDraw());
- render_target_->Present();
-}
+void D2DWindowPainter::DoEndDraw() { render_target_->Present(); }
} // namespace cru::platform::graphics::win::direct
generated by cgit v1.2.3 (git 2.46.0) at 2025-09-28 17:49:33 +0000