diff --git a/Source/Engine/Serialization/ReadStream.h b/Source/Engine/Serialization/ReadStream.h index d8868c67e..06c52b64f 100644 --- a/Source/Engine/Serialization/ReadStream.h +++ b/Source/Engine/Serialization/ReadStream.h @@ -149,14 +149,6 @@ public: v.Set(*(Guid*)id); } - template - FORCE_INLINE void Read(SoftObjectInterfaceReference& v) - { - uint32 id[4]; - ReadBytes(id, sizeof(id)); - v.Set(*(Guid*)id); - } - template FORCE_INLINE void Read(AssetReference& v) { diff --git a/Source/Engine/Serialization/Serialization.h b/Source/Engine/Serialization/Serialization.h index cc27d1726..b588a5d78 100644 --- a/Source/Engine/Serialization/Serialization.h +++ b/Source/Engine/Serialization/Serialization.h @@ -18,8 +18,6 @@ class ScriptingObjectInterfaceReference; template class SoftObjectReference; template -class SoftObjectInterfaceReference; -template class AssetReference; template class WeakAssetReference; @@ -550,27 +548,6 @@ namespace Serialization v = id; } - // Soft Object Interface Reference - - template - inline bool ShouldSerialize(const SoftObjectInterfaceReference& v, const void* otherObj) - { - return !otherObj || ShouldSerializeRef(v.GetObject(), ((SoftObjectInterfaceReference*)otherObj)->GetObject()); - } - template - inline void Serialize(ISerializable::SerializeStream& stream, const SoftObjectInterfaceReference& v, const void* otherObj) - { - stream.Guid(v.GetID()); - } - template - inline void Deserialize(ISerializable::DeserializeStream& stream, SoftObjectInterfaceReference& v, ISerializeModifier* modifier) - { - Guid id; - Deserialize(stream, id, modifier); - modifier->IdsMapping.TryGet(id, id); - v = id; - } - // Asset Reference template diff --git a/Source/Engine/Serialization/Stream.h b/Source/Engine/Serialization/Stream.h index e6dd3a42b..4e517effe 100644 --- a/Source/Engine/Serialization/Stream.h +++ b/Source/Engine/Serialization/Stream.h @@ -21,8 +21,6 @@ class ScriptingObjectInterfaceReference; template class SoftObjectReference; template -class SoftObjectInterfaceReference; -template class AssetReference; template class WeakAssetReference; diff --git a/Source/Engine/Serialization/WriteStream.h b/Source/Engine/Serialization/WriteStream.h index 4e31b37cc..a5130ed8e 100644 --- a/Source/Engine/Serialization/WriteStream.h +++ b/Source/Engine/Serialization/WriteStream.h @@ -169,14 +169,6 @@ public: Write(v.Get()); } - template - FORCE_INLINE void Write(const SoftObjectInterfaceReference& v) - { - uint32 id[4]; - v.CopyID(id); - WriteBytes(id, sizeof(id)); - } - template FORCE_INLINE void Write(const AssetReference& v) { diff --git a/Source/Engine/Tests/TestScripting.h b/Source/Engine/Tests/TestScripting.h index 0a764c89f..70f443346 100644 --- a/Source/Engine/Tests/TestScripting.h +++ b/Source/Engine/Tests/TestScripting.h @@ -7,7 +7,6 @@ #include "Engine/Core/Collections/Array.h" #include "Engine/Scripting/ScriptingObject.h" #include "Engine/Scripting/ScriptingObjectInterfaceReference.h" -#include "Engine/Scripting/SoftObjectInterfaceReference.h" #include "Engine/Scripting/SerializableScriptingObject.h" #include "Engine/Scripting/SoftTypeReference.h" #include "Engine/Content/SceneReference.h" @@ -179,10 +178,9 @@ public: // Test struct API_FIELD() TestStruct SimpleStruct; + // Test interface reference API_FIELD() ScriptingObjectInterfaceReference InterfaceRef; - // Test soft interface reference - API_FIELD() SoftObjectInterfaceReference SoftInterfaceRef; // Test event API_EVENT() Delegate&, Array&> SimpleEvent; diff --git a/Source/Tools/Flax.Build/Bindings/ClassInfo.cs b/Source/Tools/Flax.Build/Bindings/ClassInfo.cs index 46097a218..36c47138e 100644 --- a/Source/Tools/Flax.Build/Bindings/ClassInfo.cs +++ b/Source/Tools/Flax.Build/Bindings/ClassInfo.cs @@ -19,7 +19,6 @@ namespace Flax.Build.Bindings "PersistentScriptingObject", "ScriptingObjectReference", "ScriptingObjectInterfaceReference", - "SoftObjectInterfaceReference", "AssetReference", "BinaryAsset", "SceneObject",