DoodleRender -> Geomery2D

refs #507 - Clean up use of D2D1_{RECT,SIZE,POINT}_* except at D2D boundaries
OpenKneeboard · Mar 20, 2024 · afbfc00 · afbfc00
1 parent 103ce56
commit afbfc00
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/src/app/app-common/DoodleRenderer.cpp b/src/app/app-common/DoodleRenderer.cpp
@@ -79,8 +79,8 @@ void DoodleRenderer::PostCursorEvent(
   EventContext,
   const CursorEvent& event,
   PageID pageID,
-  const D2D1_SIZE_U& nativePageSize) {
-  if (nativePageSize.width == 0 || nativePageSize.height == 0) {
+  const PixelSize& nativePageSize) {
+  if (!nativePageSize) {
     OPENKNEEBOARD_BREAK;
     return;
   }
@@ -164,22 +164,17 @@ ID2D1Bitmap* DoodleRenderer::GetDrawingSurface(PageID pageID) {
   }
 
   const auto& contentPixels = page.mNativeSize;
-  if (contentPixels.height == 0 || contentPixels.width == 0) {
+  if (!contentPixels) {
     OPENKNEEBOARD_BREAK;
     return nullptr;
   }
 
-  const auto scaleX = MaxViewRenderSize.Width<float>() / contentPixels.width;
-  const auto scaleY = MaxViewRenderSize.Height<float>() / contentPixels.height;
-  page.mScale = std::min(scaleX, scaleY);
-  D2D1_SIZE_U surfaceSize {
-    static_cast<UINT32>(std::lround(contentPixels.width * page.mScale)),
-    static_cast<UINT32>(std::lround(contentPixels.height * page.mScale)),
-  };
+  const auto surfaceSize = contentPixels.ScaledToFit(MaxViewRenderSize);
+  page.mScale = surfaceSize.Height<float>() / contentPixels.Height();
 
   D3D11_TEXTURE2D_DESC textureDesc {
-    .Width = surfaceSize.width,
-    .Height = surfaceSize.height,
+    .Width = surfaceSize.mWidth,
+    .Height = surfaceSize.mHeight,
     .MipLevels = 1,
     .ArraySize = 1,
     .Format = DXGI_FORMAT_B8G8R8A8_UNORM_SRGB,
@@ -205,7 +200,7 @@ ID2D1Bitmap* DoodleRenderer::GetDrawingSurface(PageID pageID) {
 void DoodleRenderer::Render(
   ID2D1DeviceContext* ctx,
   PageID pageID,
-  const D2D1_RECT_F& rect) {
+  const PixelRect& rect) {
   FlushCursorEvents();
 
   auto it = mDrawings.find(pageID);

diff --git a/src/app/app-common/include/OpenKneeboard/DoodleRenderer.h b/src/app/app-common/include/OpenKneeboard/DoodleRenderer.h
@@ -38,12 +38,12 @@ class DoodleRenderer final {
   DoodleRenderer(const audited_ptr<DXResources>&, KneeboardState*);
   ~DoodleRenderer();
 
-  void Render(ID2D1DeviceContext*, PageID, const D2D1_RECT_F& targetRect);
+  void Render(ID2D1DeviceContext*, PageID, const PixelRect& destRect);
   void PostCursorEvent(
     EventContext,
     const CursorEvent&,
     PageID,
-    const D2D1_SIZE_U& nativePageSize);
+    const PixelSize& nativePageSize);
 
   bool HaveDoodles() const;
   bool HaveDoodles(PageID) const;
@@ -67,8 +67,8 @@ class DoodleRenderer final {
     float mScale {-1.0f};
     std::vector<CursorEvent> mBufferedEvents;
     bool mHaveCursor {false};
-    D2D1_POINT_2F mCursorPoint;
-    D2D1_SIZE_U mNativeSize {0, 0};
+    Geometry2D::Point<float> mCursorPoint;
+    PixelSize mNativeSize {0, 0};
   };
   winrt::com_ptr<ID2D1DeviceContext> mDrawingContext;
   std::mutex mBufferedEventsMutex;

diff --git a/src/lib/include/OpenKneeboard/Geometry2D.h b/src/lib/include/OpenKneeboard/Geometry2D.h
@@ -43,6 +43,10 @@ struct Size {
   T mWidth {};
   T mHeight {};
 
+  constexpr operator bool() const noexcept {
+    return mWidth >= 1 && mHeight >= 1;
+  }
+
   constexpr Size<T> operator/(const T divisor) const noexcept {
     return {mWidth / divisor, mHeight / divisor};
   }
@@ -236,6 +240,10 @@ struct Rect {
 
   Origin mOrigin {Origin::TopLeft};
 
+  constexpr operator bool() const noexcept {
+    return mSize;
+  }
+
   constexpr Rect<T> operator/(const T divisor) const noexcept {
     return {
       mOffset / divisor,