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

C#: Improve tool script support and fix reloading issues

Browse Source
This commit is contained in:
Ignacio Etcheverry
2018-11-30 20:43:06 +01:00
parent bf94eed60c
commit b9b7dcdf00
12 changed files with 550 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
modules/mono/csharp_script.h
View File

@@ -82,6 +82,21 @@ class CSharpScript : public Script {
Set<Object *> instances;
#ifdef DEBUG_ENABLED
Set<ObjectID> pending_reload_instances;
#endif
struct StateBackup {
// TODO
// Replace with buffer containing the serialized state of managed scripts.
// Keep variant state backup to use only with script instance placeholders.
List<Pair<StringName, Variant> > properties;
};
#ifdef TOOLS_ENABLED
Map<ObjectID, CSharpScript::StateBackup> pending_reload_state;
#endif
String source;
StringName name;
@@ -105,10 +120,6 @@ class CSharpScript : public Script {
virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder);
#endif
#ifdef DEBUG_ENABLED
Map<ObjectID, List<Pair<StringName, Variant> > > pending_reload_state;
#endif
Map<StringName, PropertyInfo> member_info;
void _clear();
@@ -184,6 +195,7 @@ class CSharpInstance : public ScriptInstance {
bool base_ref;
bool ref_dying;
bool unsafe_referenced;
bool predelete_notified;
Ref<CSharpScript> script;
Ref<MonoGCHandle> gchandle;
@@ -253,11 +265,9 @@ class CSharpLanguage : public ScriptLanguage {
GDMono *gdmono;
SelfList<CSharpScript>::List script_list;
Mutex *lock;
Mutex *script_bind_lock;
Mutex *script_gchandle_release_lock;
Map<Ref<CSharpScript>, Map<ObjectID, List<Pair<StringName, Variant> > > > to_reload;
Mutex *script_instances_mutex;
Mutex *script_gchandle_release_mutex;
Mutex *language_bind_mutex;
Map<Object *, CSharpScriptBinding> script_bindings;
@@ -294,7 +304,8 @@ public:
bool debug_break_parse(const String &p_file, int p_line, const String &p_error);
#ifdef TOOLS_ENABLED
void reload_assemblies_if_needed(bool p_soft_reload);
bool is_assembly_reloading_needed();
void reload_assemblies(bool p_soft_reload);
#endif
void project_assembly_loaded();