detached from godot-cpp submodule, configfiles in example repo

Author: Vano

.gitignore

@@ -2,10 +2,7 @@
 *.so
 *.os
 *.o
-
-# Generated files
-*scripts.gen.h
-*defs.json
+*.obj
 
 # Scons specific
 *.sconsign.dblite

.gitmodules

@@ -518,7 +518,7 @@ def apply_macros(item, macros):
 
 		leftover = collapse_list(class_macros, lambda x: x.kind != CursorKind.MACRO_INSTANTIATION, apply_macros)
 		for macro in leftover:
-			if macro.spelling not in ['GSIGNAL', 'GGROUP', 'GSUBGROUP']:
+			if macro.spelling not in ['GSIGNAL', 'GGROUP', 'GSUBGROUP'] + INIT_LEVELS:
 				raise CppScriptException('{}:{}:{}: error: macro without target member'
 				.format(filename, macro.location.line, macro.location.column))
 		process_macros(None, leftover, None)
@@ -669,8 +669,16 @@ def write_register_header(defs_all, env):
 				classes_register.append((base, f"\tGDREGISTER_{content['type']}({class_name_full});\n"))
 
 
-	scripts_header += '\nusing namespace godot;\n\n'
 	classes_register_str = ''
+	if classes_register_levels['CORE'] != []:
+		minimal_register_level = 'MODULE_INITIALIZATION_LEVEL_CORE'
+	elif classes_register_levels['SERVERS'] != []:
+		minimal_register_level = 'MODULE_INITIALIZATION_LEVEL_SERVERS'
+	else:
+		minimal_register_level = 'MODULE_INITIALIZATION_LEVEL_SCENE'
+
+	scripts_header += '\nusing namespace godot;\n\n' + \
+			f'static const ModuleInitializationLevel DEFAULT_INIT_LEVEL = {minimal_register_level};\n\n'
 	for level_name, defs in classes_register_levels.items():
 		registers = ''.join(i for _, i in defs)
 		classes_register_str += '_FORCE_INLINE_ void _register_level_{}() {{{}}}\n\n'.format(

CMakeLists.txt

@@ -1,6 +1,6 @@
 find_package(Python3 3.4 REQUIRED)
 
-set(CPPSCRIPT_DIR ${CMAKE_CURRENT_LIST_DIR}/..)
+set(CPPSCRIPT_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 #TODO: make it work in parallel
 function(create_cppscript_target TARGET_NAME HEADER_NAME HEADERS_DIR GEN_DIR AUTO_METHODS COMPILE_DEFS INCLUDE_PATHS)

SConstruct

@@ -3,17 +3,15 @@
 #include <godot_cpp/core/class_db.hpp>
 #include <godot_cpp/core/defs.hpp>
 #include <godot_cpp/godot.hpp>
-#include <godot_cpp/classes/multiplayer_peer.hpp>
-#include <godot_cpp/classes/multiplayer_api.hpp>
 
-#include "register_types.h"
+// Include custom headers here
 
-//include custom headers here
+#include "scripts.gen.h"
+#include "register_types.h"
 
 using namespace godot;
 
-
-void initialize_scripts_module(ModuleInitializationLevel p_level) {
+void LIBRARY_INIT_FUNC(ModuleInitializationLevel p_level) {
 	switch (p_level) {
 		case MODULE_INITIALIZATION_LEVEL_CORE:
 			_register_level_core();
@@ -22,6 +20,9 @@ void initialize_scripts_module(ModuleInitializationLevel p_level) {
 			_register_level_servers();
 			break;
 		case MODULE_INITIALIZATION_LEVEL_SCENE:
+			// Non-cppscript classes, static/global variables
+			// initialization here
+
 			_register_level_scene();
 			break;
 		case MODULE_INITIALIZATION_LEVEL_EDITOR:
@@ -32,13 +33,16 @@ void initialize_scripts_module(ModuleInitializationLevel p_level) {
 	}
 }
 
-void uninitialize_scripts_module(ModuleInitializationLevel p_level) {
+void LIBRARY_DEINIT_FUNC(ModuleInitializationLevel p_level) {
 	switch (p_level) {
 		case MODULE_INITIALIZATION_LEVEL_CORE:
 			break;
 		case MODULE_INITIALIZATION_LEVEL_SERVERS:
 			break;
 		case MODULE_INITIALIZATION_LEVEL_SCENE:
+			// Non-cppscript classes, static/global variables
+			// deinitialization here
+
 			break;
 		case MODULE_INITIALIZATION_LEVEL_EDITOR:
 			break;
@@ -48,14 +52,15 @@ void uninitialize_scripts_module(ModuleInitializationLevel p_level) {
 }
 
 extern "C" {
-// Initialization.
+// GDExtension initialization
 GDExtensionBool GDE_EXPORT scripts_library_init(GDExtensionInterfaceGetProcAddress p_get_proc_address, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) {
 	godot::GDExtensionBinding::InitObject init_obj(p_get_proc_address, p_library, r_initialization);
 
-	init_obj.register_initializer(initialize_scripts_module);
-	init_obj.register_terminator(uninitialize_scripts_module);
-	init_obj.set_minimum_library_initialization_level(MODULE_INITIALIZATION_LEVEL_SCENE);
+	init_obj.register_initializer(LIBRARY_INIT_FUNC);
+	init_obj.register_terminator(LIBRARY_DEINIT_FUNC);
+	init_obj.set_minimum_library_initialization_level(DEFAULT_INIT_LEVEL);
 
 	return init_obj.init();
 }
 }
+

cppscript.py

@@ -0,0 +1,66 @@
+#include <gdextension_interface.h>
+
+#include <godot_cpp/core/class_db.hpp>
+#include <godot_cpp/core/defs.hpp>
+#include <godot_cpp/godot.hpp>
+
+// Include custom headers here
+
+#include "scripts.gen.h"
+#include "register_types.h"
+
+using namespace godot;
+
+void LIBRARY_INIT_FUNC(ModuleInitializationLevel p_level) {
+	switch (p_level) {
+		case MODULE_INITIALIZATION_LEVEL_CORE:
+			_register_level_core();
+			break;
+		case MODULE_INITIALIZATION_LEVEL_SERVERS:
+			_register_level_servers();
+			break;
+		case MODULE_INITIALIZATION_LEVEL_SCENE:
+			// Non-cppscript classes, static/global variables
+			// initialization here
+
+			_register_level_scene();
+			break;
+		case MODULE_INITIALIZATION_LEVEL_EDITOR:
+			_register_level_editor();
+			break;
+		default:
+			break;
+	}
+}
+
+void LIBRARY_DEINIT_FUNC(ModuleInitializationLevel p_level) {
+	switch (p_level) {
+		case MODULE_INITIALIZATION_LEVEL_CORE:
+			break;
+		case MODULE_INITIALIZATION_LEVEL_SERVERS:
+			break;
+		case MODULE_INITIALIZATION_LEVEL_SCENE:
+			// Non-cppscript classes, static/global variables
+			// deinitialization here
+
+			break;
+		case MODULE_INITIALIZATION_LEVEL_EDITOR:
+			break;
+		default:
+			break;
+	}
+}
+
+extern "C" {
+// GDExtension initialization
+GDExtensionBool GDE_EXPORT scripts_library_init(GDExtensionInterfaceGetProcAddress p_get_proc_address, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) {
+	godot::GDExtensionBinding::InitObject init_obj(p_get_proc_address, p_library, r_initialization);
+
+	init_obj.register_initializer(LIBRARY_INIT_FUNC);
+	init_obj.register_terminator(LIBRARY_DEINIT_FUNC);
+	init_obj.set_minimum_library_initialization_level(DEFAULT_INIT_LEVEL);
+
+	return init_obj.init();
+}
+}
+

cmake/godot-cppscript.cmake renamed to godot-cppscript.cmake

@@ -0,0 +1,16 @@
+// Template file to use with godot-cppscript
+#ifndef REGISTER_TYPES_H
+#define REGISTER_TYPES_H
+
+#include <godot_cpp/core/class_db.hpp>
+
+// Modify this variable
+#define LIBRARY_NAME scripts
+
+#define LIBRARY_INIT_FUNC initialize_ ## LIBRARY_NAME ## _module
+#define LIBRARY_UNINIT_FUNC uninitialize_ ## LIBRARY_NAME ## _module
+
+void LIBRARY_INIT_FUNC(godot::ModuleInitializationLevel p_level);
+void LIBRARY_UNINIT_FUNC(godot::ModuleInitializationLevel p_level);
+
+#endif // REGISTER_TYPES_H