godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
godot/editor/property_editor.cpp

4214 lines
106 KiB
C++
Raw Normal View History

GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
/*************************************************************************/
/* property_editor.cpp */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* http://www.godotengine.org */
/*************************************************************************/
Welcome in 2017, dear changelog reader! That year should bring the long-awaited OpenGL ES 3.0 compatible renderer with state-of-the-art rendering techniques tuned to work as low as middle end handheld devices - without compromising with the possibilities given for higher end desktop games of course. Great times ahead for the Godot community and the gamers that will play our games! (cherry picked from commit c7bc44d5ad9aae4902280012f7654e2318cd910e)
2017-01-01 21:01:57 +00:00
/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
/* */
/* 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 "property_editor.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
#include "array_property_edit.h"
#include "editor_file_system.h"
#include "editor_help.h"
#include "editor_import_export.h"
#include "editor_node.h"
#include "editor_settings.h"
#include "globals.h"
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
#include "io/image_loader.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
#include "io/resource_loader.h"
#include "multi_node_edit.h"
#include "object_type_db.h"
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
#include "os/input.h"
#include "os/keyboard.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
#include "pair.h"
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
#include "print_string.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
#include "scene/gui/label.h"
#include "scene/main/viewport.h"
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
#include "scene/resources/font.h"
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
#include "scene/resources/packed_scene.h"
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
#include "scene/scene_string_names.h"
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void CustomPropertyEditor::_notification(int p_what) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_what == NOTIFICATION_DRAW) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
RID ci = get_canvas_item();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
get_stylebox("panel", "PopupMenu")->draw(ci, Rect2(Point2(), get_size()));
Revert "Tree and PropertyEditor confirm value change on focus loss"
2016-01-23 14:20:54 +00:00
/*
if (v.get_type()==Variant::COLOR) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Revert "Tree and PropertyEditor confirm value change on focus loss"
2016-01-23 14:20:54 +00:00
VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2( 10,10,60, get_size().height-20 ), v );
}*/
Auto select custom property value field when pop up, user can start typing to change value right away.
2014-02-27 14:16:00 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
void CustomPropertyEditor::_menu_option(int p_which) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
switch (type) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case Variant::INT: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint == PROPERTY_HINT_FLAGS) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
int val = v;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (val & (1 << p_which)) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
val &= ~(1 << p_which);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
val |= (1 << p_which);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = val;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
}
} break;
case Variant::OBJECT: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
switch (p_which) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case OBJ_MENU_LOAD: {
new file dialog! -ItemList control for easier lists/thumbnails -New file dialog, with support for thumbnails, favorites, recent places, etc -Moved .fscache out of the project, no more bugs due to committed/pulled .fscache! -Dir dialog now sorts directories
2015-06-06 12:44:38 +00:00
file->set_mode(EditorFileDialog::MODE_OPEN_FILE);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String type = (hint == PROPERTY_HINT_RESOURCE_TYPE) ? hint_text : String();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix shader loading, making possible load .shd and .sgp from editor
2015-11-28 00:11:20 +00:00
List<String> extensions;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < type.get_slice_count(","); i++) {
Fix shader loading, making possible load .shd and .sgp from editor
2015-11-28 00:11:20 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ResourceLoader::get_recognized_extensions_for_type(type.get_slice(",", i), &extensions);
Fix shader loading, making possible load .shd and .sgp from editor
2015-11-28 00:11:20 +00:00
}
Set<String> valid_extensions;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (List<String>::Element *E = extensions.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fix shader loading, making possible load .shd and .sgp from editor
2015-11-28 00:11:20 +00:00
valid_extensions.insert(E->get());
}
file->clear_filters();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (Set<String>::Element *E = valid_extensions.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
file->add_filter("*." + E->get() + " ; " + E->get().to_upper());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
file->popup_centered_ratio();
} break;
case OBJ_MENU_EDIT: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
RefPtr RefPtr = v;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!RefPtr.is_null()) {
emit_signal("resource_edit_request");
hide();
}
} break;
case OBJ_MENU_CLEAR: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = Variant();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
hide();
} break;
case OBJ_MENU_MAKE_UNIQUE: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
RefPtr RefPtr = v;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Ref<Resource> res_orig = RefPtr;
if (res_orig.is_null())
return;
List<PropertyInfo> property_list;
res_orig->get_property_list(&property_list);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
List<Pair<String, Variant> > propvalues;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (List<PropertyInfo>::Element *E = property_list.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Pair<String, Variant> p;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
PropertyInfo &pi = E->get();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (pi.usage & PROPERTY_USAGE_STORAGE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p.first = pi.name;
p.second = res_orig->get(pi.name);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
propvalues.push_back(p);
}
String orig_type = res_orig->get_type();
-Work in progress visual shader editor *DOES NOT WORK YET*
2015-01-03 19:52:37 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Object *inst = ObjectTypeDB::instance(orig_type);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Ref<Resource> res = Ref<Resource>(inst->cast_to<Resource>());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
ERR_FAIL_COND(res.is_null());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (List<Pair<String, Variant> >::Element *E = propvalues.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Pair<String, Variant> &p = E->get();
res->set(p.first, p.second);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = res.get_ref_ptr();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
hide();
} break;
case OBJ_MENU_COPY: {
EditorSettings::get_singleton()->set_resource_clipboard(v);
} break;
case OBJ_MENU_PASTE: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = EditorSettings::get_singleton()->get_resource_clipboard();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
} break;
case OBJ_MENU_REIMPORT: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
RES r = v;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (r.is_valid() && r->get_import_metadata().is_valid()) {
Ref<ResourceImportMetadata> rimd = r->get_import_metadata();
Ref<EditorImportPlugin> eip = EditorImportExport::get_singleton()->get_import_plugin_by_name(rimd->get_editor());
if (eip.is_valid()) {
eip->import_dialog(r->get_path());
}
}
} break;
default: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ERR_FAIL_COND(inheritors_array.empty());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String intype = inheritors_array[p_which - TYPE_BASE_ID];
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Object *obj = ObjectTypeDB::instance(intype);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ERR_BREAK(!obj);
Resource *res = obj->cast_to<Resource>();
ERR_BREAK(!res);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = Ref<Resource>(res).get_ref_ptr();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
} break;
}
} break;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
default: {}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
void CustomPropertyEditor::hide_menu() {
menu->hide();
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Variant CustomPropertyEditor::get_variant() const {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
return v;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
String CustomPropertyEditor::get_name() const {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return name;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant::Type p_type, const Variant &p_variant, int p_hint, String p_hint_text) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
owner = p_owner;
updating = true;
name = p_name;
v = p_variant;
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
field_names.clear();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
hint = p_hint;
hint_text = p_hint_text;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
type_button->hide();
-Heavily improved editor startup and exit performance
2016-06-08 01:08:12 +00:00
if (color_picker)
color_picker->hide();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
texture_preview->hide();
inheritors_array.clear();
text_edit->hide();
easing_draw->hide();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
spinbox->hide();
slider->hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < MAX_VALUE_EDITORS; i++) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
value_editor[i]->hide();
value_label[i]->hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (i < 4)
Revert "Tree and PropertyEditor confirm value change on focus loss"
2016-01-23 14:20:54 +00:00
scroll[i]->hide();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < MAX_ACTION_BUTTONS; i++) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
action_buttons[i]->hide();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < 20; i++)
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
checks20[i]->hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
type = (p_variant.get_type() != Variant::NIL && p_variant.get_type() != Variant::_RID && p_type != Variant::OBJECT) ? p_variant.get_type() : p_type;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
switch (type) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case Variant::INT:
case Variant::REAL: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint == PROPERTY_HINT_RANGE) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
int c = hint_text.get_slice_count(",");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
float min = 0, max = 100, step = 1;
if (c >= 1) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (!hint_text.get_slice(",", 0).empty())
min = hint_text.get_slice(",", 0).to_double();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (c >= 2) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (!hint_text.get_slice(",", 1).empty())
max = hint_text.get_slice(",", 1).to_double();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (c >= 3) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (!hint_text.get_slice(",", 2).empty())
step = hint_text.get_slice(",", 2).to_double();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (c >= 4 && hint_text.get_slice(",", 3) == "slider") {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
slider->set_min(min);
slider->set_max(max);
Allow step for integer properties Small readability improvement (cherry picked from commit 7b293aa4d412c938b56d8996dab04232d3c40e2e)
2016-10-10 10:20:52 +00:00
slider->set_step(step);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
slider->set_val(v);
slider->show();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
set_size(Size2(110, 30) * EDSCALE);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
} else {
spinbox->set_min(min);
spinbox->set_max(max);
Allow step for integer properties Small readability improvement (cherry picked from commit 7b293aa4d412c938b56d8996dab04232d3c40e2e)
2016-10-10 10:20:52 +00:00
spinbox->set_step(step);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
spinbox->set_val(v);
spinbox->show();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
set_size(Size2(70, 35) * EDSCALE);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (hint == PROPERTY_HINT_ALL_FLAGS) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
uint32_t flgs = v;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < 2; i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Point2 ofs(4, 4);
ofs.y += 22 * i;
for (int j = 0; j < 10; j++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
CheckBox *c = checks20[i * 10 + j];
Point2 o = ofs;
o.x += j * 22;
if (j >= 5)
o.x += 4;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
c->set_pos(o);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
c->set_pressed(flgs & (1 << (i * 10 + j)));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
c->show();
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
set_size(checks20[19]->get_pos() + Size2(20, 25) * EDSCALE);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (hint == PROPERTY_HINT_EXP_EASING) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
easing_draw->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_BEGIN, 5);
easing_draw->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 5);
easing_draw->set_anchor_and_margin(MARGIN_TOP, ANCHOR_BEGIN, 5);
easing_draw->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, 30);
type_button->set_anchor_and_margin(MARGIN_LEFT, ANCHOR_BEGIN, 3);
type_button->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 3);
type_button->set_anchor_and_margin(MARGIN_TOP, ANCHOR_END, 25);
type_button->set_anchor_and_margin(MARGIN_BOTTOM, ANCHOR_END, 7);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
type_button->set_text(TTR("Preset.."));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
type_button->get_popup()->clear();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
type_button->get_popup()->add_item(TTR("Linear"), EASING_LINEAR);
type_button->get_popup()->add_item(TTR("Ease In"), EASING_EASE_IN);
type_button->get_popup()->add_item(TTR("Ease Out"), EASING_EASE_OUT);
if (hint_text != "attenuation") {
type_button->get_popup()->add_item(TTR("Zero"), EASING_ZERO);
type_button->get_popup()->add_item(TTR("Easing In-Out"), EASING_IN_OUT);
type_button->get_popup()->add_item(TTR("Easing Out-In"), EASING_OUT_IN);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
type_button->show();
easing_draw->show();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
set_size(Size2(200, 150) * EDSCALE);
} else if (hint == PROPERTY_HINT_FLAGS) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
menu->clear();
Vector<String> flags = hint_text.split(",");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < flags.size(); i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
String flag = flags[i];
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (flag == "")
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
menu->add_check_item(flag, i);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
int f = v;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (f & (1 << i))
menu->set_item_checked(menu->get_item_index(i), true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
menu->set_pos(get_pos());
menu->popup();
hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
updating = false;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return false;
} else {
List<String> names;
names.push_back("value:");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
config_value_editors(1, 1, 50, names);
value_editor[0]->set_text(String::num(v));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
} break;
case Variant::STRING: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint == PROPERTY_HINT_FILE || hint == PROPERTY_HINT_GLOBAL_FILE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
List<String> names;
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
names.push_back(TTR("File.."));
names.push_back(TTR("Clear"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
config_action_buttons(names);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (hint == PROPERTY_HINT_DIR || hint == PROPERTY_HINT_GLOBAL_DIR) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
List<String> names;
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
names.push_back(TTR("Dir.."));
names.push_back(TTR("Clear"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
config_action_buttons(names);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (hint == PROPERTY_HINT_ENUM) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (hint == PROPERTY_HINT_MULTILINE_TEXT) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
text_edit->show();
text_edit->set_text(v);
//action_buttons[0];
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
int button_margin = get_constant("button_margin", "Dialogs");
int margin = get_constant("margin", "Dialogs");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
action_buttons[0]->set_anchor(MARGIN_LEFT, ANCHOR_END);
action_buttons[0]->set_anchor(MARGIN_TOP, ANCHOR_END);
action_buttons[0]->set_anchor(MARGIN_RIGHT, ANCHOR_END);
action_buttons[0]->set_anchor(MARGIN_BOTTOM, ANCHOR_END);
action_buttons[0]->set_begin(Point2(70, button_margin - 5));
action_buttons[0]->set_end(Point2(margin, margin));
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
action_buttons[0]->set_text(TTR("Close"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
action_buttons[0]->show();
} else {
List<String> names;
names.push_back("string:");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
config_value_editors(1, 1, 50, names);
value_editor[0]->set_text(v);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
} break;
case Variant::VECTOR2: {
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
field_names.push_back("x");
field_names.push_back("y");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
config_value_editors(2, 2, 10, field_names);
Vector2 vec = v;
value_editor[0]->set_text(String::num(vec.x));
value_editor[1]->set_text(String::num(vec.y));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::RECT2: {
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
field_names.push_back("x");
field_names.push_back("y");
field_names.push_back("w");
field_names.push_back("h");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
config_value_editors(4, 4, 10, field_names);
Rect2 r = v;
value_editor[0]->set_text(String::num(r.pos.x));
value_editor[1]->set_text(String::num(r.pos.y));
value_editor[2]->set_text(String::num(r.size.x));
value_editor[3]->set_text(String::num(r.size.y));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::VECTOR3: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
field_names.push_back("x");
field_names.push_back("y");
field_names.push_back("z");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
config_value_editors(3, 3, 10, field_names);
Vector3 vec = v;
value_editor[0]->set_text(String::num(vec.x));
value_editor[1]->set_text(String::num(vec.y));
value_editor[2]->set_text(String::num(vec.z));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::PLANE: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
field_names.push_back("x");
field_names.push_back("y");
field_names.push_back("z");
field_names.push_back("d");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
config_value_editors(4, 4, 10, field_names);
Plane plane = v;
value_editor[0]->set_text(String::num(plane.normal.x));
value_editor[1]->set_text(String::num(plane.normal.y));
value_editor[2]->set_text(String::num(plane.normal.z));
value_editor[3]->set_text(String::num(plane.d));
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::QUAT: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
field_names.push_back("x");
field_names.push_back("y");
field_names.push_back("z");
field_names.push_back("w");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
config_value_editors(4, 4, 10, field_names);
Quat q = v;
value_editor[0]->set_text(String::num(q.x));
value_editor[1]->set_text(String::num(q.y));
value_editor[2]->set_text(String::num(q.z));
value_editor[3]->set_text(String::num(q.w));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::_AABB: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
field_names.push_back("px");
field_names.push_back("py");
field_names.push_back("pz");
field_names.push_back("sx");
field_names.push_back("sy");
field_names.push_back("sz");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
config_value_editors(6, 3, 16, field_names);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
AABB aabb = v;
value_editor[0]->set_text(String::num(aabb.pos.x));
value_editor[1]->set_text(String::num(aabb.pos.y));
value_editor[2]->set_text(String::num(aabb.pos.z));
value_editor[3]->set_text(String::num(aabb.size.x));
value_editor[4]->set_text(String::num(aabb.size.y));
value_editor[5]->set_text(String::num(aabb.size.z));
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::MATRIX32: {
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
field_names.push_back("xx");
field_names.push_back("xy");
field_names.push_back("yx");
field_names.push_back("yy");
field_names.push_back("ox");
field_names.push_back("oy");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
config_value_editors(6, 2, 16, field_names);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Matrix32 basis = v;
for (int i = 0; i < 6; i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
value_editor[i]->set_text(String::num(basis.elements[i / 2][i % 2]));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
} break;
case Variant::MATRIX3: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
field_names.push_back("xx");
field_names.push_back("xy");
field_names.push_back("xz");
field_names.push_back("yx");
field_names.push_back("yy");
field_names.push_back("yz");
field_names.push_back("zx");
field_names.push_back("zy");
field_names.push_back("zz");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
config_value_editors(9, 3, 16, field_names);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Matrix3 basis = v;
for (int i = 0; i < 9; i++) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
value_editor[i]->set_text(String::num(basis.elements[i / 3][i % 3]));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::TRANSFORM: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
field_names.push_back("xx");
field_names.push_back("xy");
field_names.push_back("xz");
field_names.push_back("xo");
field_names.push_back("yx");
field_names.push_back("yy");
field_names.push_back("yz");
field_names.push_back("yo");
field_names.push_back("zx");
field_names.push_back("zy");
field_names.push_back("zz");
field_names.push_back("zo");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
config_value_editors(12, 4, 16, field_names);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Transform tr = v;
for (int i = 0; i < 9; i++) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
value_editor[(i / 3) * 4 + i % 3]->set_text(String::num(tr.basis.elements[i / 3][i % 3]));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
value_editor[3]->set_text(String::num(tr.origin.x));
value_editor[7]->set_text(String::num(tr.origin.y));
value_editor[11]->set_text(String::num(tr.origin.z));
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::COLOR: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
-Heavily improved editor startup and exit performance
2016-06-08 01:08:12 +00:00
if (!color_picker) {
//late init for performance
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
color_picker = memnew(ColorPicker);
-Heavily improved editor startup and exit performance
2016-06-08 01:08:12 +00:00
add_child(color_picker);
color_picker->hide();
color_picker->set_area_as_parent_rect();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < 4; i++)
color_picker->set_margin((Margin)i, 5);
color_picker->connect("color_changed", this, "_color_changed");
-Heavily improved editor startup and exit performance
2016-06-08 01:08:12 +00:00
}
Revert "Tree and PropertyEditor confirm value change on focus loss"
2016-01-23 14:20:54 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
color_picker->show();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
color_picker->set_edit_alpha(hint != PROPERTY_HINT_COLOR_NO_ALPHA);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
color_picker->set_color(v);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
set_size(Size2(300 * EDSCALE, color_picker->get_combined_minimum_size().height + 10 * EDSCALE));
Color picker was getting too much focus, made it get not as much focus. This abuse of focus was the original culprit of #5354
2016-07-01 13:55:35 +00:00
color_picker->set_focus_on_line_edit();
Revert "Tree and PropertyEditor confirm value change on focus loss"
2016-01-23 14:20:54 +00:00
/*
int ofs=80;
int m=10;
int h=20;
Color c=v;
float values[4]={c.r,c.g,c.b,c.a};
for (int i=0;i<4;i++) {
int y=m+i*h;
value_editor[i]->show();
value_label[i]->show();
value_label[i]->set_pos(Point2(ofs,y));
scroll[i]->set_min(0);
scroll[i]->set_max(1.0);
scroll[i]->set_page(0);
scroll[i]->set_pos(Point2(ofs+15,y+Math::floor((h-scroll[i]->get_minimum_size().height)/2.0)));
scroll[i]->set_val(values[i]);
scroll[i]->set_size(Size2(120,1));
scroll[i]->show();
value_editor[i]->set_pos(Point2(ofs+140,y));
value_editor[i]->set_size(Size2(40,h));
value_editor[i]->set_text( String::num(values[i],2 ));
}
value_label[0]->set_text("R");
value_label[1]->set_text("G");
value_label[2]->set_text("B");
value_label[3]->set_text("A");
Size2 new_size = value_editor[3]->get_pos() + value_editor[3]->get_size() + Point2(10,10);
set_size( new_size );
*/
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::IMAGE: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
List<String> names;
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
names.push_back(TTR("New"));
names.push_back(TTR("Load"));
names.push_back(TTR("Clear"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
config_action_buttons(names);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::NODE_PATH: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
List<String> names;
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
names.push_back(TTR("Assign"));
names.push_back(TTR("Clear"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
config_action_buttons(names);
} break;
case Variant::OBJECT: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint != PROPERTY_HINT_RESOURCE_TYPE)
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
break;
menu->clear();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
menu->set_size(Size2(1, 1));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint_text != "") {
int idx = 0;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < hint_text.get_slice_count(","); i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String base = hint_text.get_slice(",", i);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Set<String> valid_inheritors;
valid_inheritors.insert(base);
Several performance improvements, mainly in loading and instancing scenes and resources. A general speedup should be apparent, with even more peformance increase when compiling optimized. WARNING: Tested and it seems to work, but if something breaks, please report.
2015-06-29 03:29:49 +00:00
List<StringName> inheritors;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ObjectTypeDB::get_inheriters_from(base.strip_edges(), &inheritors);
List<StringName>::Element *E = inheritors.front();
while (E) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
valid_inheritors.insert(E->get());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
E = E->next();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (Set<String>::Element *E = valid_inheritors.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
String t = E->get();
if (!ObjectTypeDB::can_instance(t))
continue;
inheritors_array.push_back(t);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
int id = TYPE_BASE_ID + idx;
if (has_icon(t, "EditorIcons")) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
menu->add_icon_item(get_icon(t, "EditorIcons"), TTR("New") + " " + t, id);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
menu->add_item(TTR("New") + " " + t, id);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
idx++;
}
}
if (menu->get_item_count())
menu->add_separator();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
menu->add_icon_item(get_icon("Load", "EditorIcons"), "Load", OBJ_MENU_LOAD);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!RES(v).is_null()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
menu->add_icon_item(get_icon("EditResource", "EditorIcons"), "Edit", OBJ_MENU_EDIT);
menu->add_icon_item(get_icon("Del", "EditorIcons"), "Clear", OBJ_MENU_CLEAR);
menu->add_icon_item(get_icon("Duplicate", "EditorIcons"), "Make Unique", OBJ_MENU_MAKE_UNIQUE);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
RES r = v;
if (r.is_valid() && r->get_path().is_resource_file() && r->get_import_metadata().is_valid()) {
menu->add_separator();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
menu->add_icon_item(get_icon("ReloadSmall", "EditorIcons"), "Re-Import", OBJ_MENU_REIMPORT);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
New option to send canvas to render buffer allows to use 3D environment effects for post processing such as Glow, Bloom, HDR, etc. in 2D.
2015-03-16 03:47:37 +00:00
/*if (r.is_valid() && r->get_path().is_resource_file()) {
menu->set_item_tooltip(1,r->get_path());
} else if (r.is_valid()) {
menu->set_item_tooltip(1,r->get_name()+" ("+r->get_type()+")");
}*/
} else {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
RES cb = EditorSettings::get_singleton()->get_resource_clipboard();
bool paste_valid = false;
Allow to paste resources in inspector when text_hint indicates multiple types
2016-01-10 14:33:45 +00:00
if (cb.is_valid()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint_text == "")
paste_valid = true;
Allow to paste resources in inspector when text_hint indicates multiple types
2016-01-10 14:33:45 +00:00
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < hint_text.get_slice_count(","); i++)
if (ObjectTypeDB::is_type(cb->get_type(), hint_text.get_slice(",", i))) {
paste_valid = true;
Allow to paste resources in inspector when text_hint indicates multiple types
2016-01-10 14:33:45 +00:00
break;
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!RES(v).is_null() || paste_valid) {
menu->add_separator();
if (!RES(v).is_null()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
menu->add_item(TTR("Copy"), OBJ_MENU_COPY);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
if (paste_valid) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
menu->add_item(TTR("Paste"), OBJ_MENU_PASTE);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
menu->set_pos(get_pos());
menu->popup();
hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
updating = false;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return false;
} break;
case Variant::INPUT_EVENT: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::DICTIONARY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::RAW_ARRAY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::INT_ARRAY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::REAL_ARRAY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::STRING_ARRAY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::VECTOR3_ARRAY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::COLOR_ARRAY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
default: {}
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
updating = false;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return true;
}
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
////void CustomPropertyEditor::_save_properties_values(List<String> p_names) {
////
//// field_names=p_names;
//// for (int i=0;i<p_names.size();i++) {
//// field_values.push_back(v.get(p_names[i]));
//// }
////}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void CustomPropertyEditor::_file_selected(String p_file) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
switch (type) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case Variant::STRING: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint == PROPERTY_HINT_FILE || hint == PROPERTY_HINT_DIR) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = Globals::get_singleton()->localize_path(p_file);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
hide();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint == PROPERTY_HINT_GLOBAL_FILE || hint == PROPERTY_HINT_GLOBAL_DIR) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = p_file;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
hide();
}
} break;
case Variant::OBJECT: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String type = (hint == PROPERTY_HINT_RESOURCE_TYPE) ? hint_text : String();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
RES res = ResourceLoader::load(p_file, type);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (res.is_null()) {
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
error->set_text(TTR("Error loading file: Not a resource!"));
Changed popup_centered by popup_centered_minsize in editor dialogs
2015-04-08 17:02:13 +00:00
error->popup_centered_minsize();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
break;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = res.get_ref_ptr();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
hide();
} break;
case Variant::IMAGE: {
Image image;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Error err = ImageLoader::load_image(p_file, &image);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
ERR_EXPLAIN(TTR("Couldn't load image"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
ERR_FAIL_COND(err);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = image;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
hide();
} break;
default: {}
}
}
void CustomPropertyEditor::_type_create_selected(int p_idx) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (type == Variant::INT || type == Variant::REAL) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
float newval = 0;
switch (p_idx) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case EASING_LINEAR: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
newval = 1;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case EASING_EASE_IN: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
newval = 2.0;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case EASING_EASE_OUT: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
newval = 0.5;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case EASING_ZERO: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
newval = 0;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case EASING_IN_OUT: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
newval = -0.5;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case EASING_OUT_IN: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
newval = -2.0;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = newval;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
easing_draw->update();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (type == Variant::OBJECT) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ERR_FAIL_INDEX(p_idx, inheritors_array.size());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//List<String> inheritors;
//ObjectTypeDB::get_inheriters_from(hint_text,&inheritors);
//inheritors.push_front(hint_text);
//ERR_FAIL_INDEX( p_idx, inheritors.size() );
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String intype = inheritors_array[p_idx];
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Object *obj = ObjectTypeDB::instance(intype);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ERR_FAIL_COND(!obj);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Resource *res = obj->cast_to<Resource>();
ERR_FAIL_COND(!res);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = Ref<Resource>(res).get_ref_ptr();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
hide();
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void CustomPropertyEditor::_color_changed(const Color &p_color) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = p_color;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
}
void CustomPropertyEditor::_node_path_selected(NodePath p_path) {
Fix array editor NodePath being relative to editor
2015-12-13 14:42:29 +00:00
if (owner) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Node *node = NULL;
Fix array editor NodePath being relative to editor
2015-12-13 14:42:29 +00:00
if (owner->is_type("Node"))
node = owner->cast_to<Node>();
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-18 22:08:12 +00:00
else if (owner->is_type("ArrayPropertyEdit"))
Fix array editor NodePath being relative to editor
2015-12-13 14:42:29 +00:00
node = owner->cast_to<ArrayPropertyEdit>()->get_node();
if (!node) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = p_path;
Fix array editor NodePath being relative to editor
2015-12-13 14:42:29 +00:00
emit_signal("variant_changed");
Properly hide assign/clear dialog, closes #2295
2016-01-02 13:47:50 +00:00
call_deferred("hide"); //to not mess with dialogs
Fix array editor NodePath being relative to editor
2015-12-13 14:42:29 +00:00
return;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Node *tonode = node->get_node(p_path);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (tonode) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_path = node->get_path_to(tonode);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = p_path;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
Properly hide assign/clear dialog, closes #2295
2016-01-02 13:47:50 +00:00
call_deferred("hide"); //to not mess with dialogs
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
void CustomPropertyEditor::_action_pressed(int p_which) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
if (updating)
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return;
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
switch (type) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case Variant::INT: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint == PROPERTY_HINT_ALL_FLAGS) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
uint32_t f = v;
if (checks20[p_which]->is_pressed())
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
f |= (1 << p_which);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
f &= ~(1 << p_which);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = f;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
}
} break;
case Variant::STRING: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint == PROPERTY_HINT_MULTILINE_TEXT) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (hint == PROPERTY_HINT_FILE || hint == PROPERTY_HINT_GLOBAL_FILE) {
if (p_which == 0) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint == PROPERTY_HINT_FILE)
new file dialog! -ItemList control for easier lists/thumbnails -New file dialog, with support for thumbnails, favorites, recent places, etc -Moved .fscache out of the project, no more bugs due to committed/pulled .fscache! -Dir dialog now sorts directories
2015-06-06 12:44:38 +00:00
file->set_access(EditorFileDialog::ACCESS_RESOURCES);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
else
new file dialog! -ItemList control for easier lists/thumbnails -New file dialog, with support for thumbnails, favorites, recent places, etc -Moved .fscache out of the project, no more bugs due to committed/pulled .fscache! -Dir dialog now sorts directories
2015-06-06 12:44:38 +00:00
file->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
new file dialog! -ItemList control for easier lists/thumbnails -New file dialog, with support for thumbnails, favorites, recent places, etc -Moved .fscache out of the project, no more bugs due to committed/pulled .fscache! -Dir dialog now sorts directories
2015-06-06 12:44:38 +00:00
file->set_mode(EditorFileDialog::MODE_OPEN_FILE);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
file->clear_filters();
file->clear_filters();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint_text != "") {
Vector<String> extensions = hint_text.split(",");
for (int i = 0; i < extensions.size(); i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
-Support for changing fonts -Detect when free() might crash the project and throw error -fixed 2D Bounce in physics (3d still broken) -renamed “on_top” property to “behind_parent”, which makes more sense, old on_top remains there for compatibility but is invisible. -large amount of fixes
2014-04-05 15:39:30 +00:00
String filter = extensions[i];
if (filter.begins_with("."))
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
filter = "*" + extensions[i];
-Support for changing fonts -Detect when free() might crash the project and throw error -fixed 2D Bounce in physics (3d still broken) -renamed “on_top” property to “behind_parent”, which makes more sense, old on_top remains there for compatibility but is invisible. -large amount of fixes
2014-04-05 15:39:30 +00:00
else if (!filter.begins_with("*"))
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
filter = "*." + extensions[i];
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
file->add_filter(filter + " ; " + extensions[i].to_upper());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
file->popup_centered_ratio();
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = "";
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
hide();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (hint == PROPERTY_HINT_DIR || hint == PROPERTY_HINT_GLOBAL_DIR) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_which == 0) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint == PROPERTY_HINT_DIR)
new file dialog! -ItemList control for easier lists/thumbnails -New file dialog, with support for thumbnails, favorites, recent places, etc -Moved .fscache out of the project, no more bugs due to committed/pulled .fscache! -Dir dialog now sorts directories
2015-06-06 12:44:38 +00:00
file->set_access(EditorFileDialog::ACCESS_RESOURCES);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
else
new file dialog! -ItemList control for easier lists/thumbnails -New file dialog, with support for thumbnails, favorites, recent places, etc -Moved .fscache out of the project, no more bugs due to committed/pulled .fscache! -Dir dialog now sorts directories
2015-06-06 12:44:38 +00:00
file->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
file->set_mode(EditorFileDialog::MODE_OPEN_DIR);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
file->clear_filters();
file->popup_centered_ratio();
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = "";
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
hide();
}
}
} break;
case Variant::NODE_PATH: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_which == 0) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
scene_tree->popup_centered_ratio();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (p_which == 1) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = NodePath();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
Properly hide assign/clear dialog, closes #2295
2016-01-02 13:47:50 +00:00
hide();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::OBJECT: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_which == 0) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ERR_FAIL_COND(inheritors_array.empty());
-Work in progress visual shader editor *DOES NOT WORK YET*
2015-01-03 19:52:37 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String intype = inheritors_array[0];
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint == PROPERTY_HINT_RESOURCE_TYPE) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Object *obj = ObjectTypeDB::instance(intype);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ERR_BREAK(!obj);
Resource *res = obj->cast_to<Resource>();
ERR_BREAK(!res);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = Ref<Resource>(res).get_ref_ptr();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
hide();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (p_which == 1) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
new file dialog! -ItemList control for easier lists/thumbnails -New file dialog, with support for thumbnails, favorites, recent places, etc -Moved .fscache out of the project, no more bugs due to committed/pulled .fscache! -Dir dialog now sorts directories
2015-06-06 12:44:38 +00:00
file->set_access(EditorFileDialog::ACCESS_RESOURCES);
file->set_mode(EditorFileDialog::MODE_OPEN_FILE);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
List<String> extensions;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String type = (hint == PROPERTY_HINT_RESOURCE_TYPE) ? hint_text : String();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ResourceLoader::get_recognized_extensions_for_type(type, &extensions);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
file->clear_filters();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (List<String>::Element *E = extensions.front(); E; E = E->next()) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
file->add_filter("*." + E->get() + " ; " + E->get().to_upper());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
file->popup_centered_ratio();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (p_which == 2) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
RefPtr RefPtr = v;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!RefPtr.is_null()) {
emit_signal("resource_edit_request");
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
hide();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (p_which == 3) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = Variant();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (p_which == 4) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
RefPtr RefPtr = v;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Ref<Resource> res_orig = RefPtr;
if (res_orig.is_null())
return;
List<PropertyInfo> property_list;
res_orig->get_property_list(&property_list);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
List<Pair<String, Variant> > propvalues;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (List<PropertyInfo>::Element *E = property_list.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Pair<String, Variant> p;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
PropertyInfo &pi = E->get();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (pi.usage & PROPERTY_USAGE_STORAGE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p.first = pi.name;
p.second = res_orig->get(pi.name);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
propvalues.push_back(p);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Ref<Resource> res = Ref<Resource>(ObjectTypeDB::instance(res_orig->get_type()));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
ERR_FAIL_COND(res.is_null());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (List<Pair<String, Variant> >::Element *E = propvalues.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Pair<String, Variant> &p = E->get();
res->set(p.first, p.second);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = res.get_ref_ptr();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
hide();
}
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::IMAGE: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_which == 0) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//new image too difficult
ERR_PRINT("New Image Unimplemented");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (p_which == 1) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
new file dialog! -ItemList control for easier lists/thumbnails -New file dialog, with support for thumbnails, favorites, recent places, etc -Moved .fscache out of the project, no more bugs due to committed/pulled .fscache! -Dir dialog now sorts directories
2015-06-06 12:44:38 +00:00
file->set_access(EditorFileDialog::ACCESS_RESOURCES);
file->set_mode(EditorFileDialog::MODE_OPEN_FILE);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
List<String> extensions;
ImageLoader::get_recognized_extensions(&extensions);
file->clear_filters();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (List<String>::Element *E = extensions.front(); E; E = E->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
file->add_filter("*." + E->get() + " ; " + E->get().to_upper());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
file->popup_centered_ratio();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (p_which == 2) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = Image();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
hide();
}
} break;
default: {};
}
}
Revert "Tree and PropertyEditor confirm value change on focus loss"
2016-01-23 14:20:54 +00:00
void CustomPropertyEditor::_scroll_modified(double p_value) {
if (updating)
return;
/*
switch(type) {
case Variant::COLOR: {
for (int i=0;i<4;i++) {
value_editor[i]->set_text( String::num(scroll[i]->get_val(),2) );
}
Color c;
c.r=scroll[0]->get_val();
c.g=scroll[1]->get_val();
c.b=scroll[2]->get_val();
c.a=scroll[3]->get_val();
v=c;
update();
emit_signal("variant_changed");
} break;
default: {}
}
*/
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void CustomPropertyEditor::_drag_easing(const InputEvent &p_ev) {
Revert "Tree and PropertyEditor confirm value change on focus loss"
2016-01-23 14:20:54 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_ev.type == InputEvent::MOUSE_MOTION && p_ev.mouse_motion.button_mask & BUTTON_MASK_LEFT) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
float rel = p_ev.mouse_motion.relative_x;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (rel == 0)
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
return;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
bool flip = hint_text == "attenuation";
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (flip)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
rel = -rel;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
float val = v;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (val == 0)
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return;
bool sg = val < 0;
val = Math::absf(val);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
val = Math::log(val) / Math::log(2);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//logspace
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
val += rel * 0.05;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
val = Math::pow(2, val);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (sg)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
val = -val;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = val;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
easing_draw->update();
//emit_signal("variant_changed");
emit_signal("variant_changed");
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_ev.type == InputEvent::MOUSE_BUTTON && p_ev.mouse_button.button_index == BUTTON_LEFT) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
void CustomPropertyEditor::_draw_easing() {
RID ci = easing_draw->get_canvas_item();
Size2 s = easing_draw->get_size();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Rect2 r(Point2(), s);
r = r.grow(3);
get_stylebox("normal", "LineEdit")->draw(ci, r);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//VisualServer::get_singleton()->canvas_item_add
int points = 48;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
float prev = 1.0;
float exp = v;
bool flip = hint_text == "attenuation";
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Ref<Font> f = get_font("font", "Label");
Color color = get_color("font_color", "Label");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 1; i <= points; i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
float ifl = i / float(points);
float iflp = (i - 1) / float(points);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
float h = 1.0 - Math::ease(ifl, exp);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (flip) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ifl = 1.0 - ifl;
iflp = 1.0 - iflp;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
VisualServer::get_singleton()->canvas_item_add_line(ci, Point2(iflp * s.width, prev * s.height), Point2(ifl * s.width, h * s.height), color);
prev = h;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
f->draw(ci, Point2(10, 10 + f->get_ascent()), String::num(exp, 2), color);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
void CustomPropertyEditor::_text_edit_changed() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = text_edit->get_text();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
}
void CustomPropertyEditor::_modified(String p_string) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (updating)
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
updating = true;
switch (type) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case Variant::REAL: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint != PROPERTY_HINT_EXP_EASING) {
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
if (evaluator)
evaluator->eval(value_editor[0]->get_text());
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = value_editor[0]->get_text().to_double();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
}
} break;
case Variant::STRING: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = value_editor[0]->get_text();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
emit_signal("variant_changed");
} break;
case Variant::VECTOR2: {
Vector2 vec;
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
if (evaluator) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
vec.x = evaluator->eval(value_editor[0]->get_text());
vec.y = evaluator->eval(value_editor[1]->get_text());
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
vec.x = value_editor[0]->get_text().to_double();
vec.y = value_editor[1]->get_text().to_double();
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = vec;
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
_emit_changed_whole_or_field();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::RECT2: {
Rect2 r2;
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
if (evaluator) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
r2.pos.x = evaluator->eval(value_editor[0]->get_text());
r2.pos.y = evaluator->eval(value_editor[1]->get_text());
r2.size.x = evaluator->eval(value_editor[2]->get_text());
r2.size.y = evaluator->eval(value_editor[3]->get_text());
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
r2.pos.x = value_editor[0]->get_text().to_double();
r2.pos.y = value_editor[1]->get_text().to_double();
r2.size.x = value_editor[2]->get_text().to_double();
r2.size.y = value_editor[3]->get_text().to_double();
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = r2;
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
_emit_changed_whole_or_field();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::VECTOR3: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector3 vec;
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
if (evaluator) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
vec.x = evaluator->eval(value_editor[0]->get_text());
vec.y = evaluator->eval(value_editor[1]->get_text());
vec.z = evaluator->eval(value_editor[2]->get_text());
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
vec.x = value_editor[0]->get_text().to_double();
vec.y = value_editor[1]->get_text().to_double();
vec.z = value_editor[2]->get_text().to_double();
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = vec;
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
_emit_changed_whole_or_field();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::PLANE: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Plane pl;
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
if (evaluator) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
pl.normal.x = evaluator->eval(value_editor[0]->get_text());
pl.normal.y = evaluator->eval(value_editor[1]->get_text());
pl.normal.z = evaluator->eval(value_editor[2]->get_text());
pl.d = evaluator->eval(value_editor[3]->get_text());
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
pl.normal.x = value_editor[0]->get_text().to_double();
pl.normal.y = value_editor[1]->get_text().to_double();
pl.normal.z = value_editor[2]->get_text().to_double();
pl.d = value_editor[3]->get_text().to_double();
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = pl;
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
_emit_changed_whole_or_field();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::QUAT: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Quat q;
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
if (evaluator) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
q.x = evaluator->eval(value_editor[0]->get_text());
q.y = evaluator->eval(value_editor[1]->get_text());
q.z = evaluator->eval(value_editor[2]->get_text());
q.w = evaluator->eval(value_editor[3]->get_text());
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
q.x = value_editor[0]->get_text().to_double();
q.y = value_editor[1]->get_text().to_double();
q.z = value_editor[2]->get_text().to_double();
q.w = value_editor[3]->get_text().to_double();
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = q;
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
_emit_changed_whole_or_field();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::_AABB: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector3 pos;
Vector3 size;
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
if (evaluator) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
pos.x = evaluator->eval(value_editor[0]->get_text());
pos.y = evaluator->eval(value_editor[1]->get_text());
pos.z = evaluator->eval(value_editor[2]->get_text());
size.x = evaluator->eval(value_editor[3]->get_text());
size.y = evaluator->eval(value_editor[4]->get_text());
size.z = evaluator->eval(value_editor[5]->get_text());
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
pos.x = value_editor[0]->get_text().to_double();
pos.y = value_editor[1]->get_text().to_double();
pos.z = value_editor[2]->get_text().to_double();
size.x = value_editor[3]->get_text().to_double();
size.y = value_editor[4]->get_text().to_double();
size.z = value_editor[5]->get_text().to_double();
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = AABB(pos, size);
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
_emit_changed_whole_or_field();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::MATRIX32: {
Fix property editor Matrix3 and Matrix32 editing
2015-11-23 18:34:54 +00:00
Matrix32 m;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < 6; i++) {
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
if (evaluator) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
m.elements[i / 2][i % 2] = evaluator->eval(value_editor[i]->get_text());
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
m.elements[i / 2][i % 2] = value_editor[i]->get_text().to_double();
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = m;
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
_emit_changed_whole_or_field();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::MATRIX3: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Matrix3 m;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < 9; i++) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
if (evaluator) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
m.elements[i / 3][i % 3] = evaluator->eval(value_editor[i]->get_text());
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
m.elements[i / 3][i % 3] = value_editor[i]->get_text().to_double();
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = m;
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
_emit_changed_whole_or_field();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::TRANSFORM: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Matrix3 basis;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < 9; i++) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
if (evaluator) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
basis.elements[i / 3][i % 3] = evaluator->eval(value_editor[(i / 3) * 4 + i % 3]->get_text());
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
basis.elements[i / 3][i % 3] = value_editor[(i / 3) * 4 + i % 3]->get_text().to_double();
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector3 origin;
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
if (evaluator) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
origin.x = evaluator->eval(value_editor[3]->get_text());
origin.y = evaluator->eval(value_editor[7]->get_text());
origin.z = evaluator->eval(value_editor[11]->get_text());
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
origin.x = value_editor[3]->get_text().to_double();
origin.y = value_editor[7]->get_text().to_double();
origin.z = value_editor[11]->get_text().to_double();
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
}
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = Transform(basis, origin);
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
_emit_changed_whole_or_field();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::COLOR: {
Revert "Tree and PropertyEditor confirm value change on focus loss"
2016-01-23 14:20:54 +00:00
/*
for (int i=0;i<4;i++) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Revert "Tree and PropertyEditor confirm value change on focus loss"
2016-01-23 14:20:54 +00:00
scroll[i]->set_val( value_editor[i]->get_text().to_double() );
}
Color c;
c.r=value_editor[0]->get_text().to_double();
c.g=value_editor[1]->get_text().to_double();
c.b=value_editor[2]->get_text().to_double();
c.a=value_editor[3]->get_text().to_double();
v=c;
update();
emit_signal("variant_changed");
*/
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::IMAGE: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::NODE_PATH: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case Variant::INPUT_EVENT: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::DICTIONARY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::RAW_ARRAY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::INT_ARRAY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::REAL_ARRAY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::STRING_ARRAY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::VECTOR3_ARRAY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::COLOR_ARRAY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
default: {}
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
updating = false;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
void CustomPropertyEditor::_emit_changed_whole_or_field() {
if (!Input::get_singleton()->is_key_pressed(KEY_SHIFT)) {
emit_signal("variant_changed");
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
emit_signal("variant_field_changed", field_names[focused_value_editor]);
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void CustomPropertyEditor::_range_modified(double p_value) {
v = p_value;
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
emit_signal("variant_changed");
}
Auto select custom property value field when pop up, user can start typing to change value right away.
2014-02-27 14:16:00 +00:00
void CustomPropertyEditor::_focus_enter() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
switch (type) {
Auto select custom property value field when pop up, user can start typing to change value right away.
2014-02-27 14:16:00 +00:00
case Variant::REAL:
case Variant::STRING:
case Variant::VECTOR2:
case Variant::RECT2:
case Variant::VECTOR3:
case Variant::PLANE:
case Variant::QUAT:
case Variant::_AABB:
case Variant::MATRIX32:
case Variant::MATRIX3:
case Variant::TRANSFORM: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < MAX_VALUE_EDITORS; ++i) {
Auto select custom property value field when pop up, user can start typing to change value right away.
2014-02-27 14:16:00 +00:00
if (value_editor[i]->has_focus()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
focused_value_editor = i;
Auto select custom property value field when pop up, user can start typing to change value right away.
2014-02-27 14:16:00 +00:00
value_editor[i]->select_all();
break;
}
}
} break;
default: {}
}
}
void CustomPropertyEditor::_focus_exit() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
switch (type) {
Auto select custom property value field when pop up, user can start typing to change value right away.
2014-02-27 14:16:00 +00:00
case Variant::REAL:
case Variant::STRING:
case Variant::VECTOR2:
case Variant::RECT2:
case Variant::VECTOR3:
case Variant::PLANE:
case Variant::QUAT:
case Variant::_AABB:
case Variant::MATRIX32:
case Variant::MATRIX3:
case Variant::TRANSFORM: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < MAX_VALUE_EDITORS; ++i) {
Auto select custom property value field when pop up, user can start typing to change value right away.
2014-02-27 14:16:00 +00:00
value_editor[i]->select(0, 0);
}
} break;
default: {}
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void CustomPropertyEditor::config_action_buttons(const List<String> &p_strings) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
int w = 100;
int h = 18;
int m = 5;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
set_size(Size2(w, m * 2 + (h + m) * p_strings.size()));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < MAX_ACTION_BUTTONS; i++) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (i < p_strings.size()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
action_buttons[i]->show();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
action_buttons[i]->set_text(p_strings[i]);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
action_buttons[i]->set_pos(Point2(m, m + i * (h + m)));
action_buttons[i]->set_size(Size2(w - m * 2, h));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
action_buttons[i]->set_flat(true);
} else {
action_buttons[i]->hide();
}
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void CustomPropertyEditor::config_value_editors(int p_amount, int p_columns, int p_label_w, const List<String> &p_strings) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
int w = 80;
int h = 20;
int m = 10;
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
int rows = ((p_amount - 1) / p_columns) + 1;
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
set_size(Size2(m * (1 + p_columns) + (w + p_label_w) * p_columns, m * (1 + rows) + h * rows));
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < MAX_VALUE_EDITORS; i++) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
int c = i % p_columns;
int r = i / p_columns;
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (i < p_amount) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
value_editor[i]->show();
value_label[i]->show();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
value_label[i]->set_text(i < p_strings.size() ? p_strings[i] : String(""));
value_editor[i]->set_pos(Point2(m + p_label_w + c * (w + m + p_label_w), m + r * (h + m)));
value_editor[i]->set_size(Size2(w, h));
value_label[i]->set_pos(Point2(m + c * (w + m + p_label_w), m + r * (h + m)));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
value_editor[i]->set_editable(!read_only);
} else {
value_editor[i]->hide();
value_label[i]->hide();
}
}
}
void CustomPropertyEditor::_bind_methods() {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Auto select custom property value field when pop up, user can start typing to change value right away.
2014-02-27 14:16:00 +00:00
ObjectTypeDB::bind_method("_focus_enter", &CustomPropertyEditor::_focus_enter);
ObjectTypeDB::bind_method("_focus_exit", &CustomPropertyEditor::_focus_exit);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ObjectTypeDB::bind_method("_modified", &CustomPropertyEditor::_modified);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
ObjectTypeDB::bind_method("_range_modified", &CustomPropertyEditor::_range_modified);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ObjectTypeDB::bind_method("_scroll_modified", &CustomPropertyEditor::_scroll_modified);
ObjectTypeDB::bind_method("_action_pressed", &CustomPropertyEditor::_action_pressed);
ObjectTypeDB::bind_method("_file_selected", &CustomPropertyEditor::_file_selected);
ObjectTypeDB::bind_method("_type_create_selected", &CustomPropertyEditor::_type_create_selected);
ObjectTypeDB::bind_method("_node_path_selected", &CustomPropertyEditor::_node_path_selected);
ObjectTypeDB::bind_method("_color_changed", &CustomPropertyEditor::_color_changed);
ObjectTypeDB::bind_method("_draw_easing", &CustomPropertyEditor::_draw_easing);
ObjectTypeDB::bind_method("_drag_easing", &CustomPropertyEditor::_drag_easing);
ObjectTypeDB::bind_method("_text_edit_changed", &CustomPropertyEditor::_text_edit_changed);
ObjectTypeDB::bind_method("_menu_option", &CustomPropertyEditor::_menu_option);
ADD_SIGNAL(MethodInfo("variant_changed"));
ADD_SIGNAL(MethodInfo("variant_field_changed", PropertyInfo(Variant::STRING, "field")));
ADD_SIGNAL(MethodInfo("resource_edit_request"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
CustomPropertyEditor::CustomPropertyEditor() {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
read_only = false;
updating = false;
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < MAX_VALUE_EDITORS; i++) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
value_editor[i] = memnew(LineEdit);
add_child(value_editor[i]);
value_label[i] = memnew(Label);
add_child(value_label[i]);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
value_editor[i]->hide();
value_label[i]->hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
value_editor[i]->connect("text_entered", this, "_modified");
Auto select custom property value field when pop up, user can start typing to change value right away.
2014-02-27 14:16:00 +00:00
value_editor[i]->connect("focus_enter", this, "_focus_enter");
value_editor[i]->connect("focus_exit", this, "_focus_exit");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
focused_value_editor = -1;
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < 4; i++) {
Revert "Tree and PropertyEditor confirm value change on focus loss"
2016-01-23 14:20:54 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
scroll[i] = memnew(HScrollBar);
Revert "Tree and PropertyEditor confirm value change on focus loss"
2016-01-23 14:20:54 +00:00
scroll[i]->hide();
scroll[i]->set_min(0);
scroll[i]->set_max(1.0);
scroll[i]->set_step(0.01);
add_child(scroll[i]);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
scroll[i]->connect("value_changed", this, "_scroll_modified");
Revert "Tree and PropertyEditor confirm value change on focus loss"
2016-01-23 14:20:54 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < 20; i++) {
checks20[i] = memnew(CheckBox);
A bit of everything: -IMA-ADPCM support for samples, this means that sound effects can be compressed and use 4 timess less RAM. -New 3D import workflow based on Wavefront OBJ. Import single objects as mesh resources instead of full scenes. Many people prefers to work this way. Just like the rest of the imported resources, these are updated in realtime if modified externally. -Mesh resources now support naming surfaces. This helps reimporting to identify which user-created materials must be kept. -Several fixes and improvements to SurfaceTool. -Anti Aliasing added to WorldEnvironment effects (using FXAA) -2D Physics bodies (RigidBody, KinematicBody, etc), Raycasts, Tilemap, etc support collision layers. This makes easy to group which objects collide against which. -2D Trigger shapes can now also trigger collision reporting in other 2D bodies (it used to be in Area2D before) -Viewport render target textures can now be filtered. -Few fixes in GDscript make it easier to work with static functions and class members. -Several and many bugfixes.
2014-05-14 04:22:15 +00:00
checks20[i]->set_toggle_mode(true);
checks20[i]->set_focus_mode(FOCUS_NONE);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
add_child(checks20[i]);
checks20[i]->hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
checks20[i]->connect("pressed", this, "_action_pressed", make_binds(i));
checks20[i]->set_tooltip(vformat(TTR("Bit %d, val %d."), i, 1 << i));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
text_edit = memnew(TextEdit);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
add_child(text_edit);
text_edit->set_area_as_parent_rect();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < 4; i++)
text_edit->set_margin((Margin)i, 5);
text_edit->set_margin(MARGIN_BOTTOM, 30);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
text_edit->hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
text_edit->connect("text_changed", this, "_text_edit_changed");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < MAX_ACTION_BUTTONS; i++) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
action_buttons[i] = memnew(Button);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
action_buttons[i]->hide();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
add_child(action_buttons[i]);
Vector<Variant> binds;
binds.push_back(i);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
action_buttons[i]->connect("pressed", this, "_action_pressed", binds);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
color_picker = NULL;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
set_as_toplevel(true);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
file = memnew(EditorFileDialog);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
add_child(file);
file->hide();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
file->connect("file_selected", this, "_file_selected");
file->connect("dir_selected", this, "_file_selected");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
error = memnew(ConfirmationDialog);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
error->set_title(TTR("Error!"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
add_child(error);
//error->get_cancel()->hide();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
type_button = memnew(MenuButton);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
add_child(type_button);
type_button->hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
type_button->get_popup()->connect("item_pressed", this, "_type_create_selected");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
scene_tree = memnew(SceneTreeDialog);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
add_child(scene_tree);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
scene_tree->connect("selected", this, "_node_path_selected");
Multiple scene editing *POTENTIALLY UNSTABLE* -ability to edit multiple scenes at the same time -resource internal IDs are now persistent, this makes multiple scene editing possible but maaaaay result in file corruption bugs (tested and could not find anything but possibility exists because core code changed, report immediately if you find this). -properly save settings, layout, etc when edited -script editing is independent from scene editing now -show a yellow box when a script belongs to the scene
2015-06-22 03:03:19 +00:00
scene_tree->get_scene_tree()->set_show_enabled_subscene(true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
texture_preview = memnew(TextureFrame);
add_child(texture_preview);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
texture_preview->hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
easing_draw = memnew(Control);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
add_child(easing_draw);
easing_draw->hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
easing_draw->connect("draw", this, "_draw_easing");
easing_draw->connect("input_event", this, "_drag_easing");
Revert "Tree and PropertyEditor confirm value change on focus loss"
2016-01-23 14:20:54 +00:00
//easing_draw->emit_signal(SceneStringNames::get_singleton()->input_event,InputEvent());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
easing_draw->set_default_cursor_shape(Control::CURSOR_MOVE);
menu = memnew(PopupMenu);
add_child(menu);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
menu->connect("item_pressed", this, "_menu_option");
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
evaluator = NULL;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
spinbox = memnew(SpinBox);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
add_child(spinbox);
spinbox->set_area_as_parent_rect(5);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
spinbox->connect("value_changed", this, "_range_modified");
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
slider = memnew(HSlider);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
add_child(slider);
slider->set_area_as_parent_rect(5);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
slider->connect("value_changed", this, "_range_modified");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
bool PropertyEditor::_might_be_in_instance() {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!obj)
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
return false;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Node *node = obj->cast_to<Node>();
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
bool might_be = false;
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
while (node) {
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
if (node->get_scene_instance_state().is_valid()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
might_be = true;
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
break;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (node == edited_scene) {
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
if (node->get_scene_inherited_state().is_valid()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
might_be = true;
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
break;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
might_be = false;
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
break;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
node = node->get_owner();
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
}
return might_be;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
bool PropertyEditor::_get_instanced_node_original_property(const StringName &p_prop, Variant &value) {
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
Node *node = obj->cast_to<Node>();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!node)
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
return false;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Node *orig = node;
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
bool found = false;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
// print_line("for prop - "+String(p_prop));
remove unpexpected revert button, fixes #2614
2015-10-17 21:28:36 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
while (node) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
Ref<SceneState> ss;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (node == edited_scene) {
ss = node->get_scene_inherited_state();
remove unpexpected revert button, fixes #2614
2015-10-17 21:28:36 +00:00
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ss = node->get_scene_instance_state();
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
}
remove unpexpected revert button, fixes #2614
2015-10-17 21:28:36 +00:00
// print_line("at - "+String(edited_scene->get_path_to(node)));
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
if (ss.is_valid()) {
remove unpexpected revert button, fixes #2614
2015-10-17 21:28:36 +00:00
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
NodePath np = node->get_path_to(orig);
int node_idx = ss->find_node_by_path(np);
remove unpexpected revert button, fixes #2614
2015-10-17 21:28:36 +00:00
// print_line("\t valid, nodeidx "+itos(node_idx));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (node_idx >= 0) {
bool lfound = false;
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
Variant lvar;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
lvar = ss->get_property_value(node_idx, p_prop, lfound);
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
if (lfound) {
remove unpexpected revert button, fixes #2614
2015-10-17 21:28:36 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
found = true;
value = lvar;
remove unpexpected revert button, fixes #2614
2015-10-17 21:28:36 +00:00
// print_line("\t found value "+String(value));
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
}
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (node == edited_scene) {
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
//just in case
break;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
node = node->get_owner();
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
}
return found;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
bool PropertyEditor::_is_property_different(const Variant &p_current, const Variant &p_orig, int p_usage) {
remove unpexpected revert button, fixes #2614
2015-10-17 21:28:36 +00:00
{
Node *node = obj->cast_to<Node>();
if (!node)
return false;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Node *edited_scene = EditorNode::get_singleton()->get_edited_scene();
bool found_state = false;
remove unpexpected revert button, fixes #2614
2015-10-17 21:28:36 +00:00
// print_line("for prop - "+String(p_prop));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
while (node) {
remove unpexpected revert button, fixes #2614
2015-10-17 21:28:36 +00:00
Ref<SceneState> ss;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (node == edited_scene) {
ss = node->get_scene_inherited_state();
remove unpexpected revert button, fixes #2614
2015-10-17 21:28:36 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ss = node->get_scene_instance_state();
remove unpexpected revert button, fixes #2614
2015-10-17 21:28:36 +00:00
}
if (ss.is_valid()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
found_state = true;
remove unpexpected revert button, fixes #2614
2015-10-17 21:28:36 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (node == edited_scene) {
remove unpexpected revert button, fixes #2614
2015-10-17 21:28:36 +00:00
//just in case
break;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
node = node->get_owner();
remove unpexpected revert button, fixes #2614
2015-10-17 21:28:36 +00:00
}
if (!found_state)
return false; //pointless to check if we are not comparing against anything.
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_orig.get_type() == Variant::NIL) {
remove unpexpected revert button, fixes #2614
2015-10-17 21:28:36 +00:00
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
//special cases
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_current.is_zero() && p_usage & PROPERTY_USAGE_STORE_IF_NONZERO)
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
return false;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_current.is_one() && p_usage & PROPERTY_USAGE_STORE_IF_NONONE)
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
return false;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_current.get_type() == Variant::REAL && p_orig.get_type() == Variant::REAL) {
resolve numerical error when comparing instancing an inheritance to avoid saving changed properties when they didn't, closes 4759
2016-06-12 22:33:07 +00:00
float a = p_current;
float b = p_orig;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
return Math::abs(a - b) > CMP_EPSILON; //this must be done because, as some scenes save as text, there might be a tiny difference in floats due to numerical error
resolve numerical error when comparing instancing an inheritance to avoid saving changed properties when they didn't, closes 4759
2016-06-12 22:33:07 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
return bool(Variant::evaluate(Variant::OP_NOT_EQUAL, p_current, p_orig));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
TreeItem *PropertyEditor::find_item(TreeItem *p_item, const String &p_name) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!p_item)
return NULL;
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
String name = p_item->get_metadata(1);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (name == p_name) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return p_item;
}
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
TreeItem *c = p_item->get_children();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
while (c) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
TreeItem *found = find_item(c, p_name);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (found)
return found;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
c = c->get_next();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return NULL;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void PropertyEditor::_changed_callback(Object *p_changed, const char *p_prop) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
_changed_callbacks(p_changed, p_prop);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void PropertyEditor::_changed_callbacks(Object *p_changed, const String &p_prop) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_changed != obj)
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return;
if (changing)
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_prop == String())
update_tree_pending = true;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
else {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
pending[p_prop] = p_prop;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void PropertyEditor::update_property(const String &p_prop) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (obj)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
_changed_callbacks(obj, p_prop);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String &p_name, int p_hint, const String &p_hint_text) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
switch (p_type) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case Variant::BOOL: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_item->set_checked(1, obj->get(p_name));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::REAL:
case Variant::INT: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_hint == PROPERTY_HINT_ALL_FLAGS) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
tree->update();
break;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_hint == PROPERTY_HINT_FLAGS) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector<String> values = p_hint_text.split(",");
String flags;
int val = obj->get(p_name);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < values.size(); i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
String v = values[i];
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (v == "")
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (!(val & (1 << i)))
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (flags != "")
flags += ", ";
flags += v;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_item->set_text(1, flags);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
break;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_hint == PROPERTY_HINT_EXP_EASING) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_item->set_text(1, String::num(obj->get(p_name), 2));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
break;
}
//p_item->set_cell_mode( 1, TreeItem::CELL_MODE_RANGE );
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_type == Variant::REAL) {
p_item->set_range(1, obj->get(p_name));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_item->set_range(1, obj->get(p_name));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_item->set_editable(1, !read_only);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::STRING:
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_hint == PROPERTY_HINT_ENUM) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector<String> strings = p_hint_text.split(",");
String current = obj->get(p_name);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
int idx = 0;
for (int x = 0; x < strings.size(); x++) {
if (strings[x] == current) {
idx = x;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
break;
}
}
p_item->set_text(1, p_hint_text);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_item->set_range(1, idx);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
break;
}
case Variant::VECTOR3:
case Variant::QUAT:
case Variant::VECTOR2:
case Variant::_AABB:
case Variant::RECT2:
case Variant::MATRIX32:
case Variant::MATRIX3:
case Variant::TRANSFORM: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_item->set_text(1, obj->get(p_name));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::COLOR: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_item->set_custom_bg_color(1, obj->get(p_name));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//p_item->set_text(1,obj->get(p_name));
} break;
case Variant::IMAGE: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Image img = obj->get(p_name);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (img.empty())
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_item->set_text(1, "[Image (empty)]");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_item->set_text(1, "[Image " + itos(img.get_width()) + "x" + itos(img.get_height()) + "-" + String(Image::get_format_name(img.get_format())) + "]");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::NODE_PATH: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_item->set_text(1, obj->get(p_name));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::OBJECT: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (obj->get(p_name).get_type() == Variant::NIL || obj->get(p_name).operator RefPtr().is_null()) {
p_item->set_text(1, "<null>");
p_item->set_icon(1, Ref<Texture>());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Fixed #185 Setting a new Texture for a Sprite node does not update preview
2014-06-15 02:10:45 +00:00
Dictionary d = p_item->get_metadata(0);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
int hint = d.has("hint") ? d["hint"].operator int() : -1;
String hint_text = d.has("hint_text") ? d["hint_text"] : "";
if (hint == PROPERTY_HINT_RESOURCE_TYPE && hint_text == "Texture") {
p_item->set_icon(1, NULL);
Fixed #185 Setting a new Texture for a Sprite node does not update preview
2014-06-15 02:10:45 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
RES res = obj->get(p_name).operator RefPtr();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (res->is_type("Texture")) {
int tw = EditorSettings::get_singleton()->get("property_editor/texture_preview_width");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_item->set_icon_max_width(1, tw);
p_item->set_icon(1, res);
p_item->set_text(1, "");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else if (res->get_name() != "") {
p_item->set_text(1, res->get_name());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (res->get_path() != "" && !res->get_path().begins_with("local://")) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
p_item->set_text(1, res->get_path().get_file());
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_item->set_text(1, "<" + res->get_type() + ">");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
};
support for 2D shadow casters Added support for 2D shadow casters. *DANGER* Shaders in CanvasItem CHANGED, if you are using shader in a CanvasItem and pull this, you will lose them. Shaders now work through a 2D material system similar to 3D. If you don't want to lose the 2D shader code, save the shader as a .shd, then create a material in CanvasItem and re-assign the shader.
2015-03-02 03:54:10 +00:00
New option to send canvas to render buffer allows to use 3D environment effects for post processing such as Glow, Bloom, HDR, etc. in 2D.
2015-03-16 03:47:37 +00:00
if (res.is_valid() && res->get_path().is_resource_file()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_item->set_tooltip(1, res->get_path());
New option to send canvas to render buffer allows to use 3D environment effects for post processing such as Glow, Bloom, HDR, etc. in 2D.
2015-03-16 03:47:37 +00:00
} else if (res.is_valid()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_item->set_tooltip(1, res->get_name() + " (" + res->get_type() + ")");
New option to send canvas to render buffer allows to use 3D environment effects for post processing such as Glow, Bloom, HDR, etc. in 2D.
2015-03-16 03:47:37 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (has_icon(res->get_type(), "EditorIcons")) {
New option to send canvas to render buffer allows to use 3D environment effects for post processing such as Glow, Bloom, HDR, etc. in 2D.
2015-03-16 03:47:37 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_item->set_icon(0, get_icon(res->get_type(), "EditorIcons"));
support for 2D shadow casters Added support for 2D shadow casters. *DANGER* Shaders in CanvasItem CHANGED, if you are using shader in a CanvasItem and pull this, you will lose them. Shaders now work through a 2D material system similar to 3D. If you don't want to lose the 2D shader code, save the shader as a .shd, then create a material in CanvasItem and re-assign the shader.
2015-03-02 03:54:10 +00:00
} else {
Dictionary d = p_item->get_metadata(0);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
int hint = d.has("hint") ? d["hint"].operator int() : -1;
String hint_text = d.has("hint_text") ? d["hint_text"] : "";
if (hint == PROPERTY_HINT_RESOURCE_TYPE) {
support for 2D shadow casters Added support for 2D shadow casters. *DANGER* Shaders in CanvasItem CHANGED, if you are using shader in a CanvasItem and pull this, you will lose them. Shaders now work through a 2D material system similar to 3D. If you don't want to lose the 2D shader code, save the shader as a .shd, then create a material in CanvasItem and re-assign the shader.
2015-03-02 03:54:10 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (has_icon(hint_text, "EditorIcons")) {
support for 2D shadow casters Added support for 2D shadow casters. *DANGER* Shaders in CanvasItem CHANGED, if you are using shader in a CanvasItem and pull this, you will lose them. Shaders now work through a 2D material system similar to 3D. If you don't want to lose the 2D shader code, save the shader as a .shd, then create a material in CanvasItem and re-assign the shader.
2015-03-02 03:54:10 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_item->set_icon(0, get_icon(hint_text, "EditorIcons"));
support for 2D shadow casters Added support for 2D shadow casters. *DANGER* Shaders in CanvasItem CHANGED, if you are using shader in a CanvasItem and pull this, you will lose them. Shaders now work through a 2D material system similar to 3D. If you don't want to lose the 2D shader code, save the shader as a .shd, then create a material in CanvasItem and re-assign the shader.
2015-03-02 03:54:10 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
p_item->set_icon(0, get_icon("Object", "EditorIcons"));
support for 2D shadow casters Added support for 2D shadow casters. *DANGER* Shaders in CanvasItem CHANGED, if you are using shader in a CanvasItem and pull this, you will lose them. Shaders now work through a 2D material system similar to 3D. If you don't want to lose the 2D shader code, save the shader as a .shd, then create a material in CanvasItem and re-assign the shader.
2015-03-02 03:54:10 +00:00
}
}
}
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 17:18:40 +00:00
if (!res->is_type("Texture")) {
//texture already previews via itself
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
EditorResourcePreview::get_singleton()->queue_edited_resource_preview(res, this, "_resource_preview_done", p_item->get_instance_ID());
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 17:18:40 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
} break;
default: {};
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void PropertyEditor::_check_reload_status(const String &p_name, TreeItem *item) {
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
bool has_reload = false;
int found = -1;
bool is_disabled = false;
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < item->get_button_count(1); i++) {
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (item->get_button_id(1, i) == 3) {
found = i;
is_disabled = item->is_button_disabled(1, i);
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
break;
}
}
if (_might_be_in_instance()) {
Variant vorig;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Dictionary d = item->get_metadata(0);
int usage = d.has("usage") ? int(int(d["usage"]) & (PROPERTY_USAGE_STORE_IF_NONONE | PROPERTY_USAGE_STORE_IF_NONZERO)) : 0;
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (_get_instanced_node_original_property(p_name, vorig) || usage) {
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
Variant v = obj->get(p_name);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
bool changed = _is_property_different(v, vorig, usage);
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
-Add some offset to spinboxes in tree, so revert icon does not annoy much when pops up, fixes #3415
2016-02-02 23:44:42 +00:00
//if ((found!=-1 && !is_disabled)!=changed) {
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (changed) {
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
has_reload = true;
} else {
}
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
-Add some offset to spinboxes in tree, so revert icon does not annoy much when pops up, fixes #3415
2016-02-02 23:44:42 +00:00
//}
remove trailing whitespace
2016-03-08 23:00:52 +00:00
}
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
}
if (!has_reload && !obj->get_script().is_null()) {
Ref<Script> scr = obj->get_script();
Variant orig_value;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (scr->get_property_default_value(p_name, orig_value)) {
if (orig_value != obj->get(p_name)) {
has_reload = true;
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
}
}
}
-Add some offset to spinboxes in tree, so revert icon does not annoy much when pops up, fixes #3415
2016-02-02 23:44:42 +00:00
//print_line("found: "+itos(found)+" has reload: "+itos(has_reload)+" is_disabled "+itos(is_disabled));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (found != -1 && !has_reload) {
-Add some offset to spinboxes in tree, so revert icon does not annoy much when pops up, fixes #3415
2016-02-02 23:44:42 +00:00
if (!is_disabled) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->erase_button(1, found);
if (item->get_cell_mode(1) == TreeItem::CELL_MODE_RANGE && item->get_text(1) == String()) {
item->add_button(1, get_icon("ReloadEmpty", "EditorIcons"), 3, true);
-Add some offset to spinboxes in tree, so revert icon does not annoy much when pops up, fixes #3415
2016-02-02 23:44:42 +00:00
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (found == -1 && has_reload) {
item->add_button(1, get_icon("ReloadSmall", "EditorIcons"), 3);
} else if (found != -1 && has_reload && is_disabled) {
item->erase_button(1, found);
item->add_button(1, get_icon("ReloadSmall", "EditorIcons"), 3);
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
}
}
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
bool PropertyEditor::_is_drop_valid(const Dictionary &p_drag_data, const Dictionary &p_item_data) const {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
Dictionary d = p_item_data;
if (d.has("type")) {
int type = d["type"];
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (type == Variant::OBJECT && d.has("hint") && d.has("hint_text") && int(d["hint"]) == PROPERTY_HINT_RESOURCE_TYPE) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String allowed_type = d["hint_text"];
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
Dictionary drag_data = p_drag_data;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (drag_data.has("type") && String(drag_data["type"]) == "resource") {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
Ref<Resource> res = drag_data["resource"];
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < allowed_type.get_slice_count(","); i++) {
String at = allowed_type.get_slice(",", i).strip_edges();
if (res.is_valid() && ObjectTypeDB::is_type(res->get_type(), at)) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
return true;
}
}
}
New reworked AnimatedSprite! -New SpriteFrames editor, with support for drag&drop, multiple animation sets, animation speed and loop. -New AnimatedSprite, with support for all the new features! AnimatedSprite3D has not been updated yet. -Added support for drag&drop to other editors, such as resourcepreload, sample library, etc.
2016-05-15 02:48:23 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (drag_data.has("type") && String(drag_data["type"]) == "files") {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
Vector<String> files = drag_data["files"];
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (files.size() == 1) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
String file = files[0];
String ftype = EditorFileSystem::get_singleton()->get_file_type(file);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (ftype != "") {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < allowed_type.get_slice_count(","); i++) {
String at = allowed_type.get_slice(",", i).strip_edges();
if (ObjectTypeDB::is_type(ftype, at)) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
return true;
}
}
}
}
}
}
}
return false;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void PropertyEditor::_mark_drop_fields(TreeItem *p_at) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (_is_drop_valid(get_viewport()->gui_get_drag_data(), p_at->get_metadata(0)))
p_at->set_custom_bg_color(1, Color(0.7, 0.5, 0.2), true);
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
if (p_at->get_children()) {
_mark_drop_fields(p_at->get_children());
}
if (p_at->get_next()) {
_mark_drop_fields(p_at->get_next());
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Variant PropertyEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
TreeItem *item = tree->get_item_at_pos(p_point);
if (!item)
return Variant();
int col = tree->get_column_at_pos(p_point);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (col != 1)
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
return Variant();
Dictionary d = item->get_metadata(0);
if (!d.has("name"))
return Variant();
Variant val = obj->get(d["name"]);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (val.get_type() == Variant::OBJECT) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
RES res = val;
if (res.is_valid()) {
custom_editor->hide_menu();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
return EditorNode::get_singleton()->drag_resource(res, p_from);
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
}
}
return Variant();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
bool PropertyEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
TreeItem *item = tree->get_item_at_pos(p_point);
if (!item)
return false;
int col = tree->get_column_at_pos(p_point);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (col != 1)
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
return false;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
return _is_drop_valid(p_data, item->get_metadata(0));
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void PropertyEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
TreeItem *item = tree->get_item_at_pos(p_point);
if (!item)
return;
int col = tree->get_column_at_pos(p_point);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (col != 1)
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (!_is_drop_valid(p_data, item->get_metadata(0)))
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
return;
Dictionary d = item->get_metadata(0);
if (!d.has("name"))
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String name = d["name"];
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
Dictionary drag_data = p_data;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (drag_data.has("type") && String(drag_data["type"]) == "resource") {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
Ref<Resource> res = drag_data["resource"];
if (res.is_valid()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
_edit_set(name, res);
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
return;
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (drag_data.has("type") && String(drag_data["type"]) == "files") {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
Vector<String> files = drag_data["files"];
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (files.size() == 1) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
String file = files[0];
RES res = ResourceLoader::load(file);
if (res.is_valid()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
_edit_set(name, res);
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
return;
}
}
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void PropertyEditor::_clear_drop_fields(TreeItem *p_at) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
Dictionary d = p_at->get_metadata(0);
if (d.has("type")) {
int type = d["type"];
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (type == Variant::OBJECT) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
p_at->clear_custom_bg_color(1);
}
}
if (p_at->get_children()) {
_clear_drop_fields(p_at->get_children());
}
if (p_at->get_next()) {
_clear_drop_fields(p_at->get_next());
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void PropertyEditor::_notification(int p_what) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_what == NOTIFICATION_ENTER_TREE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
get_tree()->connect("node_removed", this, "_node_removed");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_what == NOTIFICATION_EXIT_TREE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
get_tree()->disconnect("node_removed", this, "_node_removed");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
edit(NULL);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_what == NOTIFICATION_DRAG_BEGIN) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
if (is_visible() && tree->get_root()) {
_mark_drop_fields(tree->get_root());
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_what == NOTIFICATION_DRAG_END) {
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
if (is_visible() && tree->get_root()) {
_clear_drop_fields(tree->get_root());
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_what == NOTIFICATION_FIXED_PROCESS) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (refresh_countdown > 0) {
refresh_countdown -= get_fixed_process_delta_time();
if (refresh_countdown <= 0) {
-fixed bug on focus capture, now respets line/text edit -when playing animations, property editor is now refreshed properly, fixes #1046
2015-01-03 18:39:01 +00:00
TreeItem *root = tree->get_root();
_refresh_item(root);
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
changing = true;
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (update_tree_pending) {
update_tree();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
update_tree_pending = false;
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
const String *k = NULL;
while ((k = pending.next(k))) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
TreeItem *item = find_item(tree->get_root(), *k);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!item)
continue;
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
_check_reload_status(*k, item);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Dictionary d = item->get_metadata(0);
set_item_text(item, d["type"], d["name"], d["hint"], d["hint_text"]);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
pending.clear();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
changing = false;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
TreeItem *PropertyEditor::get_parent_node(String p_path, HashMap<String, TreeItem *> &item_paths, TreeItem *root) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
TreeItem *item = NULL;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_path == "") {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
item = root;
} else if (item_paths.has(p_path)) {
item = item_paths.get(p_path);
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
// printf("path %s parent path %s - item name %s\n",p_path.ascii().get_data(),p_path.left( p_path.find_last("/") ).ascii().get_data(),p_path.right( p_path.find_last("/") ).ascii().get_data() );
TreeItem *parent = get_parent_node(p_path.left(p_path.find_last("/")), item_paths, root);
item = tree->create_item(parent);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String name = (p_path.find("/") != -1) ? p_path.right(p_path.find_last("/") + 1) : p_path;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (capitalize_paths)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(0, name.capitalize());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(0, name);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
item->set_tooltip(0, p_path);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (item->get_parent() != root) {
item->set_icon(0, get_icon("Folder", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_editable(0, false);
item->set_selectable(0, subsection_selectable);
item->set_editable(1, false);
item->set_selectable(1, subsection_selectable);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (item->get_parent() == root) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_custom_bg_color(0, get_color("prop_subsection", "Editor"));
item->set_custom_bg_color(1, get_color("prop_subsection", "Editor"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item_paths[p_path] = item;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
return item;
}
-fixed bug on focus capture, now respets line/text edit -when playing animations, property editor is now refreshed properly, fixes #1046
2015-01-03 18:39:01 +00:00
void PropertyEditor::_refresh_item(TreeItem *p_item) {
if (!p_item)
return;
String name = p_item->get_metadata(1);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (name != String()) {
-fixed bug on focus capture, now respets line/text edit -when playing animations, property editor is now refreshed properly, fixes #1046
2015-01-03 18:39:01 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
_check_reload_status(name, p_item);
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
#if 0
bool has_reload=false;
int found=-1;
for(int i=0;i<p_item->get_button_count(1);i++) {
if (p_item->get_button_id(1,i)==3) {
found=i;
break;
}
}
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
if (_might_be_in_instance()) {
Variant vorig;
Dictionary d=p_item->get_metadata(0);
int usage = d.has("usage")?int(int(d["usage"])&(PROPERTY_USAGE_STORE_IF_NONONE|PROPERTY_USAGE_STORE_IF_NONZERO)):0;
-fixed bug on focus capture, now respets line/text edit -when playing animations, property editor is now refreshed properly, fixes #1046
2015-01-03 18:39:01 +00:00
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
if (_get_instanced_node_original_property(name,vorig) || usage) {
-fixed bug on focus capture, now respets line/text edit -when playing animations, property editor is now refreshed properly, fixes #1046
2015-01-03 18:39:01 +00:00
Variant v = obj->get(name);
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
bool changed = _is_property_different(v,vorig,usage);
-fixed bug on focus capture, now respets line/text edit -when playing animations, property editor is now refreshed properly, fixes #1046
2015-01-03 18:39:01 +00:00
if ((found!=-1)!=changed) {
if (changed) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
has_reload=true;
-fixed bug on focus capture, now respets line/text edit -when playing animations, property editor is now refreshed properly, fixes #1046
2015-01-03 18:39:01 +00:00
} else {
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
//p_item->erase_button(1,found);
-fixed bug on focus capture, now respets line/text edit -when playing animations, property editor is now refreshed properly, fixes #1046
2015-01-03 18:39:01 +00:00
}
}
}
}
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
if (!has_reload && !obj->get_script().is_null()) {
Ref<Script> scr = obj->get_script();
Variant orig_value;
if (scr->get_property_default_value(name,orig_value)) {
if (orig_value!=obj->get(name)) {
has_reload=true;
}
}
}
if (!has_reload && found!=-1) {
p_item->erase_button(1,found);
} else if (has_reload && found==-1) {
-Add some offset to spinboxes in tree, so revert icon does not annoy much when pops up, fixes #3415
2016-02-02 23:44:42 +00:00
p_item->add_button(1,get_icon("ReloadSmall","EditorIcons"),3);
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
}
#endif
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Dictionary d = p_item->get_metadata(0);
set_item_text(p_item, d["type"], d["name"], d["hint"], d["hint_text"]);
-fixed bug on focus capture, now respets line/text edit -when playing animations, property editor is now refreshed properly, fixes #1046
2015-01-03 18:39:01 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
TreeItem *c = p_item->get_children();
-fixed bug on focus capture, now respets line/text edit -when playing animations, property editor is now refreshed properly, fixes #1046
2015-01-03 18:39:01 +00:00
while (c) {
_refresh_item(c);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
c = c->get_next();
-fixed bug on focus capture, now respets line/text edit -when playing animations, property editor is now refreshed properly, fixes #1046
2015-01-03 18:39:01 +00:00
}
}
void PropertyEditor::refresh() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (refresh_countdown > 0)
-fixed bug on focus capture, now respets line/text edit -when playing animations, property editor is now refreshed properly, fixes #1046
2015-01-03 18:39:01 +00:00
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
refresh_countdown = EditorSettings::get_singleton()->get("property_editor/auto_refresh_interval");
-fixed bug on focus capture, now respets line/text edit -when playing animations, property editor is now refreshed properly, fixes #1046
2015-01-03 18:39:01 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void PropertyEditor::update_tree() {
tree->clear();
if (!obj)
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
HashMap<String, TreeItem *> item_path;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
TreeItem *root = tree->create_item(NULL);
tree->set_hide_root(true);
/*
TreeItem *title = tree->create_item(root);
title->set_custom_bg_color(0,get_color("prop_section","Editor"));
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-18 22:08:12 +00:00
title->set_text(0,"Property"); // todo, fetch name if ID exists in database
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
title->set_editable(0,false);
title->set_selectable(0,false);
title->set_custom_bg_color(1,get_color("prop_section","Editor"));
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-18 22:08:12 +00:00
title->set_text(1,"Value"); // todo, fetch name if ID exists in database
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
title->set_editable(1,false);
title->set_selectable(1,false);
*/
/*
if (obj->cast_to<Node>() || obj->cast_to<Resource>()) {
TreeItem *type = tree->create_item(root);
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-18 22:08:12 +00:00
type->set_text(0,"Type"); // todo, fetch name if ID exists in database
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
type->set_text(1,obj->get_type()); // todo, fetch name if ID exists in database
if (has_icon(obj->get_type(),"EditorIcons"))
type->set_icon(1,get_icon(obj->get_type(),"EditorIcons") );
else
type->set_icon(1,get_icon("Object","EditorIcons") );
type->set_selectable(0,false);
type->set_selectable(1,false);
TreeItem *name = tree->create_item(root);
i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there.
2016-05-18 22:08:12 +00:00
name->set_text(0,"Name"); // todo, fetch name if ID exists in database
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (obj->is_type("Resource"))
name->set_text(1,obj->cast_to<Resource>()->get_name());
else if (obj->is_type("Node"))
name->set_text(1,obj->cast_to<Node>()->get_name());
name->set_selectable(0,false);
name->set_selectable(1,false);
}
*/
List<PropertyInfo> plist;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
obj->get_property_list(&plist, true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
bool draw_red = false;
3D Physics and Other Stuff -=-=-=-=-=-=-=-=-=-=-=-=-= -New Vehicle (Based on Bullet's RaycastVehicle) - Vehiclebody/VehicleWheel. Demo will come soon, old vehicle (CarBody) will go away soon too. -A lot of fixes to the 3D physics engine -Added KinematicBody with demo -Fixed the space query API for 2D (demo will come soon). 3D is WIP. -Fixed long-standing bug with body_enter/body_exit for Area and Area2D -Performance variables now includes physics (active bodies, collision pairs and islands) -Ability to see what's inside of instanced scenes! -Fixed Blend Shapes (no bs+skeleton yet) -Added an Android JavaClassWrapper singleton for using Android native classes directly from GDScript. This is very Alpha!
2014-09-03 02:13:40 +00:00
{
Node *nod = obj->cast_to<Node>();
Node *es = EditorNode::get_singleton()->get_edited_scene();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (nod && es != nod && nod->get_owner() != es) {
draw_red = true;
3D Physics and Other Stuff -=-=-=-=-=-=-=-=-=-=-=-=-= -New Vehicle (Based on Bullet's RaycastVehicle) - Vehiclebody/VehicleWheel. Demo will come soon, old vehicle (CarBody) will go away soon too. -A lot of fixes to the 3D physics engine -Added KinematicBody with demo -Fixed the space query API for 2D (demo will come soon). 3D is WIP. -Fixed long-standing bug with body_enter/body_exit for Area and Area2D -Performance variables now includes physics (active bodies, collision pairs and islands) -Ability to see what's inside of instanced scenes! -Fixed Blend Shapes (no bs+skeleton yet) -Added an Android JavaClassWrapper singleton for using Android native classes directly from GDScript. This is very Alpha!
2014-09-03 02:13:40 +00:00
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Color sscolor = get_color("prop_subsection", "Editor");
3D Physics and Other Stuff -=-=-=-=-=-=-=-=-=-=-=-=-= -New Vehicle (Based on Bullet's RaycastVehicle) - Vehiclebody/VehicleWheel. Demo will come soon, old vehicle (CarBody) will go away soon too. -A lot of fixes to the 3D physics engine -Added KinematicBody with demo -Fixed the space query API for 2D (demo will come soon). 3D is WIP. -Fixed long-standing bug with body_enter/body_exit for Area and Area2D -Performance variables now includes physics (active bodies, collision pairs and islands) -Ability to see what's inside of instanced scenes! -Fixed Blend Shapes (no bs+skeleton yet) -Added an Android JavaClassWrapper singleton for using Android native classes directly from GDScript. This is very Alpha!
2014-09-03 02:13:40 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
TreeItem *current_category = NULL;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 16:42:15 +00:00
String filter = search_box ? search_box->get_text() : "";
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (List<PropertyInfo>::Element *I = plist.front(); I; I = I->next()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
PropertyInfo &p = I->get();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//make sure the property can be edited
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p.usage & PROPERTY_USAGE_CATEGORY) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!show_categories)
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
List<PropertyInfo>::Element *N = I->next();
bool valid = true;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//if no properties in category, skip
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
while (N) {
if (N->get().usage & PROPERTY_USAGE_EDITOR)
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
break;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (N->get().usage & PROPERTY_USAGE_CATEGORY) {
valid = false;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
break;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
N = N->next();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
if (!valid)
continue; //empty, ignore
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
TreeItem *sep = tree->create_item(root);
current_category = sep;
String type = p.name;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
/*if (has_icon(type,"EditorIcons"))
sep->set_icon(0,get_icon(type,"EditorIcons") );
else
sep->set_icon(0,get_icon("Object","EditorIcons") );
i18n: Don't make print_line calls translatable
2016-05-04 13:28:37 +00:00
print_line("CATEGORY: "+type);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
*/
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
sep->set_text(0, type);
sep->set_selectable(0, false);
sep->set_selectable(1, false);
sep->set_custom_bg_color(0, get_color("prop_category", "Editor"));
sep->set_custom_bg_color(1, get_color("prop_category", "Editor"));
Show documentation for properties on hover. This works if the property has been documented (about half are at this point)
2015-08-26 02:00:11 +00:00
if (use_doc_hints) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
StringName type = p.name;
Show documentation for properties on hover. This works if the property has been documented (about half are at this point)
2015-08-26 02:00:11 +00:00
if (!class_descr_cache.has(type)) {
String descr;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
DocData *dd = EditorHelp::get_doc_data();
Map<String, DocData::ClassDoc>::Element *E = dd->class_list.find(type);
Show documentation for properties on hover. This works if the property has been documented (about half are at this point)
2015-08-26 02:00:11 +00:00
if (E) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
descr = E->get().brief_description;
Show documentation for properties on hover. This works if the property has been documented (about half are at this point)
2015-08-26 02:00:11 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
class_descr_cache[type] = descr.word_wrap(80);
Show documentation for properties on hover. This works if the property has been documented (about half are at this point)
2015-08-26 02:00:11 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
sep->set_tooltip(0, TTR("Class:") + " " + p.name + ":\n\n" + class_descr_cache[type]);
Show documentation for properties on hover. This works if the property has been documented (about half are at this point)
2015-08-26 02:00:11 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//sep->set_custom_color(0,Color(1,1,1));
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (!(p.usage & PROPERTY_USAGE_EDITOR))
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String name = (p.name.find("/") != -1) ? p.name.right(p.name.find_last("/") + 1) : p.name;
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 16:42:15 +00:00
if (capitalize_paths)
name = name.camelcase_to_underscore().capitalize();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String path = p.name.left(p.name.find_last("/"));
Better PropertyEditor search
2015-11-22 16:05:55 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (use_filter && filter != "") {
Better PropertyEditor search
2015-11-22 16:05:55 +00:00
String cat = path;
if (capitalize_paths)
cat = cat.capitalize();
Add subsequence search to tools Add it to the following searches: - Create node. - Scene tree. - Inspector properties. - Classes list in help. - Quick open.
2016-06-12 16:43:31 +00:00
if (!filter.is_subsequence_ofi(cat) && !filter.is_subsequence_ofi(name))
Better PropertyEditor search
2015-11-22 16:05:55 +00:00
continue;
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//printf("property %s\n",p.name.ascii().get_data());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
TreeItem *parent = get_parent_node(path, item_path, current_category ? current_category : root);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//if (parent->get_parent()==root)
// parent=root;
int level = 0;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (parent != root) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
level++;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
TreeItem *parent_lev = parent;
while (parent_lev->get_parent() != root) {
parent_lev = parent_lev->get_parent();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
level++;
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (level > 4)
level = 4;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Color col = sscolor;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
col.a = (level / 4.0) * 0.7;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
TreeItem *item = tree->create_item(parent);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (level > 0) {
item->set_custom_bg_color(0, col);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//item->set_custom_bg_color(1,col);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_editable(0, false);
item->set_selectable(0, false);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p.usage & PROPERTY_USAGE_CHECKABLE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(0, TreeItem::CELL_MODE_CHECK);
item->set_selectable(0, true);
item->set_editable(0, true);
item->set_checked(0, p.usage & PROPERTY_USAGE_CHECKED);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 16:42:15 +00:00
item->set_text(0, name);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
item->set_tooltip(0, p.name);
Show documentation for properties on hover. This works if the property has been documented (about half are at this point)
2015-08-26 02:00:11 +00:00
if (use_doc_hints) {
StringName setter;
StringName type;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (ObjectTypeDB::get_setter_and_type_for_property(obj->get_type_name(), p.name, type, setter)) {
Show documentation for properties on hover. This works if the property has been documented (about half are at this point)
2015-08-26 02:00:11 +00:00
String descr;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
bool found = false;
Map<StringName, Map<StringName, String> >::Element *E = descr_cache.find(type);
Show documentation for properties on hover. This works if the property has been documented (about half are at this point)
2015-08-26 02:00:11 +00:00
if (E) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Map<StringName, String>::Element *F = E->get().find(setter);
Show documentation for properties on hover. This works if the property has been documented (about half are at this point)
2015-08-26 02:00:11 +00:00
if (F) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
found = true;
descr = F->get();
Show documentation for properties on hover. This works if the property has been documented (about half are at this point)
2015-08-26 02:00:11 +00:00
}
}
if (!found) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
DocData *dd = EditorHelp::get_doc_data();
Map<String, DocData::ClassDoc>::Element *E = dd->class_list.find(type);
Show documentation for properties on hover. This works if the property has been documented (about half are at this point)
2015-08-26 02:00:11 +00:00
if (E) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < E->get().methods.size(); i++) {
if (E->get().methods[i].name == setter.operator String()) {
descr = E->get().methods[i].description.strip_edges().word_wrap(80);
Show documentation for properties on hover. This works if the property has been documented (about half are at this point)
2015-08-26 02:00:11 +00:00
}
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
descr_cache[type][setter] = descr;
Show documentation for properties on hover. This works if the property has been documented (about half are at this point)
2015-08-26 02:00:11 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_tooltip(0, TTR("Property:") + " " + p.name + "\n\n" + descr);
Show documentation for properties on hover. This works if the property has been documented (about half are at this point)
2015-08-26 02:00:11 +00:00
}
}
//EditorHelp::get_doc_data();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Dictionary d;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
d["name"] = p.name;
d["type"] = (int)p.type;
d["hint"] = (int)p.hint;
d["hint_text"] = p.hint_string;
d["usage"] = (int)p.usage;
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_metadata(0, d);
item->set_metadata(1, p.name);
3D Physics and Other Stuff -=-=-=-=-=-=-=-=-=-=-=-=-= -New Vehicle (Based on Bullet's RaycastVehicle) - Vehiclebody/VehicleWheel. Demo will come soon, old vehicle (CarBody) will go away soon too. -A lot of fixes to the 3D physics engine -Added KinematicBody with demo -Fixed the space query API for 2D (demo will come soon). 3D is WIP. -Fixed long-standing bug with body_enter/body_exit for Area and Area2D -Performance variables now includes physics (active bodies, collision pairs and islands) -Ability to see what's inside of instanced scenes! -Fixed Blend Shapes (no bs+skeleton yet) -Added an Android JavaClassWrapper singleton for using Android native classes directly from GDScript. This is very Alpha!
2014-09-03 02:13:40 +00:00
if (draw_red)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_custom_color(0, Color(0.8, 0.4, 0.20));
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p.name == selected_property) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
item->select(1);
}
3D Physics and Other Stuff -=-=-=-=-=-=-=-=-=-=-=-=-= -New Vehicle (Based on Bullet's RaycastVehicle) - Vehiclebody/VehicleWheel. Demo will come soon, old vehicle (CarBody) will go away soon too. -A lot of fixes to the 3D physics engine -Added KinematicBody with demo -Fixed the space query API for 2D (demo will come soon). 3D is WIP. -Fixed long-standing bug with body_enter/body_exit for Area and Area2D -Performance variables now includes physics (active bodies, collision pairs and islands) -Ability to see what's inside of instanced scenes! -Fixed Blend Shapes (no bs+skeleton yet) -Added an Android JavaClassWrapper singleton for using Android native classes directly from GDScript. This is very Alpha!
2014-09-03 02:13:40 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//printf("property %s type %i\n",p.name.ascii().get_data(),p.type);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
switch (p.type) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case Variant::BOOL: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CHECK);
item->set_text(1, TTR("On"));
Show True/False tooltip in property editor for bool values (cherry picked from commit 623c483ebaffa8de8f9e53b3910d6cfdf8207e59)
2016-09-19 21:41:48 +00:00
item->set_tooltip(1, obj->get(p.name) ? "True" : "False");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_checked(1, obj->get(p.name));
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Bool", "EditorIcons"));
item->set_editable(1, !read_only);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::REAL:
case Variant::INT: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p.hint == PROPERTY_HINT_EXP_EASING) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->set_text(1, String::num(obj->get(p.name), 2));
item->set_editable(1, !read_only);
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Curve", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
break;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p.hint == PROPERTY_HINT_ALL_FLAGS) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->set_editable(1, !read_only);
item->set_custom_draw(1, this, "_draw_flags");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
break;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p.hint == PROPERTY_HINT_FLAGS) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->set_editable(1, !read_only);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//item->set_icon( 0, get_icon("Curve","EditorIcons"));
Vector<String> values = p.hint_string.split(",");
String flags;
int val = obj->get(p.name);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < values.size(); i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
String v = values[i];
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (v == "")
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (!(val & (1 << i)))
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (flags != "")
flags += ", ";
flags += v;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, flags);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
break;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p.hint == PROPERTY_HINT_ENUM)
item->set_cell_mode(1, TreeItem::CELL_MODE_RANGE);
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_RANGE_EXPRESSION);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p.hint == PROPERTY_HINT_SPRITE_FRAME || p.hint == PROPERTY_HINT_RANGE || p.hint == PROPERTY_HINT_EXP_RANGE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
int c = p.hint_string.get_slice_count(",");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
float min = 0, max = 100, step = 1;
if (c >= 1) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
min = p.hint_string.get_slice(",", 0).to_double();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (c >= 2) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
max = p.hint_string.get_slice(",", 1).to_double();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p.type != PROPERTY_HINT_SPRITE_FRAME && c >= 3) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
step = p.hint_string.get_slice(",", 2).to_double();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_range_config(1, min, max, step, p.hint == PROPERTY_HINT_EXP_RANGE);
} else if (p.hint == PROPERTY_HINT_ENUM) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
// int c = p.hint_string.get_slice_count(",");
item->set_text(1, p.hint_string);
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Enum", "EditorIcons"));
item->set_range(1, obj->get(p.name));
item->set_editable(1, !read_only);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
break;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (p.hint == PROPERTY_HINT_OBJECT_ID) {
Real-Time Remote Inspector support
2016-05-22 22:28:37 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
// int c = p.hint_string.get_slice_count(",");
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
Real-Time Remote Inspector support
2016-05-22 22:28:37 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String type = p.hint_string;
if (type == "")
type = "Object";
Real-Time Remote Inspector support
2016-05-22 22:28:37 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ObjectID id = obj->get(p.name);
if (id != 0) {
item->set_text(1, type + " ID: " + itos(id));
item->add_button(1, get_icon("EditResource", "EditorIcons"));
Real-Time Remote Inspector support
2016-05-22 22:28:37 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "[Empty]");
Real-Time Remote Inspector support
2016-05-22 22:28:37 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (has_icon(p.hint_string, "EditorIcons")) {
type = p.hint_string;
Real-Time Remote Inspector support
2016-05-22 22:28:37 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
type = "Object";
Real-Time Remote Inspector support
2016-05-22 22:28:37 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon(type, "EditorIcons"));
Real-Time Remote Inspector support
2016-05-22 22:28:37 +00:00
break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
if (p.type == Variant::REAL) {
Fix default ranges of the inspector Probably closes #3091 (Should apply to Variant::REAL and Variant::INT)
2016-07-25 09:07:02 +00:00
item->set_range_config(1, -16777216, 16777216, 0.001);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
Fix default ranges of the inspector Probably closes #3091 (Should apply to Variant::REAL and Variant::INT)
2016-07-25 09:07:02 +00:00
item->set_range_config(1, -2147483647, 2147483647, 1);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
};
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p.type == Variant::REAL) {
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Real", "EditorIcons"));
item->set_range(1, obj->get(p.name));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Integer", "EditorIcons"));
item->set_range(1, obj->get(p.name));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_editable(1, !read_only);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::STRING: {
switch (p.hint) {
case PROPERTY_HINT_DIR:
case PROPERTY_HINT_FILE:
case PROPERTY_HINT_GLOBAL_DIR:
case PROPERTY_HINT_GLOBAL_FILE: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_STRING);
item->set_editable(1, !read_only);
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("File", "EditorIcons"));
item->set_text(1, obj->get(p.name));
item->add_button(1, get_icon("Folder", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case PROPERTY_HINT_ENUM: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_RANGE);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector<String> strings = p.hint_string.split(",");
String current = obj->get(p.name);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
int idx = 0;
for (int x = 0; x < strings.size(); x++) {
if (strings[x] == current) {
idx = x;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
break;
}
}
item->set_text(1, p.hint_string);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_range(1, idx);
item->set_editable(1, !read_only);
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Enum", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
default: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_STRING);
item->set_editable(1, !read_only);
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("String", "EditorIcons"));
item->set_text(1, obj->get(p.name));
if (p.hint == PROPERTY_HINT_MULTILINE_TEXT)
item->add_button(1, get_icon("MultiLine", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
}
} break;
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
case Variant::ARRAY: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->add_button(1, get_icon("EditResource", "EditorIcons"));
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
Variant v = obj->get(p.name);
if (v.is_array())
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "Array[" + itos(v.call("size")) + "]");
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "Array[]");
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("ArrayData", "EditorIcons"));
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case Variant::INT_ARRAY: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->add_button(1, get_icon("EditResource", "EditorIcons"));
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
Variant v = obj->get(p.name);
if (v.is_array())
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "IntArray[" + itos(v.call("size")) + "]");
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "IntArray[]");
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("ArrayInt", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::REAL_ARRAY: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->add_button(1, get_icon("EditResource", "EditorIcons"));
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
Variant v = obj->get(p.name);
if (v.is_array())
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "FloatArray[" + itos(v.call("size")) + "]");
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "FloatArray[]");
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("ArrayReal", "EditorIcons"));
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::STRING_ARRAY: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->add_button(1, get_icon("EditResource", "EditorIcons"));
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
Variant v = obj->get(p.name);
if (v.is_array())
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "String[" + itos(v.call("size")) + "]");
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "String[]");
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("ArrayString", "EditorIcons"));
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::RAW_ARRAY: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->add_button(1, get_icon("EditResource", "EditorIcons"));
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
Variant v = obj->get(p.name);
if (v.is_array())
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "Byte[" + itos(v.call("size")) + "]");
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "Byte[]");
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("ArrayData", "EditorIcons"));
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
} break;
case Variant::VECTOR2_ARRAY: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->add_button(1, get_icon("EditResource", "EditorIcons"));
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
Variant v = obj->get(p.name);
if (v.is_array())
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "Vector2[" + itos(v.call("size")) + "]");
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "Vector2[]");
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Vector2", "EditorIcons"));
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
} break;
case Variant::VECTOR3_ARRAY: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->add_button(1, get_icon("EditResource", "EditorIcons"));
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
Variant v = obj->get(p.name);
if (v.is_array())
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "Vector3[" + itos(v.call("size")) + "]");
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "Vector3[]");
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Vector", "EditorIcons"));
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
} break;
case Variant::COLOR_ARRAY: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->add_button(1, get_icon("EditResource", "EditorIcons"));
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
Variant v = obj->get(p.name);
if (v.is_array())
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "Color[" + itos(v.call("size")) + "]");
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "Color[]");
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Color", "EditorIcons"));
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::VECTOR2: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->set_editable(1, true);
item->set_text(1, obj->get(p.name));
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Vector2", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::RECT2: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->set_editable(1, true);
item->set_text(1, obj->get(p.name));
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Rect2", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::VECTOR3: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->set_editable(1, true);
item->set_text(1, obj->get(p.name));
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Vector", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
Fix property editor Matrix3 and Matrix32 editing
2015-11-23 18:34:54 +00:00
case Variant::MATRIX32:
case Variant::MATRIX3: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->set_editable(1, true);
Fix property editor Matrix3 and Matrix32 editing
2015-11-23 18:34:54 +00:00
item->set_text(1, obj->get(p.name));
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case Variant::TRANSFORM: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->set_editable(1, true);
item->set_text(1, obj->get(p.name));
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Matrix", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::PLANE: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->set_editable(1, true);
item->set_text(1, obj->get(p.name));
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Plane", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::_AABB: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->set_editable(1, true);
item->set_text(1, "AABB");
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Rect3", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::QUAT: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->set_editable(1, true);
item->set_text(1, obj->get(p.name));
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Quat", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::COLOR: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->set_editable(1, !read_only);
// item->set_text(1,obj->get(p.name));
item->set_custom_bg_color(1, obj->get(p.name));
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Color", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::IMAGE: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->set_editable(1, !read_only);
Image img = obj->get(p.name);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (img.empty())
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "[Image (empty)]");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "[Image " + itos(img.get_width()) + "x" + itos(img.get_height()) + "-" + String(Image::get_format_name(img.get_format())) + "]");
-remove (can be added back in editor settings) icons from property editor -remove ".." from file dialog when opening res://, fixes #2994
2015-12-11 12:37:34 +00:00
if (show_type_icons)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Image", "EditorIcons"));
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::NODE_PATH: {
Possibility to write node path by hand in exported NodePath variable (#3486) (cherry picked from commit cf4f3815b330093a0b4cf25569843929277739fd)
2016-10-11 21:14:03 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_STRING);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_editable(1, !read_only);
item->set_text(1, obj->get(p.name));
Possibility to write node path by hand in exported NodePath variable (#3486) (cherry picked from commit cf4f3815b330093a0b4cf25569843929277739fd)
2016-10-11 21:14:03 +00:00
item->add_button(1, get_icon("Collapse", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::OBJECT: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM);
item->set_editable(1, !read_only);
item->add_button(1, get_icon("EditResource", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
String type;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p.hint == PROPERTY_HINT_RESOURCE_TYPE)
type = p.hint_string;
support for 2D shadow casters Added support for 2D shadow casters. *DANGER* Shaders in CanvasItem CHANGED, if you are using shader in a CanvasItem and pull this, you will lose them. Shaders now work through a 2D material system similar to 3D. If you don't want to lose the 2D shader code, save the shader as a .shd, then create a material in CanvasItem and re-assign the shader.
2015-03-02 03:54:10 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (obj->get(p.name).get_type() == Variant::NIL || obj->get(p.name).operator RefPtr().is_null()) {
item->set_text(1, "<null>");
item->set_icon(1, Ref<Texture>());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
RES res = obj->get(p.name).operator RefPtr();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (res->is_type("Texture")) {
int tw = EditorSettings::get_singleton()->get("property_editor/texture_preview_width");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon_max_width(1, tw);
item->set_icon(1, res);
item->set_text(1, "");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else if (res->get_name() != "") {
item->set_text(1, res->get_name());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (res->get_path() != "" && !res->get_path().begins_with("local://")) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
item->set_text(1, res->get_path().get_file());
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_text(1, "<" + res->get_type() + ">");
Removed unused variables (second pass) + dead code Fixes various gcc 5.4.0 warnings for -Wunused-variable and -Wunused-but-set-variable
2016-07-06 17:04:21 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (has_icon(res->get_type(), "EditorIcons")) {
type = res->get_type();
support for 2D shadow casters Added support for 2D shadow casters. *DANGER* Shaders in CanvasItem CHANGED, if you are using shader in a CanvasItem and pull this, you will lose them. Shaders now work through a 2D material system similar to 3D. If you don't want to lose the 2D shader code, save the shader as a .shd, then create a material in CanvasItem and re-assign the shader.
2015-03-02 03:54:10 +00:00
}
New option to send canvas to render buffer allows to use 3D environment effects for post processing such as Glow, Bloom, HDR, etc. in 2D.
2015-03-16 03:47:37 +00:00
if (res.is_valid() && res->get_path().is_resource_file()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_tooltip(1, res->get_path());
New option to send canvas to render buffer allows to use 3D environment effects for post processing such as Glow, Bloom, HDR, etc. in 2D.
2015-03-16 03:47:37 +00:00
} else if (res.is_valid()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_tooltip(1, res->get_name() + " (" + res->get_type() + ")");
New option to send canvas to render buffer allows to use 3D environment effects for post processing such as Glow, Bloom, HDR, etc. in 2D.
2015-03-16 03:47:37 +00:00
}
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 17:18:40 +00:00
if (!res->is_type("Texture")) {
//texture already previews via itself
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
EditorResourcePreview::get_singleton()->queue_edited_resource_preview(res, this, "_resource_preview_done", item->get_instance_ID());
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 17:18:40 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (type != String()) {
if (type.find(",") != -1)
type = type.get_slice(",", 0);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//printf("prop %s , type %s\n",p.name.ascii().get_data(),p.hint_string.ascii().get_data());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (has_icon(type, "EditorIcons"))
item->set_icon(0, get_icon(type, "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_icon(0, get_icon("Object", "EditorIcons"));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
// item->double_click_signal.connect( Method1<int>( Method2<int,String>( this, &Editoritem_obj_edited ), p.name ) );
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
default: {};
}
if (keying) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p.hint == PROPERTY_HINT_SPRITE_FRAME) {
improved animation editor -same-value link keys -new layout -forward, backwards playback -integrated curve/property editor -auto increment sprite frame after insert -copy & paste animation resoucres
2015-05-25 04:46:45 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->add_button(1, get_icon("KeyNext", "EditorIcons"), 5);
improved animation editor -same-value link keys -new layout -forward, backwards playback -integrated curve/property editor -auto increment sprite frame after insert -copy & paste animation resoucres
2015-05-25 04:46:45 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->add_button(1, get_icon("Key", "EditorIcons"), 2);
improved animation editor -same-value link keys -new layout -forward, backwards playback -integrated curve/property editor -auto increment sprite frame after insert -copy & paste animation resoucres
2015-05-25 04:46:45 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
bool has_reload = false;
-Add some offset to spinboxes in tree, so revert icon does not annoy much when pops up, fixes #3415
2016-02-02 23:44:42 +00:00
bool mbi = _might_be_in_instance();
if (mbi) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
Variant vorig;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Dictionary d = item->get_metadata(0);
int usage = d.has("usage") ? int(int(d["usage"]) & (PROPERTY_USAGE_STORE_IF_NONONE | PROPERTY_USAGE_STORE_IF_NONZERO)) : 0;
if (_get_instanced_node_original_property(p.name, vorig) || usage) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Variant v = obj->get(p.name);
-Fixes a bunch of stdout errors, closes #2763 closes #2731
2016-01-23 22:51:51 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (_is_property_different(v, vorig, usage)) {
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
//print_line("FOR "+String(p.name)+" RELOAD WITH: "+String(v)+"("+Variant::get_type_name(v.get_type())+")=="+String(vorig)+"("+Variant::get_type_name(vorig.get_type())+")");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->add_button(1, get_icon("ReloadSmall", "EditorIcons"), 3);
has_reload = true;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
}
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
if (!has_reload && !obj->get_script().is_null()) {
Ref<Script> scr = obj->get_script();
Variant orig_value;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (scr->get_property_default_value(p.name, orig_value)) {
if (orig_value != obj->get(p.name)) {
item->add_button(1, get_icon("ReloadSmall", "EditorIcons"), 3);
has_reload = true;
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
}
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (mbi && !has_reload && item->get_cell_mode(1) == TreeItem::CELL_MODE_RANGE && item->get_text(1) == String()) {
item->add_button(1, get_icon("ReloadEmpty", "EditorIcons"), 3, true);
-Add some offset to spinboxes in tree, so revert icon does not annoy much when pops up, fixes #3415
2016-02-02 23:44:42 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
void PropertyEditor::_item_selected() {
TreeItem *item = tree->get_selected();
ERR_FAIL_COND(!item);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
selected_property = item->get_metadata(1);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void PropertyEditor::_edit_set(const String &p_name, const Variant &p_value, const String &p_changed_field) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (autoclear) {
TreeItem *item = tree->get_selected();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (item && item->get_cell_mode(0) == TreeItem::CELL_MODE_CHECK) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
item->set_checked(0, true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (!undo_redo || obj->cast_to<ArrayPropertyEdit>()) { //kind of hacky
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
obj->set(p_name, p_value);
_changed_callbacks(obj, p_name);
emit_signal(_prop_edited, p_name);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
} else if (obj->cast_to<MultiNodeEdit>()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
obj->cast_to<MultiNodeEdit>()->set_property_field(p_name, p_value, p_changed_field);
_changed_callbacks(obj, p_name);
emit_signal(_prop_edited, p_name);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
undo_redo->create_action(TTR("Set") + " " + p_name, UndoRedo::MERGE_ENDS);
undo_redo->add_do_property(obj, p_name, p_value);
undo_redo->add_undo_property(obj, p_name, obj->get(p_name));
undo_redo->add_do_method(this, "_changed_callback", obj, p_name);
undo_redo->add_undo_method(this, "_changed_callback", obj, p_name);
undo_redo->add_undo_method(this, "_changed_callback", obj, p_name);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Resource *r = obj->cast_to<Resource>();
if (r) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (!r->is_edited() && String(p_name) != "resource/edited") {
undo_redo->add_do_method(r, "set_edited", true);
undo_redo->add_undo_method(r, "set_edited", false);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
_prop_edited_name[0] = p_name;
undo_redo->add_do_method(this, "emit_signal", _prop_edited, _prop_edited_name);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
undo_redo->commit_action();
}
}
void PropertyEditor::_item_edited() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
TreeItem *item = tree->get_edited();
-Avoid crash in property editor due to newly out of focus but still valid property edition, fixes #3601
2016-02-08 14:59:44 +00:00
if (!item)
return; //it all happened too fast..
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Dictionary d = item->get_metadata(0);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String name = d["name"];
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (tree->get_edited_column() == 0) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//property checked
if (autoclear) {
if (!item->is_checked(0)) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
obj->set(name, Variant());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
update_property(name);
} else {
Variant::CallError ce;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
obj->set(name, Variant::construct(Variant::Type(int(d["type"])), NULL, 0, ce));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
emit_signal("property_toggled", name, item->is_checked(0));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
return;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (autoclear && item->get_cell_mode(0) == TreeItem::CELL_MODE_CHECK && item->get_cell_mode(1) != TreeItem::CELL_MODE_CUSTOM) {
item->set_checked(0, true);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
int type = d["type"];
int hint = d["hint"];
String hint_text = d["hint_text"];
switch (type) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case Variant::NIL: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
} break;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case Variant::BOOL: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
_edit_set(name, item->is_checked(1));
Show True/False tooltip in property editor for bool values (cherry picked from commit 623c483ebaffa8de8f9e53b3910d6cfdf8207e59)
2016-09-19 21:41:48 +00:00
item->set_tooltip(1, item->is_checked(1) ? "True" : "False");
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::INT:
case Variant::REAL: {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint == PROPERTY_HINT_ALL_FLAGS)
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
break;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint == PROPERTY_HINT_EXP_EASING)
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
break;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint == PROPERTY_HINT_FLAGS)
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
break;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (type == Variant::INT)
_edit_set(name, int(item->get_range(1)));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
else
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
_edit_set(name, item->get_range(1));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::STRING: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (hint == PROPERTY_HINT_ENUM) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
int idx = item->get_range(1);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Vector<String> strings = hint_text.split(",");
String txt;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (idx >= 0 && idx < strings.size()) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
txt = strings[idx];
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
_edit_set(name, txt);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
_edit_set(name, item->get_text(1));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
} break;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
// math types
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case Variant::VECTOR3: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::PLANE: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::QUAT: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::_AABB: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::MATRIX3: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::TRANSFORM: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case Variant::COLOR: {
//_edit_set(name,item->get_custom_bg_color(0));
} break;
case Variant::IMAGE: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::NODE_PATH: {
Possibility to write node path by hand in exported NodePath variable (#3486) (cherry picked from commit cf4f3815b330093a0b4cf25569843929277739fd)
2016-10-11 21:14:03 +00:00
_edit_set(name, NodePath(item->get_text(1)));
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::INPUT_EVENT: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::DICTIONARY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
// arrays
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
case Variant::RAW_ARRAY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::INT_ARRAY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::REAL_ARRAY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::STRING_ARRAY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::VECTOR3_ARRAY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
case Variant::COLOR_ARRAY: {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} break;
};
}
void PropertyEditor::_resource_edit_request() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
RES res = custom_editor->get_variant();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (res.is_null())
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String name = custom_editor->get_name();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
emit_signal("resource_selected", res.get_ref_ptr(), name);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
void PropertyEditor::_custom_editor_edited() {
if (!obj)
return;
_edit_set(custom_editor->get_name(), custom_editor->get_variant());
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void PropertyEditor::_custom_editor_edited_field(const String &p_field_name) {
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ERR_FAIL_COND(p_field_name == "");
Implement single-field property change for multinode edit
2017-03-01 01:59:08 +00:00
if (!obj)
return;
_edit_set(custom_editor->get_name(), custom_editor->get_variant(), p_field_name);
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void PropertyEditor::_custom_editor_request(bool p_arrow) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
TreeItem *item = tree->get_edited();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
ERR_FAIL_COND(!item);
Dictionary d = item->get_metadata(0);
//int type=d["type"];
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String name = d["name"];
Variant::Type type = Variant::NIL;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (d.has("type"))
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
type = (Variant::Type)((int)(d["type"]));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Variant v = obj->get(name);
int hint = d.has("hint") ? d["hint"].operator int() : -1;
String hint_text = d.has("hint_text") ? d["hint_text"] : "";
Rect2 where = tree->get_custom_popup_rect();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
custom_editor->set_pos(where.pos);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (custom_editor->edit(obj, name, type, v, hint, hint_text)) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
custom_editor->popup();
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void PropertyEditor::edit(Object *p_object) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (obj == p_object)
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return;
if (obj) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
obj->remove_change_receptor(this);
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
obj = p_object;
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
evaluator->edit(p_object);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
update_tree();
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (obj) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
obj->add_change_receptor(this);
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void PropertyEditor::_set_range_def(Object *p_item, String prop, float p_frame) {
improved animation editor -same-value link keys -new layout -forward, backwards playback -integrated curve/property editor -auto increment sprite frame after insert -copy & paste animation resoucres
2015-05-25 04:46:45 +00:00
TreeItem *ti = p_item->cast_to<TreeItem>();
ERR_FAIL_COND(!ti);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ti->call_deferred("set_range", 1, p_frame);
obj->call_deferred("set", prop, p_frame);
improved animation editor -same-value link keys -new layout -forward, backwards playback -integrated curve/property editor -auto increment sprite frame after insert -copy & paste animation resoucres
2015-05-25 04:46:45 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void PropertyEditor::_edit_button(Object *p_item, int p_column, int p_button) {
TreeItem *ti = p_item->cast_to<TreeItem>();
ERR_FAIL_COND(!ti);
Dictionary d = ti->get_metadata(0);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_button == 2) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!d.has("name"))
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String prop = d["name"];
emit_signal("property_keyed", prop, obj->get(prop), false);
} else if (p_button == 5) {
improved animation editor -same-value link keys -new layout -forward, backwards playback -integrated curve/property editor -auto increment sprite frame after insert -copy & paste animation resoucres
2015-05-25 04:46:45 +00:00
print_line("PB5");
if (!d.has("name"))
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String prop = d["name"];
emit_signal("property_keyed", prop, obj->get(prop), true);
improved animation editor -same-value link keys -new layout -forward, backwards playback -integrated curve/property editor -auto increment sprite frame after insert -copy & paste animation resoucres
2015-05-25 04:46:45 +00:00
//set_range(p_column, ti->get_range(p_column)+1.0 );
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
call_deferred("_set_range_def", ti, prop, ti->get_range(p_column) + 1.0);
} else if (p_button == 3) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
if (!d.has("name"))
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String prop = d["name"];
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Large improvements on scene packing and management -Ability to edit and keep changes of instanced scenes and sub-scenes -Ability to inherit from other scenes
2015-10-10 12:09:09 +00:00
Variant vorig;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (_might_be_in_instance() && _get_instanced_node_original_property(prop, vorig)) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
_edit_set(prop, vorig);
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
return;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (!obj->get_script().is_null()) {
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
Ref<Script> scr = obj->get_script();
Variant orig_value;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (scr->get_property_default_value(prop, orig_value)) {
_edit_set(prop, orig_value);
-Ability to roll-back script-exported properties to their default value on the script, closes #2128
2016-01-02 23:17:31 +00:00
}
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
} else {
Dictionary d = ti->get_metadata(0);
if (!d.has("type"))
return;
if (!d.has("hint"))
return;
if (!d.has("name"))
return;
if (!d.has("hint_text"))
return;
int t = d["type"];
int h = d["hint"];
String n = d["name"];
String ht = d["hint_text"];
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (t == Variant::NODE_PATH) {
Possibility to write node path by hand in exported NodePath variable (#3486) (cherry picked from commit cf4f3815b330093a0b4cf25569843929277739fd)
2016-10-11 21:14:03 +00:00
Variant v = obj->get(n);
custom_editor->edit(obj, n, (Variant::Type)t, v, h, ht);
Rect2 where = tree->get_item_rect(ti, 1);
where.pos -= tree->get_scroll();
where.pos += tree->get_global_pos();
custom_editor->set_pos(where.pos);
custom_editor->popup();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (t == Variant::STRING) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Variant v = obj->get(n);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
custom_editor->edit(obj, n, (Variant::Type)t, v, h, ht);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//Rect2 where=tree->get_custom_popup_rect();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (h == PROPERTY_HINT_FILE || h == PROPERTY_HINT_DIR || h == PROPERTY_HINT_GLOBAL_DIR || h == PROPERTY_HINT_GLOBAL_FILE) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Rect2 where = tree->get_item_rect(ti, 1);
where.pos -= tree->get_scroll();
where.pos += tree->get_global_pos();
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
custom_editor->set_pos(where.pos);
custom_editor->popup();
} else {
custom_editor->popup_centered_ratio();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (t == Variant::OBJECT) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
RES r = obj->get(n);
if (r.is_valid()) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
emit_signal("resource_selected", r, n);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (t == Variant::INT && h == PROPERTY_HINT_OBJECT_ID) {
Real-Time Remote Inspector support
2016-05-22 22:28:37 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
emit_signal("object_id_selected", obj->get(n));
Real-Time Remote Inspector support
2016-05-22 22:28:37 +00:00
print_line("OBJ ID SELECTED");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
} else if (t == Variant::ARRAY || t == Variant::INT_ARRAY || t == Variant::REAL_ARRAY || t == Variant::STRING_ARRAY || t == Variant::VECTOR2_ARRAY || t == Variant::VECTOR3_ARRAY || t == Variant::COLOR_ARRAY || t == Variant::RAW_ARRAY) {
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
Variant v = obj->get(n);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (v.get_type() != t) {
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
Variant::CallError ce;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
v = Variant::construct(Variant::Type(t), NULL, 0, ce);
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Ref<ArrayPropertyEdit> ape = memnew(ArrayPropertyEdit);
ape->edit(obj, n, Variant::Type(t));
Ability to edit all kinds of arrays from the property editor. Yes, I'm trying to convince you to test the alpha release by adding all these now :)
2015-08-25 23:45:51 +00:00
EditorNode::get_singleton()->push_item(ape.ptr());
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
}
void PropertyEditor::_node_removed(Node *p_node) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_node == obj) {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
edit(NULL);
}
}
void PropertyEditor::set_keying(bool p_active) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (keying == p_active)
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
keying = p_active;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
update_tree();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void PropertyEditor::_draw_flags(Object *t, const Rect2 &p_rect) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
TreeItem *ti = t->cast_to<TreeItem>();
if (!ti)
return;
Dictionary d = ti->get_metadata(0);
if (!d.has("name"))
return;
uint32_t f = obj->get(d["name"]);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
int bsize = (p_rect.size.height * 80 / 100) / 2;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
int h = bsize * 2 + 1;
int vofs = (p_rect.size.height - h) / 2;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (int i = 0; i < 2; i++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Point2 ofs(4, vofs);
if (i == 1)
ofs.y += bsize + 1;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ofs += p_rect.pos;
for (int j = 0; j < 10; j++) {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Point2 o = ofs + Point2(j * (bsize + 1), 0);
if (j >= 5)
o.x += 1;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
uint32_t idx = i * 10 + j;
bool on = f & (1 << idx);
tree->draw_rect(Rect2(o, Size2(bsize, bsize)), Color(0, 0, 0, on ? 0.8 : 0.3));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void PropertyEditor::_filter_changed(const String &p_text) {
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 16:42:15 +00:00
update_tree();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void PropertyEditor::_resource_preview_done(const String &p_path, const Ref<Texture> &p_preview, Variant p_ud) {
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 17:18:40 +00:00
if (p_preview.is_null())
return; //don't bother with empty preview
ObjectID id = p_ud;
Object *obj = ObjectDB::get_instance(id);
if (!obj)
return;
TreeItem *ti = obj->cast_to<TreeItem>();
ERR_FAIL_COND(!ti);
int tw = EditorSettings::get_singleton()->get("property_editor/texture_preview_width");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ti->set_icon(1, p_preview); //should be scaled I think?
ti->set_icon_max_width(1, tw);
ti->set_text(1, "");
Changed import workflow -Rearrange favorites in fs dock with drag and drop -Removed import -> sub-scene, moved to scenetree contextual menu -Removed import -> re-import , moved and integrated to FS dock -Added ability in FS dock to re-import more than one resource simultaneously -Added ability to drag from native filesystem explorer to Godot, only works on Windows though -Removed scene reimport merge options, never worked well. Eventually merging materials should be re-added -Added ability to set custom root node type when importing scenes -Re-Import is now automatic, can be configured back to manual in editor settings -Added resource previews in property list for many resource types
2016-05-27 17:18:40 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
void PropertyEditor::_bind_methods() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ObjectTypeDB::bind_method("_item_edited", &PropertyEditor::_item_edited);
ObjectTypeDB::bind_method("_item_selected", &PropertyEditor::_item_selected);
ObjectTypeDB::bind_method("_custom_editor_request", &PropertyEditor::_custom_editor_request);
ObjectTypeDB::bind_method("_custom_editor_edited", &PropertyEditor::_custom_editor_edited);
ObjectTypeDB::bind_method("_custom_editor_edited_field", &PropertyEditor::_custom_editor_edited_field, DEFVAL(""));
ObjectTypeDB::bind_method("_resource_edit_request", &PropertyEditor::_resource_edit_request);
ObjectTypeDB::bind_method("_node_removed", &PropertyEditor::_node_removed);
ObjectTypeDB::bind_method("_edit_button", &PropertyEditor::_edit_button);
ObjectTypeDB::bind_method("_changed_callback", &PropertyEditor::_changed_callbacks);
ObjectTypeDB::bind_method("_draw_flags", &PropertyEditor::_draw_flags);
ObjectTypeDB::bind_method("_set_range_def", &PropertyEditor::_set_range_def);
ObjectTypeDB::bind_method("_filter_changed", &PropertyEditor::_filter_changed);
ObjectTypeDB::bind_method("update_tree", &PropertyEditor::update_tree);
ObjectTypeDB::bind_method("_resource_preview_done", &PropertyEditor::_resource_preview_done);
ObjectTypeDB::bind_method("refresh", &PropertyEditor::refresh);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
ObjectTypeDB::bind_method(_MD("get_drag_data_fw"), &PropertyEditor::get_drag_data_fw);
ObjectTypeDB::bind_method(_MD("can_drop_data_fw"), &PropertyEditor::can_drop_data_fw);
ObjectTypeDB::bind_method(_MD("drop_data_fw"), &PropertyEditor::drop_data_fw);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ADD_SIGNAL(MethodInfo("property_toggled", PropertyInfo(Variant::STRING, "property"), PropertyInfo(Variant::BOOL, "value")));
ADD_SIGNAL(MethodInfo("resource_selected", PropertyInfo(Variant::OBJECT, "res"), PropertyInfo(Variant::STRING, "prop")));
ADD_SIGNAL(MethodInfo("object_id_selected", PropertyInfo(Variant::INT, "id")));
ADD_SIGNAL(MethodInfo("property_keyed", PropertyInfo(Variant::STRING, "property")));
ADD_SIGNAL(MethodInfo("property_edited", PropertyInfo(Variant::STRING, "property")));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
SceneMainLoop -> SceneTree -=-=-=-=-=-=-=-=-=-=-=-=-=- *YOUR SOURCE MIGHT NOT WORK* For mor information on fix: https://github.com/okamstudio/godot/wiki/devel_scene_tree Other stuff: -Shower of bullets demo -Fixes all around
2014-11-06 00:20:42 +00:00
Tree *PropertyEditor::get_scene_tree() {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return tree;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Label *PropertyEditor::get_top_label() {
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
return top_label;
}
void PropertyEditor::hide_top_label() {
top_label->hide();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
tree->set_begin(Point2(0, 0));
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
String PropertyEditor::get_selected_path() const {
TreeItem *ti = tree->get_selected();
if (!ti)
return "";
Dictionary d = ti->get_metadata(0);
if (d.has("name"))
return d["name"];
else
return "";
}
void PropertyEditor::set_capitalize_paths(bool p_capitalize) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
capitalize_paths = p_capitalize;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
void PropertyEditor::set_autoclear(bool p_enable) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
autoclear = p_enable;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
void PropertyEditor::set_show_categories(bool p_show) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
show_categories = p_show;
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
update_tree();
}
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 16:42:15 +00:00
void PropertyEditor::set_use_filter(bool p_use) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_use == use_filter)
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 16:42:15 +00:00
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
use_filter = p_use;
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 16:42:15 +00:00
update_tree();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void PropertyEditor::register_text_enter(Node *p_line_edit) {
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 16:42:15 +00:00
ERR_FAIL_NULL(p_line_edit);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
search_box = p_line_edit->cast_to<LineEdit>();
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 16:42:15 +00:00
if (search_box)
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
search_box->connect("text_changed", this, "_filter_changed");
Make ItemListEditor plugin functional
2015-12-03 17:59:59 +00:00
}
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 16:42:15 +00:00
Make ItemListEditor plugin functional
2015-12-03 17:59:59 +00:00
void PropertyEditor::set_subsection_selectable(bool p_selectable) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (p_selectable == subsection_selectable)
Make ItemListEditor plugin functional
2015-12-03 17:59:59 +00:00
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
subsection_selectable = p_selectable;
Make ItemListEditor plugin functional
2015-12-03 17:59:59 +00:00
update_tree();
Implement name filter to PropertyEditor - Add search bar to Inspector tab and to Project and Editor settings dialog
2015-11-21 16:42:15 +00:00
}
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
PropertyEditor::PropertyEditor() {
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
_prop_edited = "property_edited";
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
_prop_edited_name.push_back(String());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
undo_redo = NULL;
obj = NULL;
search_box = NULL;
changing = false;
update_tree_pending = false;
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
top_label = memnew(Label);
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
top_label->set_text(TTR("Properties:"));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
top_label->set_anchor(MARGIN_RIGHT, ANCHOR_END);
top_label->set_begin(Point2(10, 0));
top_label->set_end(Point2(0, 12));
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
add_child(top_label);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
tree = memnew(Tree);
tree->set_anchor(MARGIN_RIGHT, ANCHOR_END);
tree->set_anchor(MARGIN_BOTTOM, ANCHOR_END);
tree->set_begin(Point2(0, 19));
tree->set_end(Point2(0, 0));
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
tree->set_columns(2);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
tree->set_column_expand(0, true);
tree->set_column_min_width(0, 30);
tree->set_column_expand(1, true);
tree->set_column_min_width(1, 18);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
//tree->set_hide_root(true);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
add_child(tree);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
tree->connect("item_edited", this, "_item_edited", varray(), CONNECT_DEFERRED);
tree->connect("cell_selected", this, "_item_selected");
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
-begun implementing drag & drop editor wide -filesystem dock dnd support -property list dnd support -scene tree dnd support
2016-05-11 14:46:08 +00:00
tree->set_drag_forwarding(this);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
set_fixed_process(true);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
custom_editor = memnew(CustomPropertyEditor);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
add_child(custom_editor);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
tree->connect("custom_popup_edited", this, "_custom_editor_request");
tree->connect("button_pressed", this, "_edit_button");
custom_editor->connect("variant_changed", this, "_custom_editor_edited");
custom_editor->connect("variant_field_changed", this, "_custom_editor_edited_field");
custom_editor->connect("resource_edit_request", this, "_resource_edit_request", make_binds(), CONNECT_DEFERRED);
-better integration of ndee's theme
2015-11-13 23:56:44 +00:00
tree->set_hide_folding(true);
Edit default values. WARNING!!! Do not merge these changes, default values are not compiled into shaders yet!
2015-08-30 00:09:11 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
evaluator = memnew(PropertyValueEvaluator);
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
tree->set_value_evaluator(evaluator);
custom_editor->set_value_evaluator(evaluator);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
capitalize_paths = true;
autoclear = false;
remove column titles in property inspector
2015-02-28 08:28:26 +00:00
tree->set_column_titles_visible(false);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
keying = false;
read_only = false;
show_categories = false;
refresh_countdown = 0;
use_doc_hints = false;
use_filter = false;
subsection_selectable = false;
show_type_icons = EDITOR_DEF("inspector/show_type_icons", false);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
PropertyEditor::~PropertyEditor() {
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
memdelete(evaluator);
GODOT IS OPEN SOURCE
2014-02-10 01:10:30 +00:00
}
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
/////////////////////////////
class SectionedPropertyEditorFilter : public Object {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
OBJ_TYPE(SectionedPropertyEditorFilter, Object);
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
Object *edited;
String section;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
bool _set(const StringName &p_name, const Variant &p_value) {
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
if (!edited)
return false;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String name = p_name;
if (section != "") {
name = section + "/" + name;
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
}
bool valid;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
edited->set(name, p_value, &valid);
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
return valid;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
bool _get(const StringName &p_name, Variant &r_ret) const {
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
if (!edited)
return false;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String name = p_name;
if (section != "") {
name = section + "/" + name;
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
bool valid = false;
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
r_ret = edited->get(name, &valid);
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
return valid;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void _get_property_list(List<PropertyInfo> *p_list) const {
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
if (!edited)
return;
List<PropertyInfo> pinfo;
edited->get_property_list(&pinfo);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
PropertyInfo pi = E->get();
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
int sp = pi.name.find("/");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (sp != -1) {
String ss = pi.name.substr(0, sp);
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (ss == section) {
pi.name = pi.name.substr(sp + 1, pi.name.length());
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
p_list->push_back(pi);
}
} else {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (section == "")
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
p_list->push_back(pi);
}
}
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
public:
void set_section(const String &p_section) {
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
section = p_section;
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
_change_notify();
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void set_edited(Object *p_edited) {
edited = p_edited;
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
_change_notify();
}
SectionedPropertyEditorFilter() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
edited = NULL;
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
}
};
void SectionedPropertyEditor::_bind_methods() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
ObjectTypeDB::bind_method("_section_selected", &SectionedPropertyEditor::_section_selected);
Implement undo/redo for adding and deleting global properties
2016-07-07 13:10:12 +00:00
ObjectTypeDB::bind_method("update_category_list", &SectionedPropertyEditor::update_category_list);
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
}
void SectionedPropertyEditor::_section_selected(int p_which) {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
filter->set_section(sections->get_item_metadata(p_which));
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void SectionedPropertyEditor::set_current_section(const String &p_section) {
Fix Project Settings dialog add/delete global variable
2016-03-06 14:22:21 +00:00
int section_idx = sections->find_metadata(p_section);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (section_idx == sections->get_current())
Fix Project Settings dialog add/delete global variable
2016-03-06 14:22:21 +00:00
return;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (section_idx != -1) {
Fix Project Settings dialog add/delete global variable
2016-03-06 14:22:21 +00:00
sections->select(section_idx);
_section_selected(section_idx);
} else if (sections->get_item_count()) {
sections->select(0);
_section_selected(0);
}
}
-Project settings can properly add/remove properties again, fixes #3177
2016-01-10 20:08:02 +00:00
String SectionedPropertyEditor::get_current_section() const {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (sections->get_current() != -1)
return sections->get_item_metadata(sections->get_current());
Fix Project Settings dialog add/delete global variable
2016-03-06 14:22:21 +00:00
else
return "";
-Project settings can properly add/remove properties again, fixes #3177
2016-01-10 20:08:02 +00:00
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String SectionedPropertyEditor::get_full_item_path(const String &p_item) {
small fix for undo redo
2015-12-16 03:42:34 +00:00
Fix Project Settings dialog add/delete global variable
2016-03-06 14:22:21 +00:00
String base = get_current_section();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (base != "")
return base + "/" + p_item;
small fix for undo redo
2015-12-16 03:42:34 +00:00
else
return p_item;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
void SectionedPropertyEditor::edit(Object *p_object) {
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
Keep selected section in Editor Settings when reopening the dialog
2016-07-18 22:21:20 +00:00
if (!p_object) {
obj = -1;
Fix Project Settings dialog add/delete global variable
2016-03-06 14:22:21 +00:00
sections->clear();
Keep selected section in Editor Settings when reopening the dialog
2016-07-18 22:21:20 +00:00
filter->set_edited(NULL);
editor->edit(NULL);
return;
Fix Project Settings dialog add/delete global variable
2016-03-06 14:22:21 +00:00
}
Keep selected section in Editor Settings when reopening the dialog
2016-07-18 22:21:20 +00:00
ObjectID id = p_object->get_instance_ID();
if (obj != id) {
obj = id;
update_category_list();
Fix Project Settings dialog add/delete global variable
2016-03-06 14:22:21 +00:00
Keep selected section in Editor Settings when reopening the dialog
2016-07-18 22:21:20 +00:00
filter->set_edited(p_object);
editor->edit(filter);
Fix Project Settings dialog add/delete global variable
2016-03-06 14:22:21 +00:00
Keep selected section in Editor Settings when reopening the dialog
2016-07-18 22:21:20 +00:00
sections->select(0);
_section_selected(0);
} else {
update_category_list();
}
Fix Project Settings dialog add/delete global variable
2016-03-06 14:22:21 +00:00
}
void SectionedPropertyEditor::update_category_list() {
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String selected_category = get_current_section();
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
sections->clear();
Fix Project Settings dialog add/delete global variable
2016-03-06 14:22:21 +00:00
Object *o = ObjectDB::get_instance(obj);
if (!o)
return;
List<PropertyInfo> pinfo;
o->get_property_list(&pinfo);
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
Set<String> existing_sections;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
PropertyInfo pi = E->get();
Fix Project Settings dialog add/delete global variable
2016-03-06 14:22:21 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (pi.usage & PROPERTY_USAGE_CATEGORY)
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
else if (!(pi.usage & PROPERTY_USAGE_EDITOR))
Fix Project Settings dialog add/delete global variable
2016-03-06 14:22:21 +00:00
continue;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (pi.name.find(":") != -1 || pi.name == "script/script" || pi.name.begins_with("resource/"))
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
continue;
int sp = pi.name.find("/");
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
if (sp != -1) {
String sname = pi.name.substr(0, sp);
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
if (!existing_sections.has(sname)) {
existing_sections.insert(sname);
sections->add_item(sname.capitalize());
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
sections->set_item_metadata(sections->get_item_count() - 1, sname);
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
}
} else {
Revert "Better search for SectionedPropertyEditor, added "All" section"
2016-01-23 19:05:27 +00:00
if (!existing_sections.has("")) {
existing_sections.insert("");
Modified editor strings to be translatable in the future
2016-05-04 01:25:37 +00:00
sections->add_item(TTR("Global"));
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
sections->set_item_metadata(sections->get_item_count() - 1, "");
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
}
}
}
Fix Project Settings dialog add/delete global variable
2016-03-06 14:22:21 +00:00
set_current_section(selected_category);
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
}
PropertyEditor *SectionedPropertyEditor::get_property_editor() {
return editor;
}
SectionedPropertyEditor::SectionedPropertyEditor() {
Keep selected section in Editor Settings when reopening the dialog
2016-07-18 22:21:20 +00:00
obj = -1;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
VBoxContainer *left_vb = memnew(VBoxContainer);
left_vb->set_custom_minimum_size(Size2(160, 0) * EDSCALE);
added labels to sections and properties
2015-12-16 03:08:50 +00:00
add_child(left_vb);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
sections = memnew(ItemList);
added labels to sections and properties
2015-12-16 03:08:50 +00:00
sections->set_v_size_flags(SIZE_EXPAND_FILL);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
left_vb->add_margin_child(TTR("Sections:"), sections, true);
added labels to sections and properties
2015-12-16 03:08:50 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
VBoxContainer *right_vb = memnew(VBoxContainer);
added labels to sections and properties
2015-12-16 03:08:50 +00:00
right_vb->set_h_size_flags(SIZE_EXPAND_FILL);
add_child(right_vb);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
filter = memnew(SectionedPropertyEditorFilter);
editor = memnew(PropertyEditor);
added labels to sections and properties
2015-12-16 03:08:50 +00:00
editor->set_v_size_flags(SIZE_EXPAND_FILL);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
right_vb->add_margin_child(TTR("Properties:"), editor, true);
added labels to sections and properties
2015-12-16 03:08:50 +00:00
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
editor->get_scene_tree()->set_column_titles_visible(false);
-Fixes a bunch of stdout errors, closes #2763 closes #2731
2016-01-23 22:51:51 +00:00
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
editor->hide_top_label();
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
sections->connect("item_selected", this, "_section_selected");
-split view of property editor and editor settings
2015-12-16 02:39:36 +00:00
}
SectionedPropertyEditor::~SectionedPropertyEditor() {
memdelete(filter);
}
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
double PropertyValueEvaluator::eval(const String &p_text) {
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
if (!obj)
return _default_eval(p_text);
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
Ref<Script> script = Ref<Script>(script_language->create_script());
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
script->set_source_code(_build_script(p_text));
Error err = script->reload();
if (err) {
print_line("[PropertyValueEvaluator] Error loading script for expression: " + p_text);
return _default_eval(p_text);
}
ScriptInstance *script_instance = script->instance_create(this);
Variant::CallError call_err;
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
script_instance->call("set_this", obj);
double result = script_instance->call("e", NULL, 0, call_err);
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
if (call_err.error == Variant::CallError::CALL_OK) {
return result;
}
print_line("[PropertyValueEvaluator]: Error eval! Error code: " + itos(call_err.error));
memdelete(script_instance);
return _default_eval(p_text);
}
void PropertyValueEvaluator::edit(Object *p_obj) {
obj = p_obj;
}
Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261.
2017-03-18 23:36:26 +00:00
String PropertyValueEvaluator::_build_script(const String &p_text) {
Add math/script expression evaluation in editor (#3620) Rebase of #453
2016-05-01 08:33:32 +00:00
String script_text = "tool\nvar this\nfunc set_this(p_this):\n\tthis=p_this\nfunc e():\n\treturn ";
script_text += p_text.strip_edges();
script_text += "\n";
return script_text;
}
PropertyValueEvaluator::PropertyValueEvaluator() {
script_language = ScriptServer::get_language(0); // todo: get script language from editor setting
}
PropertyValueEvaluator::~PropertyValueEvaluator() {
}