From 06f2ec8e31871d71d88a1c80960e9e90f055f489 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Mon, 23 Sep 2013 20:40:58 -0300 Subject: [PATCH] Renamed BezierCurve:eval to BezierCurve:evaluate (resolves issue #722) --- src/modules/math/BezierCurve.cpp | 2 +- src/modules/math/BezierCurve.h | 2 +- src/modules/math/wrap_BezierCurve.cpp | 6 +++--- src/modules/math/wrap_BezierCurve.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/math/BezierCurve.cpp b/src/modules/math/BezierCurve.cpp index 0eda1228f..e6ac258c4 100644 --- a/src/modules/math/BezierCurve.cpp +++ b/src/modules/math/BezierCurve.cpp @@ -158,7 +158,7 @@ void BezierCurve::scale(double s, const Vector ¢er) controlPoints[i] = (controlPoints[i] - center) * s + center; } -Vector BezierCurve::eval(double t) const +Vector BezierCurve::evaluate(double t) const { if (t < 0 || t > 1) throw Exception("Invalid evaluation parameter: must be between 0 and 1"); diff --git a/src/modules/math/BezierCurve.h b/src/modules/math/BezierCurve.h index 15f61c061..3dccd5338 100644 --- a/src/modules/math/BezierCurve.h +++ b/src/modules/math/BezierCurve.h @@ -97,7 +97,7 @@ public: * Evaluates the curve at time t. * @param t Curve parameter, must satisfy 0 <= t <= 1. **/ - Vector eval(double t) const; + Vector evaluate(double t) const; /** * Renders the curve by subdivision. diff --git a/src/modules/math/wrap_BezierCurve.cpp b/src/modules/math/wrap_BezierCurve.cpp index e712521f5..e78cf7f51 100644 --- a/src/modules/math/wrap_BezierCurve.cpp +++ b/src/modules/math/wrap_BezierCurve.cpp @@ -122,13 +122,13 @@ int w_BezierCurve_scale(lua_State *L) return 0; } -int w_BezierCurve_eval(lua_State *L) +int w_BezierCurve_evaluate(lua_State *L) { BezierCurve *curve = luax_checkbeziercurve(L, 1); double t = luaL_checknumber(L, 2); EXCEPT_GUARD( - Vector v = curve->eval(t); + Vector v = curve->evaluate(t); lua_pushnumber(L, v.x); lua_pushnumber(L, v.y); ) @@ -167,7 +167,7 @@ static const luaL_Reg functions[] = {"translate", w_BezierCurve_translate}, {"rotate", w_BezierCurve_rotate}, {"scale", w_BezierCurve_scale}, - {"eval", w_BezierCurve_eval}, + {"evaluate", w_BezierCurve_evaluate}, {"render", w_BezierCurve_render}, { 0, 0 } }; diff --git a/src/modules/math/wrap_BezierCurve.h b/src/modules/math/wrap_BezierCurve.h index bb55af773..bbd688c5d 100644 --- a/src/modules/math/wrap_BezierCurve.h +++ b/src/modules/math/wrap_BezierCurve.h @@ -39,7 +39,7 @@ int w_BezierCurve_insertControlPoint(lua_State *L); int w_BezierCurve_translate(lua_State *L); int w_BezierCurve_rotate(lua_State *L); int w_BezierCurve_scale(lua_State *L); -int w_BezierCurve_eval(lua_State *L); +int w_BezierCurve_evaluate(lua_State *L); int w_BezierCurve_render(lua_State *L); extern "C" int luaopen_beziercurve(lua_State *L);