diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Source.jinja b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Source.jinja index 18b7fac688..04c030acce 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Source.jinja +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasGrammar_Source.jinja @@ -210,7 +210,9 @@ void {{ Class.attrib['QualifiedName'] }}::Reflect(AZ::ReflectContext* context) { serializeContext->Class<{{ Class.attrib['QualifiedName'] }}, {{ baseClass }}>() {% if Class.attrib['EventHandler'] is defined %} +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// ->EventHandler<{{ Class.attrib['EventHandler'] }}>() +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) {% endif %} {% if Class.attrib['Version'] is defined %} ->Version({{ Class.attrib['Version'] }}{% if Class.attrib['VersionConverter'] is defined %}, &{{ Class.attrib['VersionConverter'] }}{% endif %}) diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja index 5394ea2355..faa469594b 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/AutoGen/ScriptCanvasNodeable_Source.jinja @@ -160,7 +160,9 @@ void {{attribute_QualifiedName}}::Reflect(AZ::ReflectContext* context) { {% if ExtendReflectionSerialize is defined %} auto {{preSerialize}} = {% else %} {% endif %}serializeContext->Class<{{ attribute_Name }}{% if attribute_Base is defined %}, {{ attribute_Base }}{% endif %}>(){{postSerialize}} {% if attribute_EventHandler is defined %} +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// {{preSerialize}}->EventHandler<{{ attribute_EventHandler }}>(){{postSerialize}} +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) {% endif %} {# Serialized Properties #} diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Datum.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Datum.cpp index c36110ef92..e1af284e00 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Datum.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Datum.cpp @@ -2056,11 +2056,6 @@ namespace ScriptCanvas } } - void Datum::OnReadBegin() - { - OnSerializeBegin(); - } - void Datum::OnDeserialize() { if (m_type.GetType() == Data::eType::BehaviorContextObject) @@ -2084,10 +2079,17 @@ namespace ScriptCanvas } } +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// + void Datum::OnReadBegin() + { + OnSerializeBegin(); + } + void Datum::OnWriteEnd() { OnSerializeEnd(); } +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) void Datum::Reflect(AZ::ReflectContext* reflection) { @@ -2095,7 +2097,9 @@ namespace ScriptCanvas { serializeContext->Class() ->Version(DatumHelpers::Version::Current, &DatumHelpers::VersionConverter) +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// ->EventHandler() +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) ->Field("m_isUntypedStorage", &Datum::m_isOverloadedStorage) ->Field("m_type", &Datum::m_type) ->Field("m_originality", &Datum::m_originality) diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Datum.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Datum.h index 3ad09e2297..df94c32559 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Datum.h +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Datum.h @@ -236,6 +236,7 @@ namespace ScriptCanvas } }; +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// class SerializeContextEventHandler : public AZ::SerializeContext::IEventHandler { public: @@ -253,6 +254,7 @@ namespace ScriptCanvas datum->OnWriteEnd(); } }; +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) friend class SerializeContextEventHandler; @@ -353,10 +355,12 @@ namespace ScriptCanvas void OnSerializeBegin() override; void OnDeserialize() override; - + +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// void OnReadBegin(); void OnWriteEnd(); +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) AZ_INLINE bool SatisfiesTraits(AZ::u8 behaviorValueTraits) const; diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphData.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphData.cpp index d8fd409147..77de1330e2 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphData.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/GraphData.cpp @@ -19,6 +19,7 @@ namespace AZ namespace ScriptCanvas { +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// class GraphDataEventHandler : public AZ::SerializeContext::IEventHandler { public: @@ -28,6 +29,7 @@ namespace ScriptCanvas reinterpret_cast(classPtr)->OnDeserialized(); } }; +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) void GraphData::Reflect(AZ::ReflectContext* context) { @@ -40,7 +42,9 @@ namespace ScriptCanvas serializeContext->Class() ->Version(4, &GraphData::VersionConverter) +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// ->EventHandler() +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) ->Field("m_nodes", &GraphData::m_nodes) ->Field("m_connections", &GraphData::m_connections) ->Field("m_dependentAssets", &GraphData::m_dependentAssets) diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp index 5af59fc166..6173ccfb4f 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp @@ -60,6 +60,7 @@ namespace ScriptCanvas // Node ///////// +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// class NodeEventHandler : public AZ::SerializeContext::IEventHandler { @@ -70,6 +71,7 @@ namespace ScriptCanvas node->OnDeserialize(); } }; +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) bool NodeVersionConverter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& nodeElementNode) { @@ -420,7 +422,9 @@ namespace ScriptCanvas serializeContext->RegisterGenericType>(); serializeContext->Class() +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// ->EventHandler() +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) ->Version(NodeCpp::Version::Current, &NodeVersionConverter) ->Field("Slots", &Node::m_slots) ->Field("Datums", &Node::m_slotDatums) diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h index 298eff5222..27f0b3862d 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h @@ -63,6 +63,7 @@ namespace ScriptCanvas struct BehaviorContextMethodHelper; +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// template class SerializeContextReadWriteHandler : public AZ::SerializeContext::IEventHandler { @@ -126,6 +127,7 @@ namespace ScriptCanvas deserializedObject->OnWriteEnd(); } }; +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) // List of slots that will be create visual only slots on the nodes. // Useful for special configurations or editor only concepts. diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp index bfcb629225..938c7c3e70 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.cpp @@ -614,10 +614,12 @@ namespace ScriptCanvas Node::OnDeserialize(); } +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// void EBusEventHandler::OnWriteEnd() { OnDeserialize(); } +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) NodeTypeIdentifier EBusEventHandler::GetOutputNodeType(const SlotId& slotId) const { diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.h index b36636fe1c..c6d4a8b512 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.h +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/EBusEventHandler.h @@ -140,7 +140,9 @@ namespace ScriptCanvas void OnDeserialize(); +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// void OnWriteEnd(); +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) AZStd::string GetNodeName() const override { diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp index 5a732a1185..dbf2d47417 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.cpp @@ -771,10 +771,12 @@ namespace ScriptCanvas Node::OnDeserialize(); } +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// void Method::OnWriteEnd() { OnDeserialize(); } +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) bool Method::BranchesOnResult() const { @@ -838,7 +840,9 @@ namespace ScriptCanvas { serializeContext->Class() ->Version(MethodCPP::eVersion::Current, &MethodCPP::MethodVersionConverter) +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// ->EventHandler>() +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) ->Field("methodType", &Method::m_methodType) ->Field("methodName", &Method::m_lookupName) ->Field("className", &Method::m_className) diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.h index b44539d915..5584212048 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.h +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/Method.h @@ -109,7 +109,9 @@ namespace ScriptCanvas void OnDeserialize(); +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// void OnWriteEnd(); +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) virtual bool IsMethodOverloaded() const { return false; } diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodOverloaded.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodOverloaded.cpp index f20f79a6b1..29f583a4d9 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodOverloaded.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodOverloaded.cpp @@ -60,7 +60,9 @@ namespace ScriptCanvas { serializeContext->Class() ->Version(MethodOverloadedCpp::Version::Current, &MethodOverloadedVersionConverter) +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// ->EventHandler>() +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) ->Field("orderedInputSlotIds", &MethodOverloaded::m_orderedInputSlotIds) ->Field("outputSlotIds", &MethodOverloaded::m_outputSlotIds) ; @@ -397,6 +399,7 @@ namespace ScriptCanvas return signature; } +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// void MethodOverloaded::OnWriteBegin() { } @@ -405,6 +408,7 @@ namespace ScriptCanvas { OnDeserialize(); } +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) void MethodOverloaded::OnDeserialize() { diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodOverloaded.h b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodOverloaded.h index a4d7ea83d8..5c92bf1841 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodOverloaded.h +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodOverloaded.h @@ -33,7 +33,9 @@ namespace ScriptCanvas , public OverloadContractInterface { private: +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// friend class SerializeContextReadWriteHandler; +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) public: static void Reflect(AZ::ReflectContext* reflectContext); @@ -91,12 +93,14 @@ namespace ScriptCanvas // \todo make execution thread sensitive, which can then support generic programming Grammar::FunctionPrototype GetInputSignature() const; +#if defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED)//// // SerializeContextReadWriteHandler void OnReadBegin() {} void OnReadEnd() {} void OnWriteBegin(); void OnWriteEnd(); +#endif//defined(OBJECT_STREAM_EDITOR_ASSET_LOADING_SUPPORT_ENABLED) void OnDeserialize() override;