Added love.math.newRandomGenerator. Returns a RNG object with its own seed and random methods.

--HG--
branch : math-randobject
This commit is contained in:
Alex Szpakowski
2013-04-14 23:02:44 -03:00
parent 96f4f532bb
commit 3046981fce
10 changed files with 463 additions and 122 deletions
+21 -32
View File
@@ -19,7 +19,8 @@
**/
#include "wrap_Math.h"
#include "modules/math/MathModule.h"
#include "wrap_RandomGenerator.h"
#include "MathModule.h"
#include <cmath>
#include <iostream>
@@ -31,42 +32,14 @@ namespace math
int w_randomseed(lua_State *L)
{
union
{
double seed_double;
uint64_t seed_uint;
} s;
s.seed_double = luaL_checknumber(L, 1);
Math::instance.randomseed(s.seed_uint);
uint64 seed = luax_checkrandomseed(L, 1);
Math::instance.randomseed(seed);
return 0;
}
int w_random(lua_State *L)
{
double r = Math::instance.random();
int l, u;
// verbatim from lua 5.1.4 source code: lmathlib.c:185 ff.
switch (lua_gettop(L))
{
case 0:
lua_pushnumber(L, r);
break;
case 1:
u = luaL_checkint(L, 1);
luaL_argcheck(L, 1 <= u, 1, "interval is empty");
lua_pushnumber(L, floor(r * u) + 1);
break;
case 2:
l = luaL_checkint(L, 1);
u = luaL_checkint(L, 2);
luaL_argcheck(L, l <= u, 2, "interval is empty");
lua_pushnumber(L, floor(r * (u - l + 1)) + l);
break;
default:
return luaL_error(L, "wrong number of arguments");
}
return 1;
return luax_getrandom(L, 1, Math::instance.random());
}
int w_randnormal(lua_State *L)
@@ -87,6 +60,20 @@ int w_randnormal(lua_State *L)
return 1;
}
int w_newRandomGenerator(lua_State *L)
{
RandomGenerator *t = Math::instance.newRandomGenerator();
if (lua_gettop(L) > 0)
{
uint64 seed = luax_checkrandomseed(L, 1);
t->randomseed(seed);
}
luax_newtype(L, "RandomGenerator", MATH_RANDOM_GENERATOR_T, (void *) t);
return 1;
}
int w_triangulate(lua_State *L)
{
std::vector<vertex> vertices;
@@ -167,12 +154,14 @@ static const luaL_Reg functions[] =
{ "randomseed", w_randomseed },
{ "random", w_random },
{ "randnormal", w_randnormal },
{ "newRandomGenerator", w_newRandomGenerator },
{ "triangulate", w_triangulate },
{ 0, 0 }
};
static const lua_CFunction types[] =
{
luaopen_randomgenerator,
0
};