Gottfried/glitchy-engine-beef
1
0
Fork 0
mirror of https://github.com/aharabada/glitchy-engine-beef.git synced 2026-09-05 13:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

ScriptGlue: Changed signature of Entity_GetScriptInstance

Browse Source
This commit is contained in:
Simon Lübeß
2023-11-18 01:59:10 +01:00
parent 1a92f4aec1
commit 2a4eac814b
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEngine/src/Scripting/ScriptGlue.bf
+2 -2
View File
@@ -253,9 +253,9 @@ static class ScriptGlue
} }
[RegisterCall("ScriptGlue::Entity_GetScriptInstance")] [RegisterCall("ScriptGlue::Entity_GetScriptInstance")]
static MonoObject* Entity_GetScriptInstance(UUID entityId) static void Entity_GetScriptInstance(UUID entityId, out MonoObject* instance)
{ {
return ScriptEngine.GetManagedInstance(entityId); instance = ScriptEngine.GetManagedInstance(entityId);
} }
[RegisterCall("ScriptGlue::Entity_SetScript")] [RegisterCall("ScriptGlue::Entity_SetScript")]
ScriptCore/Entity.cs
+3 -6
View File
@@ -50,10 +50,7 @@ public class Entity : EngineObject
/// Creates an instance that represents the Entity with the given id. /// Creates an instance that represents the Entity with the given id.
/// </summary> /// </summary>
/// <param name="uuid">The ID of the entity that belongs to this instance.</param> /// <param name="uuid">The ID of the entity that belongs to this instance.</param>
internal Entity(UUID uuid) internal Entity(UUID uuid) : base(uuid) { }
{
_uuid = uuid;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)] [MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool HasComponent<T>() => HasComponent(typeof(T)); public bool HasComponent<T>() => HasComponent(typeof(T));
@@ -268,7 +265,7 @@ public class Entity : EngineObject
/// <typeparam name="T">The type of the script.</typeparam> /// <typeparam name="T">The type of the script.</typeparam>
public bool Is<T>() where T : Entity public bool Is<T>() where T : Entity
{ {
object scriptInstance = ScriptGlue.Entity_GetScriptInstance(_uuid); ScriptGlue.Entity_GetScriptInstance(_uuid, out object scriptInstance);
return scriptInstance is T; return scriptInstance is T;
} }
@@ -280,7 +277,7 @@ public class Entity : EngineObject
/// <returns>The script instance or null.</returns> /// <returns>The script instance or null.</returns>
public T As<T>() where T : Entity public T As<T>() where T : Entity
{ {
object scriptInstance = ScriptGlue.Entity_GetScriptInstance(_uuid); ScriptGlue.Entity_GetScriptInstance(_uuid, out object scriptInstance);
return scriptInstance as T; return scriptInstance as T;
} }
ScriptCore/ScriptGlue.cs
+1 -1
View File
@@ -37,7 +37,7 @@ internal static class ScriptGlue
internal static extern void Entity_FindEntityWithName(string name, out UUID uuid); internal static extern void Entity_FindEntityWithName(string name, out UUID uuid);
[MethodImpl(MethodImplOptions.InternalCall)] [MethodImpl(MethodImplOptions.InternalCall)]
internal static extern object Entity_GetScriptInstance(UUID entityId); internal static extern void Entity_GetScriptInstance(UUID entityId, out object instance);
[MethodImpl(MethodImplOptions.InternalCall)] [MethodImpl(MethodImplOptions.InternalCall)]
internal static extern object Entity_SetScript(UUID entityId, Type scriptType); internal static extern object Entity_SetScript(UUID entityId, Type scriptType);