Merge pull request #185 from godotengine/master

Merge from Godot

core/config/project_settings.cpp

@@ -348,7 +348,6 @@ bool ProjectSettings::_get(const StringName &p_name, Variant &r_ret) const {
  _THREAD_SAFE_METHOD_
 
  if (!props.has(p_name)) {
- WARN_PRINT("Property not found: " + String(p_name));
  return false;
  }
  r_ret = props[p_name].variant;

core/extension/gdextension_interface.cpp

@@ -507,6 +507,14 @@ static GDExtensionBool gdextension_variant_has_key(GDExtensionConstVariantPtr p_
  return ret;
 }
 
+static GDObjectInstanceID gdextension_variant_get_object_instance_id(GDExtensionConstVariantPtr p_self) {
+ const Variant *self = (const Variant *)p_self;
+ if (likely(self->get_type() == Variant::OBJECT)) {
+ return self->operator ObjectID();
+ }
+ return 0;
+}
+
 static void gdextension_variant_get_type_name(GDExtensionVariantType p_type, GDExtensionUninitializedVariantPtr r_ret) {
  String name = Variant::get_type_name((Variant::Type)p_type);
  memnew_placement(r_ret, String(name));
@@ -1610,6 +1618,7 @@ void gdextension_setup_interface() {
  REGISTER_INTERFACE_FUNC(variant_has_method);
  REGISTER_INTERFACE_FUNC(variant_has_member);
  REGISTER_INTERFACE_FUNC(variant_has_key);
+ REGISTER_INTERFACE_FUNC(variant_get_object_instance_id);
  REGISTER_INTERFACE_FUNC(variant_get_type_name);
  REGISTER_INTERFACE_FUNC(variant_can_convert);
  REGISTER_INTERFACE_FUNC(variant_can_convert_strict);

core/extension/gdextension_interface.h

@@ -1307,6 +1307,21 @@ typedef GDExtensionBool (*GDExtensionInterfaceVariantHasMember)(GDExtensionVaria
  */
 typedef GDExtensionBool (*GDExtensionInterfaceVariantHasKey)(GDExtensionConstVariantPtr p_self, GDExtensionConstVariantPtr p_key, GDExtensionBool *r_valid);
 
+/**
+ * @name variant_get_object_instance_id
+ * @since 4.4
+ *
+ * Gets the object instance ID from a variant of type GDEXTENSION_VARIANT_TYPE_OBJECT.
+ *
+ * If the variant isn't of type GDEXTENSION_VARIANT_TYPE_OBJECT, then zero will be returned.
+ * The instance ID will be returned even if the object is no longer valid - use `object_get_instance_by_id()` to check if the object is still valid.
+ *
+ * @param p_self A pointer to the Variant.
+ *
+ * @return The instance ID for the contained object.
+ */
+typedef GDObjectInstanceID (*GDExtensionInterfaceVariantGetObjectInstanceId)(GDExtensionConstVariantPtr p_self);
+
 /**
  * @name variant_get_type_name
  * @since 4.1

core/io/resource.cpp

@@ -99,31 +99,42 @@ void Resource::set_path_cache(const String &p_path) {
  GDVIRTUAL_CALL(_set_path_cache, p_path);
 }
 
+static thread_local RandomPCG unique_id_gen(0, RandomPCG::DEFAULT_INC);
+
+void Resource::seed_scene_unique_id(uint32_t p_seed) {
+ unique_id_gen.seed(p_seed);
+}
+
 String Resource::generate_scene_unique_id() {
  // Generate a unique enough hash, but still user-readable.
  // If it's not unique it does not matter because the saver will try again.
- OS::DateTime dt = OS::get_singleton()->get_datetime();
- uint32_t hash = hash_murmur3_one_32(OS::get_singleton()->get_ticks_usec());
- hash = hash_murmur3_one_32(dt.year, hash);
- hash = hash_murmur3_one_32(dt.month, hash);
- hash = hash_murmur3_one_32(dt.day, hash);
- hash = hash_murmur3_one_32(dt.hour, hash);
- hash = hash_murmur3_one_32(dt.minute, hash);
- hash = hash_murmur3_one_32(dt.second, hash);
- hash = hash_murmur3_one_32(Math::rand(), hash);
+ if (unique_id_gen.get_seed() == 0) {
+ OS::DateTime dt = OS::get_singleton()->get_datetime();
+ uint32_t hash = hash_murmur3_one_32(OS::get_singleton()->get_ticks_usec());
+ hash = hash_murmur3_one_32(dt.year, hash);
+ hash = hash_murmur3_one_32(dt.month, hash);
+ hash = hash_murmur3_one_32(dt.day, hash);
+ hash = hash_murmur3_one_32(dt.hour, hash);
+ hash = hash_murmur3_one_32(dt.minute, hash);
+ hash = hash_murmur3_one_32(dt.second, hash);
+ hash = hash_murmur3_one_32(Math::rand(), hash);
+ unique_id_gen.seed(hash);
+ }
+
+ uint32_t random_num = unique_id_gen.rand();
 
  static constexpr uint32_t characters = 5;
  static constexpr uint32_t char_count = ('z' - 'a');
  static constexpr uint32_t base = char_count + ('9' - '0');
  String id;
  for (uint32_t i = 0; i < characters; i++) {
- uint32_t c = hash % base;
+ uint32_t c = random_num % base;
  if (c < char_count) {
  id += String::chr('a' + c);
  } else {
  id += String::chr('0' + (c - char_count));
  }
- hash /= base;
+ random_num /= base;
  }
 
  return id;

core/io/resource.h

@@ -114,6 +114,7 @@ class Resource : public RefCounted {
  virtual void set_path_cache(const String &p_path); // Set raw path without involving resource cache.
  _FORCE_INLINE_ bool is_built_in() const { return path_cache.is_empty() || path_cache.contains("::") || path_cache.begins_with("local://"); }
 
+ static void seed_scene_unique_id(uint32_t p_seed);
  static String generate_scene_unique_id();
  void set_scene_unique_id(const String &p_id);
  String get_scene_unique_id() const;

core/io/resource_format_binary.cpp

@@ -845,29 +845,27 @@ Error ResourceLoaderBinary::load() {
  }
  }
 
- if (ClassDB::has_property(res->get_class_name(), name)) {
- if (value.get_type() == Variant::ARRAY) {
- Array set_array = value;
- bool is_get_valid = false;
- Variant get_value = res->get(name, &is_get_valid);
- if (is_get_valid && get_value.get_type() == Variant::ARRAY) {
- Array get_array = get_value;
- if (!set_array.is_same_typed(get_array)) {
- value = Array(set_array, get_array.get_typed_builtin(), get_array.get_typed_class_name(), get_array.get_typed_script());
- }
+ if (value.get_type() == Variant::ARRAY) {
+ Array set_array = value;
+ bool is_get_valid = false;
+ Variant get_value = res->get(name, &is_get_valid);
+ if (is_get_valid && get_value.get_type() == Variant::ARRAY) {
+ Array get_array = get_value;
+ if (!set_array.is_same_typed(get_array)) {
+ value = Array(set_array, get_array.get_typed_builtin(), get_array.get_typed_class_name(), get_array.get_typed_script());
  }
  }
+ }
 
- if (value.get_type() == Variant::DICTIONARY) {
- Dictionary set_dict = value;
- bool is_get_valid = false;
- Variant get_value = res->get(name, &is_get_valid);
- if (is_get_valid && get_value.get_type() == Variant::DICTIONARY) {
- Dictionary get_dict = get_value;
- if (!set_dict.is_same_typed(get_dict)) {
- value = Dictionary(set_dict, get_dict.get_typed_key_builtin(), get_dict.get_typed_key_class_name(), get_dict.get_typed_key_script(),
- get_dict.get_typed_value_builtin(), get_dict.get_typed_value_class_name(), get_dict.get_typed_value_script());
- }
+ if (value.get_type() == Variant::DICTIONARY) {
+ Dictionary set_dict = value;
+ bool is_get_valid = false;
+ Variant get_value = res->get(name, &is_get_valid);
+ if (is_get_valid && get_value.get_type() == Variant::DICTIONARY) {
+ Dictionary get_dict = get_value;
+ if (!set_dict.is_same_typed(get_dict)) {
+ value = Dictionary(set_dict, get_dict.get_typed_key_builtin(), get_dict.get_typed_key_class_name(), get_dict.get_typed_key_script(),
+ get_dict.get_typed_value_builtin(), get_dict.get_typed_value_class_name(), get_dict.get_typed_value_script());
  }
  }
  }
@@ -2136,6 +2134,8 @@ static String _resource_get_class(Ref<Resource> p_resource) {
 }
 
 Error ResourceFormatSaverBinaryInstance::save(const String &p_path, const Ref<Resource> &p_resource, uint32_t p_flags) {
+ Resource::seed_scene_unique_id(p_path.hash());
+
  Error err;
  Ref<FileAccess> f;
  if (p_flags & ResourceSaver::FLAG_COMPRESS) {

doc/classes/EditorContextMenuPlugin.xml

@@ -47,6 +47,24 @@
  [/codeblock]
  </description>
  </method>
+ <method name="add_context_submenu_item">
+ <return type="void" />
+ <param index="0" name="name" type="String" />
+ <param index="1" name="menu" type="PopupMenu" />
+ <param index="2" name="icon" type="Texture2D" default="null" />
+ <description>
+ Add a submenu to the context menu of the plugin's specified slot. The submenu is not automatically handled, you need to connect to its signals yourself. Also the submenu is freed on every popup, so provide a new [PopupMenu] every time.
+ [codeblock]
+ func _popup_menu(paths):
+ var popup_menu = PopupMenu.new()
+ popup_menu.add_item("Blue")
+ popup_menu.add_item("White")
+ popup_menu.id_pressed.connect(_on_color_submenu_option)
+
+ add_context_menu_item("Set Node Color", popup_menu)
+ [/codeblock]
+ </description>
+ </method>
  <method name="add_menu_shortcut">
  <return type="void" />
  <param index="0" name="shortcut" type="Shortcut" />

doc/classes/EditorInterface.xml

@@ -343,6 +343,14 @@
  [/codeblock]
  </description>
  </method>
+ <method name="popup_quick_open">
+ <return type="void" />
+ <param index="0" name="callback" type="Callable" />
+ <param index="1" name="base_types" type="StringName[]" default="[]" />
+ <description>
+ Pops up an editor dialog for quick selecting a resource file. The [param callback] must take a single argument of type [String] which will contain the path of the selected resource or be empty if the dialog is canceled. If [param base_types] is provided, the dialog will only show resources that match these types. Only types deriving from [Resource] are supported.
+ </description>
+ </method>
  <method name="reload_scene_from_path">
  <return type="void" />
  <param index="0" name="scene_filepath" type="String" />

doc/classes/LineEdit.xml

@@ -8,7 +8,7 @@
  - When the [LineEdit] control is focused using the keyboard arrow keys, it will only gain focus and not enter edit mode.
  - To enter edit mode, click on the control with the mouse or press the [code]ui_text_submit[/code] action (by default [kbd]Enter[/kbd] or [kbd]Kp Enter[/kbd]).
  - To exit edit mode, press [code]ui_text_submit[/code] or [code]ui_cancel[/code] (by default [kbd]Escape[/kbd]) actions.
- - Check [method is_editing] and [signal editing_toggled] for more information.
+ - Check [method edit], [method unedit], [method is_editing], and [signal editing_toggled] for more information.
  [b]Important:[/b]
  - Focusing the [LineEdit] with [code]ui_focus_next[/code] (by default [kbd]Tab[/kbd]) or [code]ui_focus_prev[/code] (by default [kbd]Shift + Tab[/kbd]) or [method Control.grab_focus] still enters edit mode (for compatibility).
  [LineEdit] features many built-in shortcuts that are always available ([kbd]Ctrl[/kbd] here maps to [kbd]Cmd[/kbd] on macOS):
@@ -75,6 +75,13 @@
  Clears the current selection.
  </description>
  </method>
+ <method name="edit">
+ <return type="void" />
+ <description>
+ Allows entering edit mode whether the [LineEdit] is focused or not.
+ Use [method Callable.call_deferred] if you want to enter edit mode on [signal text_submitted].
+ </description>
+ </method>
  <method name="get_menu" qualifiers="const">
  <return type="PopupMenu" />
  <description>
@@ -223,6 +230,12 @@
  Selects the whole [String].
  </description>
  </method>
+ <method name="unedit">
+ <return type="void" />
+ <description>
+ Allows exiting edit mode while preserving focus.
+ </description>
+ </method>
  </methods>
  <members>
  <member name="alignment" type="int" setter="set_horizontal_alignment" getter="get_horizontal_alignment" enum="HorizontalAlignment" default="0">

drivers/SCsub

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 from misc.utility.scons_hints import *
 
+from methods import print_error
+
 Import("env")
 
 env.drivers_sources = []
@@ -20,7 +22,7 @@ if env["platform"] == "windows":
  SConscript("backtrace/SCsub")
 if env["xaudio2"]:
  if "xaudio2" not in supported:
- print("Target platform '{}' does not support the XAudio2 audio driver. Aborting.".format(env["platform"]))
+ print_error("Target platform '{}' does not support the XAudio2 audio driver".format(env["platform"]))
  Exit(255)
  SConscript("xaudio2/SCsub")
 
@@ -34,7 +36,7 @@ if env["vulkan"]:
  SConscript("vulkan/SCsub")
 if env["d3d12"]:
  if "d3d12" not in supported:
- print("Target platform '{}' does not support the D3D12 rendering driver. Aborting.".format(env["platform"]))
+ print_error("Target platform '{}' does not support the D3D12 rendering driver".format(env["platform"]))
  Exit(255)
  SConscript("d3d12/SCsub")
 if env["opengl3"]:
@@ -43,7 +45,7 @@ if env["opengl3"]:
  SConscript("egl/SCsub")
 if env["metal"]:
  if "metal" not in supported:
- print("Target platform '{}' does not support the Metal rendering driver. Aborting.".format(env["platform"]))
+ print_error("Target platform '{}' does not support the Metal rendering driver".format(env["platform"]))
  Exit(255)
  SConscript("metal/SCsub")
 

drivers/metal/rendering_device_driver_metal.mm

@@ -358,7 +358,11 @@ _FORCE_INLINE_ MTLSize mipmapLevelSizeFromSize(MTLSize p_size, NSUInteger p_leve
 }
 
 RDD::TextureID RenderingDeviceDriverMetal::texture_create_from_extension(uint64_t p_native_texture, TextureType p_type, DataFormat p_format, uint32_t p_array_layers, bool p_depth_stencil) {
- ERR_FAIL_V_MSG(RDD::TextureID(), "not implemented");
+ id<MTLTexture> obj = (__bridge id<MTLTexture>)(void *)(uintptr_t)p_native_texture;
+
+ // We only need to create a RDD::TextureID for an existing, natively-provided texture.
+
+ return rid::make(obj);
 }
 
 RDD::TextureID RenderingDeviceDriverMetal::texture_create_shared(TextureID p_original_texture, const TextureView &p_view) {

editor/code_editor.cpp

@@ -644,6 +644,8 @@ void FindReplaceBar::_search_text_submitted(const String &p_text) {
  } else {
  search_next();
  }
+
+ callable_mp(search_text, &LineEdit::edit).call_deferred();
 }
 
 void FindReplaceBar::_replace_text_submitted(const String &p_text) {

editor/editor_interface.cpp

@@ -40,6 +40,7 @@
 #include "editor/editor_settings.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/filesystem_dock.h"
+#include "editor/gui/editor_quick_open_dialog.h"
 #include "editor/gui/editor_run_bar.h"
 #include "editor/gui/editor_scene_tabs.h"
 #include "editor/gui/scene_tree_editor.h"
@@ -336,6 +337,24 @@ void EditorInterface::popup_property_selector(Object *p_object, const Callable &
  property_selector->connect(SNAME("canceled"), canceled_callback, CONNECT_DEFERRED);
 }
 
+void EditorInterface::popup_quick_open(const Callable &p_callback, const TypedArray<StringName> &p_base_types) {
+ StringName required_type = SNAME("Resource");
+ Vector<StringName> base_types;
+ if (p_base_types.is_empty()) {
+ base_types.append(required_type);
+ } else {
+ for (int i = 0; i < p_base_types.size(); i++) {
+ StringName type = p_base_types[i];
+ ERR_FAIL_COND_MSG(!(ClassDB::is_parent_class(type, required_type) || EditorNode::get_editor_data().script_class_is_parent(type, required_type)), "Only types deriving from Resource are supported in the quick open dialog.");
+ base_types.append(type);
+ }
+ }
+
+ EditorQuickOpenDialog *quick_open = EditorNode::get_singleton()->get_quick_open_dialog();
+ quick_open->connect(SNAME("canceled"), callable_mp(this, &EditorInterface::_quick_open).bind(String(), p_callback));
+ quick_open->popup_dialog(base_types, callable_mp(this, &EditorInterface::_quick_open).bind(p_callback));
+}
+
 void EditorInterface::_node_selected(const NodePath &p_node_path, const Callable &p_callback) {
  const NodePath path = get_edited_scene_root()->get_path().rel_path_to(p_node_path);
  _call_dialog_callback(p_callback, path, "node selected");
@@ -353,6 +372,12 @@ void EditorInterface::_property_selection_canceled(const Callable &p_callback) {
  _call_dialog_callback(p_callback, NodePath(), "property selection canceled");
 }
 
+void EditorInterface::_quick_open(const String &p_file_path, const Callable &p_callback) {
+ EditorQuickOpenDialog *quick_open = EditorNode::get_singleton()->get_quick_open_dialog();
+ quick_open->disconnect(SNAME("canceled"), callable_mp(this, &EditorInterface::_quick_open));
+ _call_dialog_callback(p_callback, p_file_path, "quick open");
+}
+
 void EditorInterface::_call_dialog_callback(const Callable &p_callback, const Variant &p_selected, const String &p_context) {
  Callable::CallError ce;
  Variant ret;
@@ -568,6 +593,7 @@ void EditorInterface::_bind_methods() {
 
  ClassDB::bind_method(D_METHOD("popup_node_selector", "callback", "valid_types", "current_value"), &EditorInterface::popup_node_selector, DEFVAL(TypedArray<StringName>()), DEFVAL(Variant()));
  ClassDB::bind_method(D_METHOD("popup_property_selector", "object", "callback", "type_filter", "current_value"), &EditorInterface::popup_property_selector, DEFVAL(PackedInt32Array()), DEFVAL(String()));
+ ClassDB::bind_method(D_METHOD("popup_quick_open", "callback", "base_types"), &EditorInterface::popup_quick_open, DEFVAL(TypedArray<StringName>()));
 
  // Editor docks.
 

editor/editor_interface.h

@@ -72,6 +72,7 @@ class EditorInterface : public Object {
  void _node_selection_canceled(const Callable &p_callback);
  void _property_selected(const String &p_property_name, const Callable &p_callback);
  void _property_selection_canceled(const Callable &p_callback);
+ void _quick_open(const String &p_file_path, const Callable &p_callback);
  void _call_dialog_callback(const Callable &p_callback, const Variant &p_selected, const String &p_context);
 
  // Editor tools.
@@ -138,6 +139,7 @@ class EditorInterface : public Object {
  void popup_node_selector(const Callable &p_callback, const TypedArray<StringName> &p_valid_types = TypedArray<StringName>(), Node *p_current_value = nullptr);
  // Must use Vector<int> because exposing Vector<Variant::Type> is not supported.
  void popup_property_selector(Object *p_object, const Callable &p_callback, const PackedInt32Array &p_type_filter = PackedInt32Array(), const String &p_current_value = String());
+ void popup_quick_open(const Callable &p_callback, const TypedArray<StringName> &p_base_types = TypedArray<StringName>());
 
  // Editor docks.