mirror of
https://github.com/scp-fs2open/fs2open.github.com.git
synced 2026-11-07 22:56:30 -10:00
asarium
1484ddbe77
This commit changes the way the scripting API works by properly using the newly available type information for moving the FSO resources into the memory supplied by lua. This has full support for rvalue references which will make it possible to use move-only types with the scripting API. This also makes the API much safer to use since it doesn't use pointers to local values anymore which made it very hard to use the API in a different context without causing issues. This only covers writing the FSO values to Lua. Getting values back is not covered yet.
105 lines
3.0 KiB
C++
105 lines
3.0 KiB
C++
#ifndef LUAUTIL_H
|
|
#define LUAUTIL_H
|
|
#pragma once
|
|
|
|
#include "LuaHeaders.h"
|
|
#include "LuaException.h"
|
|
#include "LuaConvert.h"
|
|
#include "LuaReference.h"
|
|
|
|
#include "scripting/ade.h"
|
|
|
|
#include <cstdlib>
|
|
|
|
namespace luacpp {
|
|
/**
|
|
* @brief Contains functions to convert C++ values to and from lua values.
|
|
*
|
|
* Currently the following types are supported:
|
|
* - `double`
|
|
* - `float`
|
|
* - `int`
|
|
* - `std::string`
|
|
* - `const char*` (only for pushing as using the pointer after it was removed from the stack is dangerous)
|
|
* - `bool`
|
|
* - `lua_CFunction`
|
|
* - `LuaTable` (only pop, use LuaValue version for pushing)
|
|
* - `LuaFunction` (only pop, use LuaValue version for pushing)
|
|
* - `LuaValue` (this will reference any value at the specified poition)
|
|
*/
|
|
namespace convert {
|
|
|
|
namespace internal {
|
|
bool isValidIndex(lua_State* state, int index);
|
|
}
|
|
|
|
void pushValue(lua_State* luaState, const double& value);
|
|
|
|
void pushValue(lua_State* luaState, const float& value);
|
|
|
|
void pushValue(lua_State* luaState, const int& value);
|
|
|
|
void pushValue(lua_State* luaState, const size_t& value);
|
|
|
|
void pushValue(lua_State* luaState, const std::string& value);
|
|
|
|
void pushValue(lua_State* luaState, const char* value);
|
|
|
|
void pushValue(lua_State* luaState, const bool& value);
|
|
|
|
void pushValue(lua_State* luaState, const lua_CFunction& value);
|
|
|
|
template<typename T>
|
|
void pushValue(lua_State* L, scripting::ade_odata_setter<T>&& value) {
|
|
using namespace scripting;
|
|
|
|
//WMC - char must be 1 byte, foo.
|
|
static_assert(sizeof(char) == 1, "char must be 1 byte!");
|
|
//WMC - step by step
|
|
|
|
//Create new LUA object and get handle
|
|
char *newod = (char*)lua_newuserdata(L, sizeof(T));
|
|
//Create or get object metatable
|
|
luaL_getmetatable(L, ::scripting::internal::getTableEntry(value.idx).Name);
|
|
//Set the metatable for the object
|
|
lua_setmetatable(L, -2);
|
|
|
|
//Copy the actual object data to the Lua object
|
|
new(newod) T(std::move(value.value));
|
|
}
|
|
|
|
/**
|
|
* @brief Convenience function for string literals
|
|
*
|
|
* @param luaState The lua_State to push the values to
|
|
* @param value The value which should be pushed.
|
|
* @return void
|
|
*/
|
|
template<size_t N>
|
|
inline void pushValue(lua_State* luaState, const char(& value)[N]) {
|
|
pushValue(luaState, (const char*)value);
|
|
}
|
|
|
|
|
|
bool popValue(lua_State* luaState, float& target, int stackposition = -1, bool remove = true);
|
|
|
|
bool popValue(lua_State* luaState, double& target, int stackposition = -1, bool remove = true);
|
|
|
|
bool popValue(lua_State* luaState, int& target, int stackposition = -1, bool remove = true);
|
|
|
|
bool popValue(lua_State* luaState, size_t& target, int stackposition = -1, bool remove = true);
|
|
|
|
bool popValue(lua_State* luaState, std::string& target, int stackposition = -1, bool remove = true);
|
|
|
|
bool popValue(lua_State* luaState, bool& target, int stackposition = -1, bool remove = true);
|
|
|
|
bool popValue(lua_State* luaState, lua_CFunction& target, int stackposition = -1, bool remove = true);
|
|
|
|
bool popValue(lua_State* L, scripting::ade_odata& od, int stackposition = -1, bool remove = true);
|
|
|
|
}
|
|
}
|
|
|
|
|
|
#endif
|