Experimenting with the map

common/map/pager_api.cpp

@@ -21,42 +21,42 @@
 */
 #include "pager_api.hpp"
 
-#include "region_pager.hpp"
+#include "region_pager_lua.hpp"
 #include "region.hpp"
 
 #include <stdexcept>
 #include <string>
 
 static int setTile(lua_State* L) {
-	RegionPager* pager = reinterpret_cast<RegionPager*>(lua_touserdata(L, 1));
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
 	int ret = pager->SetTile(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4), lua_tointeger(L, 5));
 	lua_pushinteger(L, ret);
 	return 1;
 }
 
 static int getTile(lua_State* L) {
-	RegionPager* pager = reinterpret_cast<RegionPager*>(lua_touserdata(L, 1));
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
 	int ret = pager->GetTile(lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4));
 	lua_pushinteger(L, ret);
 	return 1;
 }
 
 static int getRegion(lua_State* L) {
-	RegionPager* pager = reinterpret_cast<RegionPager*>(lua_touserdata(L, 1));
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
 	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
 	lua_pushlightuserdata(L, region);
 	return 1;
 }
 
 static int setDirectory(lua_State* L) {
-	RegionPager* pager = reinterpret_cast<RegionPager*>(lua_touserdata(L, 1));
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
 	std::string s = pager->SetDirectory(lua_tostring(L, 2));
 	lua_pushstring(L, s.c_str());
 	return 1;
 }
 
 static int getDirectory(lua_State* L) {
-	RegionPager* pager = reinterpret_cast<RegionPager*>(lua_touserdata(L, 1));
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
 	std::string s = pager->GetDirectory();
 	lua_pushstring(L, s.c_str());
 	return 1;
@@ -64,7 +64,7 @@ static int getDirectory(lua_State* L) {
 
 static int loadRegion(lua_State* L) {
 	//get the parameters
-	RegionPager* pager = reinterpret_cast<RegionPager*>(lua_touserdata(L, 1));
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
 	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
 	std::string s = pager->GetDirectory();
 
@@ -83,7 +83,7 @@ static int loadRegion(lua_State* L) {
 
 static int saveRegion(lua_State* L) {
 	//get the parameters
-	RegionPager* pager = reinterpret_cast<RegionPager*>(lua_touserdata(L, 1));
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
 	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
 	std::string s = pager->GetDirectory();
 
@@ -102,7 +102,7 @@ static int saveRegion(lua_State* L) {
 
 static int createRegion(lua_State* L) {
 	//get the parameters
-	RegionPager* pager = reinterpret_cast<RegionPager*>(lua_touserdata(L, 1));
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
 	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
 
 	//push the parameters
@@ -120,7 +120,7 @@ static int createRegion(lua_State* L) {
 
 static int unloadRegion(lua_State* L) {
 	//get the parameters
-	RegionPager* pager = reinterpret_cast<RegionPager*>(lua_touserdata(L, 1));
+	RegionPagerLua* pager = reinterpret_cast<RegionPagerLua*>(lua_touserdata(L, 1));
 	Region* region = pager->GetRegion(lua_tointeger(L, 2), lua_tointeger(L, 3));
 	std::string s = pager->GetDirectory();
 

common/map/region.cpp

@@ -21,13 +21,20 @@
 */
 #include "region.hpp"
 
-Region::Region(int argX, int argY):
+#include "utility.hpp"
-	x(argX),
+
-	y(argY)
+#include <stdexcept>
-{
+#include <cstring>
-	for (register int i = 0; i < REGION_WIDTH*REGION_HEIGHT*REGION_DEPTH; ++i) {
+
-		*(reinterpret_cast<type_t*>(tiles) + i) = 0;
+Region::Region(int argX, int argY): x(argX), y(argY) {
+	if (x != snapToBase(REGION_WIDTH, x) || y != snapToBase(REGION_HEIGHT, y)) {
+		throw(std::invalid_argument("Region location is off grid"));
 	}
+	memset(tiles, 0, REGION_WIDTH*REGION_HEIGHT*REGION_DEPTH*sizeof(type_t));
+}
+
+Region::Region(Region const& rhs): x(rhs.x), y(rhs.y) {
+	memcpy(tiles, rhs.tiles, REGION_WIDTH*REGION_HEIGHT*REGION_DEPTH*sizeof(type_t));
 }
 
 Region::type_t Region::SetTile(int x, int y, int z, type_t v) {

common/map/region.hpp

@@ -32,6 +32,7 @@ public:
 
 	Region() = delete;
 	Region(int x, int y);
+	Region(Region const&);
 	~Region() = default;
 
 	type_t SetTile(int x, int y, int z, type_t v);

common/map/region_pager.cpp

@@ -1,205 +0,0 @@
-/* Copyright: (c) Kayne Ruse 2014
- * 
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event will the authors be held liable for any damages
- * arising from the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose,
- * including commercial applications, and to alter it and redistribute it
- * freely, subject to the following restrictions:
- * 
- * 1. The origin of this software must not be misrepresented; you must not
- * claim that you wrote the original software. If you use this software
- * in a product, an acknowledgment in the product documentation would be
- * appreciated but is not required.
- * 
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 
- * 3. This notice may not be removed or altered from any source
- * distribution.
-*/
-#include "region_pager.hpp"
-
-#include "utility.hpp"
-
-#include <stdexcept>
-
-Region::type_t RegionPager::SetTile(int x, int y, int z, Region::type_t v) {
-	Region* ptr = GetRegion(x, y);
-	return ptr->SetTile(x - ptr->GetX(), y - ptr->GetY(), z, v);
-}
-
-Region::type_t RegionPager::GetTile(int x, int y, int z) {
-	Region* ptr = GetRegion(x, y);
-	return ptr->GetTile(x - ptr->GetX(), y - ptr->GetY(), z);
-}
-
-Region* RegionPager::GetRegion(int x, int y) {
-	//snap the coords
-	x = snapToBase(REGION_WIDTH, x);
-	y = snapToBase(REGION_HEIGHT, y);
-
-	//get the region by various means
-	Region* ptr = nullptr;
-	ptr = FindRegion(x, y);
-	if (ptr) return ptr;
-	ptr = LoadRegion(x, y);
-	if (ptr) return ptr;
-	return CreateRegion(x, y);
-}
-
-Region* RegionPager::FindRegion(int x, int y) {
-	//snap the coords
-	x = snapToBase(REGION_WIDTH, x);
-	y = snapToBase(REGION_HEIGHT, y);
-
-	//find the region
-	for (std::list<Region*>::iterator it = regionList.begin(); it != regionList.end(); it++) {
-		if ((*it)->GetX() == x && (*it)->GetY() == y) {
-			return *it;
-		}
-	}
-	return nullptr;
-}
-
-Region* RegionPager::PushRegion(Region* const region) {
-	if (
-		region->GetX() != snapToBase(REGION_WIDTH, region->GetX()) ||
-		region->GetY() != snapToBase(REGION_HEIGHT, region->GetY())
-		)
-	{
-		throw(std::runtime_error("Pushed region does not conform to the region grid"));
-	}
-
-	regionList.push_front(region);
-	return regionList.front();
-}
-
-Region* RegionPager::LoadRegion(int x, int y) {
-	//only work if using lua
-	if (!luaState) {
-		throw(std::runtime_error("RegionPager::luaState is null"));
-	}
-
-	//load the region if possible
-
-	//snap the coords
-	x = snapToBase(REGION_WIDTH, x);
-	y = snapToBase(REGION_HEIGHT, y);
-
-	//overwrite?
-	Region* ptr = FindRegion(x, y);
-	if (!ptr) {
-		ptr = new Region(x, y);
-	}
-
-	//API hook
-	lua_getglobal(luaState, "region");
-	lua_getfield(luaState, -1, "load");
-	lua_pushlightuserdata(luaState, ptr);
-	lua_pushstring(luaState, directory.c_str());
-	if (lua_pcall(luaState, 2, 1, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
-	}
-	if (lua_toboolean(luaState, -1)) {
-		regionList.push_front(ptr);
-	}
-	else {
-		delete ptr;
-		ptr = nullptr;
-	}
-	lua_pop(luaState, 2);
-
-	return ptr;
-}
-
-Region* RegionPager::SaveRegion(int x, int y) {
-	//only work if using lua
-	if (!luaState) {
-		throw(std::runtime_error("RegionPager::luaState is null"));
-	}
-
-	//snap the coords
-	x = snapToBase(REGION_WIDTH, x);
-	y = snapToBase(REGION_HEIGHT, y);
-
-	//find & save the region
-	Region* ptr = FindRegion(x, y);
-	if (ptr) {
-		//API hook
-		lua_getglobal(luaState, "region");
-		lua_getfield(luaState, -1, "save");
-		lua_pushlightuserdata(luaState, ptr);
-		lua_pushstring(luaState, directory.c_str());
-		if (lua_pcall(luaState, 2, 0, 0) != LUA_OK) {
-			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
-		}
-		lua_pop(luaState, 1);
-	}
-	return ptr;
-}
-
-Region* RegionPager::CreateRegion(int x, int y) {
-	//only work if using lua
-	if (!luaState) {
-		throw(std::runtime_error("RegionPager::luaState is null"));
-	}
-
-	//snap the coords
-	x = snapToBase(REGION_WIDTH, x);
-	y = snapToBase(REGION_HEIGHT, y);
-
-	//overwrite?
-	Region* ptr = FindRegion(x, y);
-	if (!ptr) {
-		ptr = new Region(x, y);
-	}
-
-	//API hook
-	lua_getglobal(luaState, "region");
-	lua_getfield(luaState, -1, "create");
-	lua_pushlightuserdata(luaState, ptr);
-	//TODO: parameters
-	if (lua_pcall(luaState, 1, 0, 0) != LUA_OK) {
-		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
-	}
-	lua_pop(luaState, 1);
-
-	regionList.push_front(ptr);
-	return ptr;
-}
-
-void RegionPager::UnloadRegion(int x, int y) {
-	//only work if using lua
-	if (!luaState) {
-		throw(std::runtime_error("RegionPager::luaState is null"));
-	}
-
-	//snap the coords
-	x = snapToBase(REGION_WIDTH, x);
-	y = snapToBase(REGION_HEIGHT, y);
-
-	lua_getglobal(luaState, "region");
-
-	//custom loop, not FindRegion()
-	for (std::list<Region*>::iterator it = regionList.begin(); it != regionList.end(); /* EMPTY */) {
-		if ((*it)->GetX() == x && (*it)->GetY() == y) {
-
-			//API hook
-			lua_getfield(luaState, -1, "unload");
-			lua_pushlightuserdata(luaState, *it);
-			lua_pushstring(luaState, directory.c_str());
-			if (lua_pcall(luaState, 2, 0, 0) != LUA_OK) {
-				throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
-			}
-
-			delete (*it);
-			it = regionList.erase(it);
-			continue;
-		}
-		++it;
-	}
-
-	lua_pop(luaState, 1);
-}

common/map/region_pager_base.cpp

@@ -0,0 +1,82 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "region_pager_base.hpp"
+
+#include "utility.hpp"
+
+#include <stdexcept>
+#include <algorithm>
+
+Region::type_t RegionPagerBase::SetTile(int x, int y, int z, Region::type_t v) {
+	Region* ptr = GetRegion(x, y);
+	return ptr->SetTile(x - ptr->GetX(), y - ptr->GetY(), z, v);
+}
+
+Region::type_t RegionPagerBase::GetTile(int x, int y, int z) {
+	Region* ptr = GetRegion(x, y);
+	return ptr->GetTile(x - ptr->GetX(), y - ptr->GetY(), z);
+}
+
+Region* RegionPagerBase::GetRegion(int x, int y) {
+	//get the region by various means
+	Region* ptr = nullptr;
+	ptr = FindRegion(x, y);
+	if (ptr) return ptr;
+	ptr = LoadRegion(x, y);
+	if (ptr) return ptr;
+	return CreateRegion(x, y);
+}
+
+Region* RegionPagerBase::FindRegion(int x, int y) {
+	//find the region
+	std::list<Region>::iterator it = find_if(regionList.begin(), regionList.end(), [x, y](Region& region) -> bool {
+		return region.GetX() == x && region.GetY() == y;
+	});
+	return it != regionList.end() ? &(*it) : nullptr;
+}
+
+Region* RegionPagerBase::LoadRegion(int x, int y) {
+	//TODO: load the region if possible
+	return nullptr;
+}
+
+Region* RegionPagerBase::SaveRegion(int x, int y) {
+	//TODO: find & save the region
+	return nullptr;
+}
+
+Region* RegionPagerBase::CreateRegion(int x, int y) {
+	if (FindRegion(x, y)) {
+		throw(std::logic_error("Cannot overwrite an existing region"));
+	}
+	regionList.emplace_front(x, y);
+	return &regionList.front();
+}
+
+void RegionPagerBase::UnloadRegion(int x, int y) {
+	//custom loop, not FindRegion()
+	regionList.remove_if([x, y](Region& region) -> bool { return region.GetX() == x && region.GetY() == y; });
+}
+
+void RegionPagerBase::UnloadAll() {
+	regionList.clear();
+}

common/map/region_pager_base.hpp

@@ -0,0 +1,55 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#ifndef REGIONPAGERBASE_HPP_
+#define REGIONPAGERBASE_HPP_
+
+#include "region.hpp"
+
+#include <list>
+
+class RegionPagerBase {
+public:
+	RegionPagerBase() = default;
+	virtual ~RegionPagerBase() { UnloadAll(); };
+
+	//tile manipulation
+	virtual Region::type_t SetTile(int x, int y, int z, Region::type_t v);
+	virtual Region::type_t GetTile(int x, int y, int z);
+
+	//region manipulation
+	virtual Region* GetRegion(int x, int y);
+	virtual Region* FindRegion(int x, int y);
+
+	virtual Region* LoadRegion(int x, int y);
+	virtual Region* SaveRegion(int x, int y);
+	virtual Region* CreateRegion(int x, int y);
+	virtual void UnloadRegion(int x, int y);
+
+	virtual void UnloadAll();
+
+	//accessors & mutators
+	std::list<Region>* GetContainer() { return &regionList; }
+protected:
+	std::list<Region> regionList;
+};
+
+#endif

common/map/region_pager_lua.cpp

@@ -0,0 +1,126 @@
+/* Copyright: (c) Kayne Ruse 2014
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ * 
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ * 
+ * 1. The origin of this software must not be misrepresented; you must not
+ * claim that you wrote the original software. If you use this software
+ * in a product, an acknowledgment in the product documentation would be
+ * appreciated but is not required.
+ * 
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ * misrepresented as being the original software.
+ * 
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+*/
+#include "region_pager_lua.hpp"
+
+#include "utility.hpp"
+
+#include <stdexcept>
+
+Region* RegionPagerLua::LoadRegion(int x, int y) {
+	//load the region if possible
+
+	//something to work on
+	regionList.emplace_front(x, y);
+
+	//API hook
+	lua_getglobal(luaState, "region");
+	lua_getfield(luaState, -1, "load");
+	lua_pushlightuserdata(luaState, &regionList.front());
+	lua_pushstring(luaState, directory.c_str());
+	if (lua_pcall(luaState, 2, 1, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+	}
+	//success or failure
+	if (!lua_toboolean(luaState, -1)) {
+		lua_pop(luaState, 2);
+		regionList.pop_front();
+		return nullptr;
+	}
+	lua_pop(luaState, 2);
+	return &regionList.front();
+}
+
+Region* RegionPagerLua::SaveRegion(int x, int y) {
+	//find & save the region
+	Region* ptr = FindRegion(x, y);
+	if (ptr) {
+		//API hook
+		lua_getglobal(luaState, "region");
+		lua_getfield(luaState, -1, "save");
+		lua_pushlightuserdata(luaState, ptr);
+		lua_pushstring(luaState, directory.c_str());
+		if (lua_pcall(luaState, 2, 0, 0) != LUA_OK) {
+			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+		}
+		lua_pop(luaState, 1);
+	}
+	return ptr;
+}
+
+Region* RegionPagerLua::CreateRegion(int x, int y) {
+	if (FindRegion(x, y)) {
+		throw(std::logic_error("Cannot overwrite an existing region"));
+	}
+
+	//something to work on
+	regionList.emplace_front(x, y);
+
+	//API hook
+	lua_getglobal(luaState, "region");
+	lua_getfield(luaState, -1, "create");
+	lua_pushlightuserdata(luaState, &regionList.front());
+	//TODO: parameters
+	if (lua_pcall(luaState, 1, 0, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+	}
+	lua_pop(luaState, 1);
+	return &regionList.front();;
+}
+
+void RegionPagerLua::UnloadRegion(int x, int y) {
+	lua_getglobal(luaState, "region");
+
+	regionList.remove_if([&](Region& region) -> bool {
+		if (region.GetX() == x && region.GetY() == y) {
+
+			//API hook
+			lua_getfield(luaState, -1, "unload");
+			lua_pushlightuserdata(luaState, &region);
+			lua_pushstring(luaState, directory.c_str());
+			if (lua_pcall(luaState, 2, 0, 0) != LUA_OK) {
+				throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+			}
+
+			return true;
+		}
+		return false;
+	});
+
+	lua_pop(luaState, 1);
+}
+
+void RegionPagerLua::UnloadAll() {
+	lua_getglobal(luaState, "region");
+
+	for (auto& it : regionList) {
+		//API hook
+		lua_getfield(luaState, -1, "unload");
+		lua_pushlightuserdata(luaState, &it);
+		lua_pushstring(luaState, directory.c_str());
+		if (lua_pcall(luaState, 2, 0, 0) != LUA_OK) {
+			throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(luaState, -1) ));
+		}
+	}
+
+	lua_pop(luaState, 1);
+	regionList.clear();
+}

common/map/region_pager_lua.hpp

@@ -19,47 +19,34 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
 */
-#ifndef REGIONPAGER_HPP_
+#ifndef REGIONPAGERLUA_HPP_
-#define REGIONPAGER_HPP_
+#define REGIONPAGERLUA_HPP_
 
-#include "region.hpp"
+#include "region_pager_base.hpp"
 
 #include "lua/lua.hpp"
 
-#include <list>
 #include <string>
 
-//TODO: split this into two: "RegionPagerBase" and "RegionPagerLua"
+class RegionPagerLua : public RegionPagerBase {
-class RegionPager {
 public:
-	RegionPager() = default;
+	RegionPagerLua() = default;
-	~RegionPager() = default;
+	~RegionPagerLua() = default;
-
-	//tile manipulation
-	Region::type_t SetTile(int x, int y, int z, Region::type_t v);
-	Region::type_t GetTile(int x, int y, int z);
 
 	//region manipulation
-	Region* GetRegion(int x, int y);
+	Region* LoadRegion(int x, int y) override;
-	Region* FindRegion(int x, int y);
+	Region* SaveRegion(int x, int y) override;
-	Region* PushRegion(Region* const);
+	Region* CreateRegion(int x, int y) override;
+	void UnloadRegion(int x, int y) override;
 
-	Region* LoadRegion(int x, int y);
+	void UnloadAll() override;
-	Region* SaveRegion(int x, int y);
-	Region* CreateRegion(int x, int y);
-	void UnloadRegion(int x, int y);
-
-	//accessors & mutators
-	std::list<Region*>* GetContainer() { return &regionList; }
 
 	std::string SetDirectory(std::string s) { return directory = s; }
 	std::string GetDirectory() { return directory; }
 
 	lua_State* SetLuaState(lua_State* L) { return luaState = L; }
 	lua_State* GetLuaState() { return luaState; }
-
+protected:
-private:
-	std::list<Region*> regionList;
 	std::string directory;
 	lua_State* luaState = nullptr;
 };