e5bbcb8bcf
Also turn off -Wsign-compare warnings in the future, we do not consider them important.
Fixes the following GCC 5 warnings:
```
core/node_path.cpp:279:24: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
core/oa_hash_map.h:169:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
core/oa_hash_map.h:314:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
drivers/gles2/shader_gles2.cpp:985:23: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
drivers/gles3/rasterizer_storage_gles3.cpp:1075:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
drivers/pulseaudio/audio_driver_pulseaudio.cpp:343:34: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
editor/editor_plugin.cpp:525:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
editor/editor_properties_array_dict.cpp:747:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
editor/plugins/spatial_editor_plugin.cpp:2078:20: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
editor/plugins/spatial_editor_plugin.cpp:4096:27: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
editor/plugins/sprite_editor_plugin.cpp💯20: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
modules/cvtt/image_compress_cvtt.cpp:122:23: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
modules/cvtt/image_compress_cvtt.cpp:134:77: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
modules/cvtt/image_compress_cvtt.cpp:339:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
modules/etc/image_etc.cpp:222:34: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
modules/gdnative/register_types.cpp:242:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
modules/gdnative/register_types.cpp:258:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
modules/opensimplex/simplex_noise.cpp:200:13: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
modules/opensimplex/simplex_noise.cpp:222:13: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
modules/opensimplex/simplex_noise.cpp:246:13: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
platform/android/export/export.cpp:1085:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
platform/android/export/export.cpp:1489:23: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
platform/android/export/export.cpp:1623:22: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
platform/iphone/export/export.cpp:206:20: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
platform/iphone/export/export.cpp:356:20: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
platform/iphone/export/export.cpp:406:20: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
platform/iphone/export/export.cpp:493:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
scene/3d/audio_stream_player_3d.cpp:420:23: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
scene/resources/audio_stream_sample.cpp:565:22: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
scene/resources/audio_stream_sample.cpp:571:22: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
servers/audio/audio_rb_resampler.cpp:156:36: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
```
The following warnings were not fixed, as they implied casting for no gain:
```
core/io/packet_peer.cpp:228:38: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
core/io/resource_format_binary.cpp:109:11: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
drivers/gles2/rasterizer_scene_gles2.cpp:144:57: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
drivers/unix/file_access_unix.cpp:249:46: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
scene/3d/voxel_light_baker.cpp:889:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
scene/3d/voxel_light_baker.cpp:1020:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
scene/3d/voxel_light_baker.cpp:1154:14: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
scene/3d/voxel_light_baker.cpp:2255:38: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
scene/resources/bit_mask.cpp:336:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
servers/audio/audio_stream.cpp:141:49: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
servers/audio/audio_stream.cpp:150:19: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
servers/audio/audio_stream.cpp:154:19: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
servers/audio_server.cpp:86:21: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
servers/audio_server.cpp:89:17: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
```
1087 lines
28 KiB
C++
1087 lines
28 KiB
C++
/*************************************************************************/
|
|
/* editor_properties_array_dict.cpp */
|
|
/*************************************************************************/
|
|
/* This file is part of: */
|
|
/* GODOT ENGINE */
|
|
/* https://godotengine.org */
|
|
/*************************************************************************/
|
|
/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */
|
|
/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */
|
|
/* */
|
|
/* Permission is hereby granted, free of charge, to any person obtaining */
|
|
/* a copy of this software and associated documentation files (the */
|
|
/* "Software"), to deal in the Software without restriction, including */
|
|
/* without limitation the rights to use, copy, modify, merge, publish, */
|
|
/* distribute, sublicense, and/or sell copies of the Software, and to */
|
|
/* permit persons to whom the Software is furnished to do so, subject to */
|
|
/* the following conditions: */
|
|
/* */
|
|
/* The above copyright notice and this permission notice shall be */
|
|
/* included in all copies or substantial portions of the Software. */
|
|
/* */
|
|
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
|
|
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
|
|
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
|
|
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
|
|
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
|
|
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
|
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
|
/*************************************************************************/
|
|
|
|
#include "editor_properties_array_dict.h"
|
|
#include "editor/editor_scale.h"
|
|
#include "editor_properties.h"
|
|
|
|
bool EditorPropertyArrayObject::_set(const StringName &p_name, const Variant &p_value) {
|
|
|
|
String pn = p_name;
|
|
|
|
if (pn.begins_with("indices")) {
|
|
int idx = pn.get_slicec('/', 1).to_int();
|
|
array.set(idx, p_value);
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
bool EditorPropertyArrayObject::_get(const StringName &p_name, Variant &r_ret) const {
|
|
|
|
String pn = p_name;
|
|
|
|
if (pn.begins_with("indices")) {
|
|
|
|
int idx = pn.get_slicec('/', 1).to_int();
|
|
bool valid;
|
|
r_ret = array.get(idx, &valid);
|
|
return valid;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
void EditorPropertyArrayObject::set_array(const Variant &p_array) {
|
|
array = p_array;
|
|
}
|
|
|
|
Variant EditorPropertyArrayObject::get_array() {
|
|
return array;
|
|
}
|
|
|
|
EditorPropertyArrayObject::EditorPropertyArrayObject() {
|
|
}
|
|
|
|
///////////////////
|
|
|
|
bool EditorPropertyDictionaryObject::_set(const StringName &p_name, const Variant &p_value) {
|
|
|
|
String pn = p_name;
|
|
|
|
if (pn == "new_item_key") {
|
|
|
|
new_item_key = p_value;
|
|
return true;
|
|
}
|
|
|
|
if (pn == "new_item_value") {
|
|
|
|
new_item_value = p_value;
|
|
return true;
|
|
}
|
|
|
|
if (pn.begins_with("indices")) {
|
|
int idx = pn.get_slicec('/', 1).to_int();
|
|
Variant key = dict.get_key_at_index(idx);
|
|
dict[key] = p_value;
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
bool EditorPropertyDictionaryObject::_get(const StringName &p_name, Variant &r_ret) const {
|
|
|
|
String pn = p_name;
|
|
|
|
if (pn == "new_item_key") {
|
|
|
|
r_ret = new_item_key;
|
|
return true;
|
|
}
|
|
|
|
if (pn == "new_item_value") {
|
|
|
|
r_ret = new_item_value;
|
|
return true;
|
|
}
|
|
|
|
if (pn.begins_with("indices")) {
|
|
|
|
int idx = pn.get_slicec('/', 1).to_int();
|
|
Variant key = dict.get_key_at_index(idx);
|
|
r_ret = dict[key];
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
void EditorPropertyDictionaryObject::set_dict(const Dictionary &p_dict) {
|
|
dict = p_dict;
|
|
}
|
|
|
|
Dictionary EditorPropertyDictionaryObject::get_dict() {
|
|
return dict;
|
|
}
|
|
|
|
void EditorPropertyDictionaryObject::set_new_item_key(const Variant &p_new_item) {
|
|
new_item_key = p_new_item;
|
|
}
|
|
|
|
Variant EditorPropertyDictionaryObject::get_new_item_key() {
|
|
return new_item_key;
|
|
}
|
|
|
|
void EditorPropertyDictionaryObject::set_new_item_value(const Variant &p_new_item) {
|
|
new_item_value = p_new_item;
|
|
}
|
|
|
|
Variant EditorPropertyDictionaryObject::get_new_item_value() {
|
|
return new_item_value;
|
|
}
|
|
|
|
EditorPropertyDictionaryObject::EditorPropertyDictionaryObject() {
|
|
}
|
|
|
|
///////////////////// ARRAY ///////////////////////////
|
|
|
|
void EditorPropertyArray::_property_changed(const String &p_prop, Variant p_value, bool changing) {
|
|
|
|
if (p_prop.begins_with("indices")) {
|
|
int idx = p_prop.get_slice("/", 1).to_int();
|
|
Variant array = object->get_array();
|
|
array.set(idx, p_value);
|
|
emit_signal("property_changed", get_edited_property(), array, true);
|
|
|
|
if (array.get_type() == Variant::ARRAY) {
|
|
array = array.call("duplicate"); //dupe, so undo/redo works better
|
|
}
|
|
object->set_array(array);
|
|
}
|
|
}
|
|
|
|
void EditorPropertyArray::_change_type(Object *p_button, int p_index) {
|
|
|
|
Button *button = Object::cast_to<Button>(p_button);
|
|
|
|
Rect2 rect = button->get_global_rect();
|
|
change_type->set_as_minsize();
|
|
change_type->set_global_position(rect.position + rect.size - Vector2(change_type->get_combined_minimum_size().x, 0));
|
|
change_type->popup();
|
|
changing_type_idx = p_index;
|
|
}
|
|
|
|
void EditorPropertyArray::_change_type_menu(int p_index) {
|
|
|
|
Variant value;
|
|
Variant::CallError ce;
|
|
value = Variant::construct(Variant::Type(p_index), NULL, 0, ce);
|
|
Variant array = object->get_array();
|
|
array.set(changing_type_idx, value);
|
|
|
|
emit_signal("property_changed", get_edited_property(), array);
|
|
|
|
if (array.get_type() == Variant::ARRAY) {
|
|
array = array.call("duplicate"); //dupe, so undo/redo works better
|
|
}
|
|
object->set_array(array);
|
|
update_property();
|
|
}
|
|
|
|
void EditorPropertyArray::update_property() {
|
|
|
|
Variant array = get_edited_object()->get(get_edited_property());
|
|
|
|
String arrtype = "";
|
|
switch (array_type) {
|
|
case Variant::ARRAY: {
|
|
arrtype = "Array";
|
|
|
|
} break;
|
|
|
|
// arrays
|
|
case Variant::POOL_BYTE_ARRAY: {
|
|
arrtype = "ByteArray";
|
|
|
|
} break;
|
|
case Variant::POOL_INT_ARRAY: {
|
|
arrtype = "IntArray";
|
|
|
|
} break;
|
|
case Variant::POOL_REAL_ARRAY: {
|
|
|
|
arrtype = "FltArray";
|
|
} break;
|
|
case Variant::POOL_STRING_ARRAY: {
|
|
|
|
arrtype = "StrArray";
|
|
} break;
|
|
case Variant::POOL_VECTOR2_ARRAY: {
|
|
|
|
arrtype = "Vec2Array";
|
|
} break;
|
|
case Variant::POOL_VECTOR3_ARRAY: {
|
|
arrtype = "Vec3Array";
|
|
|
|
} break;
|
|
case Variant::POOL_COLOR_ARRAY: {
|
|
arrtype = "ColArray";
|
|
} break;
|
|
default: {}
|
|
}
|
|
|
|
if (array.get_type() == Variant::NIL) {
|
|
edit->set_text(String("(Nil) ") + arrtype);
|
|
edit->set_pressed(false);
|
|
if (vbox) {
|
|
memdelete(vbox);
|
|
}
|
|
return;
|
|
}
|
|
|
|
edit->set_text(arrtype + "(size " + itos(array.call("size")) + ")");
|
|
|
|
#ifdef TOOLS_ENABLED
|
|
|
|
bool unfolded = get_edited_object()->editor_is_section_unfolded(get_edited_property());
|
|
if (edit->is_pressed() != unfolded) {
|
|
edit->set_pressed(unfolded);
|
|
}
|
|
|
|
if (unfolded) {
|
|
|
|
updating = true;
|
|
|
|
if (!vbox) {
|
|
|
|
vbox = memnew(VBoxContainer);
|
|
add_child(vbox);
|
|
set_bottom_editor(vbox);
|
|
HBoxContainer *hbc = memnew(HBoxContainer);
|
|
vbox->add_child(hbc);
|
|
Label *label = memnew(Label(TTR("Size: ")));
|
|
label->set_h_size_flags(SIZE_EXPAND_FILL);
|
|
hbc->add_child(label);
|
|
length = memnew(EditorSpinSlider);
|
|
length->set_step(1);
|
|
length->set_max(1000000);
|
|
length->set_h_size_flags(SIZE_EXPAND_FILL);
|
|
hbc->add_child(length);
|
|
length->connect("value_changed", this, "_length_changed");
|
|
|
|
page_hb = memnew(HBoxContainer);
|
|
vbox->add_child(page_hb);
|
|
label = memnew(Label(TTR("Page: ")));
|
|
label->set_h_size_flags(SIZE_EXPAND_FILL);
|
|
page_hb->add_child(label);
|
|
page = memnew(EditorSpinSlider);
|
|
page->set_step(1);
|
|
page_hb->add_child(page);
|
|
page->set_h_size_flags(SIZE_EXPAND_FILL);
|
|
page->connect("value_changed", this, "_page_changed");
|
|
} else {
|
|
//bye bye children of the box
|
|
while (vbox->get_child_count() > 2) {
|
|
memdelete(vbox->get_child(2));
|
|
}
|
|
}
|
|
|
|
int len = array.call("size");
|
|
|
|
length->set_value(len);
|
|
|
|
int pages = MAX(0, len - 1) / page_len + 1;
|
|
|
|
page->set_max(pages);
|
|
page_idx = MIN(page_idx, pages - 1);
|
|
page->set_value(page_idx);
|
|
page_hb->set_visible(pages > 1);
|
|
|
|
int offset = page_idx * page_len;
|
|
|
|
int amount = MIN(len - offset, page_len);
|
|
|
|
if (array.get_type() == Variant::ARRAY) {
|
|
array = array.call("duplicate");
|
|
}
|
|
|
|
object->set_array(array);
|
|
|
|
for (int i = 0; i < amount; i++) {
|
|
String prop_name = "indices/" + itos(i + offset);
|
|
|
|
EditorProperty *prop = NULL;
|
|
Variant value = array.get(i + offset);
|
|
|
|
switch (value.get_type()) {
|
|
case Variant::NIL: {
|
|
prop = memnew(EditorPropertyNil);
|
|
|
|
} break;
|
|
|
|
// atomic types
|
|
case Variant::BOOL: {
|
|
|
|
prop = memnew(EditorPropertyCheck);
|
|
|
|
} break;
|
|
case Variant::INT: {
|
|
EditorPropertyInteger *editor = memnew(EditorPropertyInteger);
|
|
editor->setup(-100000, 100000, true, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::REAL: {
|
|
|
|
EditorPropertyFloat *editor = memnew(EditorPropertyFloat);
|
|
editor->setup(-100000, 100000, 0.001, true, false, true, true);
|
|
prop = editor;
|
|
} break;
|
|
case Variant::STRING: {
|
|
|
|
prop = memnew(EditorPropertyText);
|
|
|
|
} break;
|
|
|
|
// math types
|
|
|
|
case Variant::VECTOR2: {
|
|
|
|
EditorPropertyVector2 *editor = memnew(EditorPropertyVector2);
|
|
editor->setup(-100000, 100000, 0.001, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::RECT2: {
|
|
|
|
EditorPropertyRect2 *editor = memnew(EditorPropertyRect2);
|
|
editor->setup(-100000, 100000, 0.001, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::VECTOR3: {
|
|
|
|
EditorPropertyVector3 *editor = memnew(EditorPropertyVector3);
|
|
editor->setup(-100000, 100000, 0.001, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::TRANSFORM2D: {
|
|
|
|
EditorPropertyTransform2D *editor = memnew(EditorPropertyTransform2D);
|
|
editor->setup(-100000, 100000, 0.001, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::PLANE: {
|
|
|
|
EditorPropertyPlane *editor = memnew(EditorPropertyPlane);
|
|
editor->setup(-100000, 100000, 0.001, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::QUAT: {
|
|
|
|
EditorPropertyQuat *editor = memnew(EditorPropertyQuat);
|
|
editor->setup(-100000, 100000, 0.001, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::AABB: {
|
|
|
|
EditorPropertyAABB *editor = memnew(EditorPropertyAABB);
|
|
editor->setup(-100000, 100000, 0.001, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::BASIS: {
|
|
EditorPropertyBasis *editor = memnew(EditorPropertyBasis);
|
|
editor->setup(-100000, 100000, 0.001, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::TRANSFORM: {
|
|
EditorPropertyTransform *editor = memnew(EditorPropertyTransform);
|
|
editor->setup(-100000, 100000, 0.001, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
|
|
// misc types
|
|
case Variant::COLOR: {
|
|
prop = memnew(EditorPropertyColor);
|
|
|
|
} break;
|
|
case Variant::NODE_PATH: {
|
|
prop = memnew(EditorPropertyNodePath);
|
|
|
|
} break;
|
|
case Variant::_RID: {
|
|
prop = memnew(EditorPropertyNil);
|
|
|
|
} break;
|
|
case Variant::OBJECT: {
|
|
EditorPropertyResource *editor = memnew(EditorPropertyResource);
|
|
editor->setup("Resource");
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::DICTIONARY: {
|
|
prop = memnew(EditorPropertyDictionary);
|
|
|
|
} break;
|
|
|
|
// arrays
|
|
case Variant::ARRAY: {
|
|
EditorPropertyArray *editor = memnew(EditorPropertyArray);
|
|
editor->setup(Variant::ARRAY);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::POOL_BYTE_ARRAY: {
|
|
EditorPropertyArray *editor = memnew(EditorPropertyArray);
|
|
editor->setup(Variant::POOL_BYTE_ARRAY);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::POOL_INT_ARRAY: {
|
|
EditorPropertyArray *editor = memnew(EditorPropertyArray);
|
|
editor->setup(Variant::POOL_INT_ARRAY);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::POOL_REAL_ARRAY: {
|
|
|
|
EditorPropertyArray *editor = memnew(EditorPropertyArray);
|
|
editor->setup(Variant::POOL_REAL_ARRAY);
|
|
prop = editor;
|
|
} break;
|
|
case Variant::POOL_STRING_ARRAY: {
|
|
|
|
EditorPropertyArray *editor = memnew(EditorPropertyArray);
|
|
editor->setup(Variant::POOL_STRING_ARRAY);
|
|
prop = editor;
|
|
} break;
|
|
case Variant::POOL_VECTOR2_ARRAY: {
|
|
|
|
EditorPropertyArray *editor = memnew(EditorPropertyArray);
|
|
editor->setup(Variant::POOL_VECTOR2_ARRAY);
|
|
prop = editor;
|
|
} break;
|
|
case Variant::POOL_VECTOR3_ARRAY: {
|
|
|
|
EditorPropertyArray *editor = memnew(EditorPropertyArray);
|
|
editor->setup(Variant::POOL_VECTOR3_ARRAY);
|
|
prop = editor;
|
|
} break;
|
|
case Variant::POOL_COLOR_ARRAY: {
|
|
|
|
EditorPropertyArray *editor = memnew(EditorPropertyArray);
|
|
editor->setup(Variant::POOL_COLOR_ARRAY);
|
|
prop = editor;
|
|
} break;
|
|
default: {}
|
|
}
|
|
|
|
prop->set_object_and_property(object.ptr(), prop_name);
|
|
prop->set_label(itos(i + offset));
|
|
prop->set_selectable(false);
|
|
prop->connect("property_changed", this, "_property_changed");
|
|
if (array.get_type() == Variant::ARRAY) {
|
|
HBoxContainer *hb = memnew(HBoxContainer);
|
|
vbox->add_child(hb);
|
|
hb->add_child(prop);
|
|
prop->set_h_size_flags(SIZE_EXPAND_FILL);
|
|
Button *edit = memnew(Button);
|
|
edit->set_icon(get_icon("Edit", "EditorIcons"));
|
|
hb->add_child(edit);
|
|
edit->connect("pressed", this, "_change_type", varray(edit, i + offset));
|
|
} else {
|
|
vbox->add_child(prop);
|
|
}
|
|
|
|
prop->update_property();
|
|
}
|
|
|
|
updating = false;
|
|
|
|
} else {
|
|
if (vbox) {
|
|
set_bottom_editor(NULL);
|
|
memdelete(vbox);
|
|
vbox = NULL;
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
|
|
void EditorPropertyArray::_notification(int p_what) {
|
|
|
|
if (p_what == NOTIFICATION_ENTER_TREE || p_what == NOTIFICATION_THEME_CHANGED) {
|
|
}
|
|
}
|
|
void EditorPropertyArray::_edit_pressed() {
|
|
|
|
Variant array = get_edited_object()->get(get_edited_property());
|
|
if (!array.is_array()) {
|
|
Variant::CallError ce;
|
|
array = Variant::construct(array_type, NULL, 0, ce);
|
|
|
|
get_edited_object()->set(get_edited_property(), array);
|
|
}
|
|
|
|
get_edited_object()->editor_set_section_unfold(get_edited_property(), edit->is_pressed());
|
|
update_property();
|
|
}
|
|
|
|
void EditorPropertyArray::_page_changed(double p_page) {
|
|
if (updating)
|
|
return;
|
|
page_idx = p_page;
|
|
update_property();
|
|
}
|
|
|
|
void EditorPropertyArray::_length_changed(double p_page) {
|
|
if (updating)
|
|
return;
|
|
|
|
Variant array = object->get_array();
|
|
array.call("resize", int(p_page));
|
|
emit_signal("property_changed", get_edited_property(), array);
|
|
|
|
if (array.get_type() == Variant::ARRAY) {
|
|
array = array.call("duplicate"); //dupe, so undo/redo works better
|
|
}
|
|
object->set_array(array);
|
|
update_property();
|
|
}
|
|
|
|
void EditorPropertyArray::setup(Variant::Type p_array_type) {
|
|
|
|
array_type = p_array_type;
|
|
}
|
|
|
|
void EditorPropertyArray::_bind_methods() {
|
|
ClassDB::bind_method("_edit_pressed", &EditorPropertyArray::_edit_pressed);
|
|
ClassDB::bind_method("_page_changed", &EditorPropertyArray::_page_changed);
|
|
ClassDB::bind_method("_length_changed", &EditorPropertyArray::_length_changed);
|
|
ClassDB::bind_method("_property_changed", &EditorPropertyArray::_property_changed, DEFVAL(false));
|
|
ClassDB::bind_method("_change_type", &EditorPropertyArray::_change_type);
|
|
ClassDB::bind_method("_change_type_menu", &EditorPropertyArray::_change_type_menu);
|
|
}
|
|
|
|
EditorPropertyArray::EditorPropertyArray() {
|
|
|
|
object.instance();
|
|
page_idx = 0;
|
|
page_len = 10;
|
|
edit = memnew(Button);
|
|
edit->set_flat(true);
|
|
edit->set_h_size_flags(SIZE_EXPAND_FILL);
|
|
edit->set_clip_text(true);
|
|
edit->connect("pressed", this, "_edit_pressed");
|
|
edit->set_toggle_mode(true);
|
|
add_child(edit);
|
|
add_focusable(edit);
|
|
vbox = NULL;
|
|
page = NULL;
|
|
length = NULL;
|
|
updating = false;
|
|
change_type = memnew(PopupMenu);
|
|
add_child(change_type);
|
|
change_type->connect("id_pressed", this, "_change_type_menu");
|
|
changing_type_idx = -1;
|
|
for (int i = 0; i < Variant::VARIANT_MAX; i++) {
|
|
String type = Variant::get_type_name(Variant::Type(i));
|
|
change_type->add_item(type, i);
|
|
}
|
|
changing_type_idx = -1;
|
|
}
|
|
|
|
///////////////////// DICTIONARY ///////////////////////////
|
|
|
|
void EditorPropertyDictionary::_property_changed(const String &p_prop, Variant p_value, bool changing) {
|
|
|
|
if (p_prop == "new_item_key") {
|
|
|
|
object->set_new_item_key(p_value);
|
|
} else if (p_prop == "new_item_value") {
|
|
|
|
object->set_new_item_value(p_value);
|
|
} else if (p_prop.begins_with("indices")) {
|
|
int idx = p_prop.get_slice("/", 1).to_int();
|
|
Dictionary dict = object->get_dict();
|
|
Variant key = dict.get_key_at_index(idx);
|
|
dict[key] = p_value;
|
|
|
|
emit_signal("property_changed", get_edited_property(), dict, true);
|
|
|
|
dict = dict.duplicate(); //dupe, so undo/redo works better
|
|
object->set_dict(dict);
|
|
}
|
|
}
|
|
|
|
void EditorPropertyDictionary::_change_type(Object *p_button, int p_index) {
|
|
|
|
Button *button = Object::cast_to<Button>(p_button);
|
|
|
|
Rect2 rect = button->get_global_rect();
|
|
change_type->set_as_minsize();
|
|
change_type->set_global_position(rect.position + rect.size - Vector2(change_type->get_combined_minimum_size().x, 0));
|
|
change_type->popup();
|
|
changing_type_idx = p_index;
|
|
}
|
|
|
|
void EditorPropertyDictionary::_add_key_value() {
|
|
|
|
// Do not allow nil as valid key. I experienced errors with this
|
|
if (object->get_new_item_key().get_type() == Variant::NIL) {
|
|
return;
|
|
}
|
|
|
|
Dictionary dict = object->get_dict();
|
|
|
|
dict[object->get_new_item_key()] = object->get_new_item_value();
|
|
object->set_new_item_key(Variant());
|
|
object->set_new_item_value(Variant());
|
|
|
|
emit_signal("property_changed", get_edited_property(), dict);
|
|
|
|
dict = dict.duplicate(); //dupe, so undo/redo works better
|
|
object->set_dict(dict);
|
|
update_property();
|
|
}
|
|
|
|
void EditorPropertyDictionary::_change_type_menu(int p_index) {
|
|
|
|
if (changing_type_idx < 0) {
|
|
Variant value;
|
|
Variant::CallError ce;
|
|
value = Variant::construct(Variant::Type(p_index), NULL, 0, ce);
|
|
if (changing_type_idx == -1) {
|
|
object->set_new_item_key(value);
|
|
} else {
|
|
object->set_new_item_value(value);
|
|
}
|
|
update_property();
|
|
return;
|
|
}
|
|
|
|
Dictionary dict = object->get_dict();
|
|
|
|
if (p_index < Variant::VARIANT_MAX) {
|
|
|
|
Variant value;
|
|
Variant::CallError ce;
|
|
value = Variant::construct(Variant::Type(p_index), NULL, 0, ce);
|
|
Variant key = dict.get_key_at_index(changing_type_idx);
|
|
dict[key] = value;
|
|
} else {
|
|
Variant key = dict.get_key_at_index(changing_type_idx);
|
|
dict.erase(key);
|
|
}
|
|
|
|
emit_signal("property_changed", get_edited_property(), dict);
|
|
|
|
dict = dict.duplicate(); //dupe, so undo/redo works better
|
|
object->set_dict(dict);
|
|
update_property();
|
|
}
|
|
|
|
void EditorPropertyDictionary::update_property() {
|
|
|
|
Variant updated_val = get_edited_object()->get(get_edited_property());
|
|
|
|
if (updated_val.get_type() == Variant::NIL) {
|
|
edit->set_text("Dictionary (Nil)"); //This provides symmetry with the array property.
|
|
edit->set_pressed(false);
|
|
if (vbox) {
|
|
memdelete(vbox);
|
|
}
|
|
return;
|
|
}
|
|
|
|
Dictionary dict = updated_val;
|
|
|
|
edit->set_text("Dictionary (size " + itos(dict.size()) + ")");
|
|
|
|
#ifdef TOOLS_ENABLED
|
|
|
|
bool unfolded = get_edited_object()->editor_is_section_unfolded(get_edited_property());
|
|
if (edit->is_pressed() != unfolded) {
|
|
edit->set_pressed(unfolded);
|
|
}
|
|
|
|
if (unfolded) {
|
|
|
|
updating = true;
|
|
|
|
if (!vbox) {
|
|
|
|
vbox = memnew(VBoxContainer);
|
|
add_child(vbox);
|
|
set_bottom_editor(vbox);
|
|
|
|
page_hb = memnew(HBoxContainer);
|
|
vbox->add_child(page_hb);
|
|
Label *label = memnew(Label(TTR("Page: ")));
|
|
label->set_h_size_flags(SIZE_EXPAND_FILL);
|
|
page_hb->add_child(label);
|
|
page = memnew(EditorSpinSlider);
|
|
page->set_step(1);
|
|
page_hb->add_child(page);
|
|
page->set_h_size_flags(SIZE_EXPAND_FILL);
|
|
page->connect("value_changed", this, "_page_changed");
|
|
} else {
|
|
// Queue childs for deletion, delete immediately might cause errors.
|
|
for (int i = 1; i < vbox->get_child_count(); i++) {
|
|
vbox->get_child(i)->queue_delete();
|
|
}
|
|
}
|
|
|
|
int len = dict.size();
|
|
|
|
int pages = MAX(0, len - 1) / page_len + 1;
|
|
|
|
page->set_max(pages);
|
|
page_idx = MIN(page_idx, pages - 1);
|
|
page->set_value(page_idx);
|
|
page_hb->set_visible(pages > 1);
|
|
|
|
int offset = page_idx * page_len;
|
|
|
|
int amount = MIN(len - offset, page_len);
|
|
|
|
dict = dict.duplicate();
|
|
|
|
object->set_dict(dict);
|
|
VBoxContainer *add_vbox = NULL;
|
|
|
|
for (int i = 0; i < amount + 2; i++) {
|
|
String prop_name;
|
|
Variant key;
|
|
Variant value;
|
|
|
|
if (i < amount) {
|
|
prop_name = "indices/" + itos(i + offset);
|
|
key = dict.get_key_at_index(i + offset);
|
|
value = dict.get_value_at_index(i + offset);
|
|
} else if (i == amount) {
|
|
prop_name = "new_item_key";
|
|
value = object->get_new_item_key();
|
|
} else if (i == amount + 1) {
|
|
prop_name = "new_item_value";
|
|
value = object->get_new_item_value();
|
|
}
|
|
|
|
EditorProperty *prop = NULL;
|
|
|
|
switch (value.get_type()) {
|
|
case Variant::NIL: {
|
|
prop = memnew(EditorPropertyNil);
|
|
|
|
} break;
|
|
|
|
// atomic types
|
|
case Variant::BOOL: {
|
|
|
|
prop = memnew(EditorPropertyCheck);
|
|
|
|
} break;
|
|
case Variant::INT: {
|
|
EditorPropertyInteger *editor = memnew(EditorPropertyInteger);
|
|
editor->setup(-100000, 100000, true, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::REAL: {
|
|
|
|
EditorPropertyFloat *editor = memnew(EditorPropertyFloat);
|
|
editor->setup(-100000, 100000, 0.001, true, false, true, true);
|
|
prop = editor;
|
|
} break;
|
|
case Variant::STRING: {
|
|
|
|
prop = memnew(EditorPropertyText);
|
|
|
|
} break;
|
|
|
|
// math types
|
|
case Variant::VECTOR2: {
|
|
|
|
EditorPropertyVector2 *editor = memnew(EditorPropertyVector2);
|
|
editor->setup(-100000, 100000, 0.001, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::RECT2: {
|
|
|
|
EditorPropertyRect2 *editor = memnew(EditorPropertyRect2);
|
|
editor->setup(-100000, 100000, 0.001, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::VECTOR3: {
|
|
|
|
EditorPropertyVector3 *editor = memnew(EditorPropertyVector3);
|
|
editor->setup(-100000, 100000, 0.001, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::TRANSFORM2D: {
|
|
|
|
EditorPropertyTransform2D *editor = memnew(EditorPropertyTransform2D);
|
|
editor->setup(-100000, 100000, 0.001, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::PLANE: {
|
|
|
|
EditorPropertyPlane *editor = memnew(EditorPropertyPlane);
|
|
editor->setup(-100000, 100000, 0.001, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::QUAT: {
|
|
|
|
EditorPropertyQuat *editor = memnew(EditorPropertyQuat);
|
|
editor->setup(-100000, 100000, 0.001, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::AABB: {
|
|
|
|
EditorPropertyAABB *editor = memnew(EditorPropertyAABB);
|
|
editor->setup(-100000, 100000, 0.001, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::BASIS: {
|
|
EditorPropertyBasis *editor = memnew(EditorPropertyBasis);
|
|
editor->setup(-100000, 100000, 0.001, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::TRANSFORM: {
|
|
EditorPropertyTransform *editor = memnew(EditorPropertyTransform);
|
|
editor->setup(-100000, 100000, 0.001, true);
|
|
prop = editor;
|
|
|
|
} break;
|
|
|
|
// misc types
|
|
case Variant::COLOR: {
|
|
prop = memnew(EditorPropertyColor);
|
|
|
|
} break;
|
|
case Variant::NODE_PATH: {
|
|
prop = memnew(EditorPropertyNodePath);
|
|
|
|
} break;
|
|
case Variant::_RID: {
|
|
prop = memnew(EditorPropertyNil);
|
|
|
|
} break;
|
|
case Variant::OBJECT: {
|
|
EditorPropertyResource *editor = memnew(EditorPropertyResource);
|
|
editor->setup("Resource");
|
|
prop = editor;
|
|
|
|
} break;
|
|
case Variant::DICTIONARY: {
|
|
prop = memnew(EditorPropertyDictionary);
|
|
|
|
} break;
|
|
case Variant::ARRAY: {
|
|
EditorPropertyArray *editor = memnew(EditorPropertyArray);
|
|
editor->setup(Variant::ARRAY);
|
|
prop = editor;
|
|
} break;
|
|
|
|
// arrays
|
|
case Variant::POOL_BYTE_ARRAY: {
|
|
|
|
EditorPropertyArray *editor = memnew(EditorPropertyArray);
|
|
editor->setup(Variant::POOL_BYTE_ARRAY);
|
|
prop = editor;
|
|
} break;
|
|
case Variant::POOL_INT_ARRAY: {
|
|
|
|
EditorPropertyArray *editor = memnew(EditorPropertyArray);
|
|
editor->setup(Variant::POOL_INT_ARRAY);
|
|
prop = editor;
|
|
} break;
|
|
case Variant::POOL_REAL_ARRAY: {
|
|
|
|
EditorPropertyArray *editor = memnew(EditorPropertyArray);
|
|
editor->setup(Variant::POOL_REAL_ARRAY);
|
|
prop = editor;
|
|
} break;
|
|
case Variant::POOL_STRING_ARRAY: {
|
|
|
|
EditorPropertyArray *editor = memnew(EditorPropertyArray);
|
|
editor->setup(Variant::POOL_STRING_ARRAY);
|
|
prop = editor;
|
|
} break;
|
|
case Variant::POOL_VECTOR2_ARRAY: {
|
|
|
|
EditorPropertyArray *editor = memnew(EditorPropertyArray);
|
|
editor->setup(Variant::POOL_VECTOR2_ARRAY);
|
|
prop = editor;
|
|
} break;
|
|
case Variant::POOL_VECTOR3_ARRAY: {
|
|
|
|
EditorPropertyArray *editor = memnew(EditorPropertyArray);
|
|
editor->setup(Variant::POOL_VECTOR3_ARRAY);
|
|
prop = editor;
|
|
} break;
|
|
case Variant::POOL_COLOR_ARRAY: {
|
|
|
|
EditorPropertyArray *editor = memnew(EditorPropertyArray);
|
|
editor->setup(Variant::POOL_COLOR_ARRAY);
|
|
prop = editor;
|
|
} break;
|
|
default: {}
|
|
}
|
|
|
|
if (i == amount) {
|
|
PanelContainer *pc = memnew(PanelContainer);
|
|
vbox->add_child(pc);
|
|
Ref<StyleBoxFlat> flat;
|
|
flat.instance();
|
|
for (int j = 0; j < 4; j++) {
|
|
flat->set_default_margin(Margin(j), 2 * EDSCALE);
|
|
}
|
|
flat->set_bg_color(get_color("prop_subsection", "Editor"));
|
|
|
|
pc->add_style_override("panel", flat);
|
|
add_vbox = memnew(VBoxContainer);
|
|
pc->add_child(add_vbox);
|
|
}
|
|
prop->set_object_and_property(object.ptr(), prop_name);
|
|
int change_index;
|
|
|
|
if (i < amount) {
|
|
String cs = key.get_construct_string();
|
|
prop->set_label(key.get_construct_string());
|
|
prop->set_tooltip(cs);
|
|
change_index = i + offset;
|
|
} else if (i == amount) {
|
|
prop->set_label(TTR("New Key:"));
|
|
change_index = -1;
|
|
} else if (i == amount + 1) {
|
|
prop->set_label(TTR("New Value:"));
|
|
change_index = -2;
|
|
}
|
|
|
|
prop->set_selectable(false);
|
|
prop->connect("property_changed", this, "_property_changed");
|
|
|
|
HBoxContainer *hb = memnew(HBoxContainer);
|
|
if (add_vbox) {
|
|
add_vbox->add_child(hb);
|
|
} else {
|
|
vbox->add_child(hb);
|
|
}
|
|
hb->add_child(prop);
|
|
prop->set_h_size_flags(SIZE_EXPAND_FILL);
|
|
Button *edit = memnew(Button);
|
|
edit->set_icon(get_icon("Edit", "EditorIcons"));
|
|
hb->add_child(edit);
|
|
edit->connect("pressed", this, "_change_type", varray(edit, change_index));
|
|
|
|
prop->update_property();
|
|
|
|
if (i == amount + 1) {
|
|
Button *butt_add_item = memnew(Button);
|
|
butt_add_item->set_text(TTR("Add Key/Value Pair"));
|
|
butt_add_item->connect("pressed", this, "_add_key_value");
|
|
add_vbox->add_child(butt_add_item);
|
|
}
|
|
}
|
|
|
|
updating = false;
|
|
|
|
} else {
|
|
if (vbox) {
|
|
set_bottom_editor(NULL);
|
|
memdelete(vbox);
|
|
vbox = NULL;
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
|
|
void EditorPropertyDictionary::_notification(int p_what) {
|
|
|
|
if (p_what == NOTIFICATION_ENTER_TREE || p_what == NOTIFICATION_THEME_CHANGED) {
|
|
}
|
|
}
|
|
|
|
void EditorPropertyDictionary::_edit_pressed() {
|
|
|
|
Variant prop_val = get_edited_object()->get(get_edited_property());
|
|
if (prop_val.get_type() == Variant::NIL) {
|
|
Variant::CallError ce;
|
|
prop_val = Variant::construct(Variant::DICTIONARY, NULL, 0, ce);
|
|
get_edited_object()->set(get_edited_property(), prop_val);
|
|
}
|
|
|
|
get_edited_object()->editor_set_section_unfold(get_edited_property(), edit->is_pressed());
|
|
update_property();
|
|
}
|
|
|
|
void EditorPropertyDictionary::_page_changed(double p_page) {
|
|
if (updating)
|
|
return;
|
|
page_idx = p_page;
|
|
update_property();
|
|
}
|
|
|
|
void EditorPropertyDictionary::_bind_methods() {
|
|
ClassDB::bind_method("_edit_pressed", &EditorPropertyDictionary::_edit_pressed);
|
|
ClassDB::bind_method("_page_changed", &EditorPropertyDictionary::_page_changed);
|
|
ClassDB::bind_method("_property_changed", &EditorPropertyDictionary::_property_changed, DEFVAL(false));
|
|
ClassDB::bind_method("_change_type", &EditorPropertyDictionary::_change_type);
|
|
ClassDB::bind_method("_change_type_menu", &EditorPropertyDictionary::_change_type_menu);
|
|
ClassDB::bind_method("_add_key_value", &EditorPropertyDictionary::_add_key_value);
|
|
}
|
|
|
|
EditorPropertyDictionary::EditorPropertyDictionary() {
|
|
|
|
object.instance();
|
|
page_idx = 0;
|
|
page_len = 10;
|
|
edit = memnew(Button);
|
|
edit->set_flat(true);
|
|
edit->set_h_size_flags(SIZE_EXPAND_FILL);
|
|
edit->set_clip_text(true);
|
|
edit->connect("pressed", this, "_edit_pressed");
|
|
edit->set_toggle_mode(true);
|
|
add_child(edit);
|
|
add_focusable(edit);
|
|
vbox = NULL;
|
|
page = NULL;
|
|
updating = false;
|
|
change_type = memnew(PopupMenu);
|
|
add_child(change_type);
|
|
change_type->connect("id_pressed", this, "_change_type_menu");
|
|
changing_type_idx = -1;
|
|
for (int i = 0; i < Variant::VARIANT_MAX; i++) {
|
|
String type = Variant::get_type_name(Variant::Type(i));
|
|
change_type->add_item(type, i);
|
|
}
|
|
change_type->add_separator();
|
|
change_type->add_item(TTR("Remove Item"), Variant::VARIANT_MAX);
|
|
changing_type_idx = -1;
|
|
}
|