mirror of
https://github.com/Redot-Engine/redot-engine.git
synced 2025-12-06 07:17:42 -05:00
Merge commit godotengine/godot@a7a2a12bfd
This commit is contained in:
@@ -37,8 +37,6 @@
|
||||
#include "core/crypto/crypto_core.h"
|
||||
#include "core/debugger/engine_debugger.h"
|
||||
#include "core/debugger/script_debugger.h"
|
||||
#include "core/io/file_access_compressed.h"
|
||||
#include "core/io/file_access_encrypted.h"
|
||||
#include "core/io/marshalls.h"
|
||||
#include "core/math/geometry_2d.h"
|
||||
#include "core/math/geometry_3d.h"
|
||||
@@ -426,6 +424,10 @@ String OS::get_version() const {
|
||||
return ::OS::get_singleton()->get_version();
|
||||
}
|
||||
|
||||
String OS::get_version_alias() const {
|
||||
return ::OS::get_singleton()->get_version_alias();
|
||||
}
|
||||
|
||||
Vector<String> OS::get_video_adapter_driver_info() const {
|
||||
return ::OS::get_singleton()->get_video_adapter_driver_info();
|
||||
}
|
||||
@@ -682,6 +684,7 @@ void OS::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("get_name"), &OS::get_name);
|
||||
ClassDB::bind_method(D_METHOD("get_distribution_name"), &OS::get_distribution_name);
|
||||
ClassDB::bind_method(D_METHOD("get_version"), &OS::get_version);
|
||||
ClassDB::bind_method(D_METHOD("get_version_alias"), &OS::get_version_alias);
|
||||
ClassDB::bind_method(D_METHOD("get_cmdline_args"), &OS::get_cmdline_args);
|
||||
ClassDB::bind_method(D_METHOD("get_cmdline_user_args"), &OS::get_cmdline_user_args);
|
||||
|
||||
@@ -1917,6 +1920,10 @@ bool Engine::is_editor_hint() const {
|
||||
return ::Engine::get_singleton()->is_editor_hint();
|
||||
}
|
||||
|
||||
bool Engine::is_embedded_in_editor() const {
|
||||
return ::Engine::get_singleton()->is_embedded_in_editor();
|
||||
}
|
||||
|
||||
String Engine::get_write_movie_path() const {
|
||||
return ::Engine::get_singleton()->get_write_movie_path();
|
||||
}
|
||||
@@ -1997,6 +2004,7 @@ void Engine::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("get_script_language", "index"), &Engine::get_script_language);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("is_editor_hint"), &Engine::is_editor_hint);
|
||||
ClassDB::bind_method(D_METHOD("is_embedded_in_editor"), &Engine::is_embedded_in_editor);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("get_write_movie_path"), &Engine::get_write_movie_path);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user