Skip to content

Commit 166ec9c

Browse files
CedNaruCedNaru
committed
Continue conversion
1 parent 3fd8246 commit 166ec9c

File tree

127 files changed

+3021
-1733
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+3021
-1733
lines changed

‎CMakeLists.txt

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,25 @@ add_compile_definitions(X11_ENABLED)
2020
#add_compile_definitions(__ANDROID__)
2121

2222

23-
# Godot-cpp
24-
file(GLOB_RECURSE GODOT-CPP godot-cpp/*.cpp)
25-
add_library(godot STATIC ${GODOT-CPP})
23+
# Project
24+
file(GLOB_RECURSE SOURCES src/*.c**)
25+
file(GLOB_RECURSE HEADERS src/*.h**)
26+
27+
add_library(${PROJECT_NAME} SHARED ${SOURCES} ${HEADERS})
2628

27-
target_include_directories(godot
28-
PUBLIC
29+
include_directories(src)
30+
include_directories(
31+
SYSTEM
2932
godot-cpp/include
3033
godot-cpp/include/godot_cpp
3134
godot-cpp/gen/include
3235
godot-cpp/gen/include/godot_cpp
3336
godot-cpp/gdextension
3437
)
3538

36-
37-
# Project
38-
file(GLOB_RECURSE SOURCES src/*.c**)
39-
file(GLOB_RECURSE HEADERS src/*.h**)
40-
add_library(${PROJECT_NAME} SHARED ${SOURCES} ${HEADERS})
41-
42-
target_include_directories(${PROJECT_NAME}
43-
PUBLIC
44-
src
45-
)
46-
47-
4839
find_package(JNI REQUIRED)
49-
include_directories(${JNI_INCLUDE_DIRS})
40+
include_directories(
41+
SYSTEM
42+
${JNI_INCLUDE_DIRS}
43+
)
5044

51-
target_link_libraries(${PROJECT_NAME}
52-
PRIVATE
53-
godot
54-
)

‎src/api/language/gdj_language.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
#include "lifecycle/paths.h"
88
#include "names.h"
99

10+
using namespace godot;
11+
1012
constexpr const char* GDJ_TEMPLATE = "// GENERATED BY THE GODOT EDITOR. DON'T FORGET TO CREATE A CORRESPONDING SOURCE "
1113
"FILE! OTHERWISE THIS FILE WILL BE DELETED UPON NEXT BUILD.\n"
1214
"\n"

‎src/api/language/gdj_language.h

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,42 @@
22
#define GODOT_JVM_GDJ_LANGUAGE_H
33

44
#include "jvm_language.h"
5-
6-
class GdjLanguage : public JvmLanguage {
7-
public:
8-
GdjLanguage() = default;
9-
~GdjLanguage() override = default;
10-
GdjLanguage(const GdjLanguage&) = delete;
11-
void operator=(const GdjLanguage&) = delete;
12-
13-
static GdjLanguage* get_instance();
14-
15-
void init() override;
16-
void frame() override;
17-
void finish() override;
18-
19-
void thread_enter() override;
20-
void thread_exit() override;
21-
22-
String get_name() const override;
23-
String get_type() const override;
24-
String get_extension() const override;
25-
void get_recognized_extensions(List<String>* p_extensions) const override;
26-
27-
bool handles_global_class_type(const String& p_type) const override;
28-
String get_global_class_name(const String& p_path, String* r_base_type, String* r_icon_path, bool *r_is_abstract = nullptr, bool *r_is_tool = nullptr) const override;
29-
bool has_named_classes() const override;
30-
bool supports_builtin_mode() const override;
31-
Script* create_script() const override;
32-
33-
void get_reserved_words(List<String>* p_words) const override;
34-
bool is_control_flow_keyword(const String& p_keyword) const override;
35-
void get_comment_delimiters(List<String>* p_delimiters) const override;
36-
void get_doc_comment_delimiters(List<String>* p_delimiters) const override;
37-
void get_string_delimiters(List<String>* p_delimiters) const override;
38-
Ref<Script> make_template(const String& p_template, const String& p_class_name, const String& p_base_class_name) const override;
39-
Vector<ScriptTemplate> get_built_in_templates(const StringName& p_object) override;
40-
bool is_using_templates() override;
41-
};
42-
5+
namespace godot {
6+
class GdjLanguage : public JvmLanguage {
7+
public:
8+
GdjLanguage() = default;
9+
~GdjLanguage() override = default;
10+
GdjLanguage(const GdjLanguage&) = delete;
11+
void operator=(const GdjLanguage&) = delete;
12+
13+
static GdjLanguage* get_instance();
14+
15+
void init() override;
16+
void frame() override;
17+
void finish() override;
18+
19+
void thread_enter() override;
20+
void thread_exit() override;
21+
22+
String get_name() const override;
23+
String get_type() const override;
24+
String get_extension() const override;
25+
void get_recognized_extensions(List<String>* p_extensions) const override;
26+
27+
bool handles_global_class_type(const String& p_type) const override;
28+
String get_global_class_name(const String& p_path, String* r_base_type, String* r_icon_path, bool* r_is_abstract = nullptr, bool* r_is_tool = nullptr) const override;
29+
bool has_named_classes() const override;
30+
bool supports_builtin_mode() const override;
31+
Script* create_script() const override;
32+
33+
void get_reserved_words(List<String>* p_words) const override;
34+
bool is_control_flow_keyword(const String& p_keyword) const override;
35+
void get_comment_delimiters(List<String>* p_delimiters) const override;
36+
void get_doc_comment_delimiters(List<String>* p_delimiters) const override;
37+
void get_string_delimiters(List<String>* p_delimiters) const override;
38+
Ref<Script> make_template(const String& p_template, const String& p_class_name, const String& p_base_class_name) const override;
39+
Vector<ScriptTemplate> get_built_in_templates(const StringName& p_object) override;
40+
bool is_using_templates() override;
41+
};
42+
}
4343
#endif// GODOT_JVM_GDJ_LANGUAGE_H

‎src/api/language/java_language.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
#include <core/io/resource_loader.hpp>
77

8+
using namespace godot;
9+
810
constexpr const char* JAVA_TEMPLATE = PACKAGE_TEMPLATE
911
"\n"
1012
"\n"

‎src/api/language/java_language.h

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,35 @@
22
#define GODOT_JVM_JAVA_LANGUAGE_H
33

44
#include "jvm_language.h"
5+
namespace godot {
6+
class JavaLanguage : public JvmLanguage {
7+
public:
8+
JavaLanguage() = default;
9+
~JavaLanguage() override = default;
10+
JavaLanguage(const JavaLanguage&) = delete;
11+
void operator=(const JavaLanguage&) = delete;
512

6-
class JavaLanguage : public JvmLanguage {
7-
public:
8-
JavaLanguage() = default;
9-
~JavaLanguage() override = default;
10-
JavaLanguage(const JavaLanguage&) = delete;
11-
void operator=(const JavaLanguage&) = delete;
13+
static JavaLanguage* get_instance();
1214

13-
static JavaLanguage* get_instance();
15+
String get_name() const override;
16+
String get_type() const override;
17+
String get_extension() const override;
18+
void get_recognized_extensions(List<String>* p_extensions) const override;
1419

15-
String get_name() const override;
16-
String get_type() const override;
17-
String get_extension() const override;
18-
void get_recognized_extensions(List<String>* p_extensions) const override;
19-
20-
bool handles_global_class_type(const String& p_type) const override;
21-
String get_global_class_name(const String& p_path, String* r_base_type, String* r_icon_path, bool *r_is_abstract = nullptr, bool *r_is_tool = nullptr) const override;
22-
bool has_named_classes() const override;
23-
bool supports_builtin_mode() const override;
24-
Script* create_script() const override;
25-
26-
void get_reserved_words(List<String>* p_words) const override;
27-
bool is_control_flow_keyword(const String& p_keyword) const override;
28-
void get_comment_delimiters(List<String>* p_delimiters) const override;
29-
void get_doc_comment_delimiters(List<String>* p_delimiters) const override;
30-
void get_string_delimiters(List<String>* p_delimiters) const override;
31-
Ref<Script> make_template(const String& p_template, const String& p_class_name, const String& p_base_class_name) const override;
32-
Vector<ScriptTemplate> get_built_in_templates(const StringName& p_object) override;
33-
bool is_using_templates() override;
34-
};
20+
bool handles_global_class_type(const String& p_type) const override;
21+
String get_global_class_name(const String& p_path, String* r_base_type, String* r_icon_path, bool* r_is_abstract = nullptr, bool* r_is_tool = nullptr) const override;
22+
bool has_named_classes() const override;
23+
bool supports_builtin_mode() const override;
24+
Script* create_script() const override;
3525

26+
void get_reserved_words(List<String>* p_words) const override;
27+
bool is_control_flow_keyword(const String& p_keyword) const override;
28+
void get_comment_delimiters(List<String>* p_delimiters) const override;
29+
void get_doc_comment_delimiters(List<String>* p_delimiters) const override;
30+
void get_string_delimiters(List<String>* p_delimiters) const override;
31+
Ref<Script> make_template(const String& p_template, const String& p_class_name, const String& p_base_class_name) const override;
32+
Vector<ScriptTemplate> get_built_in_templates(const StringName& p_object) override;
33+
bool is_using_templates() override;
34+
};
35+
}
3636
#endif// GODOT_JVM_JAVA_LANGUAGE_H

‎src/api/language/jvm_language.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include "jvm_language.h"
22

3+
using namespace godot;
4+
35
void JvmLanguage::init() {}
46

57
void JvmLanguage::frame() {}

‎src/api/language/jvm_language.h

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2,60 +2,60 @@
22
#define KOTLIN_JVM_LANGUAGE_H
33

44
#include <core/object/script_language.h>
5-
6-
class JvmLanguage : public ScriptLanguage {
7-
public:
8-
void init() override;
9-
void frame() override;
10-
void finish() override;
11-
12-
bool validate(
13-
const String& p_script,
14-
const String& p_path,
15-
List<String>* r_functions,
16-
List<ScriptLanguage::ScriptError>* r_errors,
17-
List<ScriptLanguage::Warning>* r_warnings,
18-
HashSet<int>* r_safe_lines
19-
) const override;
20-
String validate_path(const String& p_path) const override;
21-
22-
// Dummy Implementations
23-
bool supports_documentation() const override;
24-
int find_function(const String& p_function, const String& p_code) const override;
25-
String make_function(const String& p_class, const String& p_name, const PackedStringArray& p_args) const override;
26-
Error open_in_external_editor(const Ref<Script>& p_script, int p_line, int p_col) override;
27-
bool overrides_external_editor() override;
28-
29-
Error complete_code(const String& p_code, const String& p_path, Object* p_owner, List<CodeCompletionOption>* r_options, bool& r_force, String& r_call_hint) override;
30-
Error lookup_code(const String& p_code, const String& p_symbol, const String& p_path, Object* p_owner, LookupResult& r_result) override;
31-
void auto_indent_code(String& p_code, int p_from_line, int p_to_line) const override;
32-
void add_global_constant(const StringName& p_variable, const Variant& p_value) override;
33-
void add_named_global_constant(const StringName& p_name, const Variant& p_value) override;
34-
void remove_named_global_constant(const StringName& p_name) override;
35-
36-
void get_public_functions(List<MethodInfo>* p_functions) const override;
37-
void get_public_constants(List<Pair<String, Variant>>* p_constants) const override;
38-
void get_public_annotations(List<MethodInfo>* p_annotations) const override;
39-
40-
String debug_get_error() const override;
41-
int debug_get_stack_level_count() const override;
42-
int debug_get_stack_level_line(int p_level) const override;
43-
String debug_get_stack_level_function(int p_level) const override;
44-
String debug_get_stack_level_source(int p_level) const override;
45-
void debug_get_stack_level_locals(int p_level, List<String>* p_locals, List<Variant>* p_values, int p_max_subitems, int p_max_depth) override;
46-
void debug_get_stack_level_members(int p_level, List<String>* p_members, List<Variant>* p_values, int p_max_subitems, int p_max_depth) override;
47-
void debug_get_globals(List<String>* p_globals, List<Variant>* p_values, int p_max_subitems, int p_max_depth) override;
48-
String debug_parse_stack_level_expression(int p_level, const String& p_expression, int p_max_subitems, int p_max_depth) override;
49-
50-
void profiling_start() override;
51-
void profiling_stop() override;
52-
void profiling_set_save_native_calls(bool p_enable) override;
53-
int profiling_get_accumulated_data(ProfilingInfo* p_info_arr, int p_info_max) override;
54-
int profiling_get_frame_data(ProfilingInfo* p_info_arr, int p_info_max) override;
55-
56-
void reload_scripts(const Array &p_scripts, bool p_soft_reload) override;
57-
void reload_all_scripts() override;
58-
void reload_tool_script(const Ref<Script>& p_script, bool p_soft_reload) override;
59-
};
60-
5+
namespace godot {
6+
class JvmLanguage : public ScriptLanguage {
7+
public:
8+
void init() override;
9+
void frame() override;
10+
void finish() override;
11+
12+
bool validate(
13+
const String& p_script,
14+
const String& p_path,
15+
List<String>* r_functions,
16+
List<ScriptLanguage::ScriptError>* r_errors,
17+
List<ScriptLanguage::Warning>* r_warnings,
18+
HashSet<int>* r_safe_lines
19+
) const override;
20+
String validate_path(const String& p_path) const override;
21+
22+
// Dummy Implementations
23+
bool supports_documentation() const override;
24+
int find_function(const String& p_function, const String& p_code) const override;
25+
String make_function(const String& p_class, const String& p_name, const PackedStringArray& p_args) const override;
26+
Error open_in_external_editor(const Ref<Script>& p_script, int p_line, int p_col) override;
27+
bool overrides_external_editor() override;
28+
29+
Error complete_code(const String& p_code, const String& p_path, Object* p_owner, List<CodeCompletionOption>* r_options, bool& r_force, String& r_call_hint) override;
30+
Error lookup_code(const String& p_code, const String& p_symbol, const String& p_path, Object* p_owner, LookupResult& r_result) override;
31+
void auto_indent_code(String& p_code, int p_from_line, int p_to_line) const override;
32+
void add_global_constant(const StringName& p_variable, const Variant& p_value) override;
33+
void add_named_global_constant(const StringName& p_name, const Variant& p_value) override;
34+
void remove_named_global_constant(const StringName& p_name) override;
35+
36+
void get_public_functions(List<MethodInfo>* p_functions) const override;
37+
void get_public_constants(List<Pair<String, Variant>>* p_constants) const override;
38+
void get_public_annotations(List<MethodInfo>* p_annotations) const override;
39+
40+
String debug_get_error() const override;
41+
int debug_get_stack_level_count() const override;
42+
int debug_get_stack_level_line(int p_level) const override;
43+
String debug_get_stack_level_function(int p_level) const override;
44+
String debug_get_stack_level_source(int p_level) const override;
45+
void debug_get_stack_level_locals(int p_level, List<String>* p_locals, List<Variant>* p_values, int p_max_subitems, int p_max_depth) override;
46+
void debug_get_stack_level_members(int p_level, List<String>* p_members, List<Variant>* p_values, int p_max_subitems, int p_max_depth) override;
47+
void debug_get_globals(List<String>* p_globals, List<Variant>* p_values, int p_max_subitems, int p_max_depth) override;
48+
String debug_parse_stack_level_expression(int p_level, const String& p_expression, int p_max_subitems, int p_max_depth) override;
49+
50+
void profiling_start() override;
51+
void profiling_stop() override;
52+
void profiling_set_save_native_calls(bool p_enable) override;
53+
int profiling_get_accumulated_data(ProfilingInfo* p_info_arr, int p_info_max) override;
54+
int profiling_get_frame_data(ProfilingInfo* p_info_arr, int p_info_max) override;
55+
56+
void reload_scripts(const Array& p_scripts, bool p_soft_reload) override;
57+
void reload_all_scripts() override;
58+
void reload_tool_script(const Ref<Script>& p_script, bool p_soft_reload) override;
59+
};
60+
}
6161
#endif// KOTLIN_JVM_LANGUAGE_H

‎src/api/language/kotlin_language.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
#include <core/io/resource_loader.hpp>
77

8+
using namespace godot;
9+
810
constexpr const char* KOTLIN_TEMPLATE = PACKAGE_TEMPLATE
911
"\n"
1012
"\n"

‎src/api/language/kotlin_language.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
#include <core/object/script_language.h>
77

8+
9+
810
class KotlinLanguage : public JvmLanguage {
911
public:
1012
KotlinLanguage() = default;

‎src/api/language/scala_language.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
#include <core/io/resource_loader.hpp>
77

8+
using namespace godot;
9+
810
constexpr const char* SCALA_TEMPLATE = PACKAGE_TEMPLATE
911
"\n"
1012
"\n"

0 commit comments

Comments
 (0)