Skip to content

Add missing int→Variant conversions #1298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsnopek merged 1 commit into from
Nov 15, 2023
Merged

Add missing int→Variant conversions #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion include/godot_cpp/variant/variant.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,18 @@ class Variant {
Variant(int64_t v);
Variant(int32_t v) :
Variant(static_cast<int64_t>(v)) {}
Variant(uint32_t v) :
Variant(int16_t v) :
Variant(static_cast<int64_t>(v)) {}
Variant(int8_t v) :
Variant(static_cast<int64_t>(v)) {}
Variant(uint64_t v) :
Variant(static_cast<int64_t>(v)) {}
Variant(uint32_t v) :
Variant(static_cast<int64_t>(v)) {}
Variant(uint16_t v) :
Variant(static_cast<int64_t>(v)) {}
Variant(uint8_t v) :
Variant(static_cast<int64_t>(v)) {}
Variant(double v);
Variant(float v) :
Variant((double)v) {}
Expand Down Expand Up @@ -209,8 +217,12 @@ class Variant {
operator bool() const;
operator int64_t() const;
operator int32_t() const;
operator int16_t() const;
operator int8_t() const;
operator uint64_t() const;
operator uint32_t() const;
operator uint16_t() const;
operator uint8_t() const;
operator double() const;
operator float() const;
operator String() const;
Expand Down
16 changes: 16 additions & 0 deletions src/variant/variant.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,14 @@ Variant::operator int32_t() const {
return static_cast<int32_t>(operator int64_t());
}

Variant::operator int16_t() const {
return static_cast<int16_t>(operator int64_t());
}

Variant::operator int8_t() const {
return static_cast<int8_t>(operator int64_t());
}

Variant::operator uint64_t() const {
return static_cast<uint64_t>(operator int64_t());
}
Expand All @@ -276,6 +284,14 @@ Variant::operator uint32_t() const {
return static_cast<uint32_t>(operator int64_t());
}

Variant::operator uint16_t() const {
return static_cast<uint16_t>(operator int64_t());
}

Variant::operator uint8_t() const {
return static_cast<uint8_t>(operator int64_t());
}

Variant::operator double() const {
double result;
to_type_constructor[FLOAT](&result, _native_ptr());
Expand Down