Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 12:12:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add PluginScript support for global class naming/icon path

Browse Source
This commit is contained in:
Emmanuel Leblond 2020-12-07 15:08:59 +01:00
parent 3c9c2cbb23
commit c4c18a2c58
No known key found for this signature in database
GPG Key ID: C360860E645EFFC0
5 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/gdnative/include/pluginscript/godot_pluginscript.h
View File

@ -72,6 +72,7 @@ typedef struct {
godot_string_name name; godot_string_name name;
godot_bool is_tool; godot_bool is_tool;
godot_string_name base; godot_string_name base;
godot_string icon_path;
// Member lines format: {<string>: <int>} // Member lines format: {<string>: <int>}
godot_dictionary member_lines; godot_dictionary member_lines;

26
modules/gdnative/pluginscript/pluginscript_language.cpp
View File

@ -398,6 +398,32 @@ void PluginScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool
#endif #endif
} }
bool PluginScriptLanguage::handles_global_class_type(const String &p_type) const {
return p_type == "PluginScript";
}
String PluginScriptLanguage::get_global_class_name(const String &p_path, String *r_base_type, String *r_icon_path) const {
if (!p_path.empty()) {
Ref<PluginScript> script = ResourceLoader::load(p_path, "PluginScript");
if (script.is_valid()) {
if (r_base_type) {
*r_base_type = script->get_instance_base_type();
}
if (r_icon_path) {
*r_icon_path = script->get_script_class_icon_path();
}
return script->get_script_class_name();
}
if (r_base_type) {
*r_base_type = String();
}
if (r_icon_path) {
*r_icon_path = String();
}
}
return String();
}
void PluginScriptLanguage::lock() { void PluginScriptLanguage::lock() {
_lock.lock(); _lock.lock();
} }

5
modules/gdnative/pluginscript/pluginscript_language.h
View File

@ -122,6 +122,11 @@ public:
virtual void frame(); virtual void frame();
/* GLOBAL CLASSES */
virtual bool handles_global_class_type(const String &p_type) const;
virtual String get_global_class_name(const String &p_path, String *r_base_type = nullptr, String *r_icon_path = nullptr) const;
void lock(); void lock();
void unlock(); void unlock();

1
modules/gdnative/pluginscript/pluginscript_script.cpp
View File

@ -302,6 +302,7 @@ Error PluginScript::reload(bool p_keep_state) {
_data = manifest.data; _data = manifest.data;
_name = *(StringName *)&manifest.name; _name = *(StringName *)&manifest.name;
_tool = manifest.is_tool; _tool = manifest.is_tool;
_icon_path = *(String *)&manifest.icon_path;
Dictionary *members = (Dictionary *)&manifest.member_lines; Dictionary *members = (Dictionary *)&manifest.member_lines;
for (const Variant *key = members->next(); key != nullptr; key = members->next(key)) { for (const Variant *key = members->next(); key != nullptr; key = members->next(key)) {

9
modules/gdnative/pluginscript/pluginscript_script.h
View File

@ -69,6 +69,7 @@ private:
String _source; String _source;
String _path; String _path;
StringName _name; StringName _name;
String _icon_path;
protected: protected:
static void _bind_methods(); static void _bind_methods();
@ -84,6 +85,14 @@ protected:
virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder) override; virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder) override;
#endif #endif
public: public:
String get_script_class_name() const {
return _name;
}
String get_script_class_icon_path() const {
return _icon_path;
}
virtual bool can_instance() const override; virtual bool can_instance() const override;
virtual Ref<Script> get_base_script() const override; //for script inheritance virtual Ref<Script> get_base_script() const override; //for script inheritance