upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-20 16:15:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

move lua map_location operations to their own file

Browse Source
This commit is contained in:
Chris Beck 2014-11-20 15:53:26 -05:00
parent fccddbb226
commit d7770f5a92
5 changed files with 292 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@ -962,6 +962,7 @@ set(wesnoth-main_SRC
scripting/lua_game_launcher.cpp
scripting/lua_gui2.cpp
scripting/lua_kernel_base.cpp
scripting/lua_map_location_ops.cpp
scripting/lua_types.cpp
scripting/mapgen_lua_kernel.cpp
settings.cpp

1
src/SConscript
View File

@ -536,6 +536,7 @@ wesnoth_sources = Split("""
scripting/lua_game_launcher.cpp
scripting/lua_gui2.cpp
scripting/lua_kernel_base.cpp
scripting/lua_map_location_ops.cpp
scripting/lua_types.cpp
scripting/mapgen_lua_kernel.cpp
settings.cpp

235
src/scripting/lua_kernel_base.cpp
View File

@ -23,7 +23,6 @@
#include "lua/lua.h"
#include "lua/lualib.h"
#include "lua_jailbreak_exception.hpp" // for tlua_jailbreak_exception
#include "map_location.hpp"
#ifdef DEBUG_LUA
#include "scripting/debug_lua.hpp"
@ -32,6 +31,7 @@
#include "scripting/lua_common.hpp"
#include "scripting/lua_fileops.hpp"
#include "scripting/lua_gui2.hpp"
#include "scripting/lua_map_location_ops.hpp"
#include "scripting/lua_types.hpp"
#include "version.hpp" // for do_version_check, etc
@ -75,215 +75,6 @@ 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.
@ -526,18 +317,18 @@ lua_kernel_base::lua_kernel_base(CVideo * video)
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 },
{ "get_direction", &lua_map_location::intf_get_direction },
{ "vector_sum", &lua_map_location::intf_vector_sum },
{ "vector_negation", &lua_map_location::intf_vector_negation },
{ "zero", &lua_map_location::intf_vector_zero },
{ "rotate_right_around_center", &lua_map_location::intf_rotate_right_around_center },
{ "tiles_adjacent", &lua_map_location::intf_tiles_adjacent },
{ "get_adjacent_tiles", &lua_map_location::intf_get_adjacent_tiles },
{ "distance_between", &lua_map_location::intf_distance_between },
{ "get_in_basis_N_NE", &lua_map_location::intf_get_in_basis_N_NE },
{ "get_relative_dir", &lua_map_location::intf_get_relative_dir },
{ "parse_direction", &lua_map_location::intf_parse_direction },
{ "write_direction", &lua_map_location::intf_write_direction },
{ NULL, NULL }
};

235
src/scripting/lua_map_location_ops.cpp Normal file
View File

@ -0,0 +1,235 @@
/*
Copyright (C) 2014 by Chris Beck <render787@gmail.com>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY.
See the COPYING file for more details.
*/
#include "lua_map_location_ops.hpp"
#include "lua/lua.h"
#include "lua/lauxlib.h"
#include "map_location.hpp"
#include <string>
#include <utility>
/**
* 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);
}
namespace lua_map_location {
/**
* Expose map_location::get_direction function to lua
*/
int intf_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
*/
int intf_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
*/
int intf_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
*/
int intf_vector_zero(lua_State* L)
{
push_map_location(L, map_location::ZERO());
return 2;
}
/**
* Expose map_location::rotate_right_around_center to lua
*/
int intf_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
*/
int intf_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
*/
int intf_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
*/
int intf_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
*/
int intf_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
*/
int intf_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
*/
int intf_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
*/
int intf_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;
}
}
} // end namespace lua_map_location

42
src/scripting/lua_map_location_ops.hpp Normal file
View File

@ -0,0 +1,42 @@
/*
Copyright (C) 2014 by Chris Beck <render787@gmail.com>
Part of the Battle for Wesnoth Project http://www.wesnoth.org/
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY.
See the COPYING file for more details.
*/
#ifndef LUA_MAP_LOCATION_OPS_HPP_INCLUDED
#define LUA_MAP_LOCATION_OPS_HPP_INCLUDED
/**
* This namespace contains the implementations for wesnoth's
* lua bindings for the C++ map location operations.
*/
struct lua_State;
namespace lua_map_location {
int intf_get_direction(lua_State*);
int intf_vector_sum(lua_State*);
int intf_vector_negation(lua_State*);
int intf_vector_zero(lua_State*);
int intf_rotate_right_around_center(lua_State*);
int intf_tiles_adjacent(lua_State*);
int intf_get_adjacent_tiles(lua_State*);
int intf_distance_between(lua_State*);
int intf_get_in_basis_N_NE(lua_State*);
int intf_get_relative_dir(lua_State*);
int intf_parse_direction(lua_State*);
int intf_write_direction(lua_State*);
} // end namespace lua_map_location
#endif