1 files changed, 47 insertions, 13 deletions

diff --git a/tools/doc/doc_data.cpp b/tools/doc/doc_data.cpp
index 4a8fdfb21..10d4b6461 100644
--- a/tools/doc/doc_data.cpp
+++ b/tools/doc/doc_data.cpp
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
@@ -132,6 +132,9 @@ void DocData::merge_from(const DocData& p_data) {
 				const PropertyDoc &pf = cf.properties[j];
 
 				p.description=pf.description;
+				p.setter=pf.setter;
+				p.getter=pf.getter;
+
 				break;
 			}
 		}
@@ -159,7 +162,7 @@ void DocData::generate(bool p_basic_types) {
 
 
 	List<StringName> classes;
-	ObjectTypeDB::get_type_list(&classes);
+	ClassDB::get_class_list(&classes);
 	classes.sort_custom<StringName::AlphCompare>();
 
 	while(classes.size()) {
@@ -172,11 +175,35 @@ void DocData::generate(bool p_basic_types) {
 		class_list[cname]=ClassDoc();
 		ClassDoc& c = class_list[cname];
 		c.name=cname;
-		c.inherits=ObjectTypeDB::type_inherits_from(name);
-		c.category=ObjectTypeDB::get_category(name);
+		c.inherits=ClassDB::get_parent_class(name);
+		c.category=ClassDB::get_category(name);
+
+
+		List<PropertyInfo> properties;
+		ClassDB::get_property_list(name,&properties,true);
+
+		for(List<PropertyInfo>::Element *E=properties.front();E;E=E->next()) {
+			if (E->get().usage& PROPERTY_USAGE_GROUP || E->get().usage& PROPERTY_USAGE_CATEGORY)
+				continue;
+
+			PropertyDoc prop;
+			StringName setter = ClassDB::get_property_setter(name,E->get().name);
+			StringName getter = ClassDB::get_property_getter(name,E->get().name);
+
+			prop.name=E->get().name;
+			prop.setter=setter;
+			prop.getter=getter;
+			if (E->get().type==Variant::OBJECT && E->get().hint==PROPERTY_HINT_RESOURCE_TYPE)
+				prop.type=E->get().hint_string;
+			else
+				prop.type=Variant::get_type_name(E->get().type);
+
+			c.properties.push_back(prop);
+		}
+
 
 		List<MethodInfo> method_list;
-		ObjectTypeDB::get_method_list(name,&method_list,true);
+		ClassDB::get_method_list(name,&method_list,true);
 		method_list.sort();
 
 
@@ -189,7 +216,7 @@ void DocData::generate(bool p_basic_types) {
 
 			method.name=E->get().name;
 
-			MethodBind *m = ObjectTypeDB::get_method(name,E->get().name);
+			MethodBind *m = ClassDB::get_method(name,E->get().name);
 
 
 			if (E->get().flags&METHOD_FLAG_VIRTUAL)
@@ -358,7 +385,7 @@ void DocData::generate(bool p_basic_types) {
 		}
 
 		List<MethodInfo> signal_list;
-		ObjectTypeDB::get_signal_list(name,&signal_list,true);
+		ClassDB::get_signal_list(name,&signal_list,true);
 
 		if (signal_list.size()) {
 
@@ -383,13 +410,13 @@ void DocData::generate(bool p_basic_types) {
 		}
 
 		List<String> constant_list;
-		ObjectTypeDB::get_integer_constant_list(name, &constant_list, true);
+		ClassDB::get_integer_constant_list(name, &constant_list, true);
 
 		for(List<String>::Element *E=constant_list.front();E;E=E->next()) {
 
 			ConstantDoc constant;
 			constant.name=E->get();
-			constant.value=itos(ObjectTypeDB::get_integer_constant(name, E->get()));
+			constant.value=itos(ClassDB::get_integer_constant(name, E->get()));
 			c.constants.push_back(constant);
 		}
 
@@ -590,9 +617,9 @@ void DocData::generate(bool p_basic_types) {
 			PropertyDoc pd;
 			Globals::Singleton &s=E->get();
 			pd.name=s.name;
-			pd.type=s.ptr->get_type();
-			while (String(ObjectTypeDB::type_inherits_from(pd.type))!="Object")
-				pd.type=ObjectTypeDB::type_inherits_from(pd.type);
+			pd.type=s.ptr->get_class();
+			while (String(ClassDB::get_parent_class(pd.type))!="Object")
+				pd.type=ClassDB::get_parent_class(pd.type);
 			if (pd.type.begins_with("_"))
 				pd.type=pd.type.substr(1,pd.type.length());
 			c.properties.push_back(pd);
@@ -825,6 +852,13 @@ Error DocData::_load(Ref<XMLParser> parser) {
 								prop.name=parser->get_attribute_value("name");
 								ERR_FAIL_COND_V(!parser->has_attribute("type"),ERR_FILE_CORRUPT);
 								prop.type=parser->get_attribute_value("type");
+								if (parser->has_attribute("setter"))
+									prop.setter=parser->get_attribute_value("setter");
+								if (parser->has_attribute("getter"))
+									prop.getter=parser->get_attribute_value("getter");
+								if (parser->has_attribute("brief"))
+									prop.brief_description=parser->get_attribute_value("brief").xml_unescape();
+
 								parser->read();
 								if (parser->get_node_type()==XMLParser::NODE_TEXT)
 									prop.description=parser->get_node_data().strip_edges();
@@ -1009,7 +1043,7 @@ Error DocData::save(const String& p_path) {
 
 
 				PropertyDoc &p=c.properties[i];
-				_write_string(f,2,"<member name=\""+p.name+"\" type=\""+p.type+"\">");
+				_write_string(f,2,"<member name=\""+p.name+"\" type=\""+p.type+"\" setter=\""+p.setter+"\" getter=\""+p.getter+"\" brief=\""+p.brief_description.xml_escape(true)+"\">");
 				if (p.description!="")
 					_write_string(f,3,p.description.xml_escape());
 				_write_string(f,2,"</member>");