sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into NDK-ShadowMapping 

Former-commit-id: 0d9c61835b3e42a932299c6d759e9af0f56019b8
This commit is contained in:
Lynix 2015-12-09 01:14:20 +01:00
parent 9e7452ab68 d72db3bf4b
commit 5f16da5e73
2 changed files with 59 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/Nazara/Lua/Enums.hpp
View File

@ -7,17 +7,27 @@
#ifndef NAZARA_ENUMS_LUA_HPP
#define NAZARA_ENUMS_LUA_HPP
enum LuaComparison
namespace Nz
{
enum LuaBindMode
{
LuaBindMode_Table,
LuaBindMode_Userdata,
LuaBindMode_Max = LuaBindMode_Userdata
};
enum LuaComparison
{
LuaComparison_Equality,
LuaComparison_Less,
LuaComparison_LessOrEqual,
LuaComparison_Max = LuaComparison_LessOrEqual
};
};
enum LuaOperation
{
enum LuaOperation
{
LuaOperation_Addition,
LuaOperation_BitwiseAnd,
LuaOperation_BitwiseLeftShift,
@ -34,10 +44,10 @@ enum LuaOperation
LuaOperation_Substraction,
LuaOperation_Max = LuaOperation_Substraction
};
};
enum LuaType
{
enum LuaType
{
LuaType_Boolean,
LuaType_Function,
LuaType_LightUserdata,
@ -50,6 +60,7 @@ enum LuaType
LuaType_Userdata,
LuaType_Max = LuaType_Userdata
};
};
}
#endif // NAZARA_ENUMS_LUA_HPP

20
include/Nazara/Lua/LuaInstance.inl
View File

@ -8,17 +8,17 @@
namespace Nz
{
// Functions args
bool LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<bool>)
inline bool LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<bool>)
{
return instance.CheckBoolean(index);
}
double LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<double>)
inline double LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<double>)
{
return instance.CheckNumber(index);
}
float LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<float>)
inline float LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<float>)
{
return static_cast<float>(instance.CheckNumber(index));
}
@ -41,7 +41,7 @@ namespace Nz
return static_cast<T>(LuaImplQueryArg(instance, index, TypeTag<typename std::make_signed<T>::type>()));
}
std::string LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<std::string>)
inline std::string LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<std::string>)
{
std::size_t strLength = 0;
const char* str = instance.CheckString(index, &strLength);
@ -49,7 +49,7 @@ namespace Nz
return std::string(str, strLength);
}
String LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<String>)
inline String LuaImplQueryArg(LuaInstance& instance, unsigned int index, TypeTag<String>)
{
std::size_t strLength = 0;
const char* str = instance.CheckString(index, &strLength);
@ -64,19 +64,19 @@ namespace Nz
}
// Function returns
int LuaImplReplyVal(LuaInstance& instance, bool val, TypeTag<bool>)
inline int LuaImplReplyVal(LuaInstance& instance, bool val, TypeTag<bool>)
{
instance.PushBoolean(val);
return 1;
}
int LuaImplReplyVal(LuaInstance& instance, double val, TypeTag<double>)
inline int LuaImplReplyVal(LuaInstance& instance, double val, TypeTag<double>)
{
instance.PushNumber(val);
return 1;
}
int LuaImplReplyVal(LuaInstance& instance, float val, TypeTag<float>)
inline int LuaImplReplyVal(LuaInstance& instance, float val, TypeTag<float>)
{
instance.PushNumber(val);
return 1;
@ -105,13 +105,13 @@ namespace Nz
return LuaImplReplyVal(instance, static_cast<SignedT>(val), TypeTag<SignedT>());
}
int LuaImplReplyVal(LuaInstance& instance, std::string val, TypeTag<std::string>)
inline int LuaImplReplyVal(LuaInstance& instance, std::string val, TypeTag<std::string>)
{
instance.PushString(val.c_str(), val.size());
return 1;
}
int LuaImplReplyVal(LuaInstance& instance, String val, TypeTag<String>)
inline int LuaImplReplyVal(LuaInstance& instance, String val, TypeTag<String>)
{
instance.PushString(std::move(val));
return 1;