seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removal of Image from Variant, converted to a Resource.

Browse Source
This commit is contained in:
Juan Linietsky
2017-05-17 07:36:47 -03:00
parent d801ff2b3d
commit 98a3296702
110 changed files with 690 additions and 3203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/variant.cpp
View File

@ -119,11 +119,6 @@ String Variant::get_type_name(Variant::Type p_type) {
return "Color";
} break;
case IMAGE: {
return "Image";
} break;
case _RID: {
@ -249,7 +244,6 @@ bool Variant::can_convert(Variant::Type p_type_from, Variant::Type p_type_to) {
static const Type invalid[] = {
OBJECT,
IMAGE,
NIL
};
@ -790,11 +784,6 @@ bool Variant::is_zero() const {
return *reinterpret_cast<const Color *>(_data._mem) == Color();
} break;
case IMAGE: {
return _data._image->empty();
} break;
case _RID: {
@ -1015,11 +1004,6 @@ void Variant::reference(const Variant &p_variant) {
memnew_placement(_data._mem, Color(*reinterpret_cast<const Color *>(p_variant._data._mem)));
} break;
case IMAGE: {
_data._image = memnew(Image(*p_variant._data._image));
} break;
case _RID: {
@ -1141,11 +1125,6 @@ void Variant::clear() {
} break;
// misc types
case IMAGE: {
memdelete(_data._image);
} break;
case NODE_PATH: {
reinterpret_cast<NodePath *>(_data._mem)->~NodePath();
@ -1760,13 +1739,6 @@ Variant::operator Color() const {
else
return Color();
}
Variant::operator Image() const {
if (type == IMAGE)
return *_data._image;
else
return Image();
}
Variant::operator NodePath() const {
@ -2306,11 +2278,6 @@ Variant::Variant(const Color &p_color) {
type = COLOR;
memnew_placement(_data._mem, Color(p_color));
}
Variant::Variant(const Image &p_image) {
type = IMAGE;
_data._image = memnew(Image(p_image));
}
Variant::Variant(const NodePath &p_node_path) {
@ -2710,11 +2677,6 @@ uint32_t Variant::hash() const {
hash = hash_djb2_one_float(reinterpret_cast<const Color *>(_data._mem)->b, hash);
return hash_djb2_one_float(reinterpret_cast<const Color *>(_data._mem)->a, hash);
} break;
case IMAGE: {
return 0;
} break;
case _RID: {