gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-05 02:58:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #72635 from RedworkDE/net-nodepath-iequatable

Browse source 
C#: Implement `IEquatable<>` and equality operators in `NodePath`
This commit is contained in:
Rémi Verschelde 2023-02-03 15:35:22 +01:00
parent 91dfd6484b 7403a3a11b
commit 5a413894fc
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 47 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/NativeFuncs.cs
View file

@ -459,6 +459,10 @@ namespace Godot.NativeInterop
public static partial godot_bool godotsharp_node_path_is_absolute(in godot_node_path p_self);
public static partial godot_bool godotsharp_node_path_equals(in godot_node_path p_self, in godot_node_path p_other);
public static partial int godotsharp_node_path_hash(in godot_node_path p_self);
// GD, etc
internal static partial void godotsharp_bytes_to_var(in godot_packed_byte_array p_bytes,

34
modules/mono/glue/GodotSharp/GodotSharp/Core/NodePath.cs
View file

@ -39,7 +39,7 @@ namespace Godot
/// new NodePath("/root/MyAutoload"); // If you have an autoloaded node or scene.
/// </code>
/// </example>
public sealed class NodePath : IDisposable
public sealed class NodePath : IDisposable, IEquatable<NodePath>
{
internal godot_node_path.movable NativeValue;
@ -288,5 +288,37 @@ namespace Godot
/// </summary>
/// <returns>If the <see cref="NodePath"/> is empty.</returns>
public bool IsEmpty => NativeValue.DangerousSelfRef.IsEmpty;
public static bool operator ==(NodePath left, NodePath right)
{
if (left is null)
return right is null;
return left.Equals(right);
}
public static bool operator !=(NodePath left, NodePath right)
{
return !(left == right);
}
public bool Equals(NodePath other)
{
if (other is null)
return false;
var self = (godot_node_path)NativeValue;
var otherNative = (godot_node_path)other.NativeValue;
return NativeFuncs.godotsharp_node_path_equals(self, otherNative).ToBool();
}
public override bool Equals(object obj)
{
return ReferenceEquals(this, obj) || (obj is NodePath other && Equals(other));
}
public override int GetHashCode()
{
var self = (godot_node_path)NativeValue;
return NativeFuncs.godotsharp_node_path_hash(self);
}
}
}

10
modules/mono/glue/runtime_interop.cpp
View file

@ -1141,6 +1141,14 @@ bool godotsharp_node_path_is_absolute(const NodePath *p_self) {
return p_self->is_absolute();
}
bool godotsharp_node_path_equals(const NodePath *p_self, const NodePath *p_other) {
return *p_self == *p_other;
}
int godotsharp_node_path_hash(const NodePath *p_self) {
return p_self->hash();
}
void godotsharp_randomize() {
Math::randomize();
}
@ -1477,6 +1485,8 @@ static const void *unmanaged_callbacks[]{
(void *)godotsharp_node_path_get_subname,
(void *)godotsharp_node_path_get_subname_count,
(void *)godotsharp_node_path_is_absolute,
(void *)godotsharp_node_path_equals,
(void *)godotsharp_node_path_hash,
(void *)godotsharp_bytes_to_var,
(void *)godotsharp_convert,
(void *)godotsharp_hash,