mirror of
https://github.com/wesnoth/wesnoth
synced 2025-05-20 18:21:12 +00:00
add bindings for map_location functions to the lua kernel base
I mainly want to use this for random map generators, it would be silly to rewrite this stuff in lua after we already have it in C++ (and unit tested there).
This commit is contained in:
Chris Beck
parent
3c431d8406
commit
dffbd96068
@ -26,6 +26,7 @@
|
||||
#include "lua/lualib.h"
|
||||
#include "lua/luaconf.h" // for LUAL_BUFFERSIZE
|
||||
#include "lua_jailbreak_exception.hpp" // for tlua_jailbreak_exception
|
||||
#include "map_location.hpp"
|
||||
|
||||
#ifdef DEBUG_LUA
|
||||
#include "scripting/debug_lua.hpp"
|
||||
@ -230,6 +231,215 @@ static int intf_compare_versions(lua_State* L)
|
||||
return 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper function which gets a map location from the stack. Handles lua (1-based) to C++ (0-based) conversion.
|
||||
* Expected: stack has at least two elements, top is y, next is x.
|
||||
*/
|
||||
static map_location pop_map_location(lua_State* L)
|
||||
{
|
||||
if (lua_gettop(L) < 2) {
|
||||
luaL_error(L, "pop_map_location: expected to find a map location on the stack, but stack has less than two elements");
|
||||
return map_location();
|
||||
}
|
||||
int y = luaL_checkint(L, -1);
|
||||
int x = luaL_checkint(L, -2);
|
||||
lua_pop(L, 2);
|
||||
|
||||
return map_location(x-1, y-1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Helper function which pushes a map location onto the stack. Handles lua (1-based) to C++ (0-based) conversion.
|
||||
*/
|
||||
static void push_map_location(lua_State* L, const map_location & loc)
|
||||
{
|
||||
lua_pushinteger(L, loc.x+1);
|
||||
lua_pushinteger(L, loc.y+1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Expose map_location::get_direction function to lua
|
||||
*/
|
||||
static int intf_map_location_get_direction(lua_State* L)
|
||||
{
|
||||
int nargs = lua_gettop(L);
|
||||
if (nargs != 3 and nargs != 4) {
|
||||
std::string msg("get_direction: must pass 3 or 4 args, found ");
|
||||
msg += nargs;
|
||||
luaL_error(L, msg.c_str());
|
||||
return 0;
|
||||
}
|
||||
|
||||
int n = 1;
|
||||
if (nargs == 4) {
|
||||
n = luaL_checkint(L, -1);
|
||||
lua_pop(L,1);
|
||||
}
|
||||
|
||||
map_location::DIRECTION d;
|
||||
if (lua_isnumber(L, -1)) {
|
||||
d = map_location::rotate_right(map_location::NORTH, luaL_checkint(L, -1)); //easiest way to correctly convert int to direction
|
||||
lua_pop(L,1);
|
||||
} else if (lua_isstring(L, -1)) {
|
||||
d = map_location::parse_direction(luaL_checkstring(L,-1));
|
||||
lua_pop(L,1);
|
||||
} else {
|
||||
std::string msg("get_direction: third argument should be a direction, either a string or an integer, instead found a ");
|
||||
msg += lua_typename(L, lua_type(L, -1));
|
||||
luaL_argerror(L, -1, msg.c_str());
|
||||
return 0;
|
||||
}
|
||||
|
||||
map_location l = pop_map_location(L);
|
||||
map_location result = l.get_direction(d, n);
|
||||
|
||||
push_map_location(L, result);
|
||||
return 2;
|
||||
}
|
||||
|
||||
/**
|
||||
* Expose map_location::vector_sum to lua
|
||||
*/
|
||||
static int intf_map_location_vector_sum(lua_State* L)
|
||||
{
|
||||
map_location l2 = pop_map_location(L);
|
||||
map_location l1 = pop_map_location(L);
|
||||
|
||||
push_map_location(L, l1.vector_sum_assign(l2));
|
||||
return 2;
|
||||
}
|
||||
|
||||
/**
|
||||
* Expose map_location::vector_negation to lua
|
||||
*/
|
||||
static int intf_map_location_vector_negation(lua_State* L)
|
||||
{
|
||||
map_location l1 = pop_map_location(L);
|
||||
|
||||
push_map_location(L, l1.vector_negation());
|
||||
return 2;
|
||||
}
|
||||
|
||||
/**
|
||||
* Expose map_location::ZERO to lua
|
||||
*/
|
||||
static int intf_map_location_vector_zero(lua_State* L)
|
||||
{
|
||||
push_map_location(L, map_location::ZERO());
|
||||
return 2;
|
||||
}
|
||||
|
||||
/**
|
||||
* Expose map_location::rotate_right_around_center to lua
|
||||
*/
|
||||
static int intf_map_location_rotate_right_around_center(lua_State* L)
|
||||
{
|
||||
int k = luaL_checkint(L, -1);
|
||||
lua_pop(L,1);
|
||||
map_location center = pop_map_location(L);
|
||||
map_location loc = pop_map_location(L);
|
||||
|
||||
push_map_location(L, loc.rotate_right_around_center(center, k));
|
||||
return 2;
|
||||
}
|
||||
|
||||
/**
|
||||
* Expose map_location tiles_adjacent
|
||||
*/
|
||||
static int intf_map_location_tiles_adjacent(lua_State* L)
|
||||
{
|
||||
map_location l2 = pop_map_location(L);
|
||||
map_location l1 = pop_map_location(L);
|
||||
|
||||
lua_pushboolean(L, tiles_adjacent(l1,l2));
|
||||
return 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Expose map_location get_adjacent_tiles
|
||||
*/
|
||||
static int intf_map_location_get_adjacent_tiles(lua_State* L)
|
||||
{
|
||||
map_location l1 = pop_map_location(L);
|
||||
|
||||
map_location locs[6];
|
||||
get_adjacent_tiles(l1, locs);
|
||||
|
||||
for (int i = 0; i < 6; ++i) {
|
||||
push_map_location(L, locs[i]);
|
||||
}
|
||||
|
||||
return 12;
|
||||
}
|
||||
|
||||
/**
|
||||
* Expose map_location distance_between
|
||||
*/
|
||||
static int intf_map_location_distance_between(lua_State* L)
|
||||
{
|
||||
map_location l2 = pop_map_location(L);
|
||||
map_location l1 = pop_map_location(L);
|
||||
|
||||
lua_pushinteger(L, distance_between(l1,l2));
|
||||
return 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Expose map_location get_in_basis_N_NE
|
||||
*/
|
||||
static int intf_map_location_get_in_basis_N_NE(lua_State* L)
|
||||
{
|
||||
map_location l1 = pop_map_location(L);
|
||||
|
||||
std::pair<int, int> r = l1.get_in_basis_N_NE();
|
||||
lua_pushinteger(L, r.first);
|
||||
lua_pushinteger(L, r.second);
|
||||
return 2;
|
||||
}
|
||||
|
||||
/**
|
||||
* Expose map_location get_relative_dir
|
||||
*/
|
||||
static int intf_map_location_get_relative_dir(lua_State* L)
|
||||
{
|
||||
map_location l2 = pop_map_location(L);
|
||||
map_location l1 = pop_map_location(L);
|
||||
|
||||
lua_pushinteger(L, l1.get_relative_dir(l2));
|
||||
return 1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Expose map_location parse_direction
|
||||
*/
|
||||
static int intf_map_location_parse_direction(lua_State* L)
|
||||
{
|
||||
std::string str = luaL_checkstring(L, -1);
|
||||
map_location::DIRECTION d = map_location::parse_direction(str);
|
||||
if (d == map_location::NDIRECTIONS) {
|
||||
luaL_argerror(L, -1, "error: not a direction string");
|
||||
return 0;
|
||||
} else {
|
||||
lua_pushinteger(L, d);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Expose map_location write_direction
|
||||
*/
|
||||
static int intf_map_location_write_direction(lua_State* L)
|
||||
{
|
||||
int d = luaL_checkint(L, -1);
|
||||
if (d >= 0 && d < map_location::NDIRECTIONS) {
|
||||
lua_pushstring(L, map_location::write_direction(static_cast<map_location::DIRECTION>(d)).c_str());
|
||||
return 1;
|
||||
} else {
|
||||
luaL_argerror(L, -1, "error: must be an integer from 0 to 5");
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Replacement print function -- instead of printing to std::cout, print to the command log.
|
||||
* Intended to be bound to this' command_log at registration time.
|
||||
@ -464,6 +674,31 @@ lua_kernel_base::lua_kernel_base(CVideo * video)
|
||||
lua_setfield(L, -2, "package");
|
||||
lua_pop(L, 1);
|
||||
|
||||
// Get some callbacks for map locations
|
||||
cmd_log_ << "Adding map_location table...\n";
|
||||
|
||||
static luaL_Reg const map_callbacks[] = {
|
||||
{ "get_direction", &intf_map_location_get_direction },
|
||||
{ "vector_sum", &intf_map_location_vector_sum },
|
||||
{ "vector_negation", &intf_map_location_vector_negation },
|
||||
{ "zero", &intf_map_location_vector_zero },
|
||||
{ "rotate_right_around_center", &intf_map_location_rotate_right_around_center },
|
||||
{ "tiles_adjacent", &intf_map_location_tiles_adjacent },
|
||||
{ "get_adjacent_tiles", &intf_map_location_get_adjacent_tiles },
|
||||
{ "distance_between", &intf_map_location_distance_between },
|
||||
{ "get_in_basis_N_NE", &intf_map_location_get_in_basis_N_NE },
|
||||
{ "get_relative_dir", &intf_map_location_get_relative_dir },
|
||||
{ "parse_direction", &intf_map_location_parse_direction },
|
||||
{ "write_direction", &intf_map_location_write_direction },
|
||||
{ NULL, NULL }
|
||||
};
|
||||
|
||||
// Create the map_location table.
|
||||
lua_getglobal(L, "wesnoth");
|
||||
lua_newtable(L);
|
||||
luaL_setfuncs(L, map_callbacks, 0);
|
||||
lua_setfield(L, -2, "map_location");
|
||||
lua_pop(L,1);
|
||||
}
|
||||
|
||||
lua_kernel_base::~lua_kernel_base()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user