godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Reenable node name case setting + code cleanups

Browse Source 
The method _generate_serial_child_name is indeed called relatively often
in editor mode, but that commented out code chunk hardly adds to its
slowness (and with the default setting, not at all).

Also did various related code cleanups and simplifications.
This commit is contained in:
Rémi Verschelde
2017-01-13 22:38:37 +01:00
parent f392b340ff
commit f19fd7a4c1
4 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scene/main/node.cpp
View File

@@ -1384,10 +1384,8 @@ String Node::_generate_serial_child_name(Node *p_child) {
if (name=="") {
name = p_child->get_class();
/* this is probably too slow to use here, should check alternatives
*
// Adjust casing according to project setting. The current type name is expected to be in PascalCase.
switch (Globals::get_singleton()->get("node/name_casing").operator int()) {
switch (GlobalConfig::get_singleton()->get("editor/node_name_casing").operator int()) {
case NAME_CASING_PASCAL_CASE:
break;
case NAME_CASING_CAMEL_CASE:
@@ -1397,7 +1395,6 @@ String Node::_generate_serial_child_name(Node *p_child) {
name = name.camelcase_to_underscore(true);
break;
}
*/
}
// Extract trailing number
@@ -2902,10 +2899,10 @@ void Node::request_ready() {
void Node::_bind_methods() {
_GLOBAL_DEF("editor/node_name_num_separator",0);
GLOBAL_DEF("editor/node_name_num_separator",0);
GlobalConfig::get_singleton()->set_custom_property_info("editor/node_name_num_separator",PropertyInfo(Variant::INT,"editor/node_name_num_separator",PROPERTY_HINT_ENUM, "None,Space,Underscore,Dash"));
_GLOBAL_DEF("node/name_casing",NAME_CASING_PASCAL_CASE);
GlobalConfig::get_singleton()->set_custom_property_info("node/name_casing",PropertyInfo(Variant::INT,"node/name_casing",PROPERTY_HINT_ENUM,"PascalCase,camelCase,snake_case"));
GLOBAL_DEF("node/name_casing",NAME_CASING_PASCAL_CASE);
GlobalConfig::get_singleton()->set_custom_property_info("editor/node_name_casing",PropertyInfo(Variant::INT,"editor/node_name_casing",PROPERTY_HINT_ENUM,"PascalCase,camelCase,snake_case"));
ClassDB::bind_method(_MD("_add_child_below_node","node:Node","child_node:Node","legible_unique_name"),&Node::add_child_below_node,DEFVAL(false));