The Great ScriptCanvas Purge, Part V
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
+1
-1
@@ -7,7 +7,6 @@
|
||||
|
||||
#include <ScriptCanvas/Core/Graph.h>
|
||||
#include <ScriptCanvas/Asset/RuntimeAsset.h>
|
||||
#include <ScriptCanvas/Asset/Functions/RuntimeFunctionAssetHandler.h>
|
||||
#include <ScriptCanvas/Execution/RuntimeComponent.h>
|
||||
|
||||
#include <ScriptCanvas/Core/ScriptCanvasBus.h>
|
||||
@@ -19,6 +18,7 @@
|
||||
#include <AzCore/Component/ComponentApplicationBus.h>
|
||||
#include <AzCore/Component/Entity.h>
|
||||
|
||||
#include <ScriptCanvas/Asset/SubgraphInterfaceAssetHandler.h>
|
||||
|
||||
namespace ScriptCanvas
|
||||
{
|
||||
@@ -13,8 +13,6 @@
|
||||
#include <AzCore/Serialization/SerializeContext.h>
|
||||
#include <AzCore/Serialization/Utils.h>
|
||||
#include <AzFramework/Entity/EntityContextBus.h>
|
||||
|
||||
#include <ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h>
|
||||
#include <ScriptCanvas/Asset/RuntimeAsset.h>
|
||||
#include <ScriptCanvas/Core/Connection.h>
|
||||
#include <ScriptCanvas/Core/Core.h>
|
||||
|
||||
@@ -83,7 +83,7 @@ namespace ScriptCanvas
|
||||
////
|
||||
|
||||
int m_timeUnits = 0;
|
||||
int m_tickOrder = static_cast<int>(AZ::TICK_DEFAULT);
|
||||
int m_tickOrder = 1000; // from TICK_DEFAULT
|
||||
|
||||
bool m_isActive = false;
|
||||
|
||||
|
||||
@@ -443,11 +443,6 @@ namespace ScriptCanvas
|
||||
});
|
||||
}
|
||||
|
||||
void ExpressionNodeBase::OnResult([[maybe_unused]] const ExpressionEvaluation::ExpressionResult& result)
|
||||
{
|
||||
AZ_Assert(false, "Implementing node must override OnResult.");
|
||||
}
|
||||
|
||||
ExpressionEvaluation::ParseOutcome ExpressionNodeBase::ParseExpression([[maybe_unused]] const AZStd::string& formatString)
|
||||
{
|
||||
AZ_Assert(false , "Implementing node must override OnResult.");
|
||||
|
||||
@@ -37,8 +37,6 @@ namespace ScriptCanvas
|
||||
AZStd::string GetRawFormat() const;
|
||||
|
||||
const AZStd::unordered_map<AZStd::string, SlotId>& GetSlotsByName() const;
|
||||
|
||||
|
||||
|
||||
protected:
|
||||
|
||||
@@ -76,14 +74,11 @@ namespace ScriptCanvas
|
||||
AZ::Crc32 GetPropertyId() const { return AZ_CRC("FormatStringProperty", 0x2c587efa); }
|
||||
|
||||
protected:
|
||||
|
||||
virtual void OnResult(const ExpressionEvaluation::ExpressionResult& result);
|
||||
virtual ExpressionEvaluation::ParseOutcome ParseExpression(const AZStd::string& formatString);
|
||||
|
||||
virtual AZStd::string GetExpressionSeparator() const;
|
||||
|
||||
private:
|
||||
|
||||
void PushVariable(const AZStd::string& variableName, const Datum& datum);
|
||||
|
||||
// NodePropertyInterface...
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
#include <AzCore/Asset/AssetCommon.h>
|
||||
#include <AzCore/std/containers/unordered_map.h>
|
||||
#include <AzCore/std/parallel/mutex.h>
|
||||
#include <ScriptCanvas/Asset/Functions/ScriptCanvasFunctionAsset.h>
|
||||
#include <ScriptCanvas/Asset/RuntimeAsset.h>
|
||||
#include <ScriptCanvas/Core/SubgraphInterface.h>
|
||||
#include <ScriptCanvas/Core/Graph.h>
|
||||
|
||||
@@ -86,11 +86,6 @@ namespace ScriptCanvas
|
||||
|
||||
AZ::Outcome<void, AZStd::string> IsExposable(const AZ::BehaviorMethod& method)
|
||||
{
|
||||
if (method.GetNumArguments() > BehaviorContextMethodHelper::MaxCount)
|
||||
{
|
||||
return AZ::Failure(AZStd::string("Too many arguments for a Script Canvas method"));
|
||||
}
|
||||
|
||||
for (size_t argIndex(0), sentinel(method.GetNumArguments()); argIndex != sentinel; ++argIndex)
|
||||
{
|
||||
if (const AZ::BehaviorParameter* argument = method.GetArgument(argIndex))
|
||||
|
||||
@@ -177,11 +177,6 @@ namespace ScriptCanvas
|
||||
m_userData.m_methodDefinition = methodDefinition;
|
||||
|
||||
AZ_Assert(!event.m_parameters.empty(), "No parameters in event!");
|
||||
if (!events[eventIndex].m_function)
|
||||
{
|
||||
m_handler->InstallGenericHook(events[eventIndex].m_name, &OnEventGenericHook, &m_userData);
|
||||
}
|
||||
|
||||
if (m_eventMap.find(eventId) == m_eventMap.end())
|
||||
{
|
||||
m_eventMap[eventId] = ConfigureEbusEntry(*methodDefinition, event, populationMapping);
|
||||
@@ -309,12 +304,6 @@ namespace ScriptCanvas
|
||||
return eBusEventEntry;
|
||||
}
|
||||
|
||||
void ReceiveScriptEvent::OnEventGenericHook(void* userData, const char* eventName, int eventIndex, AZ::BehaviorValueParameter* result, int numParameters, AZ::BehaviorValueParameter* parameters)
|
||||
{
|
||||
ReceiveScriptEvent::EventHookUserData* eventHookUserData(reinterpret_cast<ReceiveScriptEvent::EventHookUserData*>(userData));
|
||||
eventHookUserData->m_handler->OnEvent(eventName, eventIndex, result, numParameters, parameters);
|
||||
}
|
||||
|
||||
void ReceiveScriptEvent::SetAutoConnectToGraphOwner(bool enabled)
|
||||
{
|
||||
ScriptCanvas::Slot* connectSlot = ReceiveScriptEventProperty::GetConnectSlot(this);
|
||||
|
||||
@@ -42,7 +42,6 @@ namespace ScriptCanvas
|
||||
~ReceiveScriptEvent() override;
|
||||
|
||||
void OnActivate() override;
|
||||
void OnPostActivate() override;
|
||||
void OnDeactivate() override;
|
||||
|
||||
const AZ::Data::AssetId GetAssetId() const { return m_scriptEventAssetId; }
|
||||
|
||||
@@ -12,17 +12,6 @@ namespace ScriptCanvas
|
||||
{
|
||||
namespace Math
|
||||
{
|
||||
void MathExpression::OnResult(const ExpressionEvaluation::ExpressionResult& result)
|
||||
{
|
||||
if (result.is<double>())
|
||||
{
|
||||
Datum output;
|
||||
output.Set(AZStd::any_cast<double>(result));
|
||||
PushOutput(output, (*MathExpressionProperty::GetResultSlot(this)));
|
||||
SignalOutput(MathExpressionProperty::GetOutSlotId(this));
|
||||
}
|
||||
}
|
||||
|
||||
ExpressionEvaluation::ParseOutcome MathExpression::ParseExpression(const AZStd::string& formatString)
|
||||
{
|
||||
const AZStd::unordered_set<ExpressionEvaluation::ExpressionParserId> mathInterfaceSet = {
|
||||
|
||||
@@ -37,7 +37,6 @@ namespace ScriptCanvas
|
||||
return AZ::Success(GetSlotsByType(targetSlotType));
|
||||
}
|
||||
|
||||
void OnResult(const ExpressionEvaluation::ExpressionResult& result) override;
|
||||
ExpressionEvaluation::ParseOutcome ParseExpression(const AZStd::string& formatString) override;
|
||||
|
||||
AZStd::string GetExpressionSeparator() const override;
|
||||
|
||||
-2
@@ -35,9 +35,7 @@ namespace ScriptCanvas
|
||||
|
||||
void ConfigureContracts(SourceType sourceType, AZStd::vector<ContractDescriptor>& contractDescs) override;
|
||||
void OnSourceTypeChanged() override;
|
||||
void InvokeOperator();
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
-2
@@ -35,9 +35,7 @@ namespace ScriptCanvas
|
||||
|
||||
void ConfigureContracts(SourceType sourceType, AZStd::vector<ContractDescriptor>& contractDescs) override;
|
||||
void OnSourceTypeChanged() override;
|
||||
void InvokeOperator();
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
-14
@@ -207,20 +207,6 @@ namespace ScriptCanvas
|
||||
AZ_UNUSED(dataType);
|
||||
}
|
||||
|
||||
void OperatorArithmetic::InvokeOperator()
|
||||
{
|
||||
if (!m_result.GetType().IsValid())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Evaluate(m_applicableInputs, m_result);
|
||||
|
||||
PushOutput(m_result, (*m_resultSlot));
|
||||
|
||||
SignalOutput(m_outSlot);
|
||||
}
|
||||
|
||||
SlotId OperatorArithmetic::CreateSlot(AZStd::string_view name, AZStd::string_view toolTip, ConnectionType connectionType)
|
||||
{
|
||||
DynamicDataSlotConfiguration slotConfiguration;
|
||||
|
||||
+1
-2
@@ -100,8 +100,7 @@ namespace ScriptCanvas
|
||||
|
||||
virtual void Operator(Data::eType type, const ArithmeticOperands& operands, Datum& result);
|
||||
virtual void InitializeSlot(const SlotId& slotId, const Data::Type& dataType);
|
||||
virtual void InvokeOperator();
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
// Translation
|
||||
AZ::Outcome<DependencyReport, void> GetDependencies() const override;
|
||||
|
||||
@@ -20,11 +20,6 @@ namespace ScriptCanvas
|
||||
, m_seconds(0.f)
|
||||
, m_milliseconds(0.f)
|
||||
{}
|
||||
|
||||
void Timer::OnDeactivate()
|
||||
{
|
||||
AZ::TickBus::Handler::BusDisconnect();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,11 +34,6 @@ namespace ScriptCanvas
|
||||
|
||||
float m_seconds;
|
||||
float m_milliseconds;
|
||||
|
||||
protected:
|
||||
|
||||
AZ::ScriptTimePoint m_start;
|
||||
void OnDeactivate() override;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user