Преглед изворни кода

[GDNative] C API and generator fixes

Karroffel пре 8 година
родитељ
комит
544940c175
2 измењених фајлова са 2 додато и 1 уклоњено
  1. 1 0
      modules/gdnative/api_generator.cpp
  2. 1 1
      modules/gdnative/godot.h

+ 1 - 0
modules/gdnative/api_generator.cpp

@@ -402,6 +402,7 @@ static List<String> generate_c_api_json(const List<ClassAPI> &p_api) {
 				source.push_back("\t\t\t\t\t{\n");
 				source.push_back("\t\t\t\t\t{\n");
 				source.push_back("\t\t\t\t\t\t\"name\": \"" + e->get().argument_names[i] + "\",\n");
 				source.push_back("\t\t\t\t\t\t\"name\": \"" + e->get().argument_names[i] + "\",\n");
 				source.push_back("\t\t\t\t\t\t\"type\": \"" + e->get().argument_types[i] + "\",\n");
 				source.push_back("\t\t\t\t\t\t\"type\": \"" + e->get().argument_types[i] + "\",\n");
+				source.push_back(String("\t\t\t\t\t\t\"has_default_value\": ") + (e->get().default_arguments.has(i) ? "true" : "false") + ",\n");
 				source.push_back("\t\t\t\t\t\t\"default_value\": \"" + (e->get().default_arguments.has(i) ? (String)e->get().default_arguments[i] : "") + "\"\n");
 				source.push_back("\t\t\t\t\t\t\"default_value\": \"" + (e->get().default_arguments.has(i) ? (String)e->get().default_arguments[i] : "") + "\"\n");
 				source.push_back(String("\t\t\t\t\t}") + ((i < e->get().argument_names.size() - 1) ? "," : "") + "\n");
 				source.push_back(String("\t\t\t\t\t}") + ((i < e->get().argument_names.size() - 1) ? "," : "") + "\n");
 			}
 			}

+ 1 - 1
modules/gdnative/godot.h

@@ -317,7 +317,7 @@ typedef struct godot_instance_create_func {
 	void *(*create_func)(godot_object *, void *);
 	void *(*create_func)(godot_object *, void *);
 	void *method_data;
 	void *method_data;
 	void (*free_func)(void *);
 	void (*free_func)(void *);
-} godot_script_instance_func;
+} godot_instance_create_func;
 
 
 typedef struct godot_instance_destroy_func {
 typedef struct godot_instance_destroy_func {
 	// instance pointer, method data, user data
 	// instance pointer, method data, user data