diff options
| author | Alexander Pickering <alex@cogarr.net> | 2018-11-01 13:53:16 -0400 |
|---|---|---|
| committer | Alexander Pickering <alex@cogarr.net> | 2018-11-01 13:53:16 -0400 |
| commit | 112517494847f0c86f58544cbf4c35c9b7712ab1 (patch) | |
| tree | 115d9ae3da8028e67e498ed8c587d14972b7699b /src/client/lua_api/scene | |
| parent | 77b26fba6e78ac4af2b28b3bbb4646dea5682ed1 (diff) | |
| download | brokengine-112517494847f0c86f58544cbf4c35c9b7712ab1.tar.gz brokengine-112517494847f0c86f58544cbf4c35c9b7712ab1.tar.bz2 brokengine-112517494847f0c86f58544cbf4c35c9b7712ab1.zip | |
Refactored code and added library
Physics code for models now lives in the shared directory.
To get file loading without irrlicht, a single-file header library
(lib/tinyobjloader-c) was added.
Metatables for generics and physics generics have also been
seperated out.
Diffstat (limited to 'src/client/lua_api/scene')
| -rw-r--r-- | src/client/lua_api/scene/igeneric.cpp | 9 | ||||
| -rw-r--r-- | src/client/lua_api/scene/igeneric.hpp | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/client/lua_api/scene/igeneric.cpp b/src/client/lua_api/scene/igeneric.cpp index 0383619..38479d4 100644 --- a/src/client/lua_api/scene/igeneric.cpp +++ b/src/client/lua_api/scene/igeneric.cpp @@ -67,3 +67,12 @@ int iscenesetmaterial(lua_State* L){ return 0; } + +extern const luaL_reg igeneric_m[] = { + {"getpos", iscenegetpos}, + {"setpos", iscenesetpos}, + {"getang", iscenegetangle}, + {"setang", iscenesetangle}, + {"setmaterial", iscenesetmaterial}, + {0, 0}, +}; diff --git a/src/client/lua_api/scene/igeneric.hpp b/src/client/lua_api/scene/igeneric.hpp index 6d41028..9e3d6f6 100644 --- a/src/client/lua_api/scene/igeneric.hpp +++ b/src/client/lua_api/scene/igeneric.hpp @@ -15,12 +15,5 @@ int iscenegetangle(lua_State* L); int iscenesetangle(lua_State* L); int iscenesetmaterial(lua_State* L); -static const luaL_reg igeneric_m[] = { - {"getpos", iscenegetpos}, - {"setpos", iscenesetpos}, - {"getang", iscenegetangle}, - {"setang", iscenesetangle}, - {"setmaterial", iscenesetmaterial}, - {0, 0}, -}; +extern const luaL_reg igeneric_m[]; #endif |