mirror of
https://github.com/godotengine/godot.git
synced 2025-10-19 16:03:29 +00:00
Bring that Whole New World to the Old Continent too
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
parent
1d418afe86
commit
f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
|
|
@ -32,15 +32,15 @@
|
|||
|
||||
#define ITEMS_PER_PAGE 100
|
||||
|
||||
Variant ArrayPropertyEdit::get_array() const{
|
||||
Variant ArrayPropertyEdit::get_array() const {
|
||||
|
||||
Object*o = ObjectDB::get_instance(obj);
|
||||
Object *o = ObjectDB::get_instance(obj);
|
||||
if (!o)
|
||||
return Array();
|
||||
Variant arr=o->get(property);
|
||||
Variant arr = o->get(property);
|
||||
if (!arr.is_array()) {
|
||||
Variant::CallError ce;
|
||||
arr=Variant::construct(default_type,NULL,0,ce);
|
||||
arr = Variant::construct(default_type, NULL, 0, ce);
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
|
|
@ -48,7 +48,7 @@ Variant ArrayPropertyEdit::get_array() const{
|
|||
void ArrayPropertyEdit::_notif_change() {
|
||||
_change_notify();
|
||||
}
|
||||
void ArrayPropertyEdit::_notif_changev(const String& p_v) {
|
||||
void ArrayPropertyEdit::_notif_changev(const String &p_v) {
|
||||
|
||||
_change_notify(p_v.utf8().get_data());
|
||||
}
|
||||
|
|
@ -56,109 +56,105 @@ void ArrayPropertyEdit::_notif_changev(const String& p_v) {
|
|||
void ArrayPropertyEdit::_set_size(int p_size) {
|
||||
|
||||
Variant arr = get_array();
|
||||
arr.call("resize",p_size);
|
||||
Object*o = ObjectDB::get_instance(obj);
|
||||
arr.call("resize", p_size);
|
||||
Object *o = ObjectDB::get_instance(obj);
|
||||
if (!o)
|
||||
return;
|
||||
|
||||
o->set(property,arr);
|
||||
|
||||
o->set(property, arr);
|
||||
}
|
||||
|
||||
void ArrayPropertyEdit::_set_value(int p_idx,const Variant& p_value) {
|
||||
void ArrayPropertyEdit::_set_value(int p_idx, const Variant &p_value) {
|
||||
|
||||
Variant arr = get_array();
|
||||
arr.set(p_idx,p_value);
|
||||
Object*o = ObjectDB::get_instance(obj);
|
||||
arr.set(p_idx, p_value);
|
||||
Object *o = ObjectDB::get_instance(obj);
|
||||
if (!o)
|
||||
return;
|
||||
|
||||
o->set(property,arr);
|
||||
o->set(property, arr);
|
||||
}
|
||||
|
||||
bool ArrayPropertyEdit::_set(const StringName& p_name, const Variant& p_value){
|
||||
bool ArrayPropertyEdit::_set(const StringName &p_name, const Variant &p_value) {
|
||||
|
||||
String pn=p_name;
|
||||
String pn = p_name;
|
||||
|
||||
if (pn.begins_with("array/")) {
|
||||
|
||||
if (pn=="array/size") {
|
||||
if (pn == "array/size") {
|
||||
|
||||
Variant arr = get_array();
|
||||
int size = arr.call("size");
|
||||
|
||||
int newsize=p_value;
|
||||
if (newsize==size)
|
||||
int newsize = p_value;
|
||||
if (newsize == size)
|
||||
return true;
|
||||
|
||||
UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
|
||||
ur->create_action(TTR("Resize Array"));
|
||||
ur->add_do_method(this,"_set_size",newsize);
|
||||
ur->add_undo_method(this,"_set_size",size);
|
||||
if (newsize<size) {
|
||||
for(int i=newsize;i<size;i++) {
|
||||
ur->add_undo_method(this,"_set_value",i,arr.get(i));
|
||||
|
||||
ur->add_do_method(this, "_set_size", newsize);
|
||||
ur->add_undo_method(this, "_set_size", size);
|
||||
if (newsize < size) {
|
||||
for (int i = newsize; i < size; i++) {
|
||||
ur->add_undo_method(this, "_set_value", i, arr.get(i));
|
||||
}
|
||||
} else if (newsize>size && size) {
|
||||
} else if (newsize > size && size) {
|
||||
|
||||
Variant init;
|
||||
Variant::CallError ce;
|
||||
init = Variant::construct(arr.get(size-1).get_type(),NULL,0,ce);
|
||||
for(int i=size;i<newsize;i++) {
|
||||
ur->add_do_method(this,"_set_value",i,init);
|
||||
init = Variant::construct(arr.get(size - 1).get_type(), NULL, 0, ce);
|
||||
for (int i = size; i < newsize; i++) {
|
||||
ur->add_do_method(this, "_set_value", i, init);
|
||||
}
|
||||
|
||||
}
|
||||
ur->add_do_method(this,"_notif_change");
|
||||
ur->add_undo_method(this,"_notif_change");
|
||||
ur->add_do_method(this, "_notif_change");
|
||||
ur->add_undo_method(this, "_notif_change");
|
||||
ur->commit_action();
|
||||
return true;
|
||||
}
|
||||
if (pn=="array/page") {
|
||||
page=p_value;
|
||||
if (pn == "array/page") {
|
||||
page = p_value;
|
||||
_change_notify();
|
||||
return true;
|
||||
}
|
||||
|
||||
} else if (pn.begins_with("indices")) {
|
||||
|
||||
if (pn.find("_")!=-1) {
|
||||
if (pn.find("_") != -1) {
|
||||
//type
|
||||
int idx=pn.get_slicec('/',1).get_slicec('_',0).to_int();
|
||||
int idx = pn.get_slicec('/', 1).get_slicec('_', 0).to_int();
|
||||
|
||||
int type = p_value;
|
||||
|
||||
Variant arr = get_array();
|
||||
|
||||
Variant value = arr.get(idx);
|
||||
if (value.get_type()!=type && type>=0 && type<Variant::VARIANT_MAX) {
|
||||
if (value.get_type() != type && type >= 0 && type < Variant::VARIANT_MAX) {
|
||||
Variant::CallError ce;
|
||||
Variant new_value=Variant::construct(Variant::Type(type),NULL,0,ce);
|
||||
Variant new_value = Variant::construct(Variant::Type(type), NULL, 0, ce);
|
||||
UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
|
||||
|
||||
ur->create_action(TTR("Change Array Value Type"));
|
||||
ur->add_do_method(this,"_set_value",idx,new_value);
|
||||
ur->add_undo_method(this,"_set_value",idx,value);
|
||||
ur->add_do_method(this,"_notif_change");
|
||||
ur->add_undo_method(this,"_notif_change");
|
||||
ur->add_do_method(this, "_set_value", idx, new_value);
|
||||
ur->add_undo_method(this, "_set_value", idx, value);
|
||||
ur->add_do_method(this, "_notif_change");
|
||||
ur->add_undo_method(this, "_notif_change");
|
||||
ur->commit_action();
|
||||
|
||||
}
|
||||
return true;
|
||||
|
||||
} else {
|
||||
int idx=pn.get_slicec('/',1).to_int();
|
||||
int idx = pn.get_slicec('/', 1).to_int();
|
||||
Variant arr = get_array();
|
||||
|
||||
Variant value = arr.get(idx);
|
||||
UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
|
||||
|
||||
ur->create_action(TTR("Change Array Value"));
|
||||
ur->add_do_method(this,"_set_value",idx,p_value);
|
||||
ur->add_undo_method(this,"_set_value",idx,value);
|
||||
ur->add_do_method(this,"_notif_changev",p_name);
|
||||
ur->add_undo_method(this,"_notif_changev",p_name);
|
||||
ur->add_do_method(this, "_set_value", idx, p_value);
|
||||
ur->add_undo_method(this, "_set_value", idx, value);
|
||||
ur->add_do_method(this, "_notif_changev", p_name);
|
||||
ur->add_undo_method(this, "_notif_changev", p_name);
|
||||
ur->commit_action();
|
||||
return true;
|
||||
}
|
||||
|
|
@ -167,37 +163,37 @@ bool ArrayPropertyEdit::_set(const StringName& p_name, const Variant& p_value){
|
|||
return false;
|
||||
}
|
||||
|
||||
bool ArrayPropertyEdit::_get(const StringName& p_name,Variant &r_ret) const {
|
||||
bool ArrayPropertyEdit::_get(const StringName &p_name, Variant &r_ret) const {
|
||||
|
||||
Variant arr = get_array();
|
||||
//int size = arr.call("size");
|
||||
|
||||
String pn=p_name;
|
||||
String pn = p_name;
|
||||
if (pn.begins_with("array/")) {
|
||||
|
||||
if (pn=="array/size") {
|
||||
r_ret=arr.call("size");
|
||||
if (pn == "array/size") {
|
||||
r_ret = arr.call("size");
|
||||
return true;
|
||||
}
|
||||
if (pn=="array/page") {
|
||||
r_ret=page;
|
||||
if (pn == "array/page") {
|
||||
r_ret = page;
|
||||
return true;
|
||||
}
|
||||
} else if (pn.begins_with("indices")) {
|
||||
|
||||
if (pn.find("_")!=-1) {
|
||||
if (pn.find("_") != -1) {
|
||||
//type
|
||||
int idx=pn.get_slicec('/',1).get_slicec('_',0).to_int();
|
||||
int idx = pn.get_slicec('/', 1).get_slicec('_', 0).to_int();
|
||||
bool valid;
|
||||
r_ret=arr.get(idx,&valid);
|
||||
r_ret = arr.get(idx, &valid);
|
||||
if (valid)
|
||||
r_ret=r_ret.get_type();
|
||||
r_ret = r_ret.get_type();
|
||||
return valid;
|
||||
|
||||
} else {
|
||||
int idx=pn.get_slicec('/',1).to_int();
|
||||
int idx = pn.get_slicec('/', 1).to_int();
|
||||
bool valid;
|
||||
r_ret=arr.get(idx,&valid);
|
||||
r_ret = arr.get(idx, &valid);
|
||||
return valid;
|
||||
}
|
||||
}
|
||||
|
|
@ -205,46 +201,43 @@ bool ArrayPropertyEdit::_get(const StringName& p_name,Variant &r_ret) const {
|
|||
return false;
|
||||
}
|
||||
|
||||
void ArrayPropertyEdit::_get_property_list( List<PropertyInfo> *p_list) const{
|
||||
void ArrayPropertyEdit::_get_property_list(List<PropertyInfo> *p_list) const {
|
||||
|
||||
Variant arr = get_array();
|
||||
int size = arr.call("size");
|
||||
|
||||
p_list->push_back( PropertyInfo(Variant::INT,"array/size",PROPERTY_HINT_RANGE,"0,100000,1") );
|
||||
int pages = size/ITEMS_PER_PAGE;
|
||||
if (pages>0)
|
||||
p_list->push_back( PropertyInfo(Variant::INT,"array/page",PROPERTY_HINT_RANGE,"0,"+itos(pages)+",1") );
|
||||
p_list->push_back(PropertyInfo(Variant::INT, "array/size", PROPERTY_HINT_RANGE, "0,100000,1"));
|
||||
int pages = size / ITEMS_PER_PAGE;
|
||||
if (pages > 0)
|
||||
p_list->push_back(PropertyInfo(Variant::INT, "array/page", PROPERTY_HINT_RANGE, "0," + itos(pages) + ",1"));
|
||||
|
||||
int offset=page*ITEMS_PER_PAGE;
|
||||
int offset = page * ITEMS_PER_PAGE;
|
||||
|
||||
int items=MIN(size-offset,ITEMS_PER_PAGE);
|
||||
int items = MIN(size - offset, ITEMS_PER_PAGE);
|
||||
|
||||
for (int i = 0; i < items; i++) {
|
||||
|
||||
for(int i=0;i<items;i++) {
|
||||
|
||||
Variant v=arr.get(i+offset);
|
||||
if (arr.get_type()==Variant::ARRAY) {
|
||||
p_list->push_back(PropertyInfo(Variant::INT,"indices/"+itos(i+offset)+"_type",PROPERTY_HINT_ENUM,vtypes));
|
||||
Variant v = arr.get(i + offset);
|
||||
if (arr.get_type() == Variant::ARRAY) {
|
||||
p_list->push_back(PropertyInfo(Variant::INT, "indices/" + itos(i + offset) + "_type", PROPERTY_HINT_ENUM, vtypes));
|
||||
}
|
||||
if (arr.get_type()!=Variant::ARRAY || v.get_type()!=Variant::NIL) {
|
||||
PropertyInfo pi(v.get_type(),"indices/"+itos(i+offset));
|
||||
if (v.get_type()==Variant::OBJECT) {
|
||||
pi.hint=PROPERTY_HINT_RESOURCE_TYPE;
|
||||
pi.hint_string="Resource";
|
||||
if (arr.get_type() != Variant::ARRAY || v.get_type() != Variant::NIL) {
|
||||
PropertyInfo pi(v.get_type(), "indices/" + itos(i + offset));
|
||||
if (v.get_type() == Variant::OBJECT) {
|
||||
pi.hint = PROPERTY_HINT_RESOURCE_TYPE;
|
||||
pi.hint_string = "Resource";
|
||||
}
|
||||
p_list->push_back(pi);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void ArrayPropertyEdit::edit(Object* p_obj,const StringName& p_prop,Variant::Type p_deftype) {
|
||||
|
||||
page=0;
|
||||
property=p_prop;
|
||||
obj=p_obj->get_instance_ID();
|
||||
default_type=p_deftype;
|
||||
void ArrayPropertyEdit::edit(Object *p_obj, const StringName &p_prop, Variant::Type p_deftype) {
|
||||
|
||||
page = 0;
|
||||
property = p_prop;
|
||||
obj = p_obj->get_instance_ID();
|
||||
default_type = p_deftype;
|
||||
}
|
||||
|
||||
Node *ArrayPropertyEdit::get_node() {
|
||||
|
|
@ -258,21 +251,19 @@ Node *ArrayPropertyEdit::get_node() {
|
|||
|
||||
void ArrayPropertyEdit::_bind_methods() {
|
||||
|
||||
ObjectTypeDB::bind_method(_MD("_set_size"),&ArrayPropertyEdit::_set_size);
|
||||
ObjectTypeDB::bind_method(_MD("_set_value"),&ArrayPropertyEdit::_set_value);
|
||||
ObjectTypeDB::bind_method(_MD("_notif_change"),&ArrayPropertyEdit::_notif_change);
|
||||
ObjectTypeDB::bind_method(_MD("_notif_changev"),&ArrayPropertyEdit::_notif_changev);
|
||||
ObjectTypeDB::bind_method(_MD("_set_size"), &ArrayPropertyEdit::_set_size);
|
||||
ObjectTypeDB::bind_method(_MD("_set_value"), &ArrayPropertyEdit::_set_value);
|
||||
ObjectTypeDB::bind_method(_MD("_notif_change"), &ArrayPropertyEdit::_notif_change);
|
||||
ObjectTypeDB::bind_method(_MD("_notif_changev"), &ArrayPropertyEdit::_notif_changev);
|
||||
}
|
||||
|
||||
ArrayPropertyEdit::ArrayPropertyEdit()
|
||||
{
|
||||
page=0;
|
||||
for(int i=0;i<Variant::VARIANT_MAX;i++) {
|
||||
ArrayPropertyEdit::ArrayPropertyEdit() {
|
||||
page = 0;
|
||||
for (int i = 0; i < Variant::VARIANT_MAX; i++) {
|
||||
|
||||
if (i>0)
|
||||
vtypes+=",";
|
||||
vtypes+=Variant::get_type_name( Variant::Type(i) );
|
||||
if (i > 0)
|
||||
vtypes += ",";
|
||||
vtypes += Variant::get_type_name(Variant::Type(i));
|
||||
}
|
||||
default_type=Variant::NIL;
|
||||
|
||||
default_type = Variant::NIL;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue