Merge branch 'master' of gitlab.com:seichter/pixwerx

src/scripting/src/script.cpp

@@ -1,8 +1,6 @@
 #include "pw/scripting/script.hpp"
 
-#include "pw/scripting/scripting.hpp"
-
-#include "pw/scene/node.hpp"
+#include "scripting.hpp"
 
 #include "script_core.hpp"
 #include "script_system.hpp"

src/scripting/src/script_core.hpp

@@ -1,7 +1,7 @@
 #ifndef PW_SCRIPTING_PRIVATE_CORE_HPP
 #define PW_SCRIPTING_PRIVATE_CORE_HPP
 
-#include <pw/scripting/scripting.hpp>
+#include "scripting.hpp"
 
 namespace pw {
 

src/scripting/src/script_scene.hpp

@@ -1,7 +1,7 @@
 #ifndef PW_SCRIPTING_PRIVATE_SCENE_HPP
 #define PW_SCRIPTING_PRIVATE_SCENE_HPP
 
-#include <pw/scripting/scripting.hpp>
+#include "scripting.hpp"
 
 namespace pw {
 

src/scripting/src/script_system.cpp

@@ -33,6 +33,7 @@ void script_system::load(sol::table &ns)
 
     ns.new_usertype<window>("window",
                             "update",&window::update,
+                            "on_update",sol::writeonly_property(&window::set_on_update),
                             "title",sol::writeonly_property(&window::set_title),
                             "size",sol::property(&window::size,&window::set_size),
                             "position",sol::property(&window::position,&window::set_position),

src/scripting/src/script_system.hpp

@@ -1,7 +1,7 @@
 #ifndef PW_SCRIPTING_PRIVATE_SYSTEM_HPP
 #define PW_SCRIPTING_PRIVATE_SYSTEM_HPP
 
-#include <pw/scripting/scripting.hpp>
+#include "scripting.hpp"
 
 namespace pw {
 

src/scripting/src/scripting.hpp

@@ -0,0 +1,15 @@
+#ifndef PW_SCRIPTING_SCRIPTING_HPP
+#define PW_SCRIPTING_SCRIPTING_HPP
+
+#include "sol/sol.hpp"
+#include <lua.hpp>
+
+namespace pw {
+
+// include external namespace of sol
+namespace scripting = sol;
+
+
+}
+
+#endif