Ratstail91/TurtleMap
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RegionPager's API now takes a pager as an optional first parameter to all methods

Browse Source
This commit is contained in:
Kayne Ruse
2016-11-27 22:29:49 +11:00
parent 4f9b8695bd
commit d6672e59d0
1 changed files with 60 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
region_pager_api.cpp
+60 -72
View File
@@ -27,124 +27,124 @@
#include <stdexcept> #include <stdexcept>
//DOCS: These glue functions simply wrap RegionPagerLua's methods //DOCS: These glue functions simply wrap RegionPagerLua's methods
//DOCS: These functions take a pager as an optional first parameter
//NOTE: zero indexing is used here, but not in the region API //NOTE: zero indexing is used here, but not in the region API
static int setTile(lua_State* L) { static RegionPagerLua* getPager(lua_State* L) {
//get the global pager RegionPagerLua* pager = nullptr;
//get the pager, either the global pager or the parameter pager
lua_getglobal(L, REGION_PAGER_NAME); lua_getglobal(L, REGION_PAGER_NAME);
RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, -1)); if (lua_isnil(L, -1)) {
pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
}
else {
pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, -1));
}
lua_pop(L, 1); lua_pop(L, 1);
return pager;
}
static int setTile(lua_State* L) {
//get the pager
RegionPagerLua* pager = getPager(L);
//set tile //set tile
int ret = pager->SetTile(lua_tointeger(L, 1), lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4)); int ret = pager->SetTile(lua_tointeger(L, -4), lua_tointeger(L, -3), lua_tointeger(L, -2), lua_tointeger(L, -1));
lua_pushinteger(L, ret); lua_pushinteger(L, ret);
return 1; return 1;
} }
static int getTile(lua_State* L) { static int getTile(lua_State* L) {
//get the global pager //get the pager
lua_getglobal(L, REGION_PAGER_NAME); RegionPagerLua* pager = getPager(L);
RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, -1));
lua_pop(L, 1);
//get tile //get tile
int ret = pager->GetTile(lua_tointeger(L, 1), lua_tointeger(L, 2), lua_tointeger(L, 3)); int ret = pager->GetTile(lua_tointeger(L, -3), lua_tointeger(L, -2), lua_tointeger(L, -1));
lua_pushinteger(L, ret); lua_pushinteger(L, ret);
return 1; return 1;
} }
static int setSolid(lua_State* L) { static int setSolid(lua_State* L) {
//get the global pager //get the pager
lua_getglobal(L, REGION_PAGER_NAME); RegionPagerLua* pager = getPager(L);
RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, -1));
lua_pop(L, 1);
//set solid //set solid
bool ret = pager->SetSolid(lua_tointeger(L, 1), lua_tointeger(L, 2), lua_toboolean(L, 3)); bool ret = pager->SetSolid(lua_tointeger(L, -3), lua_tointeger(L, -2), lua_toboolean(L, -1));
lua_pushboolean(L, ret); lua_pushboolean(L, ret);
return 1; return 1;
} }
static int getSolid(lua_State* L) { static int getSolid(lua_State* L) {
//get the global pager //get the pager
lua_getglobal(L, REGION_PAGER_NAME); RegionPagerLua* pager = getPager(L);
RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, -1));
lua_pop(L, 1);
//get solid //get solid
bool ret = pager->GetSolid(lua_tointeger(L, 1), lua_tointeger(L, 2)); bool ret = pager->GetSolid(lua_tointeger(L, -2), lua_tointeger(L, -1));
lua_pushboolean(L, ret); lua_pushboolean(L, ret);
return 1; return 1;
} }
static int getRegion(lua_State* L) { static int getRegion(lua_State* L) {
//get the global pager //get the pager
lua_getglobal(L, REGION_PAGER_NAME); RegionPagerLua* pager = getPager(L);
RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, -1));
lua_pop(L, 1);
//get region //get region
Region* region = pager->GetRegion(lua_tointeger(L, 1), lua_tointeger(L, 2)); Region* region = pager->GetRegion(lua_tointeger(L, -2), lua_tointeger(L, -1));
lua_pushlightuserdata(L, region); lua_pushlightuserdata(L, region);
return 1; return 1;
} }
static int loadRegion(lua_State* L) { static int loadRegion(lua_State* L) {
//get the global pager //get the pager
lua_getglobal(L, REGION_PAGER_NAME); RegionPagerLua* pager = getPager(L);
RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, -1));
lua_pop(L, 1);
//load region //load region
Region* region = pager->LoadRegion(lua_tointeger(L, 1), lua_tointeger(L, 2)); Region* region = pager->LoadRegion(lua_tointeger(L, -2), lua_tointeger(L, -1));
lua_pushlightuserdata(L, region); lua_pushlightuserdata(L, region);
return 1; return 1;
} }
static int saveRegion(lua_State* L) { static int saveRegion(lua_State* L) {
//get the global pager //get the pager
lua_getglobal(L, REGION_PAGER_NAME); RegionPagerLua* pager = getPager(L);
RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, -1));
lua_pop(L, 1);
//save region //save region
Region* region = pager->SaveRegion(lua_tointeger(L, 1), lua_tointeger(L, 2)); Region* region = pager->SaveRegion(lua_tointeger(L, -2), lua_tointeger(L, -1));
lua_pushlightuserdata(L, region); lua_pushlightuserdata(L, region);
return 1; return 1;
} }
static int createRegion(lua_State* L) { static int createRegion(lua_State* L) {
//get the global pager //get the pager
lua_getglobal(L, REGION_PAGER_NAME); RegionPagerLua* pager = getPager(L);
RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, -1));
lua_pop(L, 1);
//create region //create region
Region* region = pager->CreateRegion(lua_tointeger(L, 1), lua_tointeger(L, 2)); Region* region = pager->CreateRegion(lua_tointeger(L, -2), lua_tointeger(L, -1));
lua_pushlightuserdata(L, region); lua_pushlightuserdata(L, region);
return 1; return 1;
} }
static int unloadRegion(lua_State* L) { static int unloadRegion(lua_State* L) {
//get the global pager //get the pager
lua_getglobal(L, REGION_PAGER_NAME); RegionPagerLua* pager = getPager(L);
RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, -1));
lua_pop(L, 1);
//two argument types: coords & the region itself //two argument types: coords & the region itself
switch(lua_type(L, 1)) { switch(lua_type(L, -1)) {
case LUA_TNUMBER: case LUA_TNUMBER:
//unload using coords //unload using coords
pager->UnloadIf([&](Region const& region) -> bool { pager->UnloadIf([&](Region const& region) -> bool {
int x = lua_tointeger(L, 1); int x = lua_tointeger(L, -2);
int y = lua_tointeger(L, 2); int y = lua_tointeger(L, -1);
return region.GetX() == x && region.GetY() == y; return region.GetX() == x && region.GetY() == y;
}); });
break; break;
case LUA_TLIGHTUSERDATA: case LUA_TLIGHTUSERDATA:
//unloading using reference //unloading using reference
pager->UnloadIf([&](Region const& region) -> bool { pager->UnloadIf([&](Region const& region) -> bool {
return (&region) == lua_touserdata(L, 1); return (&region) == lua_touserdata(L, -1);
}); });
break; break;
} }
@@ -152,10 +152,8 @@ static int unloadRegion(lua_State* L) {
} }
static int setOnLoad(lua_State* L) { static int setOnLoad(lua_State* L) {
//get the global pager //get the pager
lua_getglobal(L, REGION_PAGER_NAME); RegionPagerLua* pager = getPager(L);
RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, -1));
lua_pop(L, 1);
//set on load //set on load
luaL_unref(L, LUA_REGISTRYINDEX, pager->GetLoadReference()); luaL_unref(L, LUA_REGISTRYINDEX, pager->GetLoadReference());
@@ -164,10 +162,8 @@ static int setOnLoad(lua_State* L) {
} }
static int setOnSave(lua_State* L) { static int setOnSave(lua_State* L) {
//get the global pager //get the pager
lua_getglobal(L, REGION_PAGER_NAME); RegionPagerLua* pager = getPager(L);
RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, -1));
lua_pop(L, 1);
//set on save //set on save
luaL_unref(L, LUA_REGISTRYINDEX, pager->GetSaveReference()); luaL_unref(L, LUA_REGISTRYINDEX, pager->GetSaveReference());
@@ -176,10 +172,8 @@ static int setOnSave(lua_State* L) {
} }
static int setOnCreate(lua_State* L) { static int setOnCreate(lua_State* L) {
//get the global pager //get the pager
lua_getglobal(L, REGION_PAGER_NAME); RegionPagerLua* pager = getPager(L);
RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, -1));
lua_pop(L, 1);
//set on create //set on create
luaL_unref(L, LUA_REGISTRYINDEX, pager->GetCreateReference()); luaL_unref(L, LUA_REGISTRYINDEX, pager->GetCreateReference());
@@ -188,10 +182,8 @@ static int setOnCreate(lua_State* L) {
} }
static int setOnUnload(lua_State* L) { static int setOnUnload(lua_State* L) {
//get the global pager //get the pager
lua_getglobal(L, REGION_PAGER_NAME); RegionPagerLua* pager = getPager(L);
RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, -1));
lua_pop(L, 1);
//set on unload //set on unload
luaL_unref(L, LUA_REGISTRYINDEX, pager->GetUnloadReference()); luaL_unref(L, LUA_REGISTRYINDEX, pager->GetUnloadReference());
@@ -200,14 +192,12 @@ static int setOnUnload(lua_State* L) {
} }
static int forEach(lua_State* L) { static int forEach(lua_State* L) {
//get the global pager //get the pager
lua_getglobal(L, REGION_PAGER_NAME); RegionPagerLua* pager = getPager(L);
RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, -1));
lua_pop(L, 1);
//run the given closure on each region //run the given closure on each region
pager->ForEach([L](Region& r) -> void { pager->ForEach([L](Region& r) -> void {
lua_pushvalue(L, 1); //copy the closure passed lua_pushvalue(L, -1); //copy the closure passed
lua_pushlightuserdata(L, &r); //push this region lua_pushlightuserdata(L, &r); //push this region
//call the function, catching any errors //call the function, catching any errors
@@ -221,10 +211,8 @@ static int forEach(lua_State* L) {
//debugging //debugging
static int containerSize(lua_State* L) { static int containerSize(lua_State* L) {
//get the global pager //get the pager
lua_getglobal(L, REGION_PAGER_NAME); RegionPagerLua* pager = getPager(L);
RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, -1));
lua_pop(L, 1);
//push container size //push container size
lua_pushinteger(L, pager->GetContainer()->size()); lua_pushinteger(L, pager->GetContainer()->size());