Merge branch 'master' of github.com:perbone/luascript

Author: perbone

SCsub

@@ -6,7 +6,9 @@ Import('env_modules')
 env_luascript = env_modules.Clone()
 
 if env.msvc:
-    env_luascript['CCFLAGS'] = ['/std:c++17','/Zc:__cplusplus']
+    env_luascript.Append(CCFLAGS=["/std:c++17","/Zc:__cplusplus"])
+    env_luascript.Append(CCFLAGS=["/Zi", "/FS"])
+    env_luascript.Append(LINKFLAGS=["/DEBUG:FULL"])
     env_luascript.Append(CPPDEFINES=['ANTLR4CPP_STATIC'])
 elif env["platform"] == "macos":
     env_luascript.Append(ASFLAGS=["-mmacosx-version-min=10.13"])

debug.cpp

@@ -36,6 +36,7 @@ std::map<int, std::string>
 		notifications{
 			{ 0, "NOTIFICATION_POSTINITIALIZE" },
 			{ 1, "NOTIFICATION_PREDELETE" },
+			{ 2, "NOTIFICATION_EXTENSION_RELOADED" },
 			{ 10, "NOTIFICATION_ENTER_TREE" },
 			{ 11, "NOTIFICATION_EXIT_TREE" },
 			{ 12, "NOTIFICATION_MOVED_IN_PARENT" },
@@ -46,31 +47,34 @@ std::map<int, std::string>
 			{ 17, "NOTIFICATION_PROCESS" },
 			{ 18, "NOTIFICATION_PARENTED" },
 			{ 19, "NOTIFICATION_UNPARENTED" },
-			{ 20, "NOTIFICATION_INSTANCED" },
+			{ 20, "NOTIFICATION_SCENE_INSTANTIATED" },
 			{ 21, "NOTIFICATION_DRAG_BEGIN" },
 			{ 22, "NOTIFICATION_DRAG_END" },
-			{ 23, "NOTIFICATION_PATH_CHANGED" },
+			{ 23, "NOTIFICATION_PATH_RENAMED" },
+			{ 24, "NOTIFICATION_CHILD_ORDER_CHANGED" },
 			{ 25, "NOTIFICATION_INTERNAL_PROCESS" },
 			{ 26, "NOTIFICATION_INTERNAL_PHYSICS_PROCESS" },
 			{ 27, "NOTIFICATION_POST_ENTER_TREE" },
 			{ 28, "NOTIFICATION_DISABLED" },
 			{ 29, "NOTIFICATION_ENABLED" },
-			{ 30, "NOTIFICATION_DRAW" },
-			{ 31, "NOTIFICATION_VISIBILITY_CHANGED" },
-			{ 32, "NOTIFICATION_ENTER_CANVAS" },
+			{ 30, "NOTIFICATION_VISIBILITY_CHANGED|NOTIFICATION_DRAW|NOTIFICATION_NODE_RECACHE_REQUESTED" },
+			{ 31, "NOTIFICATION_VISIBILITY_CHANGED|NOTIFICATION_POST_POPUP" },
+			{ 32, "NOTIFICATION_ENTER_CANVAS|NOTIFICATION_THEME_CHANGED" },
 			{ 33, "NOTIFICATION_EXIT_CANVAS" },
+			{ 35, "NOTIFICATION_LOCAL_TRANSFORM_CHANGED" },
+			{ 36, "NOTIFICATION_WORLD_2D_CHANGED" },
 			{ 40, "NOTIFICATION_RESIZED" },
-			{ 41, "NOTIFICATION_MOUSE_ENTER" },
-			{ 42, "NOTIFICATION_MOUSE_EXIT" },
-			{ 43, "NOTIFICATION_FOCUS_ENTER" },
-			{ 44, "NOTIFICATION_FOCUS_EXIT" },
+			{ 41, "NOTIFICATION_ENTER_WORLD|NOTIFICATION_MOUSE_ENTER" },
+			{ 42, "NOTIFICATION_EXIT_WORLD|NOTIFICATION_MOUSE_EXIT" },
+			{ 43, "NOTIFICATION_VISIBILITY_CHANGED|NOTIFICATION_FOCUS_ENTER" },
+			{ 44, "NOTIFICATION_LOCAL_TRANSFORM_CHANGED|NOTIFICATION_FOCUS_EXIT" },
 			{ 45, "NOTIFICATION_THEME_CHANGED" },
 			{ 46, "NOTIFICATION_MODAL_CLOSE" },
 			{ 47, "NOTIFICATION_SCROLL_BEGIN" },
 			{ 48, "NOTIFICATION_SCROLL_END" },
 			{ 49, "NOTIFICATION_LAYOUT_DIRECTION_CHANGED" },
-			{ 50, "NOTIFICATION_PRE_SORT_CHILDREN" },
-			{ 51, "NOTIFICATION_SORT_CHILDREN" },
+			{ 50, "NOTIFICATION_PRE_SORT_CHILDREN|NOTIFICATION_BECAME_CURRENT|NOTIFICATION_UPDATE_SKELETON" },
+			{ 51, "NOTIFICATION_SORT_CHILDREN|NOTIFICATION_LOST_CURRENT" },
 			{ 80, "NOTIFICATION_POST_POPUP" },
 			{ 81, "NOTIFICATION_POPUP_HIDE" },
 			{ 1002, "NOTIFICATION_WM_MOUSE_ENTER" },
@@ -80,7 +84,11 @@ std::map<int, std::string>
 			{ 1006, "NOTIFICATION_WM_CLOSE_REQUEST" },
 			{ 1007, "NOTIFICATION_WM_GO_BACK_REQUEST" },
 			{ 1008, "NOTIFICATION_WM_SIZE_CHANGED" },
+			{ 1009, "NOTIFICATION_WM_DPI_CHANGE" },
+			{ 1010, "NOTIFICATION_VP_MOUSE_ENTER" },
+			{ 1011, "NOTIFICATION_VP_MOUSE_EXIT" },
 			{ 2000, "NOTIFICATION_TRANSFORM_CHANGED" },
+			{ 2009, "NOTIFICATION_OS_MEMORY_WARNING" },
 			{ 2010, "NOTIFICATION_TRANSLATION_CHANGED" },
 			{ 2011, "NOTIFICATION_WM_ABOUT" },
 			{ 2012, "NOTIFICATION_CRASH" },
@@ -89,7 +97,6 @@ std::map<int, std::string>
 			{ 2015, "NOTIFICATION_APPLICATION_PAUSED" },
 			{ 2016, "NOTIFICATION_APPLICATION_FOCUS_IN" },
 			{ 2017, "NOTIFICATION_APPLICATION_FOCUS_OUT" },
-			{ 2009, "NOTIFICATION_OS_MEMORY_WARNING" },
 			{ 2018, "NOTIFICATION_TEXT_SERVER_CHANGED" },
 			{ 9001, "NOTIFICATION_EDITOR_PRE_SAVE" },
 			{ 9002, "NOTIFICATION_EDITOR_POST_SAVE" },
@@ -125,8 +132,10 @@ std::string cur_timestamp() {
 	return buffer;
 }
 
-void print_debug(const String fmt, ...) {
+void print_debugORIG(const String fmt, ...) {
 	char tmpbuf[256], finalbuf[512];
+	memset(tmpbuf, '\0', 256);
+	memset(finalbuf, '\0', 512);
 	std::vector<char> fmtbuffer(fmt.size());
 	char *fmtbuf = fmtbuffer.data();
 

debug.h

@@ -26,7 +26,8 @@
 #include "core/string/ustring.h"
 
 std::string get_notification_name(const int constant_value);
-void print_debug(const String fmt, ...);
+//void print_debug(const String fmt, ...);
+#define print_debug(fmt, ...)  print_line(vformat(fmt, __VA_ARGS__))
 
 #else
 

lua_script.cpp

@@ -205,7 +205,7 @@ bool LuaScript::is_valid() const { // TODO
 bool LuaScript::is_abstract() const {
 	print_debug("LuaScript::is_abstract");
 
-	return false;
+	return this->abstract;
 }
 
 ScriptLanguage *LuaScript::get_language() const { // TODO

lua_script.h

@@ -109,6 +109,7 @@ class LuaScript : public Script {
 private:
 	bool tool{};
 	bool valid{};
+	bool abstract{};
 
 	SelfList<LuaScript> self;