Add missing floating point variants of render functions (#271)

hanst99 · web-flow · commit 941327b36e96 · 2022-08-22T13:36:56.000+03:00
We already had copyExF, this also adds

* copyF
* drawLineF
* drawLinesF
* drawPointF
* drawPointsF
* drawRectF
* drawRectsF
* fillRectF
* fillRectsF
diff --git a/src/SDL/Raw/Video.hs b/src/SDL/Raw/Video.hs
@@ -108,9 +108,6 @@ module SDL.Raw.Video (
   renderClear,
   renderCopy,
   renderCopyEx,
-#ifdef RECENT_ISH
-  renderCopyExF,
-#endif
   renderDrawLine,
   renderDrawLines,
   renderDrawPoint,
@@ -120,6 +117,18 @@ module SDL.Raw.Video (
   renderFillRect,
   renderFillRectEx,
   renderFillRects,
+#ifdef RECENT_ISH
+  renderCopyF,
+  renderCopyExF,
+  renderDrawLineF,
+  renderDrawLinesF,
+  renderDrawPointF,
+  renderDrawPointsF,
+  renderDrawRectF,
+  renderDrawRectsF,
+  renderFillRectF,
+  renderFillRectsF,
+#endif
   renderGetClipRect,
   renderGetLogicalSize,
   renderGetScale,
@@ -328,16 +337,25 @@ foreign import ccall "SDL.h SDL_QueryTexture" queryTextureFFI :: Texture -> Ptr
 foreign import ccall "SDL.h SDL_RenderClear" renderClearFFI :: Renderer -> IO CInt
 foreign import ccall "SDL.h SDL_RenderCopy" renderCopyFFI :: Renderer -> Texture -> Ptr Rect -> Ptr Rect -> IO CInt
 foreign import ccall "SDL.h SDL_RenderCopyEx" renderCopyExFFI :: Renderer -> Texture -> Ptr Rect -> Ptr Rect -> CDouble -> Ptr Point -> RendererFlip -> IO CInt
-#ifdef RECENT_ISH
-foreign import ccall "SDL.h SDL_RenderCopyExF" renderCopyExFFFI :: Renderer -> Texture -> Ptr Rect -> Ptr FRect -> CDouble -> Ptr FPoint -> RendererFlip -> IO CInt
-#endif
 foreign import ccall "SDL.h SDL_RenderDrawLine" renderDrawLineFFI :: Renderer -> CInt -> CInt -> CInt -> CInt -> IO CInt
 foreign import ccall "SDL.h SDL_RenderDrawLines" renderDrawLinesFFI :: Renderer -> Ptr Point -> CInt -> IO CInt
 foreign import ccall "SDL.h SDL_RenderDrawPoint" renderDrawPointFFI :: Renderer -> CInt -> CInt -> IO CInt
 foreign import ccall "SDL.h SDL_RenderDrawPoints" renderDrawPointsFFI :: Renderer -> Ptr Point -> CInt -> IO CInt
 foreign import ccall "SDL.h SDL_RenderDrawRect" renderDrawRectFFI :: Renderer -> Ptr Rect -> IO CInt
 foreign import ccall "SDL.h SDL_RenderDrawRects" renderDrawRectsFFI :: Renderer -> Ptr Rect -> CInt -> IO CInt
 foreign import ccall "SDL.h SDL_RenderFillRect" renderFillRectFFI :: Renderer -> Ptr Rect -> IO CInt
+#ifdef RECENT_ISH
+foreign import ccall "SDL.h SDL_RenderCopyF" renderCopyFFFI :: Renderer -> Texture -> Ptr Rect -> Ptr FRect -> IO CInt
+foreign import ccall "SDL.h SDL_RenderCopyExF" renderCopyExFFFI :: Renderer -> Texture -> Ptr Rect -> Ptr FRect -> CDouble -> Ptr FPoint -> RendererFlip -> IO CInt
+foreign import ccall "SDL.h SDL_RenderDrawLineF" renderDrawLineFFFI :: Renderer -> CFloat -> CFloat -> CFloat -> CFloat -> IO CInt
+foreign import ccall "SDL.h SDL_RenderDrawLinesF" renderDrawLinesFFFI :: Renderer -> Ptr FPoint -> CInt -> IO CInt
+foreign import ccall "SDL.h SDL_RenderDrawPointF" renderDrawPointFFFI :: Renderer -> CFloat -> CFloat -> IO CInt
+foreign import ccall "SDL.h SDL_RenderDrawPointsF" renderDrawPointsFFFI :: Renderer -> Ptr FPoint -> CInt -> IO CInt
+foreign import ccall "SDL.h SDL_RenderDrawRectF" renderDrawRectFFFI :: Renderer -> Ptr FRect -> IO CInt
+foreign import ccall "SDL.h SDL_RenderDrawRectsF" renderDrawRectsFFFI :: Renderer -> Ptr FRect -> CInt -> IO CInt
+foreign import ccall "SDL.h SDL_RenderFillRectF" renderFillRectFFFI :: Renderer -> Ptr FRect -> IO CInt
+foreign import ccall "SDL.h SDL_RenderFillRectsF" renderFillRectsFFFI :: Renderer -> Ptr FRect -> CInt -> IO CInt
+#endif
 foreign import ccall "sqlhelper.c SDLHelper_RenderFillRectEx" renderFillRectExFFI :: Renderer -> CInt -> CInt -> CInt -> CInt -> IO CInt
 foreign import ccall "SDL.h SDL_RenderFillRects" renderFillRectsFFI :: Renderer -> Ptr Rect -> CInt -> IO CInt
 foreign import ccall "SDL.h SDL_RenderGetClipRect" renderGetClipRectFFI :: Renderer -> Ptr Rect -> IO ()
@@ -841,12 +859,6 @@ renderCopyEx :: MonadIO m => Renderer -> Texture -> Ptr Rect -> Ptr Rect -> CDou
 renderCopyEx v1 v2 v3 v4 v5 v6 v7 = liftIO $ renderCopyExFFI v1 v2 v3 v4 v5 v6 v7
 {-# INLINE renderCopyEx #-}
 
-#ifdef RECENT_ISH
-renderCopyExF :: MonadIO m => Renderer -> Texture -> Ptr Rect -> Ptr FRect -> CDouble -> Ptr FPoint -> RendererFlip -> m CInt
-renderCopyExF v1 v2 v3 v4 v5 v6 v7 = liftIO $ renderCopyExFFFI v1 v2 v3 v4 v5 v6 v7
-{-# INLINE renderCopyExF #-}
-#endif
-
 renderDrawLine :: MonadIO m => Renderer -> CInt -> CInt -> CInt -> CInt -> m CInt
 renderDrawLine v1 v2 v3 v4 v5 = liftIO $ renderDrawLineFFI v1 v2 v3 v4 v5
 {-# INLINE renderDrawLine #-}
@@ -883,6 +895,51 @@ renderFillRects :: MonadIO m => Renderer -> Ptr Rect -> CInt -> m CInt
 renderFillRects v1 v2 v3 = liftIO $ renderFillRectsFFI v1 v2 v3
 {-# INLINE renderFillRects #-}
 
+#ifdef RECENT_ISH
+
+renderCopyF :: MonadIO m => Renderer -> Texture -> Ptr Rect -> Ptr FRect -> m CInt
+renderCopyF v1 v2 v3 v4 = liftIO $ renderCopyFFFI v1 v2 v3 v4
+{-# INLINE renderCopyF #-}
+
+renderCopyExF :: MonadIO m => Renderer -> Texture -> Ptr Rect -> Ptr FRect -> CDouble -> Ptr FPoint -> RendererFlip -> m CInt
+renderCopyExF v1 v2 v3 v4 v5 v6 v7 = liftIO $ renderCopyExFFFI v1 v2 v3 v4 v5 v6 v7
+{-# INLINE renderCopyExF #-}
+
+renderDrawLineF :: MonadIO m => Renderer -> CFloat -> CFloat -> CFloat -> CFloat -> m CInt
+renderDrawLineF v1 v2 v3 v4 v5 = liftIO $ renderDrawLineFFFI v1 v2 v3 v4 v5
+{-# INLINE renderDrawLineF #-}
+
+renderDrawLinesF :: MonadIO m => Renderer -> Ptr FPoint -> CInt -> m CInt
+renderDrawLinesF v1 v2 v3 = liftIO $ renderDrawLinesFFFI v1 v2 v3
+{-# INLINE renderDrawLinesF #-}
+
+renderDrawPointF :: MonadIO m => Renderer -> CFloat -> CFloat -> m CInt
+renderDrawPointF v1 v2 v3 = liftIO $ renderDrawPointFFFI v1 v2 v3
+{-# INLINE renderDrawPointF #-}
+
+renderDrawPointsF :: MonadIO m => Renderer -> Ptr FPoint -> CInt -> m CInt
+renderDrawPointsF v1 v2 v3 = liftIO $ renderDrawPointsFFFI v1 v2 v3
+{-# INLINE renderDrawPointsF #-}
+
+renderDrawRectF :: MonadIO m => Renderer -> Ptr FRect -> m CInt
+renderDrawRectF v1 v2 = liftIO $ renderDrawRectFFFI v1 v2
+{-# INLINE renderDrawRectF #-}
+
+renderDrawRectsF :: MonadIO m => Renderer -> Ptr FRect -> CInt -> m CInt
+renderDrawRectsF v1 v2 v3 = liftIO $ renderDrawRectsFFFI v1 v2 v3
+{-# INLINE renderDrawRectsF #-}
+
+renderFillRectF :: MonadIO m => Renderer -> Ptr FRect -> m CInt
+renderFillRectF v1 v2 = liftIO $ renderFillRectFFFI v1 v2
+{-# INLINE renderFillRectF #-}
+
+renderFillRectsF :: MonadIO m => Renderer -> Ptr FRect -> CInt -> m CInt
+renderFillRectsF v1 v2 v3 = liftIO $ renderFillRectsFFFI v1 v2 v3
+{-# INLINE renderFillRectsF #-}
+
+#endif
+
+
 renderGetClipRect :: MonadIO m => Renderer -> Ptr Rect -> m ()
 renderGetClipRect v1 v2 = liftIO $ renderGetClipRectFFI v1 v2
 {-# INLINE renderGetClipRect #-}
diff --git a/src/SDL/Video/Renderer.hs b/src/SDL/Video/Renderer.hs
@@ -23,9 +23,6 @@ module SDL.Video.Renderer
   , clear
   , copy
   , copyEx
-#ifdef RECENT_ISH
-  , copyExF
-#endif
   , drawLine
   , drawLines
   , drawPoint
@@ -34,6 +31,18 @@ module SDL.Video.Renderer
   , drawRects
   , fillRect
   , fillRects
+#ifdef RECENT_ISH
+  , copyF
+  , copyExF
+  , drawLineF
+  , drawLinesF
+  , drawPointF
+  , drawPointsF
+  , drawRectF
+  , drawRectsF
+  , fillRectF
+  , fillRectsF
+#endif
   , present
 
   -- * 'Renderer' State
@@ -650,6 +659,94 @@ fillRects (Renderer r) rects = liftIO $
                           (castPtr rp)
                           (fromIntegral (SV.length rects))
 
+#ifdef RECENT_ISH
+
+-- | Copy a portion of the texture to the current rendering target.
+copyF :: MonadIO m => Renderer -> Texture -> Maybe (Rectangle CInt) -> Maybe (Rectangle CFloat) -> m ()
+copyF (Renderer r) (Texture t) srcRect dstRect = liftIO $
+  throwIfNeg_ "SDL.Video.copyF" "SDL_RenderCopyF" $
+    maybeWith with srcRect $ \src ->
+      maybeWith with dstRect $ \dst ->
+        Raw.renderCopyF r t (castPtr src) (castPtr dst)
+
+-- | Copy a portion of the texture to the current rendering target, optionally rotating it by angle around the given center and also flipping it top-bottom and/or left-right.
+copyExF :: MonadIO m
+       => Renderer -- ^ The rendering context
+       -> Texture -- ^ The source texture
+       -> Maybe (Rectangle CInt) -- ^ The source rectangle to copy, or 'Nothing' for the whole texture
+       -> Maybe (Rectangle CFloat) -- ^ The destination rectangle to copy to, or 'Nothing' for the whole rendering target. The texture will be stretched to fill the given rectangle.
+       -> CDouble -- ^ The angle of rotation in degrees. The rotation will be performed clockwise.
+       -> Maybe (Point V2 CFloat) -- ^ The point indicating the center of the rotation, or 'Nothing' to rotate around the center of the destination rectangle
+       -> V2 Bool -- ^ Whether to flip the texture on the X and/or Y axis
+       -> m ()
+copyExF (Renderer r) (Texture t) srcRect dstRect theta center flips =
+  liftIO $
+  throwIfNeg_ "SDL.Video.copyExF" "SDL_RenderCopyExF" $
+  maybeWith with srcRect $ \src ->
+  maybeWith with dstRect $ \dst ->
+  maybeWith with center $ \c ->
+  Raw.renderCopyExF r t (castPtr src) (castPtr dst) theta (castPtr c)
+                   (case flips of
+                      V2 x y -> (if x then Raw.SDL_FLIP_HORIZONTAL else 0) .|.
+                               (if y then Raw.SDL_FLIP_VERTICAL else 0))
+
+-- | Draw a line between two points on the current rendering target.
+drawLineF :: MonadIO m => Renderer -> Point V2 CFloat -> Point V2 CFloat -> m ()
+drawLineF (Renderer r) (P (V2 x y)) (P (V2 x' y')) = liftIO $
+  throwIfNeg_ "SDL.Video.drawLineF" "SDL_RenderDrawLineF" $
+    Raw.renderDrawLineF r x y x' y'
+
+-- | Draw a series of connected lines on the current rendering target.
+drawLinesF :: MonadIO m => Renderer -> SV.Vector (Point V2 CFloat) -> m ()
+drawLinesF (Renderer r) points = liftIO $
+  throwIfNeg_ "SDL.Video.drawLinesF" "SDL_RenderDrawLinesF" $
+    SV.unsafeWith points $ \p ->
+      Raw.renderDrawLinesF r (castPtr p) (fromIntegral (SV.length points))
+
+-- | Draw a point on the current rendering target.
+drawPointF :: MonadIO m => Renderer -> Point V2 CFloat -> m ()
+drawPointF (Renderer r) (P (V2 x y)) = liftIO $
+  throwIfNeg_ "SDL.Video.drawPointF" "SDL_RenderDrawPointF" $
+    Raw.renderDrawPointF r x y
+
+-- | Draw a collection of points on the current rendering target.
+drawPointsF :: MonadIO m => Renderer -> SV.Vector (Point V2 CFloat) -> m ()
+drawPointsF (Renderer r) points = liftIO $
+  throwIfNeg_ "SDL.Video.drawPointsF" "SDL_RenderDrawPointsF" $
+    SV.unsafeWith points $ \p ->
+      Raw.renderDrawPointsF r (castPtr p) (fromIntegral (SV.length points))
+
+-- | Draw the outline of a rectangle on the current rendering target.
+drawRectF :: MonadIO m => Renderer -> Rectangle CFloat -> m ()
+drawRectF (Renderer r) rect = liftIO $
+  throwIfNeg_ "SDL.Video.drawRectF" "SDL_RenderDrawRectF" $
+    with rect $ \rectPtr ->
+      Raw.renderDrawRectF r (castPtr rectPtr)
+
+-- | Draw a series of rectangle outlines on the current rendering target.
+drawRectsF :: MonadIO m => Renderer -> SV.Vector (Rectangle CFloat) -> m ()
+drawRectsF (Renderer r) rects = liftIO $
+  throwIfNeg_ "SDL.Video.drawRectsF" "SDL_RenderDrawRectsF" $
+    SV.unsafeWith rects $ \rp ->
+      Raw.renderDrawRectsF r (castPtr rp) (fromIntegral (SV.length rects))
+
+-- | Draw a filled rectangle on the current rendering target.
+fillRectF :: MonadIO m => Renderer -> Rectangle CFloat -> m ()
+fillRectF (Renderer r) rect = liftIO $
+  throwIfNeg_ "SDL.Video.fillRectF" "SDL_RenderFillRectF" $
+    with rect $ \rectPtr ->
+      Raw.renderFillRectF r (castPtr rectPtr)
+
+-- | Draw a series of filled rectangles on the current rendering target.
+fillRectsF :: MonadIO m => Renderer -> SV.Vector (Rectangle CFloat) -> m ()
+fillRectsF (Renderer r) rects = liftIO $
+  throwIfNeg_ "SDL.Video.fillRectsF" "SDL_RenderFillRectsF" $
+    SV.unsafeWith rects $ \rp ->
+      Raw.renderFillRectsF r (castPtr rp) (fromIntegral (SV.length rects))
+
+#endif
+
+
 -- | Clear the current rendering target with the drawing color.
 --
 -- See @<https://wiki.libsdl.org/SDL_RenderClear SDL_RenderClear>@ for C documentation.
@@ -765,29 +862,6 @@ copyEx (Renderer r) (Texture t) srcRect dstRect theta center flips =
                       V2 x y -> (if x then Raw.SDL_FLIP_HORIZONTAL else 0) .|.
                                (if y then Raw.SDL_FLIP_VERTICAL else 0))
 
-#ifdef RECENT_ISH
--- | Copy a portion of the texture to the current rendering target, optionally rotating it by angle around the given center and also flipping it top-bottom and/or left-right.
-copyExF :: MonadIO m
-       => Renderer -- ^ The rendering context
-       -> Texture -- ^ The source texture
-       -> Maybe (Rectangle CInt) -- ^ The source rectangle to copy, or 'Nothing' for the whole texture
-       -> Maybe (Rectangle CFloat) -- ^ The destination rectangle to copy to, or 'Nothing' for the whole rendering target. The texture will be stretched to fill the given rectangle.
-       -> CDouble -- ^ The angle of rotation in degrees. The rotation will be performed clockwise.
-       -> Maybe (Point V2 CFloat) -- ^ The point indicating the center of the rotation, or 'Nothing' to rotate around the center of the destination rectangle
-       -> V2 Bool -- ^ Whether to flip the texture on the X and/or Y axis
-       -> m ()
-copyExF (Renderer r) (Texture t) srcRect dstRect theta center flips =
-  liftIO $
-  throwIfNeg_ "SDL.Video.copyExF" "SDL_RenderCopyExF" $
-  maybeWith with srcRect $ \src ->
-  maybeWith with dstRect $ \dst ->
-  maybeWith with center $ \c ->
-  Raw.renderCopyExF r t (castPtr src) (castPtr dst) theta (castPtr c)
-                   (case flips of
-                      V2 x y -> (if x then Raw.SDL_FLIP_HORIZONTAL else 0) .|.
-                               (if y then Raw.SDL_FLIP_VERTICAL else 0))
-#endif
-
 -- | Draw a line on the current rendering target.
 --
 -- See @<https://wiki.libsdl.org/SDL_RenderDrawLine SDL_RenderDrawLine>@ for C documentation.
