godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removal of InputEvent as built-in Variant type..

Browse Source 
this might cause bugs I haven't found yet..
This commit is contained in:
Juan Linietsky
2017-05-20 12:38:03 -03:00
parent 93f9a83062
commit 5b3709d309
206 changed files with 9547 additions and 10167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
core/variant.cpp
View File

@@ -132,11 +132,6 @@ String Variant::get_type_name(Variant::Type p_type) {
return "NodePath";
} break;
case INPUT_EVENT: {
return "InputEvent";
} break;
case DICTIONARY: {
@@ -797,11 +792,6 @@ bool Variant::is_zero() const {
return reinterpret_cast<const NodePath *>(_data._mem)->is_empty();
} break;
case INPUT_EVENT: {
return _data._input_event->type == InputEvent::NONE;
} break;
case DICTIONARY: {
@@ -1017,11 +1007,6 @@ void Variant::reference(const Variant &p_variant) {
memnew_placement(_data._mem, NodePath(*reinterpret_cast<const NodePath *>(p_variant._data._mem)));
} break;
case INPUT_EVENT: {
_data._input_event = memnew(InputEvent(*p_variant._data._input_event));
} break;
case DICTIONARY: {
@@ -1149,12 +1134,6 @@ void Variant::clear() {
reinterpret_cast<Array *>(_data._mem)->~Array();
} break;
case INPUT_EVENT: {
memdelete(_data._input_event);
} break;
// arrays
case POOL_BYTE_ARRAY: {
@@ -1503,7 +1482,6 @@ Variant::operator String() const {
} break;
case TRANSFORM: return operator Transform();
case NODE_PATH: return operator NodePath();
case INPUT_EVENT: return operator InputEvent();
case COLOR: return String::num(operator Color().r) + "," + String::num(operator Color().g) + "," + String::num(operator Color().b) + "," + String::num(operator Color().a);
case DICTIONARY: {
@@ -1798,14 +1776,6 @@ Variant::operator Control *() const {
return NULL;
}
Variant::operator InputEvent() const {
if (type == INPUT_EVENT)
return *reinterpret_cast<const InputEvent *>(_data._input_event);
else
return InputEvent();
}
Variant::operator Dictionary() const {
if (type == DICTIONARY)
@@ -2285,12 +2255,6 @@ Variant::Variant(const NodePath &p_node_path) {
memnew_placement(_data._mem, NodePath(p_node_path));
}
Variant::Variant(const InputEvent &p_input_event) {
type = INPUT_EVENT;
_data._input_event = memnew(InputEvent(p_input_event));
}
Variant::Variant(const RefPtr &p_resource) {
type = OBJECT;
@@ -2690,11 +2654,6 @@ uint32_t Variant::hash() const {
return reinterpret_cast<const NodePath *>(_data._mem)->hash();
} break;
case INPUT_EVENT: {
return hash_djb2_buffer((uint8_t *)_data._input_event, sizeof(InputEvent));
} break;
case DICTIONARY: {
return reinterpret_cast<const Dictionary *>(_data._mem)->hash();