Merge branch 'lua-api' into network-map

client/scenes/in_world.hpp

@@ -88,7 +88,7 @@ protected:
 	RasterFont font;
 
 	//map
-	RegionPager<MapGenerator, MapFileFormat> mapPager;
+	RegionPager<BlankGenerator, DummyFormat> mapPager;
 
 	//UI
 	Button disconnectButton;

common/makefile

@@ -22,6 +22,7 @@ all: $(OBJ) $(OUT)
 	ar -crs $(OUT) $(OBJ)
 	$(MAKE) -C graphics
 	$(MAKE) -C map
+	$(MAKE) -C script
 	$(MAKE) -C network
 	$(MAKE) -C ui
 

common/map/map_file_format.cpp

@@ -21,10 +21,59 @@
 */
 #include "map_file_format.hpp"
 
-void MapFileFormat::Load(Region** const ptr, int x, int y) {
+#include <stdexcept>
+
+void DummyFormat::Load(Region** const ptr, int width, int height, int depth, int x, int y) {
 	//TODO
 }
 
-void MapFileFormat::Save(Region* const ptr) {
+void DummyFormat::Save(Region* const ptr) {
 	//TODO
 }
+/*
+void VerboseFormat::Load(Region** const ptr, int x, int y) {
+	//TODO
+}
+
+void VerboseFormat::Save(Region* const ptr) {
+	//TODO
+}
+
+void CompactFormat::Load(Region** const ptr, int x, int y) {
+	//TODO
+}
+
+void CompactFormat::Save(Region* const ptr) {
+	//TODO
+}
+*/
+void LuaFormat::Load(Region** const ptr, int width, int height, int depth, int x, int y) {
+	//something to load into
+	(*ptr) = new Region(width, height, depth, x, y);
+
+	//API hook
+	lua_getglobal(state, "Region");
+	lua_getfield(state, -1, "Load");
+	lua_pushlightuserdata(state, *ptr);
+	lua_pushstring(state, saveDir.c_str());
+	if (lua_pcall(state, 2, 1, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
+	}
+	if (lua_toboolean(state, -1) == false) {
+		delete (*ptr);
+		(*ptr) = nullptr;
+	}
+	lua_pop(state, 2);
+}
+
+void LuaFormat::Save(Region* const ptr) {
+	//API hook
+	lua_getglobal(state, "Region");
+	lua_getfield(state, -1, "Save");
+	lua_pushlightuserdata(state, ptr);
+	lua_pushstring(state, saveDir.c_str());
+	if (lua_pcall(state, 2, 0, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
+	}
+	lua_pop(state, 1);
+}

common/map/map_file_format.hpp

@@ -24,12 +24,56 @@
 
 #include "region.hpp"
 
-class MapFileFormat {
+#include "lua/lua.hpp"
+
+#include <string>
+
+class DummyFormat {
 public:
-	void Load(Region** const, int x, int y);
+	void Load(Region** const, int width, int height, int depth, int x, int y);
 	void Save(Region* const);
+
+	std::string SetSaveDir(std::string s) { return saveDir = s; }
+	std::string GetSaveDir() { return saveDir; }
 private:
-	//
+	std::string saveDir;
+};
+/*
+class VerboseFormat {
+public:
+	void Load(Region** const, int width, int height, int depth, int x, int y);
+	void Save(Region* const);
+
+	std::string SetSaveDir(std::string s) { return saveDir = s; }
+	std::string GetSaveDir() { return saveDir; }
+private:
+	std::string saveDir;
+};
+
+class CompactFormat {
+public:
+	void Load(Region** const, int width, int height, int depth, int x, int y);
+	void Save(Region* const);
+
+	std::string SetSaveDir(std::string s) { return saveDir = s; }
+	std::string GetSaveDir() { return saveDir; }
+private:
+	std::string saveDir;
+};
+*/
+class LuaFormat {
+public:
+	void Load(Region** const, int width, int height, int depth, int x, int y);
+	void Save(Region* const);
+
+	std::string SetSaveDir(std::string s) { return saveDir = s; }
+	std::string GetSaveDir() { return saveDir; }
+
+	lua_State* SetLuaState(lua_State* L) { return state = L; }
+	lua_State* GetLuaState() { return state; }
+private:
+	std::string saveDir;
+	lua_State* state = nullptr;
 };
 
 #endif

common/map/map_generator.cpp

@@ -21,10 +21,48 @@
 */
 #include "map_generator.hpp"
 
-void MapGenerator::Create(Region** const ptr, int width, int height, int depth, int x, int y) {
+#include <stdexcept>
+
+void BlankGenerator::Create(Region** const ptr, int width, int height, int depth, int x, int y) {
 	(*ptr) = new Region(width, height, depth, x, y);
 }
 
-void MapGenerator::Unload(Region* const ptr) {
+void BlankGenerator::Unload(Region* const ptr) {
+	delete ptr;
+}
+/*
+void PerlinGenerator::Create(Region** const ptr, int width, int height, int depth, int x, int y) {
+	(*ptr) = new Region(width, height, depth, x, y);
+}
+
+void PerlinGenerator::Unload(Region* const ptr) {
+	delete ptr;
+}
+*/
+void LuaGenerator::Create(Region** const ptr, int width, int height, int depth, int x, int y) {
+	//something to work on
+	(*ptr) = new Region(width, height, depth, x, y);
+
+	//API hook
+	lua_getglobal(state, "Region");
+	lua_getfield(state, -1, "Create");
+	lua_pushlightuserdata(state, *ptr);
+	if (lua_pcall(state, 1, 0, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
+	}
+	lua_pop(state, 1);
+}
+
+void LuaGenerator::Unload(Region* const ptr) {
+	//API hook
+	lua_getglobal(state, "Region");
+	lua_getfield(state, -1, "Unload");
+	lua_pushlightuserdata(state, ptr);
+	if (lua_pcall(state, 1, 0, 0) != LUA_OK) {
+		throw(std::runtime_error(std::string() + "Lua error: " + lua_tostring(state, -1) ));
+	}
+	lua_pop(state, 1);
+
+	//clean up the memory
 	delete ptr;
 }

common/map/map_generator.hpp

@@ -24,12 +24,33 @@
 
 #include "region.hpp"
 
-class MapGenerator {
+#include "lua/lua.hpp"
+
+class BlankGenerator {
 public:
 	void Create(Region** const, int width, int height, int depth, int x, int y);
 	void Unload(Region* const);
 private:
 	//
 };
+/*
+class PerlinGenerator {
+public:
+	void Create(Region** const, int width, int height, int depth, int x, int y);
+	void Unload(Region* const);
+private:
+	//
+};
+*/
+class LuaGenerator {
+public:
+	void Create(Region** const, int width, int height, int depth, int x, int y);
+	void Unload(Region* const);
+
+	lua_State* SetLuaState(lua_State* L) { return state = L; }
+	lua_State* GetLuaState() { return state; }
+private:
+	lua_State* state = nullptr;
+};
 
 #endif

common/map/region_pager.hpp

@@ -43,6 +43,7 @@ public:
 	virtual Region* SaveRegion(int x, int y) = 0;
 	virtual Region* CreateRegion(int x, int y) = 0;
 	virtual void UnloadRegion(int x, int y) = 0;
+	virtual void UnloadAll() = 0;
 
 	//accessors
 	//NOTE: don't change the sizes mid-program, it will cause issues
@@ -69,7 +70,9 @@ public:
 	{
 		//EMPTY
 	}
-	~RegionPager() = default;
+	~RegionPager() {
+		UnloadAll();
+	}
 
 	Region* LoadRegion(int x, int y) {
 		//snap the coords
@@ -78,7 +81,7 @@ public:
 
 		//load the region if possible
 		Region* ptr = nullptr;
-		format.Load(&ptr, x, y);
+		format.Load(&ptr, regionWidth, regionHeight, regionDepth, x, y);
 		if (ptr) {
 			regionList.push_back(ptr);
 			return ptr;
@@ -130,6 +133,12 @@ public:
 			++it;
 		}
 	}
+	void UnloadAll() {
+		for (auto& it : regionList) {
+			generator.Unload(it);
+		}
+		regionList.clear();
+	}
 
 	//accessors
 	MapGenerator* GetGenerator() { return &generator; }

common/script/linit.cpp

@@ -0,0 +1,72 @@
+/*
+** $Id: linit.c,v 1.32 2011/04/08 19:17:36 roberto Exp $
+** Initialization of libraries for lua.c and other clients
+** See Copyright Notice in lua.h
+*/
+
+/* Modified for use in Tortuga, renamed to linit.cpp
+*/
+
+
+/*
+** If you embed Lua in your program and need to open the standard
+** libraries, call luaL_openlibs in your program. If you need a
+** different set of libraries, copy this file to your project and edit
+** it to suit your needs.
+*/
+
+
+#define linit_c
+#define LUA_LIB
+
+#include "lua/lua.hpp"
+#include "region_api.hpp"
+
+
+/*
+** these libs are loaded by lua.c and are readily available to any Lua
+** program
+*/
+static const luaL_Reg loadedlibs[] = {
+  /* Standard libs */
+  {"_G", luaopen_base},
+  {LUA_LOADLIBNAME, luaopen_package},
+  {LUA_COLIBNAME, luaopen_coroutine},
+  {LUA_TABLIBNAME, luaopen_table},
+  {LUA_IOLIBNAME, luaopen_io},
+  {LUA_OSLIBNAME, luaopen_os},
+  {LUA_STRLIBNAME, luaopen_string},
+  {LUA_BITLIBNAME, luaopen_bit32},
+  {LUA_MATHLIBNAME, luaopen_math},
+  {LUA_DBLIBNAME, luaopen_debug},
+
+  /* custom libs */
+  {LUA_REGIONLIBNAME, luaopen_regionapi},
+
+  {NULL, NULL}
+};
+
+
+/*
+** these libs are preloaded and must be required before used
+*/
+static const luaL_Reg preloadedlibs[] = {
+  {NULL, NULL}
+};
+
+
+LUALIB_API void luaL_openlibs (lua_State *L) {
+  const luaL_Reg *lib;
+  /* call open functions from 'loadedlibs' and set results to global table */
+  for (lib = loadedlibs; lib->func; lib++) {
+    luaL_requiref(L, lib->name, lib->func, 1);
+    lua_pop(L, 1);  /* remove lib */
+  }
+  /* add open functions from 'preloadedlibs' into 'package.preload' table */
+  luaL_getsubtable(L, LUA_REGISTRYINDEX, "_PRELOAD");
+  for (lib = preloadedlibs; lib->func; lib++) {
+    lua_pushcfunction(L, lib->func);
+    lua_setfield(L, -2, lib->name);
+  }
+  lua_pop(L, 1);  /* remove _PRELOAD table */
+}

common/script/makefile

@@ -0,0 +1,43 @@
+#config
+INCLUDES+=. .. ../map
+LIBS+=
+CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
+CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
+
+#source
+CXXSRC=$(wildcard *.cpp)
+CSRC=$(wildcard *.c)
+
+#objects
+OBJDIR=obj
+OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o))
+OBJ+=$(addprefix $(OBJDIR)/,$(CSRC:.c=.o))
+
+#output
+OUTDIR=../..
+OUT=$(addprefix $(OUTDIR)/,libcommon.a)
+
+#targets
+all: $(OBJ) $(OUT)
+	ar -crs $(OUT) $(OBJ)
+
+$(OBJ): | $(OBJDIR)
+
+$(OUT): | $(OUTDIR)
+
+$(OBJDIR):
+	mkdir $(OBJDIR)
+
+$(OUTDIR):
+	mkdir $(OUTDIR)
+
+$(OBJDIR)/%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ $<
+
+$(OBJDIR)/%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+clean:
+	$(RM) *.o *.a *.exe
+
+rebuild: clean all

common/script/region_api.cpp

@@ -0,0 +1,91 @@
+/* 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_api.hpp"
+
+#include "region.hpp"
+
+static int setTile(lua_State* L) {
+	Region* ptr = (Region*)lua_touserdata(L, 1);
+	ptr->SetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1, lua_tointeger(L, 5));
+	return 0;
+}
+
+static int getTile(lua_State* L) {
+	Region* ptr = (Region*)lua_touserdata(L, 1);
+	int ret = ptr->GetTile(lua_tointeger(L, 2)-1, lua_tointeger(L, 3)-1, lua_tointeger(L, 4)-1);
+	lua_pushnumber(L, ret);
+	return 1;
+}
+
+static int getWidth(lua_State* L) {
+	Region* ptr = (Region*)lua_touserdata(L, 1);
+	lua_pushinteger(L, ptr->GetWidth());
+	return 1;
+}
+
+static int getHeight(lua_State* L) {
+	Region* ptr = (Region*)lua_touserdata(L, 1);
+	lua_pushinteger(L, ptr->GetHeight());
+	return 1;
+}
+
+static int getDepth(lua_State* L) {
+	Region* ptr = (Region*)lua_touserdata(L, 1);
+	lua_pushinteger(L, ptr->GetDepth());
+	return 1;
+}
+
+static int getX(lua_State* L) {
+	Region* ptr = (Region*)lua_touserdata(L, 1);
+	lua_pushinteger(L, ptr->GetX());
+	return 1;
+}
+
+static int getY(lua_State* L) {
+	Region* ptr = (Region*)lua_touserdata(L, 1);
+	lua_pushinteger(L, ptr->GetY());
+	return 1;
+}
+
+static int dummy(lua_State* L) {
+	return 0;
+}
+
+static const luaL_Reg regionlib[] = {
+	{"SetTile",setTile},
+	{"GetTile",getTile},
+	{"GetWidth",getWidth},
+	{"GetHeight",getHeight},
+	{"GetDepth",getDepth},
+	{"GetX",getX},
+	{"GetY",getY},
+	{"Create", dummy},
+	{"Unload", dummy},
+	{"Load", dummy},
+	{"Save", dummy},
+	{nullptr, nullptr}
+};
+
+LUAMOD_API int luaopen_regionapi(lua_State* L) {
+	luaL_newlib(L, regionlib);
+	return 1;
+}

common/script/region_api.hpp

@@ -0,0 +1,30 @@
+/* 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 REGIONAPI_HPP_
+#define REGIONAPI_HPP_
+
+#include "lua/lua.hpp"
+
+#define LUA_REGIONLIBNAME "Region"
+LUAMOD_API int luaopen_regionapi(lua_State* L);
+
+#endif

editor/editor_scene.hpp

@@ -73,7 +73,7 @@ protected:
 		int x = 0, y = 0;
 	} camera;
 
-	RegionPager<MapGenerator, MapFileFormat> pager;
+	RegionPager<BlankGenerator, DummyFormat> pager;
 	TileSheet tsheet;
 };
 

editor/makefile

@@ -1,6 +1,6 @@
 #config
 INCLUDES+=../common ../common/graphics ../common/map ../common/ui
-LIBS+=../libcommon.a -lmingw32 -lSDLmain -lSDL
+LIBS+=../libcommon.a -lmingw32 -lSDLmain -lSDL -llua
 CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
 CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))
 

rsc/scripts/setup_server.lua

@@ -1 +1,19 @@
-print("Lua script check OK")
+print("Lua script check OK (./rsc)")
+
+function Region.Create(r)
+	print("Region:Create(r", Region.GetX(r), Region.GetY(r), ")")
+end
+
+function Region.Unload(r)
+	print("Region:Unload(r", Region.GetX(r), Region.GetY(r), ")")
+end
+
+--return true if file loaded, otherwise return false
+function Region.Load(r, saveDir)
+	print("Region:Load(r,", saveDir, Region.GetX(r), Region.GetY(r), ")")
+	return false
+end
+
+function Region.Save(r, saveDir)
+	print("Region:Save(r,", saveDir, Region.GetX(r), Region.GetY(r), ")")
+end

server/makefile

@@ -1,5 +1,5 @@
 #config
-INCLUDES+=. ../common ../common/map ../common/network
+INCLUDES+=. ../common ../common/map ../common/script ../common/network
 LIBS+=../libcommon.a -lSDL_net -lwsock32 -liphlpapi -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
 CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(INCLUDES))
 CFLAGS+=-DDEBUG $(addprefix -I,$(INCLUDES))

server/server_application.cpp

@@ -100,6 +100,9 @@ void ServerApplication::Init(int argc, char** argv) {
 	mapPager.SetRegionWidth(REGION_WIDTH);
 	mapPager.SetRegionHeight(REGION_HEIGHT);
 	mapPager.SetRegionDepth(REGION_DEPTH);
+	mapPager.GetGenerator()->SetLuaState(luaState);
+	mapPager.GetFormat()->SetLuaState(luaState);
+	mapPager.GetFormat()->SetSaveDir("save/mapname/");
 	//TODO: pass args to the generator & format as needed
 	//NOTE: I might need to rearrange the init process so that lua & SQL can interact
 	//      with the map system as needed.
@@ -109,6 +112,9 @@ void ServerApplication::Init(int argc, char** argv) {
 
 	//finalize the startup
 	cout << "Startup completed successfully" << endl;
+
+	//debugging
+	//
 }
 
 void ServerApplication::Loop() {
@@ -131,6 +137,7 @@ void ServerApplication::Loop() {
 void ServerApplication::Quit() {
 	cout << "Shutting down" << endl;
 	//empty the members
+	mapPager.UnloadAll();
 	//TODO: player manager
 	//TODO: client manager
 
@@ -212,7 +219,7 @@ void ServerApplication::HandleJoinRequest(NetworkPacket packet) {
 
 	//finished this routine
 	clientCounter++;
-	cout << "connect, total: " << clientMap.size() << endl;
+	cout << "Connect, total: " << clientMap.size() << endl;
 }
 
 void ServerApplication::HandleDisconnect(NetworkPacket packet) {
@@ -239,7 +246,7 @@ void ServerApplication::HandleDisconnect(NetworkPacket packet) {
 	});
 
 	//finished this routine
-	cout << "disconnect, total: " << clientMap.size() << endl;
+	cout << "Disconnect, total: " << clientMap.size() << endl;
 }
 
 void ServerApplication::HandleSynchronize(NetworkPacket packet) {
@@ -270,7 +277,7 @@ void ServerApplication::HandleShutdown(NetworkPacket packet) {
 	PumpPacket(packet);
 
 	//finished this routine
-	cout << "shutting down" << endl;
+	cout << "Shutdown signal accepted" << endl;
 }
 
 void ServerApplication::HandlePlayerNew(NetworkPacket packet) {

server/server_application.hpp

@@ -85,7 +85,7 @@ private:
 	void PumpPacket(NetworkPacket);
 
 	//maps
-	RegionPager<MapGenerator, MapFileFormat> mapPager;
+	RegionPager<LuaGenerator, LuaFormat> mapPager;
 
 	//networking
 	UDPNetworkUtility network;