Răsfoiți Sursa

LuaEnvironment cleaned

mikymod 12 ani în urmă
părinte
comite
c6e09bf0a3
3 a modificat fișierele cu 9 adăugiri și 8 ștergeri
  1. 2 0
      lua/CMakeLists.txt
  2. 6 1
      lua/LuaEnvironment.cpp
  3. 1 7
      lua/LuaEnvironment.h

+ 2 - 0
lua/CMakeLists.txt

@@ -27,3 +27,5 @@ target_link_libraries(crownlua crown)
 
 install (TARGETS crownlua DESTINATION lib/${CMAKE_PROJECT_NAME})
 
+install (FILES ${LUA_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/lua)
+

+ 6 - 1
lua/LuaEnvironment.cpp

@@ -25,16 +25,21 @@ void LuaEnvironment::load_module_function(const char* module, const char* name,
 
 extern "C"
 {
-	int luaopen_libcrownlua(lua_State* L)
+	int32_t luaopen_libcrownlua(lua_State* L)
 	{
 		LuaEnvironment env(L);
 
 		load_vec2(env);
 		load_vec3(env);
+		load_mat4(env);
+		load_quat(env);
+		load_math(env);
 
 		load_mouse(env);
 		load_keyboard(env);
 		load_accelerometer(env);
+
+		return 1;
 	}
 }
 

+ 1 - 7
lua/LuaEnvironment.h

@@ -6,12 +6,6 @@
 namespace crown
 {
 
-struct ModuleEntry
-{
-	const char* 	module;
-	luaL_Reg		entry[2];
-};
-
 class LuaEnvironment
 {
 
@@ -30,7 +24,7 @@ private:
 
 extern "C"
 {
-	int luaopen_libcrownlua(lua_State* L);
+	int32_t luaopen_libcrownlua(lua_State* L);
 }
 
 void load_vec2(LuaEnvironment& env);