code cleanup, merge Lua.h and LuaUtil.h
This commit is contained in:
+22
-12
@@ -18,27 +18,37 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
or see http://www.gnu.org/licenses/agpl.txt.
|
||||
*/
|
||||
|
||||
#ifndef LUA_UTIL_
|
||||
#define LUA_UTIL_
|
||||
|
||||
|
||||
#ifndef LUAUTIL_H_
|
||||
#define LUAUTIL_H_
|
||||
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include <boost/filesystem/convenience.hpp>
|
||||
|
||||
template<typename T>
|
||||
void LUA_print(T number) {
|
||||
std::cout << "[LUA] " << number << std::endl;
|
||||
}
|
||||
|
||||
// Check if the lua function <name> is defined
|
||||
bool lua_function_exists(lua_State* lua_state, const char* name)
|
||||
{
|
||||
using namespace luabind;
|
||||
object g = globals(lua_state);
|
||||
object func = g[name];
|
||||
return func && type(func) == LUA_TFUNCTION;
|
||||
luabind::object g = luabind::globals(lua_state);
|
||||
luabind::object func = g[name];
|
||||
return func && (luabind::type(func) == LUA_TFUNCTION);
|
||||
}
|
||||
|
||||
// Add the folder contain the script to the lua load path, so script can easily require() other lua scripts inside that folder, or subfolders.
|
||||
// See http://lua-users.org/wiki/PackagePath for details on the package.path syntax.
|
||||
void luaAddScriptFolderToLoadPath(lua_State* myLuaState, const char* fileName) {
|
||||
//add the folder contain the script to the lua load path, so script can easily require() other lua scripts inside that folder
|
||||
//see http://lua-users.org/wiki/PackagePath for details on the package.path syntax
|
||||
const boost::filesystem::path profilePath( fileName );
|
||||
const std::string folder = profilePath.parent_path().c_str();
|
||||
const std::string luaCode = "package.path = \"" + folder + "/?.lua;\" .. package.path";
|
||||
luaL_dostring(myLuaState,luaCode.c_str());
|
||||
if( !profilePath.parent_path().empty() ) {
|
||||
const std::string folder = profilePath.parent_path().string();
|
||||
const std::string luaCode = "package.path = \"" + folder + "/?.lua;\" .. package.path";
|
||||
luaL_dostring( myLuaState, luaCode.c_str() );
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* LUA_UTIL_ */
|
||||
#endif /* LUAUTIL_H_ */
|
||||
Reference in New Issue
Block a user