birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The Great ScriptCanvas Purge, Part IV

Browse Source 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-07-06 13:13:16 -07:00
parent fa7accf2dc
commit 360236b89e
173 changed files with 131 additions and 6154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/StartingPointInput/Code/Source/InputNode.cpp
-90
View File
@@ -1,90 +0,0 @@
/*
* Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#include <StartingPointInput_precompiled.h>
#include <InputNode.h>
#include <AzCore/EBus/EBus.h>
#include <AzCore/RTTI/ReflectContext.h>
#include <AzCore/Serialization/SerializeContext.h>
#include <AzCore/Serialization/EditContext.h>
#include <AzCore/Component/TickBus.h>
#include <AzCore/RTTI/BehaviorContext.h>
namespace StartingPointInput
{
void InputNode::OnPostActivate()
{
//if (GetExecutionType() == ScriptCanvas::ExecutionType::Runtime)
//{
// const ScriptCanvas::SlotId eventNameSlotId = InputNodeProperty::GetEventNameSlotId(this);
// m_eventName = (*(FindDatum(eventNameSlotId)->GetAs<ScriptCanvas::Data::StringType>()));
// InputEventNotificationBus::Handler::BusConnect(InputEventNotificationId(m_eventName.c_str()));
//}
}
void InputNode::OnDeactivate()
{
InputEventNotificationBus::Handler::BusDisconnect();
}
void InputNode::OnInputChanged(const ScriptCanvas::Datum& input, const ScriptCanvas::SlotId& slotId)
{
// we got a new event name, we need to drop our connection to the old and connect to the new event
const ScriptCanvas::SlotId eventNameSlotId = InputNodeProperty::GetEventNameSlotId(this);
if (slotId == eventNameSlotId)
{
InputEventNotificationBus::Handler::BusDisconnect();
m_eventName = (*input.GetAs<ScriptCanvas::Data::StringType>());
InputEventNotificationBus::Handler::BusConnect(InputEventNotificationId(m_eventName.c_str()));
}
}
void InputNode::OnPressed(float value)
{
m_value = value;
const ScriptCanvas::Datum output = ScriptCanvas::Datum(m_value);
const ScriptCanvas::SlotId pressedSlotId = InputNodeProperty::GetPressedSlotId(this);
const ScriptCanvas::SlotId valueId = InputNodeProperty::GetValueSlotId(this);
if (auto* slot = GetSlot(valueId))
{
PushOutput(output, *slot);
}
SignalOutput(pressedSlotId);
}
void InputNode::OnHeld(float value)
{
m_value = value;
const ScriptCanvas::Datum output = ScriptCanvas::Datum(m_value);
const ScriptCanvas::SlotId heldSlotId = InputNodeProperty::GetHeldSlotId(this);
const ScriptCanvas::SlotId valueId = InputNodeProperty::GetValueSlotId(this);
if (auto* slot = GetSlot(valueId))
{
PushOutput(output, *slot);
}
SignalOutput(heldSlotId);
}
void InputNode::OnReleased(float value)
{
m_value = value;
const ScriptCanvas::Datum output = ScriptCanvas::Datum(m_value);
const ScriptCanvas::SlotId releasedSlotId = InputNodeProperty::GetReleasedSlotId(this);
const ScriptCanvas::SlotId valueId = InputNodeProperty::GetValueSlotId(this);
if (auto* slot = GetSlot(valueId))
{
PushOutput(output, *slot);
}
SignalOutput(releasedSlotId);
}
}
Gems/StartingPointInput/Code/Source/InputNode.h
+1 -20
View File
@@ -10,18 +10,15 @@
#include <ScriptCanvas/Core/Node.h>
#include <ScriptCanvas/Core/Graph.h>
#include <StartingPointInput/InputEventNotificationBus.h>
#include <AzCore/RTTI/TypeInfo.h>
namespace StartingPointInput
{
//////////////////////////////////////////////////////////////////////////
/// Input handles raw input from any source and outputs Pressed, Held, and Released input events
/// This nodes id deprecated in favor of its nodeable counterpart.
class InputNode
: public ScriptCanvas::Node
, protected InputEventNotificationBus::Handler
{
public:
@@ -35,21 +32,5 @@ namespace StartingPointInput
AZStd::string m_eventName;
float m_value;
//////////////////////////////////////////////////////////////////////////
/// ScriptCanvas_Node
void OnInputChanged(const ScriptCanvas::Datum& input, const ScriptCanvas::SlotId& slotId) override;
protected:
//////////////////////////////////////////////////////////////////////////
/// Node
void OnPostActivate() override;
void OnDeactivate() override;
//////////////////////////////////////////////////////////////////////////
/// InputEventNotificationBus::Handler
void OnPressed(float value) override;
void OnHeld(float value) override;
void OnReleased(float value) override;
};
}
Gems/StartingPointInput/Code/startingpointinput_files.cmake
-1
View File
@@ -17,7 +17,6 @@ set(FILES
Source/InputLibrary.h
Source/InputLibrary.cpp
Source/InputNode.h
Source/InputNode.cpp
Source/InputHandlerNodeable.h
Source/InputHandlerNodeable.cpp
Source/InputHandlerNodeable.ScriptCanvasNodeable.xml