Added rectangle drawing functions which accept a GPU_Rect: GPU_Rectan…

…gle2(), GPU_RectangleFilled2(), GPU_RectangleRound2(), and GPU_RectangleRoundFilled2().
grimfang4 · Oct 2, 2015 · 3a49673 · 3a49673
1 parent 7bcc529
commit 3a49673
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 0 deletions.
diff --git a/include/SDL_gpu.h b/include/SDL_gpu.h
@@ -1380,6 +1380,13 @@ DECLSPEC void SDLCALL GPU_TriFilled(GPU_Target* target, float x1, float y1, floa
  */
 DECLSPEC void SDLCALL GPU_Rectangle(GPU_Target* target, float x1, float y1, float x2, float y2, SDL_Color color);
 
+/*! Renders a colored rectangle outline.
+ * \param target The destination render target
+ * \param rect The rectangular area to draw
+ * \param color The color of the shape to render
+ */
+DECLSPEC void SDLCALL GPU_Rectangle2(GPU_Target* target, GPU_Rect rect, SDL_Color color);
+
 /*! Renders a colored filled rectangle.
  * \param target The destination render target
  * \param x1 x-coord of top-left corner
@@ -1390,6 +1397,13 @@ DECLSPEC void SDLCALL GPU_Rectangle(GPU_Target* target, float x1, float y1, floa
  */
 DECLSPEC void SDLCALL GPU_RectangleFilled(GPU_Target* target, float x1, float y1, float x2, float y2, SDL_Color color);
 
+/*! Renders a colored filled rectangle.
+ * \param target The destination render target
+ * \param rect The rectangular area to draw
+ * \param color The color of the shape to render
+ */
+DECLSPEC void SDLCALL GPU_RectangleFilled2(GPU_Target* target, GPU_Rect rect, SDL_Color color);
+
 /*! Renders a colored rounded (filleted) rectangle outline.
  * \param target The destination render target
  * \param x1 x-coord of top-left corner
@@ -1401,6 +1415,14 @@ DECLSPEC void SDLCALL GPU_RectangleFilled(GPU_Target* target, float x1, float y1
  */
 DECLSPEC void SDLCALL GPU_RectangleRound(GPU_Target* target, float x1, float y1, float x2, float y2, float radius, SDL_Color color);
 
+/*! Renders a colored rounded (filleted) rectangle outline.
+ * \param target The destination render target
+ * \param rect The rectangular area to draw
+ * \param radius The radius of the corners
+ * \param color The color of the shape to render
+ */
+DECLSPEC void SDLCALL GPU_RectangleRound2(GPU_Target* target, GPU_Rect rect, float radius, SDL_Color color);
+
 /*! Renders a colored filled rounded (filleted) rectangle.
  * \param target The destination render target
  * \param x1 x-coord of top-left corner
@@ -1412,6 +1434,14 @@ DECLSPEC void SDLCALL GPU_RectangleRound(GPU_Target* target, float x1, float y1,
  */
 DECLSPEC void SDLCALL GPU_RectangleRoundFilled(GPU_Target* target, float x1, float y1, float x2, float y2, float radius, SDL_Color color);
 
+/*! Renders a colored filled rounded (filleted) rectangle.
+ * \param target The destination render target
+ * \param rect The rectangular area to draw
+ * \param radius The radius of the corners
+ * \param color The color of the shape to render
+ */
+DECLSPEC void SDLCALL GPU_RectangleRoundFilled2(GPU_Target* target, GPU_Rect rect, float radius, SDL_Color color);
+
 /*! Renders a colored polygon outline.  The vertices are expected to define a convex polygon.
  * \param target The destination render target
  * \param num_vertices Number of vertices (x and y pairs)

diff --git a/src/SDL_gpu_shapes.c b/src/SDL_gpu_shapes.c
@@ -105,24 +105,48 @@ void GPU_Rectangle(GPU_Target* target, float x1, float y1, float x2, float y2, S
 	renderer->impl->Rectangle(renderer, target, x1, y1, x2, y2, color);
 }
 
+void GPU_Rectangle2(GPU_Target* target, GPU_Rect rect, SDL_Color color)
+{
+	CHECK_RENDERER();
+	renderer->impl->Rectangle(renderer, target, rect.x, rect.y, rect.x + rect.w, rect.y + rect.h, color);
+}
+
 void GPU_RectangleFilled(GPU_Target* target, float x1, float y1, float x2, float y2, SDL_Color color)
 {
 	CHECK_RENDERER();
 	renderer->impl->RectangleFilled(renderer, target, x1, y1, x2, y2, color);
 }
 
+void GPU_RectangleFilled2(GPU_Target* target, GPU_Rect rect, SDL_Color color)
+{
+	CHECK_RENDERER();
+	renderer->impl->RectangleFilled(renderer, target, rect.x, rect.y, rect.x + rect.w, rect.y + rect.h, color);
+}
+
 void GPU_RectangleRound(GPU_Target* target, float x1, float y1, float x2, float y2, float radius, SDL_Color color)
 {
 	CHECK_RENDERER();
 	renderer->impl->RectangleRound(renderer, target, x1, y1, x2, y2, radius, color);
 }
 
+void GPU_RectangleRound2(GPU_Target* target, GPU_Rect rect, float radius, SDL_Color color)
+{
+	CHECK_RENDERER();
+	renderer->impl->RectangleRound(renderer, target, rect.x, rect.y, rect.x + rect.w, rect.y + rect.h, radius, color);
+}
+
 void GPU_RectangleRoundFilled(GPU_Target* target, float x1, float y1, float x2, float y2, float radius, SDL_Color color)
 {
 	CHECK_RENDERER();
 	renderer->impl->RectangleRoundFilled(renderer, target, x1, y1, x2, y2, radius, color);
 }
 
+void GPU_RectangleRoundFilled2(GPU_Target* target, GPU_Rect rect, float radius, SDL_Color color)
+{
+	CHECK_RENDERER();
+	renderer->impl->RectangleRoundFilled(renderer, target, rect.x, rect.y, rect.x + rect.w, rect.y + rect.h, radius, color);
+}
+
 void GPU_Polygon(GPU_Target* target, unsigned int num_vertices, float* vertices, SDL_Color color)
 {
 	CHECK_RENDERER();