Adapt code to godot-cpp

Author: CedNaru

CMakeLists.txt

@@ -20,30 +20,31 @@ add_compile_definitions(X11_ENABLED)
 #add_compile_definitions(__ANDROID__)
 
 
-
-
-#Godot-cpp
+# Godot-cpp
 file(GLOB_RECURSE GODOT-CPP godot-cpp/*.cpp)
 add_library(godot STATIC ${GODOT-CPP})
 
-
-# Get sources
-file(GLOB_RECURSE SOURCES src/*.c**)
-file(GLOB_RECURSE HEADERS src/*.h**)
-add_library(${PROJECT_NAME} SHARED ${SOURCES} ${HEADERS})
-
-# Includes
 target_include_directories(godot
         PUBLIC
-        src
         godot-cpp/include
         godot-cpp/include/godot_cpp
         godot-cpp/gen/include
         godot-cpp/gen/include/godot_cpp
         godot-cpp/gdextension
 )
 
-# JNI
+
+# Project
+file(GLOB_RECURSE SOURCES src/*.c**)
+file(GLOB_RECURSE HEADERS src/*.h**)
+add_library(${PROJECT_NAME} SHARED ${SOURCES} ${HEADERS})
+
+target_include_directories(${PROJECT_NAME}
+        PUBLIC
+        src
+)
+
+
 find_package(JNI REQUIRED)
 include_directories(${JNI_INCLUDE_DIRS})
 

SConstruct

@@ -9,8 +9,8 @@ generate_templates.generate_header_from_files("kt/plugins/godot-intellij-plugin/
 
 # Add those directory manually, so we can skip the godot_cpp directory when including headers in C++ files
 source_path = [
-    os.path.join("godot-cpp", "include","godot_cpp"),
-    os.path.join("godot-cpp", "gen", "include","godot_cpp")
+    os.path.join("godot-cpp", "include", "godot_cpp"),
+    os.path.join("godot-cpp", "gen", "include", "godot_cpp")
 ]
 env.Append(CPPPATH=[env.Dir(d) for d in source_path])
 
@@ -46,8 +46,8 @@ if env["target"] in ["editor", "template_debug"]:
     sources.append(Glob("src/editor/*.cpp"))
     sources.append(Glob("src/editor/project/*.cpp"))
     sources.append(Glob("src/editor/build/*.cpp"))
-    sources.append(Glob("src/editor/dialog/*.cpp"))
-    sources.append(Glob("src/editor/panel/*.cpp"))
+    sources.append(Glob("src/editor/ui/*.cpp"))
+    sources.append(Glob("src/editor/export/*.cpp"))
 
 # Android
 if env["platform"] != "android":

src/api/language/gdj_language.cpp

@@ -1,11 +1,11 @@
 #include "gdj_language.h"
 
 #include "gd_kotlin.h"
-#include "jvm_wrapper/memory/memory_manager.h"
+#include "jvm/wrapper/memory/memory_manager.h"
 #include "lifecycle/paths.h"
 #include "names.h"
-#include "script/jvm_script_manager.h"
-#include "script/language/gdj_script.h"
+#include "api/script/jvm_script_manager.h"
+#include "api/script/language/gdj_script.h"
 
 constexpr const char* GDJ_TEMPLATE = "// GENERATED BY THE GODOT EDITOR. DON'T FORGET TO CREATE A CORRESPONDING SOURCE "
                                      "FILE! OTHERWISE THIS FILE WILL BE DELETED UPON NEXT BUILD.\n"

src/api/language/java_language.cpp

@@ -1,7 +1,7 @@
 #include "java_language.h"
 
 #include "names.h"
-#include "script/language/java_script.h"
+#include "api/script/language/java_script.h"
 
 #include <core/io/resource_loader.hpp>
 

src/api/language/kotlin_language.cpp

@@ -1,7 +1,7 @@
 #include "kotlin_language.h"
 
 #include "names.h"
-#include "script/language/kotlin_script.h"
+#include "api/script/language/kotlin_script.h"
 
 #include <core/io/resource_loader.hpp>
 

src/api/language/scala_language.cpp

@@ -1,7 +1,7 @@
 #include "scala_language.h"
 
 #include "names.h"
-#include "script/language/scala_script.h"
+#include "api/script/language/scala_script.h"
 
 #include <core/io/resource_loader.hpp>
 

src/api/resource_format/jvm_resource_format_loader.cpp

@@ -1,13 +1,13 @@
 #include "jvm_resource_format_loader.h"
 
 #include "hash.h"
-#include "language/names.h"
-#include "script/jvm_script.h"
-#include "script/jvm_script_manager.h"
-#include "script/language/gdj_script.h"
-#include "script/language/java_script.h"
-#include "script/language/kotlin_script.h"
-#include "script/language/scala_script.h"
+#include "api/language/names.h"
+#include "api/script/jvm_script.h"
+#include "api/script/jvm_script_manager.h"
+#include "api/script/language/gdj_script.h"
+#include "api/script/language/java_script.h"
+#include "api/script/language/kotlin_script.h"
+#include "api/script/language/scala_script.h"
 
 void JvmResourceFormatLoader::get_recognized_extensions(List<String>* p_extensions) const {
     p_extensions->push_back(GODOT_JVM_REGISTRATION_FILE_EXTENSION);

src/api/resource_format/jvm_resource_format_saver.cpp

@@ -1,8 +1,8 @@
 #include "jvm_resource_format_saver.h"
 
-#include "language/names.h"
-#include "script/jvm_script.h"
-#include "script/jvm_script_manager.h"
+#include "api/language/names.h"
+#include "api/script/jvm_script.h"
+#include "api/script/jvm_script_manager.h"
 
 void JvmResourceFormatSaver::get_recognized_extensions(const Ref<Resource>& p_resource, List<String>* p_extensions) const {
     if (recognize(p_resource)) {

src/api/script/jvm_script.cpp

@@ -4,8 +4,8 @@
 #include <core/os/thread.hpp>
 #include "jvm_instance.h"
 #include "jvm_placeholder_instance.h"
-#include "language/gdj_language.h"
-#include "script/jvm_script_manager.h"
+#include "api/language/gdj_language.h"
+#include "api/script/jvm_script_manager.h"
 #include <core/config/project_settings.hpp>
 #include <scene/main/node.hpp>
 #include <core/io/resource_loader.hpp>

src/api/script/language/gdj_script.cpp

@@ -1,6 +1,6 @@
 #include "gdj_script.h"
 
-#include "language/gdj_language.h"
+#include "api/language/gdj_language.h"
 
 ScriptLanguage* GdjScript::get_language() const {
     return GdjLanguage::get_instance();

src/api/script/language/java_script.cpp

@@ -1,7 +1,7 @@
 #include "java_script.h"
 
-#include "language/java_language.h"
-#include "language/names.h"
+#include "api/language/java_language.h"
+#include "api/language/names.h"
 
 ScriptLanguage* JavaScript::get_language() const {
     return JavaLanguage::get_instance();

src/api/script/language/kotlin_script.cpp

@@ -1,7 +1,7 @@
 #include "kotlin_script.h"
 
-#include "language/kotlin_language.h"
-#include "language/names.h"
+#include "api/language/kotlin_language.h"
+#include "api/language/names.h"
 
 ScriptLanguage* KotlinScript::get_language() const {
     return KotlinLanguage::get_instance();

src/api/script/language/scala_script.cpp

@@ -1,6 +1,6 @@
 #include "scala_script.h"
-#include "language/names.h"
-#include "language/scala_language.h"
+#include "api/language/names.h"
+#include "api/language/scala_language.h"
 
 ScriptLanguage* ScalaScript::get_language() const {
     return ScalaLanguage::get_instance();

src/core/kotlin_binding.cpp

@@ -1,6 +1,6 @@
 #include "kotlin_binding.h"
 
-#include "jvm_wrapper/memory/type_manager.h"
+#include "jvm/wrapper/memory/type_manager.h"
 
 
 void KotlinBinding::init(Object* p_object) {

src/core/kotlin_binding_manager.cpp

@@ -1,7 +1,7 @@
 #include "kotlin_binding_manager.h"
 
 #include "gd_kotlin.h"
-#include "jvm_wrapper/memory/memory_manager.h"
+#include "jvm/wrapper/memory/memory_manager.h"
 
 GDExtensionInstanceBindingCallbacks KotlinBindingManager::_instance_binding_callbacks = {
   &_instance_binding_create_callback,

src/editor/export/kotlin_editor_export_plugin.cpp

@@ -3,10 +3,10 @@
 #include "kotlin_editor_export_plugin.h"
 
 #include "gd_kotlin.h"
-#include "language/names.h"
+#include "api/language/names.h"
 #include "lifecycle/jvm_user_configuration.h"
 #include "lifecycle/paths.h"
-#include "script/jvm_script_manager.h"
+#include "api/script/jvm_script_manager.h"
 
 #include <core/config/project_settings.hpp>
 

src/gd_kotlin.cpp

@@ -1,19 +1,17 @@
 #include "gd_kotlin.h"
 
 #include "jni/env.h"
-#include "jvm_wrapper/memory/long_string_queue.h"
-#include "jvm_wrapper/memory/memory_manager.h"
-#include "jvm_wrapper/memory/type_manager.h"
+#include "jvm/wrapper/memory/long_string_queue.h"
+#include "jvm/wrapper/memory/memory_manager.h"
+#include "jvm/wrapper/memory/type_manager.h"
 #include "lifecycle/paths.h"
-#include "script/jvm_script_manager.h"
+#include "api/script/jvm_script_manager.h"
 #include "version.h"
 
 #include <core/config/project_settings.hpp>
 #include <core/io/resource_loader.hpp>
 #include <main/main.hpp>
 
-using namespace godot;
-
 #define DISPLAY_ERROR(cause, hint)                  \
     display_initialization_error_hint(cause, hint); \
     JVM_ERR_FAIL_V_MSG(false, cause)

src/gd_kotlin.h

@@ -1,15 +1,13 @@
 #ifndef GODOT_JVM_GD_KOTLIN_H
 #define GODOT_JVM_GD_KOTLIN_H
 
-#include "jvm_wrapper/bootstrap.h"
-#include "lifecycle/jvm_manager.h"
-#include "lifecycle/jvm_options.h"
-#include "lifecycle/jvm_user_configuration.h"
-#include "resource_format/java_archive.h"
+#include "jvm/lifecycle/class_loader.h"
+#include "jvm/lifecycle/jvm_options.h"
+#include "jvm/lifecycle/jvm_user_configuration.h"
+#include "jvm/wrapper/bootstrap.h"
 
 #include <variant/string.hpp>
 
-namespace godot {
     class GDKotlin {
         friend class GdjLanguage;
 #ifdef TOOLS_ENABLED
@@ -87,5 +85,4 @@ namespace godot {
         Object* get_callable_middleman() const;
     };
 
-} // namespace godot
 #endif // GODOT_JVM_GD_KOTLIN_H

src/jvm/lifecycle/jvm_manager.cpp

@@ -1,26 +1,26 @@
 #include "jvm_manager.h"
 
-#include "jvm_wrapper/bootstrap.h"
-#include "jvm_wrapper/bridge/callable_bridge.h"
-#include "jvm_wrapper/bridge/dictionary_bridge.h"
-#include "jvm_wrapper/bridge/godot_print_bridge.h"
-#include "jvm_wrapper/bridge/lambda_callable_bridge.h"
-#include "jvm_wrapper/bridge/node_path_bridge.h"
-#include "jvm_wrapper/bridge/packed_array_bridge.h"
-#include "jvm_wrapper/bridge/packed_byte_array_bridge.h"
-#include "jvm_wrapper/bridge/packed_color_array_bridge.h"
-#include "jvm_wrapper/bridge/packed_float_32_array_bridge.h"
-#include "jvm_wrapper/bridge/packed_float_64_array_bridge.h"
-#include "jvm_wrapper/bridge/packed_int_32_array_bridge.h"
-#include "jvm_wrapper/bridge/packed_int_64_array_bridge.h"
-#include "jvm_wrapper/bridge/packed_string_array_bridge.h"
-#include "jvm_wrapper/bridge/packed_vector2_array_bridge.h"
-#include "jvm_wrapper/bridge/packed_vector3_array_bridge.h"
-#include "jvm_wrapper/bridge/packed_vector4_array_bridge.h"
-#include "jvm_wrapper/bridge/string_name_bridge.h"
-#include "jvm_wrapper/bridge/variant_array_bridge.h"
-#include "jvm_wrapper/kotlin_callable_custom.h"
-#include "jvm_wrapper/memory/memory_manager.h"
+#include "jvm/wrapper/bootstrap.h"
+#include "jvm/wrapper/bridge/callable_bridge.h"
+#include "jvm/wrapper/bridge/dictionary_bridge.h"
+#include "jvm/wrapper/bridge/godot_print_bridge.h"
+#include "jvm/wrapper/bridge/lambda_callable_bridge.h"
+#include "jvm/wrapper/bridge/node_path_bridge.h"
+#include "jvm/wrapper/bridge/packed_array_bridge.h"
+#include "jvm/wrapper/bridge/packed_byte_array_bridge.h"
+#include "jvm/wrapper/bridge/packed_color_array_bridge.h"
+#include "jvm/wrapper/bridge/packed_float_32_array_bridge.h"
+#include "jvm/wrapper/bridge/packed_float_64_array_bridge.h"
+#include "jvm/wrapper/bridge/packed_int_32_array_bridge.h"
+#include "jvm/wrapper/bridge/packed_int_64_array_bridge.h"
+#include "jvm/wrapper/bridge/packed_string_array_bridge.h"
+#include "jvm/wrapper/bridge/packed_vector2_array_bridge.h"
+#include "jvm/wrapper/bridge/packed_vector3_array_bridge.h"
+#include "jvm/wrapper/bridge/packed_vector4_array_bridge.h"
+#include "jvm/wrapper/bridge/string_name_bridge.h"
+#include "jvm/wrapper/bridge/variant_array_bridge.h"
+#include "jvm/wrapper/kotlin_callable_custom.h"
+#include "jvm/wrapper/memory/memory_manager.h"
 
 #include <jni.h>
 

src/jvm/wrapper/bootstrap.cpp

@@ -1,7 +1,7 @@
 #include "bootstrap.h"
 
-#include "jvm_wrapper/memory/type_manager.h"
-#include "script/jvm_script_manager.h"
+#include "jvm/wrapper/memory/type_manager.h"
+#include "api/script/jvm_script_manager.h"
 
 void Bootstrap::load_classes(JNIEnv* p_env, jobject p_this, jobjectArray p_classes) {
     jni::Env env(p_env);

src/jvm/wrapper/bootstrap.h

@@ -1,7 +1,7 @@
 #ifndef GODOT_JVM_BOOTSTRAP_H
 #define GODOT_JVM_BOOTSTRAP_H
 
-#include "jvm_wrapper/jvm_instance_wrapper.h"
+#include "jvm/wrapper/jvm_instance_wrapper.h"
 
 JVM_INSTANCE_WRAPPER(Bootstrap, "godot.runtime.Bootstrap") {
     JVM_CLASS(Bootstrap)

src/jvm/wrapper/bridge/callable_bridge.cpp

@@ -2,8 +2,8 @@
 
 #include "bridges_utils.h"
 #include "constraints.h"
-#include "jvm_wrapper/kotlin_callable_custom.h"
-#include "jvm_wrapper/memory/transfer_context.h"
+#include "jvm/wrapper/kotlin_callable_custom.h"
+#include "jvm/wrapper/memory/transfer_context.h"
 #include "variant_allocator.h"
 
 using namespace bridges;

src/jvm/wrapper/bridge/dictionary_bridge.cpp

@@ -2,9 +2,9 @@
 
 #include "bridges_utils.h"
 #include "constraints.h"
-#include "jvm_wrapper/memory/transfer_context.h"
-#include "script/jvm_script.h"
-#include "script/jvm_script_manager.h"
+#include "jvm/wrapper/memory/transfer_context.h"
+#include "api/script/jvm_script.h"
+#include "api/script/jvm_script_manager.h"
 #include "variant_allocator.h"
 
 using namespace bridges;

src/jvm/wrapper/bridge/godot_print_bridge.cpp

@@ -1,5 +1,5 @@
 #include "godot_print_bridge.h"
-#include "jvm_wrapper/memory/transfer_context.h"
+#include "jvm/wrapper/memory/transfer_context.h"
 
 using namespace bridges;
 

src/jvm/wrapper/bridge/lambda_callable_bridge.cpp

@@ -1,6 +1,6 @@
 #include "lambda_callable_bridge.h"
 
-#include "jvm_wrapper/kotlin_callable_custom.h"
+#include "jvm/wrapper/kotlin_callable_custom.h"
 
 using namespace bridges;
 

src/jvm/wrapper/bridge/node_path_bridge.cpp

@@ -1,7 +1,7 @@
 #include "node_path_bridge.h"
 
 #include "bridges_utils.h"
-#include "jvm_wrapper/memory/transfer_context.h"
+#include "jvm/wrapper/memory/transfer_context.h"
 #include "variant_allocator.h"
 
 using namespace bridges;

src/jvm/wrapper/bridge/packed_int_64_array_bridge.cpp

@@ -1,7 +1,7 @@
 #include "packed_int_64_array_bridge.h"
 
 #include "bridges_utils.h"
-#include "jvm_wrapper/memory/transfer_context.h"
+#include "jvm/wrapper/memory/transfer_context.h"
 
 using namespace bridges;