diff options
69 files changed, 252 insertions, 448 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" diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt index aa9a8a6b..5892c136 100644 --- a/src/base/CMakeLists.txt +++ b/src/base/CMakeLists.txt @@ -52,14 +52,17 @@ endif() if (WIN32) target_sources(CruBase PRIVATE + platform/win/Base.cpp platform/win/BridgeComStream.cpp platform/win/ComAutoInit.cpp platform/win/DebugLogTarget.cpp - platform/win/Exception.cpp platform/win/StreamConvert.cpp platform/win/Win32FileStream.cpp ) - + target_compile_definitions(CruBase PUBLIC + UNICODE _UNICODE + _CRT_SECURE_NO_WARNINGS + ) target_link_libraries(CruBase PUBLIC Shlwapi.lib) endif() @@ -70,7 +73,6 @@ endif() if (WIN32) target_compile_definitions(CruBase PUBLIC CRU_PLATFORM_WINDOWS - _CRT_SECURE_NO_WARNINGS ) elseif(APPLE) target_compile_definitions(CruBase PUBLIC diff --git a/src/base/platform/win/Exception.cpp b/src/base/platform/win/Base.cpp index adc59e3c..5edf9779 100644 --- a/src/base/platform/win/Exception.cpp +++ b/src/base/platform/win/Base.cpp @@ -1,4 +1,4 @@ -#include "cru/base/platform/win/Exception.h" +#include "cru/base/platform/win/Base.h" #include <format> #include <optional> diff --git a/src/base/platform/win/BrigdeComStream.h b/src/base/platform/win/BrigdeComStream.h index 1621b567..ee189433 100644 --- a/src/base/platform/win/BrigdeComStream.h +++ b/src/base/platform/win/BrigdeComStream.h @@ -1,6 +1,5 @@ #pragma once -#include "cru/base/platform/win/WinPreConfig.h" - +#include "cru/base/platform/win/Base.h" #include "cru/base/io/Stream.h" #include <objidlbase.h> diff --git a/src/base/platform/win/ComAutoInit.cpp b/src/base/platform/win/ComAutoInit.cpp index 548a7bea..75ced601 100644 --- a/src/base/platform/win/ComAutoInit.cpp +++ b/src/base/platform/win/ComAutoInit.cpp @@ -1,5 +1,4 @@ #include "cru/base/platform/win/ComAutoInit.h" -#include "cru/base/platform/win/Exception.h" #include <combaseapi.h> diff --git a/src/base/platform/win/StreamConvert.cpp b/src/base/platform/win/StreamConvert.cpp index e0266765..cb353fd3 100644 --- a/src/base/platform/win/StreamConvert.cpp +++ b/src/base/platform/win/StreamConvert.cpp @@ -2,9 +2,7 @@ #include "BrigdeComStream.h" #include "Win32FileStreamPrivate.h" #include "cru/base/io/MemoryStream.h" -#include "cru/base/io/OpenFileFlag.h" #include "cru/base/platform/win/ComAutoInit.h" -#include "cru/base/platform/win/Exception.h" #include "cru/base/platform/win/Win32FileStream.h" #include <shlwapi.h> diff --git a/src/base/platform/win/Win32FileStream.cpp b/src/base/platform/win/Win32FileStream.cpp index 618ce386..96a3dc67 100644 --- a/src/base/platform/win/Win32FileStream.cpp +++ b/src/base/platform/win/Win32FileStream.cpp @@ -3,7 +3,6 @@ #include "Win32FileStreamPrivate.h" #include "cru/base/StringUtil.h" #include "cru/base/io/OpenFileFlag.h" -#include "cru/base/platform/win/Exception.h" #include <Windows.h> #include <coml2api.h> diff --git a/src/base/platform/win/Win32FileStreamPrivate.h b/src/base/platform/win/Win32FileStreamPrivate.h index 718f8d9a..c49fa913 100644 --- a/src/base/platform/win/Win32FileStreamPrivate.h +++ b/src/base/platform/win/Win32FileStreamPrivate.h @@ -1,4 +1,4 @@ -#include "cru/base/platform/win/WinPreConfig.h" +#include "cru/base/platform/win/Base.h" #include <objidl.h> diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt index 62ebe9c7..0412662c 100644 --- a/src/platform/CMakeLists.txt +++ b/src/platform/CMakeLists.txt @@ -10,7 +10,6 @@ add_subdirectory(graphics) add_subdirectory(gui) if (WIN32) - add_subdirectory(win) add_subdirectory(graphics/direct2d) add_subdirectory(gui/win) elseif (APPLE) diff --git a/src/platform/graphics/direct2d/Resource.cpp b/src/platform/graphics/direct2d/Base.cpp index 2f1b7654..0dd4a7e1 100644 --- a/src/platform/graphics/direct2d/Resource.cpp +++ b/src/platform/graphics/direct2d/Base.cpp @@ -1,15 +1,18 @@ -#include "cru/platform/graphics/direct2d/Resource.h" +#include "cru/platform/graphics/direct2d/Base.h" #include "cru/platform/graphics/direct2d/Factory.h" namespace cru::platform::graphics::direct2d { -std::string DirectResource::kPlatformId = "Windows Direct"; DirectGraphicsResource::DirectGraphicsResource(DirectGraphicsFactory* factory) : factory_(factory) { Expects(factory); } +std::string DirectGraphicsResource::GetPlatformId() const { + return kPlatformId; +} + IGraphicsFactory* DirectGraphicsResource::GetGraphicsFactory() { return factory_; } diff --git a/src/platform/graphics/direct2d/Brush.cpp b/src/platform/graphics/direct2d/Brush.cpp index 27b76202..7ab35273 100644 --- a/src/platform/graphics/direct2d/Brush.cpp +++ b/src/platform/graphics/direct2d/Brush.cpp @@ -1,7 +1,4 @@ #include "cru/platform/graphics/direct2d/Brush.h" - -#include "cru/platform/graphics/direct2d/ConvertUtil.h" -#include "cru/platform/graphics/direct2d/Exception.h" #include "cru/platform/graphics/direct2d/Factory.h" namespace cru::platform::graphics::direct2d { diff --git a/src/platform/graphics/direct2d/CMakeLists.txt b/src/platform/graphics/direct2d/CMakeLists.txt index 4776e773..322c91e9 100644 --- a/src/platform/graphics/direct2d/CMakeLists.txt +++ b/src/platform/graphics/direct2d/CMakeLists.txt @@ -1,4 +1,5 @@ add_library(CruPlatformGraphicsDirect2d + Base.cpp Brush.cpp Font.cpp Geometry.cpp @@ -6,11 +7,10 @@ add_library(CruPlatformGraphicsDirect2d ImageFactory.cpp Factory.cpp Painter.cpp - Resource.cpp TextLayout.cpp WindowPainter.cpp WindowRenderTarget.cpp ) target_link_libraries(CruPlatformGraphicsDirect2d PUBLIC D3D11 D2d1 DWrite) -target_link_libraries(CruPlatformGraphicsDirect2d PUBLIC CruWinBase CruPlatformGraphics) +target_link_libraries(CruPlatformGraphicsDirect2d PUBLIC CruPlatformGraphics) target_compile_definitions(CruPlatformGraphicsDirect2d PRIVATE CRU_WIN_GRAPHICS_DIRECT_EXPORT_API) diff --git a/src/platform/graphics/direct2d/Factory.cpp b/src/platform/graphics/direct2d/Factory.cpp index af3f174d..414ef2ab 100644 --- a/src/platform/graphics/direct2d/Factory.cpp +++ b/src/platform/graphics/direct2d/Factory.cpp @@ -1,19 +1,16 @@ #include "cru/platform/graphics/direct2d/Factory.h" - -#include "cru/base/log/Logger.h" +#include "cru/platform/graphics/direct2d/Base.h" #include "cru/platform/graphics/direct2d/Brush.h" -#include "cru/platform/graphics/direct2d/Exception.h" #include "cru/platform/graphics/direct2d/Font.h" #include "cru/platform/graphics/direct2d/Geometry.h" #include "cru/platform/graphics/direct2d/ImageFactory.h" #include "cru/platform/graphics/direct2d/TextLayout.h" -#include <cstdlib> #include <utility> namespace cru::platform::graphics::direct2d { -DirectGraphicsFactory::DirectGraphicsFactory() { +DirectGraphicsFactory::DirectGraphicsFactory() : DirectGraphicsResource(this) { // 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. diff --git a/src/platform/graphics/direct2d/Font.cpp b/src/platform/graphics/direct2d/Font.cpp index f8dfbf38..50f7c266 100644 --- a/src/platform/graphics/direct2d/Font.cpp +++ b/src/platform/graphics/direct2d/Font.cpp @@ -1,7 +1,5 @@ #include "cru/platform/graphics/direct2d/Font.h" - #include "cru/base/StringUtil.h" -#include "cru/platform/graphics/direct2d/Exception.h" #include "cru/platform/graphics/direct2d/Factory.h" #include <array> diff --git a/src/platform/graphics/direct2d/Geometry.cpp b/src/platform/graphics/direct2d/Geometry.cpp index 45971b76..89b2cfd9 100644 --- a/src/platform/graphics/direct2d/Geometry.cpp +++ b/src/platform/graphics/direct2d/Geometry.cpp @@ -1,8 +1,4 @@ #include "cru/platform/graphics/direct2d/Geometry.h" - -#include "cru/base/platform/win/Exception.h" -#include "cru/platform/graphics/direct2d/ConvertUtil.h" -#include "cru/platform/graphics/direct2d/Exception.h" #include "cru/platform/graphics/direct2d/Factory.h" #include <d2d1.h> diff --git a/src/platform/graphics/direct2d/Image.cpp b/src/platform/graphics/direct2d/Image.cpp index 2f60b373..1c4619b3 100644 --- a/src/platform/graphics/direct2d/Image.cpp +++ b/src/platform/graphics/direct2d/Image.cpp @@ -1,8 +1,4 @@ #include "cru/platform/graphics/direct2d/Image.h" -#include <d2d1_1.h> -#include "cru/base/platform/win/Exception.h" -#include "cru/platform/graphics/direct2d/ConvertUtil.h" -#include "cru/platform/graphics/direct2d/Exception.h" #include "cru/platform/graphics/direct2d/Factory.h" #include "cru/platform/graphics/direct2d/Painter.h" @@ -39,7 +35,7 @@ std::unique_ptr<IImage> Direct2DImage::CreateWithRect(const Rect& rect) { 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); + return std::make_unique<D2DDeviceContextPainter>( + GetDirectFactory(), device_context.Detach(), true); } } // namespace cru::platform::graphics::direct2d diff --git a/src/platform/graphics/direct2d/ImageFactory.cpp b/src/platform/graphics/direct2d/ImageFactory.cpp index df162561..5e667f48 100644 --- a/src/platform/graphics/direct2d/ImageFactory.cpp +++ b/src/platform/graphics/direct2d/ImageFactory.cpp @@ -1,7 +1,5 @@ #include "cru/platform/graphics/direct2d/ImageFactory.h" -#include "cru/base/platform/win/Exception.h" #include "cru/base/platform/win/StreamConvert.h" -#include "cru/platform/graphics/direct2d/Exception.h" #include "cru/platform/graphics/direct2d/Factory.h" #include "cru/platform/graphics/direct2d/Image.h" diff --git a/src/platform/graphics/direct2d/Painter.cpp b/src/platform/graphics/direct2d/Painter.cpp index c62947e0..1744a638 100644 --- a/src/platform/graphics/direct2d/Painter.cpp +++ b/src/platform/graphics/direct2d/Painter.cpp @@ -1,18 +1,16 @@ #include "cru/platform/graphics/direct2d/Painter.h" - #include "cru/base/log/Logger.h" +#include "cru/platform/graphics/direct2d/Base.h" #include "cru/platform/graphics/direct2d/Brush.h" -#include "cru/platform/graphics/direct2d/ConvertUtil.h" -#include "cru/platform/graphics/direct2d/Exception.h" #include "cru/platform/graphics/direct2d/Geometry.h" #include "cru/platform/graphics/direct2d/Image.h" #include "cru/platform/graphics/direct2d/TextLayout.h" -#include <type_traits> - namespace cru::platform::graphics::direct2d { D2DDeviceContextPainter::D2DDeviceContextPainter( - ID2D1DeviceContext1* device_context, bool release) { + DirectGraphicsFactory* graphics_factory, + ID2D1DeviceContext1* device_context, bool release) + : DirectGraphicsResource(graphics_factory) { Expects(device_context); device_context_ = device_context; release_ = release; @@ -21,7 +19,8 @@ D2DDeviceContextPainter::D2DDeviceContextPainter( D2DDeviceContextPainter::~D2DDeviceContextPainter() { if (is_drawing_) { - CRU_LOG_TAG_INFO("You may forget to call EndDraw before destroying painter."); + CRU_LOG_TAG_INFO( + "You may forget to call EndDraw before destroying painter."); } if (release_) { diff --git a/src/platform/graphics/direct2d/TextLayout.cpp b/src/platform/graphics/direct2d/TextLayout.cpp index 1abaa383..ce584608 100644 --- a/src/platform/graphics/direct2d/TextLayout.cpp +++ b/src/platform/graphics/direct2d/TextLayout.cpp @@ -1,9 +1,5 @@ #include "cru/platform/graphics/direct2d/TextLayout.h" -#include <dwrite.h> - #include "cru/base/StringUtil.h" -#include "cru/base/log/Logger.h" -#include "cru/platform/graphics/direct2d/Exception.h" #include "cru/platform/graphics/direct2d/Factory.h" #include "cru/platform/graphics/direct2d/Font.h" diff --git a/src/platform/graphics/direct2d/WindowPainter.cpp b/src/platform/graphics/direct2d/WindowPainter.cpp index c950a2b6..b27fa735 100644 --- a/src/platform/graphics/direct2d/WindowPainter.cpp +++ b/src/platform/graphics/direct2d/WindowPainter.cpp @@ -1,12 +1,12 @@ #include "cru/platform/graphics/direct2d/WindowPainter.h" - -#include "cru/platform/graphics/direct2d/Exception.h" #include "cru/platform/graphics/direct2d/Factory.h" #include "cru/platform/graphics/direct2d/WindowRenderTarget.h" namespace cru::platform::graphics::direct2d { -D2DWindowPainter::D2DWindowPainter(D2DWindowRenderTarget* render_target) - : D2DDeviceContextPainter(render_target->GetD2D1DeviceContext()), +D2DWindowPainter::D2DWindowPainter(DirectGraphicsFactory* graphics_factory, + D2DWindowRenderTarget* render_target) + : D2DDeviceContextPainter(graphics_factory, + render_target->GetD2D1DeviceContext(), false), render_target_(render_target) {} D2DWindowPainter::~D2DWindowPainter() {} diff --git a/src/platform/graphics/direct2d/WindowRenderTarget.cpp b/src/platform/graphics/direct2d/WindowRenderTarget.cpp index a8d988f4..51b6ab22 100644 --- a/src/platform/graphics/direct2d/WindowRenderTarget.cpp +++ b/src/platform/graphics/direct2d/WindowRenderTarget.cpp @@ -1,6 +1,4 @@ #include "cru/platform/graphics/direct2d/WindowRenderTarget.h" - -#include "cru/platform/graphics/direct2d/Exception.h" #include "cru/platform/graphics/direct2d/Factory.h" namespace cru::platform::graphics::direct2d { diff --git a/src/platform/gui/win/Resource.cpp b/src/platform/gui/win/Base.cpp index 6fb4d634..2db07eb0 100644 --- a/src/platform/gui/win/Resource.cpp +++ b/src/platform/gui/win/Base.cpp @@ -1,4 +1,4 @@ -#include "cru/platform/gui/win/Resource.h" +#include "cru/platform/gui/win/Base.h" namespace cru::platform::gui::win { std::string WinNativeResource::kPlatformId = "Windows"; diff --git a/src/platform/gui/win/CMakeLists.txt b/src/platform/gui/win/CMakeLists.txt index 9f2263fd..d5ac6851 100644 --- a/src/platform/gui/win/CMakeLists.txt +++ b/src/platform/gui/win/CMakeLists.txt @@ -1,10 +1,10 @@ add_library(CruPlatformGuiWin + Base.cpp Clipboard.cpp Cursor.cpp GodWindow.cpp InputMethod.cpp Keyboard.cpp - Resource.cpp TimerManager.cpp UiApplication.cpp Window.cpp diff --git a/src/platform/gui/win/Clipboard.cpp b/src/platform/gui/win/Clipboard.cpp index 1ffb0254..f5d2513a 100644 --- a/src/platform/gui/win/Clipboard.cpp +++ b/src/platform/gui/win/Clipboard.cpp @@ -1,5 +1,4 @@ #include "cru/platform/gui/win/Clipboard.h" -#include <string> #include "cru/base/StringUtil.h" #include "cru/base/log/Logger.h" #include "cru/platform/gui/win/GodWindow.h" diff --git a/src/platform/gui/win/Cursor.cpp b/src/platform/gui/win/Cursor.cpp index c5424eb4..0ed40416 100644 --- a/src/platform/gui/win/Cursor.cpp +++ b/src/platform/gui/win/Cursor.cpp @@ -1,7 +1,5 @@ #include "cru/platform/gui/win/Cursor.h" - #include "cru/base/log/Logger.h" -#include "cru/platform/gui/win/Exception.h" #include <stdexcept> @@ -17,7 +15,7 @@ WinCursor::~WinCursor() { // This is not a fetal error but might still need notice because it may // cause leak. CRU_LOG_TAG_WARN("Failed to destroy a cursor. Last error code: {}", - ::GetLastError()); + ::GetLastError()); } } } diff --git a/src/platform/gui/win/GodWindow.cpp b/src/platform/gui/win/GodWindow.cpp index 7f24fd17..7cdf229c 100644 --- a/src/platform/gui/win/GodWindow.cpp +++ b/src/platform/gui/win/GodWindow.cpp @@ -1,7 +1,5 @@ #include "cru/platform/gui/win/GodWindow.h" - #include "cru/base/log/Logger.h" -#include "cru/platform/gui/win/Exception.h" #include "cru/platform/gui/win/UiApplication.h" #include "cru/platform/gui/win/WindowClass.h" diff --git a/src/platform/gui/win/InputMethod.cpp b/src/platform/gui/win/InputMethod.cpp index 1d7e2629..c5aca657 100644 --- a/src/platform/gui/win/InputMethod.cpp +++ b/src/platform/gui/win/InputMethod.cpp @@ -1,5 +1,4 @@ #include "cru/platform/gui/win/InputMethod.h" - #include "cru/base/StringUtil.h" #include "cru/base/log/Logger.h" #include "cru/platform/gui/DebugFlags.h" diff --git a/src/platform/gui/win/TimerManager.cpp b/src/platform/gui/win/TimerManager.cpp index 3fc9afe4..794e714c 100644 --- a/src/platform/gui/win/TimerManager.cpp +++ b/src/platform/gui/win/TimerManager.cpp @@ -1,8 +1,5 @@ #include "TimerManager.h" -#include "cru/platform/gui/win/Base.h" -#include "cru/platform/gui/win/Exception.h" - #include <functional> namespace cru::platform::gui::win { diff --git a/src/platform/gui/win/TimerManager.h b/src/platform/gui/win/TimerManager.h index 9b049310..b35ef1fc 100644 --- a/src/platform/gui/win/TimerManager.h +++ b/src/platform/gui/win/TimerManager.h @@ -1,7 +1,6 @@ #pragma once -#include "cru/base/Event.h" - #include "cru/base/Base.h" +#include "cru/base/Event.h" #include "cru/platform/gui/win/GodWindow.h" #include "cru/platform/gui/win/WindowNativeMessageEventArgs.h" diff --git a/src/platform/gui/win/UiApplication.cpp b/src/platform/gui/win/UiApplication.cpp index 9909cd47..0de79675 100644 --- a/src/platform/gui/win/UiApplication.cpp +++ b/src/platform/gui/win/UiApplication.cpp @@ -6,7 +6,6 @@ #include "cru/platform/gui/win/Base.h" #include "cru/platform/gui/win/Clipboard.h" #include "cru/platform/gui/win/Cursor.h" -#include "cru/platform/gui/win/Exception.h" #include "cru/platform/gui/win/GodWindow.h" #include "cru/platform/gui/win/Window.h" diff --git a/src/platform/gui/win/Window.cpp b/src/platform/gui/win/Window.cpp index 35f79a66..2acd4c75 100644 --- a/src/platform/gui/win/Window.cpp +++ b/src/platform/gui/win/Window.cpp @@ -9,7 +9,6 @@ #include "cru/platform/gui/Input.h" #include "cru/platform/gui/Window.h" #include "cru/platform/gui/win/Cursor.h" -#include "cru/platform/gui/win/Exception.h" #include "cru/platform/gui/win/InputMethod.h" #include "cru/platform/gui/win/Keyboard.h" #include "cru/platform/gui/win/UiApplication.h" @@ -219,7 +218,7 @@ void WinNativeWindow::RequestRepaint() { std::unique_ptr<graphics::IPainter> WinNativeWindow::BeginPaint() { if (hwnd_) return std::make_unique<graphics::direct2d::D2DWindowPainter>( - window_render_target_.get()); + application_->GetDirectFactory(), window_render_target_.get()); else return std::make_unique<graphics::NullPainter>(); } diff --git a/src/platform/gui/win/WindowClass.cpp b/src/platform/gui/win/WindowClass.cpp index 67ff4710..bf8e9c76 100644 --- a/src/platform/gui/win/WindowClass.cpp +++ b/src/platform/gui/win/WindowClass.cpp @@ -1,7 +1,5 @@ #include "cru/platform/gui/win/WindowClass.h" -#include "cru/platform/gui/win/Exception.h" - namespace cru::platform::gui::win { WindowClass::WindowClass(std::wstring name, WNDPROC window_proc, HINSTANCE h_instance) diff --git a/src/platform/gui/win/WindowManager.h b/src/platform/gui/win/WindowManager.h index 1bbcd25e..e674c951 100644 --- a/src/platform/gui/win/WindowManager.h +++ b/src/platform/gui/win/WindowManager.h @@ -1,7 +1,5 @@ #pragma once -#include "cru/platform/win/WinPreConfig.h" - -#include "cru/base/Base.h" +#include "cru/base/platform/win/Base.h" #include <map> #include <memory> diff --git a/src/platform/win/CMakeLists.txt b/src/platform/win/CMakeLists.txt deleted file mode 100644 index 06406267..00000000 --- a/src/platform/win/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_library(CruWinBase - ForDllExport.cpp -) -target_compile_definitions(CruWinBase PUBLIC UNICODE _UNICODE) # use unicode -target_compile_definitions(CruWinBase PRIVATE CRU_WIN_EXPORT_API) -target_link_libraries(CruWinBase PUBLIC CruBase) diff --git a/src/platform/win/ForDllExport.cpp b/src/platform/win/ForDllExport.cpp deleted file mode 100644 index c177c481..00000000 --- a/src/platform/win/ForDllExport.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "cru/platform/win/Base.h" - -namespace cru::platform::win { -CRU_WIN_API void Dummy() {} -} // namespace cru::platform::win diff --git a/test/base/platform/win/StreamConvertTest.cpp b/test/base/platform/win/StreamConvertTest.cpp index c0c5535c..b16aa7b6 100644 --- a/test/base/platform/win/StreamConvertTest.cpp +++ b/test/base/platform/win/StreamConvertTest.cpp @@ -1,6 +1,6 @@ #include "cru/base/StringUtil.h" #include "cru/base/io/OpenFileFlag.h" -#include "cru/base/platform/win/Exception.h" +#include "cru/base/platform/win/Base.h" #include "cru/base/platform/win/StreamConvert.h" #include "cru/base/platform/win/Win32FileStream.h" diff --git a/test/platform/graphics/direct2d/ConvertTest.cpp b/test/platform/graphics/direct2d/ConvertTest.cpp index c30bb6a5..780deb9c 100644 --- a/test/platform/graphics/direct2d/ConvertTest.cpp +++ b/test/platform/graphics/direct2d/ConvertTest.cpp @@ -1,5 +1,5 @@ #include "cru/platform/Matrix.h" -#include "cru/platform/graphics/direct2d/ConvertUtil.h" +#include "cru/platform/graphics/direct2d/Base.h" #include <catch2/catch_test_macros.hpp> #include "catch2/catch_approx.hpp" |