Rounded rectangles with radius values >= the rectangle's width and height are now clamped rather than causing an error.

This commit is contained in:
Alex Szpakowski
2015-08-01 13:31:08 -03:00
parent c02ba91ef4
commit 2392174eb2
2 changed files with 7 additions and 5 deletions
+7
View File
@@ -1137,6 +1137,13 @@ void Graphics::rectangle(DrawMode mode, float x, float y, float w, float h, floa
return;
}
// Radius values that are more than half the rectangle's size aren't handled
// correctly (for now)...
if (w >= 0.02f)
rx = std::min(rx, w / 2.0f - 0.01f);
if (h >= 0.02f)
ry = std::min(ry, h / 2.0f - 0.01f);
points = std::max(points, 1);
const float half_pi = static_cast<float>(LOVE_M_PI / 2);
@@ -1592,11 +1592,6 @@ int w_rectangle(lua_State *L)
float rx = (float)luaL_optnumber(L, 6, 0.0);
float ry = (float)luaL_optnumber(L, 7, rx);
if (w > 0.0 && rx >= w / 2.0)
return luaL_error(L, "Invalid rectangle x-axis radius (must be less than half the width)");
if (h > 0.0 && ry >= h / 2.0)
return luaL_error(L, "Invalid rectangle y-axis radius (must be less than half the height)");
int points;
if (lua_isnoneornil(L, 8))
points = std::max(rx, ry) > 20.0 ? (int)(std::max(rx, ry) / 2) : 10;