18
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-11-20 04:35:02 +01:00

Merge branch 'master' into feat/renderers-cleanup

This commit is contained in:
2026-11-16 21:44:48 +01:00
264 changed files with 41203 additions and 10041 deletions

View File

@@ -443,7 +443,7 @@ auto python_taskqueue::run_file(std::string const &File, std::string const &Path
return false;
}
std::ifstream inputfile{filepath + fileextension};
std::ifstream inputfile{FileOnDisk(filepath + fileextension)};
std::string input;
input.assign(std::istreambuf_iterator<char>(inputfile), std::istreambuf_iterator<char>());

View File

@@ -33,6 +33,8 @@ http://mozilla.org/MPL/2.0/.
#include <iterator>
#include <new>
#include <string_view>
#include <type_traits>
#include <utility>
namespace script_screens
{
@@ -106,10 +108,13 @@ void count_hook(lua_State *L, lua_Debug * /*Debug*/)
// objects of the api -------------------------------------------------------------------------------------------------
template <typename Type_> Type_ *push_object(lua_State *L, Type_ &&Object, char const *Metatable)
// puts the object in a new userdata with the metatable, left on the stack: an rvalue is moved in, an lvalue copied.
// what's stored is the plain type (no reference, no const), the one collect<> and check_object<> are given
template <typename Type_> std::remove_cvref_t<Type_> *push_object(lua_State *L, Type_ &&Object, char const *Metatable)
{
auto *memory{lua_newuserdata(L, sizeof(Type_))};
auto *object{new (memory) Type_(std::move(Object))};
using object_type = std::remove_cvref_t<Type_>;
auto *memory{lua_newuserdata(L, sizeof(object_type))};
auto *object{new (memory) object_type(std::forward<Type_>(Object))};
luaL_getmetatable(L, Metatable);
lua_setmetatable(L, -2);
return object;