LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-12 08:30:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge default into minor

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-08-29 22:41:24 -03:00
parent daf13de4eb d572c70883
commit ef61573cd3
23 changed files with 232 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/math/wrap_Math.cpp
+6 -6
View File
@@ -120,7 +120,7 @@ int w_newBezierCurve(lua_State *L)
int w_triangulate(lua_State *L)
{
std::vector<Vertex> vertices;
std::vector<love::Vector> vertices;
if (lua_istable(L, 1))
{
int top = (int) luax_objlen(L, 1);
@@ -130,7 +130,7 @@ int w_triangulate(lua_State *L)
lua_rawgeti(L, 1, i);
lua_rawgeti(L, 1, i+1);
Vertex v;
Vector v;
v.x = (float) luaL_checknumber(L, -2);
v.y = (float) luaL_checknumber(L, -1);
vertices.push_back(v);
@@ -144,7 +144,7 @@ int w_triangulate(lua_State *L)
vertices.reserve(top / 2);
for (int i = 1; i <= top; i += 2)
{
Vertex v;
Vector v;
v.x = (float) luaL_checknumber(L, i);
v.y = (float) luaL_checknumber(L, i+1);
vertices.push_back(v);
@@ -190,7 +190,7 @@ int w_triangulate(lua_State *L)
int w_isConvex(lua_State *L)
{
std::vector<Vertex> vertices;
std::vector<love::Vector> vertices;
if (lua_istable(L, 1))
{
int top = (int) luax_objlen(L, 1);
@@ -200,7 +200,7 @@ int w_isConvex(lua_State *L)
lua_rawgeti(L, 1, i);
lua_rawgeti(L, 1, i+1);
Vertex v;
love::Vector v;
v.x = (float) luaL_checknumber(L, -2);
v.y = (float) luaL_checknumber(L, -1);
vertices.push_back(v);
@@ -214,7 +214,7 @@ int w_isConvex(lua_State *L)
vertices.reserve(top / 2);
for (int i = 1; i <= top; i += 2)
{
Vertex v;
love::Vector v;
v.x = (float) luaL_checknumber(L, i);
v.y = (float) luaL_checknumber(L, i+1);
vertices.push_back(v);