From 1b250f668bf31bdfc9d4e7975daa23f3474c298a Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 5 Oct 2014 15:46:50 +0200 Subject: Implement mappings for Lua types --- src/CMakeLists.txt | 1 + src/control/ScriptContext.hpp | 7 +++ src/model/ScriptValue.hpp | 143 ++++++++++++++++++++++++++++++++++++++++++ src/model/Scriptable.cpp | 58 +++++++++++++++++ src/model/Scriptable.hpp | 57 +++++++++++++++++ 5 files changed, 266 insertions(+) create mode 100644 src/model/ScriptValue.hpp create mode 100644 src/model/Scriptable.cpp create mode 100644 src/model/Scriptable.hpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8a38474..3ba9985 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,6 +6,7 @@ add_executable(rpgedit control/MapContext.cpp control/RPGEdit.cpp model/Map.cpp + model/Scriptable.cpp view/MapView.cpp view/SpriteCache.cpp ) diff --git a/src/control/ScriptContext.hpp b/src/control/ScriptContext.hpp index 23f0fab..86c8c0f 100644 --- a/src/control/ScriptContext.hpp +++ b/src/control/ScriptContext.hpp @@ -26,6 +26,8 @@ #pragma once +#include "../model/ScriptValue.hpp" + extern "C" { #include #include @@ -100,6 +102,11 @@ public: lua_close(L); } + void setGlobal(const std::string &key, Model::ScriptValue *value) { + value->push(L); + lua_setglobal(L, key.c_str()); + } + void load(const std::string &name) { std::string filename = "../resources/script/" + name + ".lua"; diff --git a/src/model/ScriptValue.hpp b/src/model/ScriptValue.hpp new file mode 100644 index 0000000..a82ba8e --- /dev/null +++ b/src/model/ScriptValue.hpp @@ -0,0 +1,143 @@ +/* + Copyright (c) 2014, Matthias Schiffer + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + + +#pragma once + +extern "C" { +#include +#include +#include +} + +#include +#include +#include + +namespace RPGEdit { + +namespace Model { + +class ScriptValue { +public: + virtual void push(lua_State *L) = 0; + + virtual ~ScriptValue() {} +}; + + +class ScriptBoolean : public ScriptValue { +private: + bool value; + +public: + ScriptBoolean(bool value0) : value(value0) { + } + + ScriptBoolean & operator=(bool newValue) { + value = newValue; + return *this; + } + + operator bool() const { + return value; + } + + virtual void push(lua_State *L) { + lua_pushboolean(L, value); + } +}; + +class ScriptNumber : public ScriptValue { +private: + lua_Number value; + +public: + ScriptNumber(lua_Number value0) : value(value0) { + } + + ScriptNumber & operator=(lua_Number newValue) { + value = newValue; + return *this; + } + + operator lua_Number() const { + return value; + } + + virtual void push(lua_State *L) { + lua_pushnumber(L, value); + } +}; + +class ScriptString : public ScriptValue { +private: + std::string value; + +public: + ScriptString(std::string &value0) : value(value0) { + } + + ScriptString & operator=(std::string &newValue) { + value = newValue; + return *this; + } + + operator std::string &() { + return value; + } + + virtual void push(lua_State *L) { + lua_pushstring(L, value.c_str()); + } +}; + +class ScriptTable : public ScriptValue { +public: + typedef std::unordered_map> MapType; + +private: + MapType value; + +public: + std::shared_ptr & operator[](const std::string &key) { + return value[key]; + } + + virtual void push(lua_State *L) { + lua_createtable(L, 0, value.size()); + + for (const auto &entry : value) { + lua_pushstring(L, entry.first.c_str()); + entry.second->push(L); + + lua_settable(L, -3); + } + } +}; + +} + +} diff --git a/src/model/Scriptable.cpp b/src/model/Scriptable.cpp new file mode 100644 index 0000000..5bec739 --- /dev/null +++ b/src/model/Scriptable.cpp @@ -0,0 +1,58 @@ +/* + Copyright (c) 2014, Matthias Schiffer + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + + +#include "Scriptable.hpp" + + +namespace RPGEdit { + +namespace Model { + +int Scriptable::gc(lua_State *L) { + std::shared_ptr *value = static_cast *>(lua_touserdata(L, -1)); + + value->~shared_ptr(); + + return 0; +} + +void Scriptable::setupMetatable(lua_State *L) { + if (luaL_newmetatable(L, "RPGEdit::Model::Scriptable")) { + lua_pushstring(L, "__metatable"); + lua_pushstring(L, "protected"); + lua_rawset(L, -3); + + lua_pushstring(L, "__gc"); + lua_pushcfunction(L, &gc); + lua_rawset(L, -3); + } + + lua_setmetatable(L, -2); +} + +} + +} diff --git a/src/model/Scriptable.hpp b/src/model/Scriptable.hpp new file mode 100644 index 0000000..20ae7ff --- /dev/null +++ b/src/model/Scriptable.hpp @@ -0,0 +1,57 @@ +/* + Copyright (c) 2014, Matthias Schiffer + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + + +#pragma once + + +#include "ScriptValue.hpp" + +#include + + +namespace RPGEdit { + +namespace Model { + +class Scriptable : public ScriptValue, public std::enable_shared_from_this { +private: + static int gc(lua_State *L); + + void setupMetatable(lua_State *L); + +public: + virtual void push(lua_State *L) { + + void *ptr = lua_newuserdata(L, sizeof(std::shared_ptr)); + setupMetatable(L); + + new (ptr) std::shared_ptr(shared_from_this()); + } +}; + +} + +} -- cgit v1.2.3