Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 39 additions & 20 deletions include/godot_cpp/classes/ref.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -125,30 +125,33 @@ class Ref {
unref();
return;
}

Ref r;
r.reference = Object::cast_to<T>(refb);
ref(r);
r.reference = nullptr;
}

void operator=(const Variant &p_variant) {
// FIXME
// Needs testing, Variant has a cast to Object * here.

// Object *object = p_variant.get_validated_object();
Object *object = p_variant;

// if (object == reference) {
// return;
// }
if (object == reference) {
return;
}

// unref();
unref();

// if (!object) {
// return;
// }
if (!object) {
return;
}

// T *r = Object::cast_to<T>(object);
// if (r && r->reference()) {
// reference = r;
// }
T *r = Object::cast_to<T>(object);
if (r && r->reference()) {
reference = r;
}
}

template <class T_Other>
Expand All @@ -168,24 +171,40 @@ class Ref {
ref(p_from);
}

template <class T_Other>
Ref(const Ref<T_Other> &p_from) {
RefCounted *refb = const_cast<RefCounted *>(static_cast<const RefCounted *>(p_from.ptr()));
if (!refb) {
unref();
return;
}

Ref r;
r.reference = Object::cast_to<T>(refb);
ref(r);
r.reference = nullptr;
}

Ref(T *p_reference) {
if (p_reference) {
ref_pointer(p_reference);
}
}

Ref(const Variant &p_variant) {
// FIXME
// Needs testing, Variant has a cast to Object * here.

// Object *object = p_variant.get_validated_object();
Object *object = p_variant;

// if (!object) {
// return;
// }
if (!object) {
return;
}

// T *r = Object::cast_to<T>(object);
// if (r && r->reference()) {
// reference = r;
// }
T *r = Object::cast_to<T>(object);
if (r && r->reference()) {
reference = r;
}
}

inline bool is_valid() const { return reference != nullptr; }
Expand Down