diff options
Diffstat (limited to 'include')
33 files changed, 215 insertions, 358 deletions
diff --git a/include/cru/base/platform/win/Exception.h b/include/cru/base/platform/win/Base.h index db98e7b6..83420461 100644 --- a/include/cru/base/platform/win/Exception.h +++ b/include/cru/base/platform/win/Base.h @@ -1,13 +1,19 @@ #pragma once #ifndef _WIN32 -#error "This file can only be used on Windows." +#error "This file can only be included on Windows." #endif -#include "WinPreConfig.h" - #include "../../Base.h" +#define NOMINMAX +#define WIN32_LEAN_AND_MEAN +#include <Windows.h> +#undef CreateWindow +#undef DrawText +#undef CreateFont +#undef CreateEvent + namespace cru::platform::win { class CRU_BASE_API HResultError : public Exception { public: diff --git a/include/cru/base/platform/win/ComAutoInit.h b/include/cru/base/platform/win/ComAutoInit.h index cef819a5..524cd026 100644 --- a/include/cru/base/platform/win/ComAutoInit.h +++ b/include/cru/base/platform/win/ComAutoInit.h @@ -1,9 +1,10 @@ #pragma once -#ifdef CRU_PLATFORM_WINDOWS +#ifndef _WIN32 +#error "This file can only be included on Windows." +#endif -#include "WinPreConfig.h" -#include "cru/base/Base.h" +#include "Base.h" namespace cru::platform::win { class CRU_BASE_API ComAutoInit { @@ -16,5 +17,3 @@ class CRU_BASE_API ComAutoInit { ~ComAutoInit(); }; } // namespace cru::platform::win - -#endif diff --git a/include/cru/base/platform/win/DebugLogTarget.h b/include/cru/base/platform/win/DebugLogTarget.h index cabfa7e5..333e764f 100644 --- a/include/cru/base/platform/win/DebugLogTarget.h +++ b/include/cru/base/platform/win/DebugLogTarget.h @@ -1,15 +1,13 @@ #pragma once #ifndef _WIN32 -#error "This file can only be used on Windows." +#error "This file can only be included on Windows." #endif -#include "WinPreConfig.h" - +#include "Base.h" #include "../../log/Logger.h" namespace cru::platform::win { - class CRU_BASE_API WinDebugLogTarget : public ::cru::log::ILogTarget { public: void Write(::cru::log::LogLevel level, std::string s) override; diff --git a/include/cru/base/platform/win/StreamConvert.h b/include/cru/base/platform/win/StreamConvert.h index 17552c31..085e94e6 100644 --- a/include/cru/base/platform/win/StreamConvert.h +++ b/include/cru/base/platform/win/StreamConvert.h @@ -1,6 +1,8 @@ #pragma once -#ifdef CRU_PLATFORM_WINDOWS +#ifndef _WIN32 +#error "This file can only be included on Windows." +#endif #include "../../io/Stream.h" @@ -9,5 +11,3 @@ namespace cru::platform::win { CRU_BASE_API IStream* ConvertStreamToComStream(io::Stream* stream); } - -#endif diff --git a/include/cru/base/platform/win/Win32FileStream.h b/include/cru/base/platform/win/Win32FileStream.h index d0339b11..2980d059 100644 --- a/include/cru/base/platform/win/Win32FileStream.h +++ b/include/cru/base/platform/win/Win32FileStream.h @@ -1,6 +1,8 @@ #pragma once -#ifdef CRU_PLATFORM_WINDOWS +#ifndef _WIN32 +#error "This file can only be included on Windows." +#endif #include "../../io/OpenFileFlag.h" #include "../../io/Stream.h" @@ -38,5 +40,3 @@ class CRU_BASE_API Win32FileStream : public io::Stream { details::Win32FileStreamPrivate* p_; }; } // namespace cru::platform::win - -#endif diff --git a/include/cru/base/platform/win/WinPreConfig.h b/include/cru/base/platform/win/WinPreConfig.h deleted file mode 100644 index 03e0c03c..00000000 --- a/include/cru/base/platform/win/WinPreConfig.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once -#ifdef CRU_PLATFORM_WINDOWS - -#define NOMINMAX -#define WIN32_LEAN_AND_MEAN -#include <Windows.h> -#undef CreateWindow -#undef DrawText -#undef CreateFont -#undef CreateEvent - -#endif diff --git a/include/cru/platform/graphics/direct2d/Base.h b/include/cru/platform/graphics/direct2d/Base.h index 55942e53..f42d6193 100644 --- a/include/cru/platform/graphics/direct2d/Base.h +++ b/include/cru/platform/graphics/direct2d/Base.h @@ -1,5 +1,7 @@ #pragma once -#include "cru/platform/win/WinPreConfig.h" + +#include <cru/base/platform/win/Base.h> +#include <cru/platform/graphics/Base.h> #include <d2d1_2.h> #include <d3d11.h> @@ -16,3 +18,138 @@ #else #define CRU_WIN_GRAPHICS_DIRECT_API #endif + +namespace cru::platform::graphics::direct2d { +using platform::win::HResultError; +using platform::win::ThrowIfFailed; + +inline D2D1_MATRIX_3X2_F Convert(const platform::Matrix& matrix) { + D2D1_MATRIX_3X2_F m; + m._11 = matrix.m11; + m._12 = matrix.m12; + m._21 = matrix.m21; + m._22 = matrix.m22; + m._31 = matrix.m31; + m._32 = matrix.m32; + return m; +} + +inline D2D1_COLOR_F Convert(const Color& color) { + return D2D1::ColorF(color.red / 255.0f, color.green / 255.0f, + color.blue / 255.0f, color.alpha / 255.0f); +} + +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 platform::Matrix Convert(const D2D1_MATRIX_3X2_F& matrix) { + return platform::Matrix{matrix._11, matrix._12, matrix._21, + matrix._22, matrix._31, matrix._32}; +} + +inline Color Convert(const D2D1_COLOR_F& color) { + auto floor = [](float n) { return static_cast<std::uint8_t>(n + 0.5f); }; + return Color{floor(color.r * 255.0f), floor(color.g * 255.0f), + floor(color.b * 255.0f), floor(color.a * 255.0f)}; +} + +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); +} + +class DirectGraphicsFactory; + +class CRU_WIN_GRAPHICS_DIRECT_API DirectGraphicsResource + : public Object, + public virtual IGraphicsResource { + public: + constexpr static auto kPlatformId = "Windows Direct"; + + protected: + // Param factory can't be null. + explicit DirectGraphicsResource(DirectGraphicsFactory* factory); + + public: + std::string GetPlatformId() const override; + + IGraphicsFactory* GetGraphicsFactory() final; + + public: + DirectGraphicsFactory* GetDirectFactory() const { return factory_; } + + private: + DirectGraphicsFactory* factory_; +}; + +template <typename TInterface> +struct CRU_WIN_GRAPHICS_DIRECT_API IComResource : virtual Interface { + virtual TInterface* GetComInterface() const = 0; +}; +} // namespace cru::platform::graphics::direct2d diff --git a/include/cru/platform/graphics/direct2d/Brush.h b/include/cru/platform/graphics/direct2d/Brush.h index 98f9018c..331a9bc0 100644 --- a/include/cru/platform/graphics/direct2d/Brush.h +++ b/include/cru/platform/graphics/direct2d/Brush.h @@ -1,8 +1,7 @@ #pragma once -#include "ComResource.h" -#include "Resource.h" +#include "Base.h" -#include "cru/platform/graphics/Brush.h" +#include <cru/platform/graphics/Brush.h> namespace cru::platform::graphics::direct2d { struct CRU_WIN_GRAPHICS_DIRECT_API ID2DBrush : virtual IBrush { @@ -17,12 +16,6 @@ class CRU_WIN_GRAPHICS_DIRECT_API D2DSolidColorBrush public: explicit D2DSolidColorBrush(DirectGraphicsFactory* factory); - CRU_DELETE_COPY(D2DSolidColorBrush) - CRU_DELETE_MOVE(D2DSolidColorBrush) - - ~D2DSolidColorBrush() override = default; - - public: Color GetColor() override { return color_; } void SetColor(const Color& color) override; diff --git a/include/cru/platform/graphics/direct2d/ComResource.h b/include/cru/platform/graphics/direct2d/ComResource.h deleted file mode 100644 index d274ae16..00000000 --- a/include/cru/platform/graphics/direct2d/ComResource.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once -#include "Base.h" - -#include "cru/base/Base.h" - -namespace cru::platform::graphics::direct2d { -template <typename TInterface> -struct CRU_WIN_GRAPHICS_DIRECT_API IComResource : virtual Interface { - virtual TInterface* GetComInterface() const = 0; -}; -} // namespace cru::platform::graphics::direct2d diff --git a/include/cru/platform/graphics/direct2d/ConvertUtil.h b/include/cru/platform/graphics/direct2d/ConvertUtil.h deleted file mode 100644 index 66fa37f8..00000000 --- a/include/cru/platform/graphics/direct2d/ConvertUtil.h +++ /dev/null @@ -1,107 +0,0 @@ -#pragma once -#include "Base.h" - -#include "cru/platform/graphics/Base.h" - -namespace cru::platform::graphics::direct2d { -inline D2D1_MATRIX_3X2_F Convert(const platform::Matrix& matrix) { - D2D1_MATRIX_3X2_F m; - m._11 = matrix.m11; - m._12 = matrix.m12; - m._21 = matrix.m21; - m._22 = matrix.m22; - m._31 = matrix.m31; - m._32 = matrix.m32; - return m; -} - -inline D2D1_COLOR_F Convert(const Color& color) { - return D2D1::ColorF(color.red / 255.0f, color.green / 255.0f, - color.blue / 255.0f, color.alpha / 255.0f); -} - -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 platform::Matrix Convert(const D2D1_MATRIX_3X2_F& matrix) { - return platform::Matrix{matrix._11, matrix._12, matrix._21, - matrix._22, matrix._31, matrix._32}; -} - -inline Color Convert(const D2D1_COLOR_F& color) { - auto floor = [](float n) { return static_cast<std::uint8_t>(n + 0.5f); }; - return Color{floor(color.r * 255.0f), floor(color.g * 255.0f), - floor(color.b * 255.0f), floor(color.a * 255.0f)}; -} - -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::platform::graphics::direct2d diff --git a/include/cru/platform/graphics/direct2d/Exception.h b/include/cru/platform/graphics/direct2d/Exception.h deleted file mode 100644 index 9be6f10a..00000000 --- a/include/cru/platform/graphics/direct2d/Exception.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once -#include "cru/platform/win/Exception.h" - -namespace cru::platform::graphics::direct2d { -using platform::win::HResultError; -using platform::win::ThrowIfFailed; -} // namespace cru::platform::graphics::direct2d diff --git a/include/cru/platform/graphics/direct2d/Factory.h b/include/cru/platform/graphics/direct2d/Factory.h index e96950fd..1d6cdef8 100644 --- a/include/cru/platform/graphics/direct2d/Factory.h +++ b/include/cru/platform/graphics/direct2d/Factory.h @@ -1,5 +1,5 @@ #pragma once -#include "Resource.h" +#include "Base.h" #include "ImageFactory.h" @@ -9,14 +9,10 @@ namespace cru::platform::graphics::direct2d { class CRU_WIN_GRAPHICS_DIRECT_API DirectGraphicsFactory - : public DirectResource, + : public DirectGraphicsResource, public virtual IGraphicsFactory { public: DirectGraphicsFactory(); - - CRU_DELETE_COPY(DirectGraphicsFactory) - CRU_DELETE_MOVE(DirectGraphicsFactory) - ~DirectGraphicsFactory() override; public: diff --git a/include/cru/platform/graphics/direct2d/Font.h b/include/cru/platform/graphics/direct2d/Font.h index 86576592..0e7af622 100644 --- a/include/cru/platform/graphics/direct2d/Font.h +++ b/include/cru/platform/graphics/direct2d/Font.h @@ -1,10 +1,7 @@ #pragma once -#include "ComResource.h" -#include "Resource.h" +#include "Base.h" -#include "cru/platform/graphics/Font.h" - -#include <string_view> +#include <cru/platform/graphics/Font.h> namespace cru::platform::graphics::direct2d { class CRU_WIN_GRAPHICS_DIRECT_API DWriteFont @@ -15,12 +12,6 @@ class CRU_WIN_GRAPHICS_DIRECT_API DWriteFont DWriteFont(DirectGraphicsFactory* factory, std::string font_family, float font_size); - CRU_DELETE_COPY(DWriteFont) - CRU_DELETE_MOVE(DWriteFont) - - ~DWriteFont() override = default; - - public: IDWriteTextFormat* GetComInterface() const override { return text_format_.Get(); } diff --git a/include/cru/platform/graphics/direct2d/Geometry.h b/include/cru/platform/graphics/direct2d/Geometry.h index 64dbae84..2af275d4 100644 --- a/include/cru/platform/graphics/direct2d/Geometry.h +++ b/include/cru/platform/graphics/direct2d/Geometry.h @@ -1,8 +1,7 @@ #pragma once -#include "ComResource.h" -#include "Resource.h" +#include "Base.h" -#include "cru/platform/graphics/Geometry.h" +#include <cru/platform/graphics/Geometry.h> namespace cru::platform::graphics::direct2d { class CRU_WIN_GRAPHICS_DIRECT_API D2DGeometryBuilder @@ -11,12 +10,6 @@ class CRU_WIN_GRAPHICS_DIRECT_API D2DGeometryBuilder public: explicit D2DGeometryBuilder(DirectGraphicsFactory* factory); - CRU_DELETE_COPY(D2DGeometryBuilder) - CRU_DELETE_MOVE(D2DGeometryBuilder) - - ~D2DGeometryBuilder() override = default; - - public: Point GetCurrentPosition() override; void MoveTo(const Point& point) override; diff --git a/include/cru/platform/graphics/direct2d/Image.h b/include/cru/platform/graphics/direct2d/Image.h index 9f3f247f..89eb6738 100644 --- a/include/cru/platform/graphics/direct2d/Image.h +++ b/include/cru/platform/graphics/direct2d/Image.h @@ -1,6 +1,7 @@ #pragma once -#include "Resource.h" -#include "cru/platform/graphics/Image.h" +#include "Base.h" + +#include <cru/platform/graphics/Image.h> namespace cru::platform::graphics::direct2d { class CRU_WIN_GRAPHICS_DIRECT_API Direct2DImage : public DirectGraphicsResource, @@ -9,12 +10,8 @@ class CRU_WIN_GRAPHICS_DIRECT_API Direct2DImage : public DirectGraphicsResource, Direct2DImage(DirectGraphicsFactory* graphics_factory, Microsoft::WRL::ComPtr<ID2D1Bitmap1> d2d_bitmap); - CRU_DELETE_COPY(Direct2DImage) - CRU_DELETE_MOVE(Direct2DImage) - ~Direct2DImage() override; - public: float GetWidth() override; float GetHeight() override; diff --git a/include/cru/platform/graphics/direct2d/ImageFactory.h b/include/cru/platform/graphics/direct2d/ImageFactory.h index 87f6c0ee..b7aad021 100644 --- a/include/cru/platform/graphics/direct2d/ImageFactory.h +++ b/include/cru/platform/graphics/direct2d/ImageFactory.h @@ -1,8 +1,8 @@ #pragma once -#include "Resource.h" -#include "cru/platform/graphics/Image.h" -#include "cru/platform/graphics/ImageFactory.h" +#include "Base.h" + +#include <cru/platform/graphics/ImageFactory.h> namespace cru::platform::graphics::direct2d { class CRU_WIN_GRAPHICS_DIRECT_API WinImageFactory @@ -11,12 +11,8 @@ class CRU_WIN_GRAPHICS_DIRECT_API WinImageFactory public: explicit WinImageFactory(DirectGraphicsFactory* graphics_factory); - CRU_DELETE_COPY(WinImageFactory) - CRU_DELETE_MOVE(WinImageFactory) - ~WinImageFactory() override; - public: std::unique_ptr<IImage> DecodeFromStream(io::Stream* stream) override; void EncodeToStream(IImage* image, io::Stream* stream, ImageFormat format, diff --git a/include/cru/platform/graphics/direct2d/Painter.h b/include/cru/platform/graphics/direct2d/Painter.h index c5d5e86a..b0998c6b 100644 --- a/include/cru/platform/graphics/direct2d/Painter.h +++ b/include/cru/platform/graphics/direct2d/Painter.h @@ -1,25 +1,21 @@ #pragma once -#include "ComResource.h" -#include "Resource.h" +#include "Base.h" -#include "cru/base/Base.h" -#include "cru/platform/graphics/Painter.h" +#include <cru/platform/graphics/Painter.h> #include <vector> namespace cru::platform::graphics::direct2d { class CRU_WIN_GRAPHICS_DIRECT_API D2DDeviceContextPainter - : public DirectResource, + : public DirectGraphicsResource, public virtual IPainter, public virtual IComResource<ID2D1DeviceContext1> { CRU_DEFINE_CLASS_LOG_TAG("D2DDeviceContextPainter") public: - explicit D2DDeviceContextPainter(ID2D1DeviceContext1* device_context, + explicit D2DDeviceContextPainter(DirectGraphicsFactory* graphics_factory, + ID2D1DeviceContext1* device_context, bool release = false); - CRU_DELETE_COPY(D2DDeviceContextPainter) - CRU_DELETE_MOVE(D2DDeviceContextPainter) - ~D2DDeviceContextPainter() override; public: diff --git a/include/cru/platform/graphics/direct2d/Resource.h b/include/cru/platform/graphics/direct2d/Resource.h deleted file mode 100644 index b8dd42ab..00000000 --- a/include/cru/platform/graphics/direct2d/Resource.h +++ /dev/null @@ -1,49 +0,0 @@ -#pragma once -#include "Base.h" - -#include "cru/platform/graphics/Base.h" - -#include <string_view> - -namespace cru::platform::graphics::direct2d { -class DirectGraphicsFactory; - -class CRU_WIN_GRAPHICS_DIRECT_API DirectResource - : public Object, - public virtual IPlatformResource { - public: - static std::string kPlatformId; - - protected: - DirectResource() = default; - - public: - ~DirectResource() override = default; - - public: - std::string GetPlatformId() const final { return kPlatformId; } -}; - -class CRU_WIN_GRAPHICS_DIRECT_API DirectGraphicsResource - : public DirectResource, - public virtual IGraphicsResource { - protected: - // Param factory can't be null. - explicit DirectGraphicsResource(DirectGraphicsFactory* factory); - - public: - CRU_DELETE_COPY(DirectGraphicsResource) - CRU_DELETE_MOVE(DirectGraphicsResource) - - ~DirectGraphicsResource() override = default; - - public: - IGraphicsFactory* GetGraphicsFactory() final; - - public: - DirectGraphicsFactory* GetDirectFactory() const { return factory_; } - - private: - DirectGraphicsFactory* factory_; -}; -} // namespace cru::platform::graphics::direct2d diff --git a/include/cru/platform/graphics/direct2d/TextLayout.h b/include/cru/platform/graphics/direct2d/TextLayout.h index a41c3c6c..186c35c0 100644 --- a/include/cru/platform/graphics/direct2d/TextLayout.h +++ b/include/cru/platform/graphics/direct2d/TextLayout.h @@ -1,8 +1,7 @@ #pragma once -#include "ComResource.h" -#include "Resource.h" +#include "Base.h" -#include "cru/platform/graphics/TextLayout.h" +#include <cru/platform/graphics/TextLayout.h> #include <limits> #include <memory> @@ -18,9 +17,6 @@ class CRU_WIN_GRAPHICS_DIRECT_API DWriteTextLayout DWriteTextLayout(DirectGraphicsFactory* factory, std::shared_ptr<IFont> font, std::string text); - CRU_DELETE_COPY(DWriteTextLayout) - CRU_DELETE_MOVE(DWriteTextLayout) - ~DWriteTextLayout() override; public: diff --git a/include/cru/platform/graphics/direct2d/WindowPainter.h b/include/cru/platform/graphics/direct2d/WindowPainter.h index 01ff3b32..0f51ab8a 100644 --- a/include/cru/platform/graphics/direct2d/WindowPainter.h +++ b/include/cru/platform/graphics/direct2d/WindowPainter.h @@ -6,10 +6,7 @@ namespace cru::platform::graphics::direct2d { class CRU_WIN_GRAPHICS_DIRECT_API D2DWindowPainter : public graphics::direct2d::D2DDeviceContextPainter { public: - explicit D2DWindowPainter(D2DWindowRenderTarget* window); - - CRU_DELETE_COPY(D2DWindowPainter) - CRU_DELETE_MOVE(D2DWindowPainter) + explicit D2DWindowPainter(DirectGraphicsFactory* graphics_factory, D2DWindowRenderTarget* window); ~D2DWindowPainter() override; diff --git a/include/cru/platform/gui/win/Base.h b/include/cru/platform/gui/win/Base.h index 5c9ab7d3..9c253950 100644 --- a/include/cru/platform/gui/win/Base.h +++ b/include/cru/platform/gui/win/Base.h @@ -1,7 +1,7 @@ #pragma once -#include "cru/platform/win/WinPreConfig.h" - -#include "cru/base/Base.h" +#include <cru/base/Base.h> +#include <cru/base/platform/win/Base.h> +#include <cru/platform/Base.h> #ifdef CRU_IS_DLL #ifdef CRU_WIN_GUI_EXPORT_API @@ -14,6 +14,9 @@ #endif namespace cru::platform::gui::win { +using platform::win::HResultError; +using platform::win::Win32Error; + class GodWindow; class TimerManager; class WinCursor; @@ -24,4 +27,16 @@ class WinNativeWindow; class WinUiApplication; class WinInputMethodContext; class WinClipboard; + +class CRU_WIN_GUI_API WinNativeResource : public Object, + public virtual IPlatformResource { + public: + static std::string kPlatformId; + + protected: + WinNativeResource() = default; + + public: + std::string GetPlatformId() const final { return kPlatformId; } +}; } // namespace cru::platform::gui::win diff --git a/include/cru/platform/gui/win/Clipboard.h b/include/cru/platform/gui/win/Clipboard.h index 50a3aeea..d9ef0532 100644 --- a/include/cru/platform/gui/win/Clipboard.h +++ b/include/cru/platform/gui/win/Clipboard.h @@ -1,8 +1,7 @@ #pragma once -#include "Resource.h" -#include "cru/base/Base.h" -#include "cru/platform/gui/Clipboard.h" -#include "cru/platform/gui/win/Base.h" +#include "Base.h" + +#include <cru/platform/gui/Clipboard.h> namespace cru::platform::gui::win { class WinClipboard : public WinNativeResource, public virtual IClipboard { @@ -10,9 +9,6 @@ class WinClipboard : public WinNativeResource, public virtual IClipboard { public: explicit WinClipboard(WinUiApplication* application); - CRU_DELETE_COPY(WinClipboard) - CRU_DELETE_MOVE(WinClipboard) - ~WinClipboard() override; public: diff --git a/include/cru/platform/gui/win/Cursor.h b/include/cru/platform/gui/win/Cursor.h index 66b0f657..48817061 100644 --- a/include/cru/platform/gui/win/Cursor.h +++ b/include/cru/platform/gui/win/Cursor.h @@ -1,7 +1,7 @@ #pragma once -#include "Resource.h" +#include "Base.h" -#include "cru/platform/gui/Cursor.h" +#include <cru/platform/gui/Cursor.h> #include <memory> @@ -13,9 +13,6 @@ class CRU_WIN_GUI_API WinCursor : public WinNativeResource, public: WinCursor(HCURSOR handle, bool auto_destroy); - CRU_DELETE_COPY(WinCursor) - CRU_DELETE_MOVE(WinCursor) - ~WinCursor() override; public: @@ -31,9 +28,6 @@ class WinCursorManager : public WinNativeResource, public: WinCursorManager(); - CRU_DELETE_COPY(WinCursorManager) - CRU_DELETE_MOVE(WinCursorManager) - ~WinCursorManager() override = default; public: diff --git a/include/cru/platform/gui/win/Exception.h b/include/cru/platform/gui/win/Exception.h deleted file mode 100644 index a0689075..00000000 --- a/include/cru/platform/gui/win/Exception.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once -#include "cru/platform/win/Exception.h" - -namespace cru::platform::gui::win { -using platform::win::HResultError; -using platform::win::Win32Error; -} // namespace cru::platform::gui::win diff --git a/include/cru/platform/gui/win/GodWindow.h b/include/cru/platform/gui/win/GodWindow.h index 439c0125..22068ff5 100644 --- a/include/cru/platform/gui/win/GodWindow.h +++ b/include/cru/platform/gui/win/GodWindow.h @@ -1,8 +1,8 @@ #pragma once #include "Base.h" - #include "WindowNativeMessageEventArgs.h" -#include "cru/base/Event.h" + +#include <cru/base/Event.h> #include <memory> diff --git a/include/cru/platform/gui/win/InputMethod.h b/include/cru/platform/gui/win/InputMethod.h index fa4d5882..bf59387b 100644 --- a/include/cru/platform/gui/win/InputMethod.h +++ b/include/cru/platform/gui/win/InputMethod.h @@ -3,10 +3,10 @@ // https://chromium.googlesource.com/chromium/chromium/+/refs/heads/master/ui/base/win/ime_input.cc #pragma once -#include "Resource.h" - +#include "Base.h" #include "WindowNativeMessageEventArgs.h" -#include "cru/platform/gui/InputMethod.h" + +#include <cru/platform/gui/InputMethod.h> #include <imm.h> @@ -41,9 +41,6 @@ class CRU_WIN_GUI_API WinInputMethodContext public: WinInputMethodContext(WinNativeWindow* window); - CRU_DELETE_COPY(WinInputMethodContext) - CRU_DELETE_MOVE(WinInputMethodContext) - ~WinInputMethodContext() override; bool ShouldManuallyDrawCompositionText() override { return true; } diff --git a/include/cru/platform/gui/win/Resource.h b/include/cru/platform/gui/win/Resource.h deleted file mode 100644 index 98853ed7..00000000 --- a/include/cru/platform/gui/win/Resource.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once -#include "Base.h" - -#include <cru/platform/Base.h> - -namespace cru::platform::gui::win { -class CRU_WIN_GUI_API WinNativeResource : public Object, - public virtual IPlatformResource { - public: - static std::string kPlatformId; - - protected: - WinNativeResource() = default; - - public: - ~WinNativeResource() override = default; - - public: - std::string GetPlatformId() const final { return kPlatformId; } -}; -} // namespace cru::platform::gui::win diff --git a/include/cru/platform/gui/win/UiApplication.h b/include/cru/platform/gui/win/UiApplication.h index 5abe7356..9b1d011b 100644 --- a/include/cru/platform/gui/win/UiApplication.h +++ b/include/cru/platform/gui/win/UiApplication.h @@ -1,8 +1,7 @@ #pragma once -#include "Resource.h" +#include "Base.h" -#include "cru/platform/gui/Base.h" -#include "cru/platform/gui/UiApplication.h" +#include <cru/platform/gui/UiApplication.h> #include <memory> @@ -22,9 +21,6 @@ class CRU_WIN_GUI_API WinUiApplication : public WinNativeResource, public: WinUiApplication(); - CRU_DELETE_COPY(WinUiApplication) - CRU_DELETE_MOVE(WinUiApplication) - ~WinUiApplication() override; public: diff --git a/include/cru/platform/gui/win/Window.h b/include/cru/platform/gui/win/Window.h index f315f3d3..409574eb 100644 --- a/include/cru/platform/gui/win/Window.h +++ b/include/cru/platform/gui/win/Window.h @@ -1,9 +1,9 @@ #pragma once -#include "Resource.h" - +#include "Base.h" #include "WindowNativeMessageEventArgs.h" -#include "cru/platform/gui/Window.h" -#include "cru/platform/graphics/direct2d/WindowRenderTarget.h" + +#include <cru/platform/gui/Window.h> +#include <cru/platform/graphics/direct2d/WindowRenderTarget.h> #include <memory> @@ -15,9 +15,6 @@ class CRU_WIN_GUI_API WinNativeWindow : public WinNativeResource, public: explicit WinNativeWindow(WinUiApplication* application); - CRU_DELETE_COPY(WinNativeWindow) - CRU_DELETE_MOVE(WinNativeWindow) - ~WinNativeWindow() override; public: diff --git a/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h b/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h index 3a89b786..169d2c74 100644 --- a/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h +++ b/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h @@ -1,8 +1,6 @@ #pragma once #include "Base.h" -#include "cru/base/Base.h" - namespace cru::platform::gui::win { struct CRU_WIN_GUI_API WindowNativeMessage { HWND hwnd; diff --git a/include/cru/platform/win/Base.h b/include/cru/platform/win/Base.h deleted file mode 100644 index fce89b04..00000000 --- a/include/cru/platform/win/Base.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "WinPreConfig.h" - -#ifdef CRU_IS_DLL -#ifdef CRU_WIN_EXPORT_API -#define CRU_WIN_API __declspec(dllexport) -#else -#define CRU_WIN_API __declspec(dllimport) -#endif -#else -#define CRU_WIN_API -#endif diff --git a/include/cru/platform/win/Exception.h b/include/cru/platform/win/Exception.h deleted file mode 100644 index e6c65016..00000000 --- a/include/cru/platform/win/Exception.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "cru/base/platform/win/Exception.h" diff --git a/include/cru/platform/win/WinPreConfig.h b/include/cru/platform/win/WinPreConfig.h deleted file mode 100644 index a67faf8f..00000000 --- a/include/cru/platform/win/WinPreConfig.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "cru/base/platform/win/WinPreConfig.h" |