...

31 files changed, 46 insertions, 46 deletions

diff --git a/include/cru/win/graphics/direct/Base.h b/include/cru/platform/graphics/direct2d/Base.h
index 5f6f8c99..a2f6772c 100644
--- a/include/cru/win/graphics/direct/Base.h
+++ b/include/cru/platform/graphics/direct2d/Base.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../../WinPreConfig.h"
+#include "cru/platform/win/WinPreConfig.h"
 
 #include <d2d1_2.h>
 #include <d3d11.h>
diff --git a/include/cru/win/graphics/direct/Brush.h b/include/cru/platform/graphics/direct2d/Brush.h
index fe5321b7..98f9018c 100644
--- a/include/cru/win/graphics/direct/Brush.h
+++ b/include/cru/platform/graphics/direct2d/Brush.h
@@ -4,7 +4,7 @@
 
 #include "cru/platform/graphics/Brush.h"
 
-namespace cru::platform::graphics::win::direct {
+namespace cru::platform::graphics::direct2d {
 struct CRU_WIN_GRAPHICS_DIRECT_API ID2DBrush : virtual IBrush {
   virtual ID2D1Brush* GetD2DBrushInterface() const = 0;
 };
@@ -37,4 +37,4 @@ class CRU_WIN_GRAPHICS_DIRECT_API D2DSolidColorBrush
 
   Microsoft::WRL::ComPtr<ID2D1SolidColorBrush> brush_;
 };
-}  // namespace cru::platform::graphics::win::direct
+}  // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/win/graphics/direct/ComResource.h b/include/cru/platform/graphics/direct2d/ComResource.h
index 36023b84..2beb4e20 100644
--- a/include/cru/win/graphics/direct/ComResource.h
+++ b/include/cru/platform/graphics/direct2d/ComResource.h
@@ -3,9 +3,9 @@
 
 #include "cru/common/Base.h"
 
-namespace cru::platform::graphics::win::direct {
+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::win::direct
+}  // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/win/graphics/direct/ConvertUtil.h b/include/cru/platform/graphics/direct2d/ConvertUtil.h
index 8066a265..66fa37f8 100644
--- a/include/cru/win/graphics/direct/ConvertUtil.h
+++ b/include/cru/platform/graphics/direct2d/ConvertUtil.h
@@ -3,7 +3,7 @@
 
 #include "cru/platform/graphics/Base.h"
 
-namespace cru::platform::graphics::win::direct {
+namespace cru::platform::graphics::direct2d {
 inline D2D1_MATRIX_3X2_F Convert(const platform::Matrix& matrix) {
   D2D1_MATRIX_3X2_F m;
   m._11 = matrix.m11;
@@ -104,4 +104,4 @@ inline bool operator==(const D2D1_ELLIPSE& left, const D2D1_ELLIPSE& right) {
 inline bool operator!=(const D2D1_ELLIPSE& left, const D2D1_ELLIPSE& right) {
   return !(left == right);
 }
-}  // namespace cru::platform::graphics::win::direct
+}  // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/platform/graphics/direct2d/Exception.h b/include/cru/platform/graphics/direct2d/Exception.h
new file mode 100644
index 00000000..9be6f10a
--- /dev/null
+++ b/include/cru/platform/graphics/direct2d/Exception.h
@@ -0,0 +1,7 @@
+#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/win/graphics/direct/Factory.h b/include/cru/platform/graphics/direct2d/Factory.h
index 368c68f0..d6c43d9f 100644
--- a/include/cru/win/graphics/direct/Factory.h
+++ b/include/cru/platform/graphics/direct2d/Factory.h
@@ -7,7 +7,7 @@
 #include "cru/platform/graphics/Base.h"
 #include "cru/platform/graphics/Factory.h"
 
-namespace cru::platform::graphics::win::direct {
+namespace cru::platform::graphics::direct2d {
 class CRU_WIN_GRAPHICS_DIRECT_API DirectGraphicsFactory
     : public DirectResource,
       public virtual IGraphicsFactory {
@@ -65,4 +65,4 @@ class CRU_WIN_GRAPHICS_DIRECT_API DirectGraphicsFactory
 
   std::unique_ptr<WinImageFactory> image_factory_;
 };
-}  // namespace cru::platform::graphics::win::direct
+}  // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/win/graphics/direct/Font.h b/include/cru/platform/graphics/direct2d/Font.h
index 0d0dd28b..841a57b5 100644
--- a/include/cru/win/graphics/direct/Font.h
+++ b/include/cru/platform/graphics/direct2d/Font.h
@@ -6,7 +6,7 @@
 
 #include <string_view>
 
-namespace cru::platform::graphics::win::direct {
+namespace cru::platform::graphics::direct2d {
 class CRU_WIN_GRAPHICS_DIRECT_API DWriteFont
     : public DirectGraphicsResource,
       public virtual IFont,
@@ -32,4 +32,4 @@ class CRU_WIN_GRAPHICS_DIRECT_API DWriteFont
   String font_family_;
   Microsoft::WRL::ComPtr<IDWriteTextFormat> text_format_;
 };
-}  // namespace cru::platform::graphics::win::direct
+}  // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/win/graphics/direct/Geometry.h b/include/cru/platform/graphics/direct2d/Geometry.h
index 7c231d69..64dbae84 100644
--- a/include/cru/win/graphics/direct/Geometry.h
+++ b/include/cru/platform/graphics/direct2d/Geometry.h
@@ -4,7 +4,7 @@
 
 #include "cru/platform/graphics/Geometry.h"
 
-namespace cru::platform::graphics::win::direct {
+namespace cru::platform::graphics::direct2d {
 class CRU_WIN_GRAPHICS_DIRECT_API D2DGeometryBuilder
     : public DirectGraphicsResource,
       public virtual IGeometryBuilder {
@@ -68,4 +68,4 @@ class CRU_WIN_GRAPHICS_DIRECT_API D2DGeometry
  private:
   Microsoft::WRL::ComPtr<ID2D1Geometry> geometry_;
 };
-}  // namespace cru::platform::graphics::win::direct
+}  // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/win/graphics/direct/Image.h b/include/cru/platform/graphics/direct2d/Image.h
index bcf2386b..9f3f247f 100644
--- a/include/cru/win/graphics/direct/Image.h
+++ b/include/cru/platform/graphics/direct2d/Image.h
@@ -2,7 +2,7 @@
 #include "Resource.h"
 #include "cru/platform/graphics/Image.h"
 
-namespace cru::platform::graphics::win::direct {
+namespace cru::platform::graphics::direct2d {
 class CRU_WIN_GRAPHICS_DIRECT_API Direct2DImage : public DirectGraphicsResource,
                                                   public virtual IImage {
  public:
@@ -30,4 +30,4 @@ class CRU_WIN_GRAPHICS_DIRECT_API Direct2DImage : public DirectGraphicsResource,
   Microsoft::WRL::ComPtr<ID2D1Bitmap1> d2d_bitmap_;
 };
 
-}  // namespace cru::platform::graphics::win::direct
+}  // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/win/graphics/direct/ImageFactory.h b/include/cru/platform/graphics/direct2d/ImageFactory.h
index df1def0d..87f6c0ee 100644
--- a/include/cru/win/graphics/direct/ImageFactory.h
+++ b/include/cru/platform/graphics/direct2d/ImageFactory.h
@@ -4,7 +4,7 @@
 #include "cru/platform/graphics/Image.h"
 #include "cru/platform/graphics/ImageFactory.h"
 
-namespace cru::platform::graphics::win::direct {
+namespace cru::platform::graphics::direct2d {
 class CRU_WIN_GRAPHICS_DIRECT_API WinImageFactory
     : public DirectGraphicsResource,
       public virtual IImageFactory {
@@ -27,4 +27,4 @@ class CRU_WIN_GRAPHICS_DIRECT_API WinImageFactory
  private:
   Microsoft::WRL::ComPtr<IWICImagingFactory> wic_imaging_factory_;
 };
-}  // namespace cru::platform::graphics::win::direct
+}  // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/win/graphics/direct/Painter.h b/include/cru/platform/graphics/direct2d/Painter.h
index da89ba5d..f85d840a 100644
--- a/include/cru/win/graphics/direct/Painter.h
+++ b/include/cru/platform/graphics/direct2d/Painter.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-namespace cru::platform::graphics::win::direct {
+namespace cru::platform::graphics::direct2d {
 class CRU_WIN_GRAPHICS_DIRECT_API D2DDeviceContextPainter
     : public DirectResource,
       public virtual IPainter,
@@ -77,4 +77,4 @@ class CRU_WIN_GRAPHICS_DIRECT_API D2DDeviceContextPainter
 
   bool release_;
 };
-}  // namespace cru::platform::graphics::win::direct
+}  // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/win/graphics/direct/Resource.h b/include/cru/platform/graphics/direct2d/Resource.h
index df558686..6d2f968c 100644
--- a/include/cru/win/graphics/direct/Resource.h
+++ b/include/cru/platform/graphics/direct2d/Resource.h
@@ -5,7 +5,7 @@
 
 #include <string_view>
 
-namespace cru::platform::graphics::win::direct {
+namespace cru::platform::graphics::direct2d {
 class DirectGraphicsFactory;
 
 class CRU_WIN_GRAPHICS_DIRECT_API DirectResource
@@ -49,4 +49,4 @@ class CRU_WIN_GRAPHICS_DIRECT_API DirectGraphicsResource
  private:
   DirectGraphicsFactory* factory_;
 };
-}  // namespace cru::platform::graphics::win::direct
+}  // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/win/graphics/direct/TextLayout.h b/include/cru/platform/graphics/direct2d/TextLayout.h
index fca5d68f..9f2e75a9 100644
--- a/include/cru/win/graphics/direct/TextLayout.h
+++ b/include/cru/platform/graphics/direct2d/TextLayout.h
@@ -7,7 +7,7 @@
 #include <limits>
 #include <memory>
 
-namespace cru::platform::graphics::win::direct {
+namespace cru::platform::graphics::direct2d {
 class DWriteFont;
 
 class CRU_WIN_GRAPHICS_DIRECT_API DWriteTextLayout
@@ -60,4 +60,4 @@ class CRU_WIN_GRAPHICS_DIRECT_API DWriteTextLayout
   float max_height_ = std::numeric_limits<float>::max();
   Microsoft::WRL::ComPtr<IDWriteTextLayout> text_layout_;
 };
-}  // namespace cru::platform::graphics::win::direct
+}  // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/win/graphics/direct/WindowPainter.h b/include/cru/platform/graphics/direct2d/WindowPainter.h
index 67ff91e1..01ff3b32 100644
--- a/include/cru/win/graphics/direct/WindowPainter.h
+++ b/include/cru/platform/graphics/direct2d/WindowPainter.h
@@ -2,9 +2,9 @@
 #include "Painter.h"
 #include "WindowRenderTarget.h"
 
-namespace cru::platform::graphics::win::direct {
+namespace cru::platform::graphics::direct2d {
 class CRU_WIN_GRAPHICS_DIRECT_API D2DWindowPainter
-    : public graphics::win::direct::D2DDeviceContextPainter {
+    : public graphics::direct2d::D2DDeviceContextPainter {
  public:
   explicit D2DWindowPainter(D2DWindowRenderTarget* window);
 
@@ -19,4 +19,4 @@ class CRU_WIN_GRAPHICS_DIRECT_API D2DWindowPainter
  private:
   D2DWindowRenderTarget* render_target_;
 };
-}  // namespace cru::platform::graphics::win::direct
+}  // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/win/graphics/direct/WindowRenderTarget.h b/include/cru/platform/graphics/direct2d/WindowRenderTarget.h
index c588f261..c0251880 100644
--- a/include/cru/win/graphics/direct/WindowRenderTarget.h
+++ b/include/cru/platform/graphics/direct2d/WindowRenderTarget.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "Factory.h"
 
-namespace cru::platform::graphics::win::direct {
+namespace cru::platform::graphics::direct2d {
 // Represents a window render target.
 class CRU_WIN_GRAPHICS_DIRECT_API D2DWindowRenderTarget : public Object {
  public:
@@ -14,7 +14,7 @@ class CRU_WIN_GRAPHICS_DIRECT_API D2DWindowRenderTarget : public Object {
   ~D2DWindowRenderTarget() override = default;
 
  public:
-  graphics::win::direct::DirectGraphicsFactory* GetDirectFactory() const {
+  graphics::direct2d::DirectGraphicsFactory* GetDirectFactory() const {
     return factory_;
   }
 
@@ -40,4 +40,4 @@ class CRU_WIN_GRAPHICS_DIRECT_API D2DWindowRenderTarget : public Object {
   Microsoft::WRL::ComPtr<IDXGISwapChain1> dxgi_swap_chain_;
   Microsoft::WRL::ComPtr<ID2D1Bitmap1> target_bitmap_;
 };
-}  // namespace cru::platform::graphics::win::direct
+}  // namespace cru::platform::graphics::direct2d
diff --git a/include/cru/win/gui/Base.h b/include/cru/platform/gui/win/Base.h
index ab915c57..78068827 100644
--- a/include/cru/win/gui/Base.h
+++ b/include/cru/platform/gui/win/Base.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "../WinPreConfig.h"
+#include "cru/platform/win/WinPreConfig.h"
 
 #include "cru/common/Base.h"
 
diff --git a/include/cru/win/gui/Clipboard.h b/include/cru/platform/gui/win/Clipboard.h
index ef05e0f1..dc4bc9b5 100644
--- a/include/cru/win/gui/Clipboard.h
+++ b/include/cru/platform/gui/win/Clipboard.h
@@ -2,7 +2,7 @@
 #include "Resource.h"
 #include "cru/common/Base.h"
 #include "cru/platform/gui/Clipboard.h"
-#include "cru/win/gui/Base.h"
+#include "cru/platform/gui/win/Base.h"
 
 namespace cru::platform::gui::win {
 class WinClipboard : public WinNativeResource, public virtual IClipboard {
diff --git a/include/cru/win/gui/Cursor.h b/include/cru/platform/gui/win/Cursor.h
index f9cb0a09..f9cb0a09 100644
--- a/include/cru/win/gui/Cursor.h
+++ b/include/cru/platform/gui/win/Cursor.h
diff --git a/include/cru/win/gui/Exception.h b/include/cru/platform/gui/win/Exception.h
index 99ed5863..a0689075 100644
--- a/include/cru/win/gui/Exception.h
+++ b/include/cru/platform/gui/win/Exception.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "../Exception.h"
+#include "cru/platform/win/Exception.h"
 
 namespace cru::platform::gui::win {
-using platform::win::Win32Error;
 using platform::win::HResultError;
+using platform::win::Win32Error;
 }  // namespace cru::platform::gui::win
diff --git a/include/cru/win/gui/GodWindow.h b/include/cru/platform/gui/win/GodWindow.h
index fe61c80d..fe61c80d 100644
--- a/include/cru/win/gui/GodWindow.h
+++ b/include/cru/platform/gui/win/GodWindow.h
diff --git a/include/cru/win/gui/InputMethod.h b/include/cru/platform/gui/win/InputMethod.h
index 8e28f857..8e28f857 100644
--- a/include/cru/win/gui/InputMethod.h
+++ b/include/cru/platform/gui/win/InputMethod.h
diff --git a/include/cru/win/gui/Keyboard.h b/include/cru/platform/gui/win/Keyboard.h
index 18b37b60..18b37b60 100644
--- a/include/cru/win/gui/Keyboard.h
+++ b/include/cru/platform/gui/win/Keyboard.h
diff --git a/include/cru/win/gui/Resource.h b/include/cru/platform/gui/win/Resource.h
index ed43bec3..ed43bec3 100644
--- a/include/cru/win/gui/Resource.h
+++ b/include/cru/platform/gui/win/Resource.h
diff --git a/include/cru/win/gui/UiApplication.h b/include/cru/platform/gui/win/UiApplication.h
index a4dfcf3d..5abe7356 100644
--- a/include/cru/win/gui/UiApplication.h
+++ b/include/cru/platform/gui/win/UiApplication.h
@@ -6,7 +6,7 @@
 
 #include <memory>
 
-namespace cru::platform::graphics::win::direct {
+namespace cru::platform::graphics::direct2d {
 class DirectGraphicsFactory;
 }
 
@@ -52,7 +52,7 @@ class CRU_WIN_GUI_API WinUiApplication : public WinNativeResource,
 
   cru::platform::graphics::IGraphicsFactory* GetGraphicsFactory() override;
 
-  cru::platform::graphics::win::direct::DirectGraphicsFactory*
+  cru::platform::graphics::direct2d::DirectGraphicsFactory*
   GetDirectFactory() {
     return graph_factory_.get();
   }
@@ -72,7 +72,7 @@ class CRU_WIN_GUI_API WinUiApplication : public WinNativeResource,
 
   bool is_quit_on_all_window_closed_ = true;
 
-  std::unique_ptr<cru::platform::graphics::win::direct::DirectGraphicsFactory>
+  std::unique_ptr<cru::platform::graphics::direct2d::DirectGraphicsFactory>
       graph_factory_;
 
   std::unique_ptr<GodWindow> god_window_;
diff --git a/include/cru/win/gui/Window.h b/include/cru/platform/gui/win/Window.h
index b279a434..292bdee2 100644
--- a/include/cru/win/gui/Window.h
+++ b/include/cru/platform/gui/win/Window.h
@@ -4,7 +4,7 @@
 #include "WindowNativeMessageEventArgs.h"
 #include "cru/platform/gui/Base.h"
 #include "cru/platform/gui/Window.h"
-#include "cru/win/graphics/direct/WindowRenderTarget.h"
+#include "cru/platform/graphics/direct2d/WindowRenderTarget.h"
 
 #include <memory>
 
@@ -105,7 +105,7 @@ class CRU_WIN_GUI_API WinNativeWindow : public WinNativeResource,
   bool HandleNativeWindowMessage(HWND hwnd, UINT msg, WPARAM w_param,
                                  LPARAM l_param, LRESULT* result);
 
-  graphics::win::direct::D2DWindowRenderTarget* GetWindowRenderTarget() const {
+  graphics::direct2d::D2DWindowRenderTarget* GetWindowRenderTarget() const {
     return window_render_target_.get();
   }
 
@@ -191,7 +191,7 @@ class CRU_WIN_GUI_API WinNativeWindow : public WinNativeResource,
   bool has_focus_ = false;
   bool is_mouse_in_ = false;
 
-  std::unique_ptr<graphics::win::direct::D2DWindowRenderTarget>
+  std::unique_ptr<graphics::direct2d::D2DWindowRenderTarget>
       window_render_target_;
 
   std::shared_ptr<WinCursor> cursor_;
diff --git a/include/cru/win/gui/WindowClass.h b/include/cru/platform/gui/win/WindowClass.h
index 50729887..50729887 100644
--- a/include/cru/win/gui/WindowClass.h
+++ b/include/cru/platform/gui/win/WindowClass.h
diff --git a/include/cru/win/gui/WindowNativeMessageEventArgs.h b/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h
index bc85a597..bc85a597 100644
--- a/include/cru/win/gui/WindowNativeMessageEventArgs.h
+++ b/include/cru/platform/gui/win/WindowNativeMessageEventArgs.h
diff --git a/include/cru/win/Base.h b/include/cru/platform/win/Base.h
index 75da7287..75da7287 100644
--- a/include/cru/win/Base.h
+++ b/include/cru/platform/win/Base.h
diff --git a/include/cru/win/Exception.h b/include/cru/platform/win/Exception.h
index af8b495c..af8b495c 100644
--- a/include/cru/win/Exception.h
+++ b/include/cru/platform/win/Exception.h
diff --git a/include/cru/win/WinPreConfig.h b/include/cru/platform/win/WinPreConfig.h
index e714bf5e..e714bf5e 100644
--- a/include/cru/win/WinPreConfig.h
+++ b/include/cru/platform/win/WinPreConfig.h
diff --git a/include/cru/win/graphics/direct/Exception.h b/include/cru/win/graphics/direct/Exception.h
deleted file mode 100644
index 21dde875..00000000
--- a/include/cru/win/graphics/direct/Exception.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-#include "../../Exception.h"
-
-namespace cru::platform::graphics::win::direct {
-using platform::win::HResultError;
-using platform::win::ThrowIfFailed;
-}  // namespace cru::platform::graphics::win::direct