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

Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development

Browse Source
This commit is contained in:
chcurran
2021-08-30 14:33:16 -07:00
parent 862df096db cdcdcb0777
commit 782c6748ae
1660 changed files with 432462 additions and 114764 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorkerUtility.cpp
-6
View File
@@ -486,7 +486,6 @@ namespace ScriptCanvasBuilder
AZ::Outcome<void, AZStd::string> ProcessTranslationJob(ProcessTranslationJobInput& input)
{
const bool saveRawLua{ true };
auto sourceGraph = PrepareSourceGraph(input.buildEntity);
auto version = sourceGraph->GetVersion();
@@ -651,11 +650,6 @@ namespace ScriptCanvasBuilder
for (const auto& assetDependency : runtimeData.m_requiredAssets)
{
auto filterScripts = [](const AZ::Data::Asset<AZ::Data::AssetData>& asset)
{
return asset.GetType() != azrtti_typeid<AZ::ScriptAsset>();
};
if (AZ::Data::AssetManager::Instance().GetAsset(assetDependency.GetId(), assetDependency.GetType(), AZ::Data::AssetLoadBehavior::PreLoad))
{
jobProduct.m_dependencies.push_back({ assetDependency.GetId(), {} });
Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHelpers.cpp
-1
View File
@@ -41,7 +41,6 @@ namespace ScriptCanvasEditor
bool sourceInfoFound{};
AzToolsFramework::AssetSystemRequestBus::BroadcastResult(sourceInfoFound, &AzToolsFramework::AssetSystemRequestBus::Events::GetSourceInfoBySourcePath, fullPath.data(), catalogAssetInfo, watchFolder);
auto saveAssetId = sourceInfoFound ? catalogAssetInfo.m_assetId : AZ::Data::AssetId(AZ::Uuid::CreateRandom());
if (sourceInfoFound)
{
outAssetInfo = catalogAssetInfo;
Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.cpp
+1 -1
View File
@@ -67,7 +67,7 @@ namespace ScriptCanvasEditor
{
AssetTrackerNotificationBus::Handler::BusConnect(m_scriptCanvasAsset.GetId());
Callbacks::OnAssetReadyCallback onAssetReady = [this](ScriptCanvasMemoryAsset& asset)
Callbacks::OnAssetReadyCallback onAssetReady = [](ScriptCanvasMemoryAsset& asset)
{
AssetHelpers::DumpAssetInfo(asset.GetFileAssetId(), "ScriptCanvasAssetHolder::Init");
};
Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp
+1 -3
View File
@@ -374,7 +374,6 @@ namespace ScriptCanvasEditor
}
else
{
AZ::Data::AssetId assetId = asset.GetId();
Internal::MemoryAssetSystemNotificationBus::Broadcast(&Internal::MemoryAssetSystemNotifications::OnAssetReloaded, this);
}
}
@@ -392,7 +391,6 @@ namespace ScriptCanvasEditor
}
else
{
AZ::Data::AssetId assetId = asset.GetId();
Internal::MemoryAssetSystemNotificationBus::Broadcast(&Internal::MemoryAssetSystemNotifications::OnAssetError, this);
}
}
@@ -505,7 +503,7 @@ namespace ScriptCanvasEditor
m_pendingSave.emplace_back(normPath);
m_assetSaveFinalizer.Reset();
m_assetSaveFinalizer.Start(this, fileInfo, saveInfo, onSaveCallback, AssetSaveFinalizer::OnCompleteHandler([this, saveInfo](AZ::Data::AssetId /*assetId*/)
m_assetSaveFinalizer.Start(this, fileInfo, saveInfo, onSaveCallback, AssetSaveFinalizer::OnCompleteHandler([](AZ::Data::AssetId /*assetId*/)
{
}));
}
Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp
-9
View File
@@ -1034,16 +1034,9 @@ namespace ScriptCanvasEditor
if (connection)
{
ScriptCanvas::Endpoint scSourceEndpoint = connection->GetSourceEndpoint();
GraphCanvas::Endpoint sourceEndpoint = ConvertToGraphCanvasEndpoint(scSourceEndpoint);
ScriptCanvas::Endpoint scTargetEndpoint = connection->GetTargetEndpoint();
GraphCanvas::Endpoint targetEndpoint = ConvertToGraphCanvasEndpoint(scTargetEndpoint);
ScriptCanvas::GraphNotificationBus::Event(GetScriptCanvasId(), &ScriptCanvas::GraphNotifications::OnDisonnectionComplete, connectionId);
DisconnectById(scConnectionId);
}
}
@@ -2666,8 +2659,6 @@ namespace ScriptCanvasEditor
AZStd::vector< GraphCanvas::SlotId > slotIds;
GraphCanvas::NodeRequestBus::EventResult(slotIds, nodeId, &GraphCanvas::NodeRequests::GetSlotIds);
GraphCanvas::GraphId graphCanvasGraphId = GetGraphCanvasGraphId();
for (const GraphCanvas::SlotId& slotId : slotIds)
{
GraphCanvas::SlotType slotType = GraphCanvas::SlotTypes::Invalid;
Gems/ScriptCanvas/Code/Editor/Nodes/NodeDisplayUtils.cpp
-1
View File
@@ -744,7 +744,6 @@ namespace ScriptCanvasEditor::Nodes
return graphCanvasNodeId;
}
auto busId = senderNode->GetBusSlotId();
for (const auto& slot : senderNode->GetSlots())
{
if (slot.IsVisible())
Gems/ScriptCanvas/Code/Editor/Nodes/NodeUtils.cpp
-21
View File
@@ -14,27 +14,6 @@
#include <ScriptCanvas/Core/NodeBus.h>
namespace
{
ScriptCanvas::ConnectionType ToScriptCanvasConnectionType(GraphCanvas::ConnectionType connectionType)
{
ScriptCanvas::ConnectionType scriptCanvasConnectionType = ScriptCanvas::ConnectionType::Unknown;
switch (connectionType)
{
case GraphCanvas::CT_Input:
scriptCanvasConnectionType = ScriptCanvas::ConnectionType::Input;
break;
case GraphCanvas::CT_Output:
scriptCanvasConnectionType = ScriptCanvas::ConnectionType::Output;
break;
default:
break;
}
return scriptCanvasConnectionType;
}
}
namespace ScriptCanvasEditor::Nodes
{
void CopyTranslationKeyedNameToDatumLabel(const AZ::EntityId& graphCanvasNodeId,
Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp
+1 -1
View File
@@ -332,7 +332,7 @@ namespace ScriptCanvasEditor
if (isScriptCanvasAsset)
{
auto scriptCanvasEditorCallback = [this]([[maybe_unused]] const char* fullSourceFileNameInCall, const AZ::Uuid& sourceUUIDInCall)
auto scriptCanvasEditorCallback = []([[maybe_unused]] const char* fullSourceFileNameInCall, const AZ::Uuid& sourceUUIDInCall)
{
AZ::Outcome<int, AZStd::string> openOutcome = AZ::Failure(AZStd::string());
const SourceAssetBrowserEntry* fullDetails = SourceAssetBrowserEntry::GetSourceByUuid(sourceUUIDInCall);
Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/PivotTreeWidget.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
// Disable warnings in moc code
AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option")
#include <Editor/View/Widgets/LoggingPanel/PivotTree/ui_PivotTreeWidget.h>
AZ_POP_DISABLE_OVERRIDE_WARNING
AZ_POP_DISABLE_WARNING
namespace ScriptCanvasEditor
{
Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp
-10
View File
@@ -87,16 +87,6 @@ namespace
return AZ::FindAttribute(attribute, method->m_attributes) != nullptr; // warning C4800: 'AZ::Attribute *': forcing value to bool 'true' or 'false' (performance warning)
}
bool HasAttribute(const AZ::BehaviorClass* behaviorClass, AZ::Crc32 attributeCrc)
{
AZ::Attribute* attribute = AZ::FindAttribute(attributeCrc, behaviorClass->m_attributes);
if (attribute)
{
return true;
}
return false;
}
// Checks for and returns the Category attribute from an AZ::AttributeArray
AZStd::string GetCategoryPath(const AZ::AttributeArray& attributes, const AZ::BehaviorContext& behaviorContext)
{
Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/NodeUsageTreeItem.cpp
-2
View File
@@ -152,8 +152,6 @@ namespace ScriptCanvasEditor
m_assetType = assetType;
const bool loadBlocking = false;
auto onAssetReady = [](ScriptCanvasMemoryAsset&) {};
AssetTrackerRequestBus::Broadcast(&AssetTrackerRequests::Load, m_assetId, m_assetType, onAssetReady);
}
Gems/ScriptCanvas/Code/Editor/View/Widgets/ValidationPanel/GraphValidationDockWidget.cpp
-1
View File
@@ -810,7 +810,6 @@ namespace ScriptCanvasEditor
const ScriptCanvas::ValidationEvent* validationEvent = model->FindItemForIndex(m_proxyModel->mapToSource(modelIndex));
AZ::EntityId graphCanvasMemberId;
QRectF focusArea;
if (const ScriptCanvas::FocusOnEntityEffect* focusOnEntityEffect = azrtti_cast<const ScriptCanvas::FocusOnEntityEffect*>(validationEvent))
{
Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.ui
+109 -97
View File
@@ -6,110 +6,122 @@
<rect>
<x>0</x>
<y>0</y>
<width>278</width>
<height>316</height>
<width>294</width>
<height>265</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string>Pick slot name/type</string>
</property>
<property name="floating" stdset="0">
<bool>false</bool>
</property>
<widget class="QWidget" name="widgetContents">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>278</width>
<height>278</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>10</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>10</number>
</property>
<property name="bottomMargin">
<number>30</number>
</property>
<item>
<widget class="AzQtComponents::SearchLineEdit" name="searchFilter">
<property name="inputMask">
<string/>
</property>
<property name="placeholderText">
<string>Search...</string>
</property>
</widget>
</item>
<item>
<widget class="ScriptCanvasEditor::VariablePaletteTableView" name="variablePalette">
<property name="alternatingRowColors">
<bool>true</bool>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<attribute name="horizontalHeaderVisible">
<bool>false</bool>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLineEdit" name="slotName">
<property name="placeholderText">
<string>Type the name for your slot here...</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing">
<number>0</number>
</property>
<property name="sizeConstraint">
<enum>QLayout::SetMaximumSize</enum>
</property>
<property name="leftMargin">
<number>10</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>10</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Slot Name</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="slotName">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="placeholderText">
<string>Type the name for your slot here...</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Slot Type</string>
</property>
</widget>
</item>
<item>
<widget class="AzQtComponents::SearchLineEdit" name="searchFilter">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="inputMask">
<string/>
</property>
<property name="placeholderText">
<string>Search...</string>
</property>
</widget>
</item>
<item>
<widget class="ScriptCanvasEditor::VariablePaletteTableView" name="variablePalette">
<property name="alternatingRowColors">
<bool>true</bool>
</property>
<property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<attribute name="horizontalHeaderVisible">
<bool>false</bool>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
</widget>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2"/>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
@@ -124,7 +136,7 @@
</customwidget>
</customwidgets>
<resources/>
<connections>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.cpp
+1 -1
View File
@@ -258,7 +258,7 @@ namespace ScriptCanvasEditor
QObject::connect(pasteAction,
&QAction::triggered,
[dockWidget, varId](bool)
[dockWidget](bool)
{
GraphVariablesTableView::HandleVariablePaste(dockWidget->GetActiveScriptCanvasId());
});
Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
+5 -7
View File
@@ -15,7 +15,6 @@
#include <QSplitter>
#include <QListView>
#include <QFileDialog>
#include <QShortcut>
#include <QKeySequence>
#include <QKeyEvent>
@@ -91,6 +90,7 @@
#include <AzToolsFramework/ToolsComponents/ToolsAssetCatalogBus.h>
#include <AzToolsFramework/UI/UICore/WidgetHelpers.h>
#include <AzQtComponents/Components/Widgets/FileDialog.h>
#include <AzQtComponents/Components/Widgets/TabWidget.h>
#include <ScriptCanvas/Core/ScriptCanvasBus.h>
@@ -323,14 +323,13 @@ namespace ScriptCanvasEditor
m_mainWindow->OnWorkspaceRestoreStart();
}
AZ::Data::AssetId focusedAsset = workspace->GetFocusedAssetId();
m_queuedAssetFocus = workspace->GetFocusedAssetId();
for (const auto& assetSaveData : workspace->GetActiveAssetData())
{
AssetTrackerNotificationBus::MultiHandler::BusConnect(assetSaveData.m_assetId);
Callbacks::OnAssetReadyCallback onAssetReady = [this, focusedAsset, assetSaveData](ScriptCanvasMemoryAsset& asset)
Callbacks::OnAssetReadyCallback onAssetReady = [this, assetSaveData](ScriptCanvasMemoryAsset& asset)
{
// If we get an error callback. Just remove it from out active lists.
if (asset.IsSourceInError())
@@ -1020,7 +1019,7 @@ namespace ScriptCanvasEditor
if (shouldSaveResults == UnsavedChangesOptions::SAVE)
{
Callbacks::OnSave saveCB = [this, assetId](bool isSuccessful, AZ::Data::AssetPtr, AZ::Data::AssetId)
Callbacks::OnSave saveCB = [this](bool isSuccessful, AZ::Data::AssetPtr, AZ::Data::AssetId)
{
if (isSuccessful)
{
@@ -1610,7 +1609,7 @@ namespace ScriptCanvasEditor
return;
}
Callbacks::OnAssetReadyCallback onAssetReady = [this, fullPath, assetInfo](ScriptCanvasMemoryAsset&)
Callbacks::OnAssetReadyCallback onAssetReady = [this, assetInfo](ScriptCanvasMemoryAsset&)
{
ScriptCanvasMemoryAsset::pointer memoryAsset;
AssetTrackerRequestBus::BroadcastResult(memoryAsset, &AssetTrackerRequests::GetAsset, assetInfo.m_assetId);
@@ -1869,7 +1868,7 @@ namespace ScriptCanvasEditor
while (!isValidFileName)
{
selectedFile = QFileDialog::getSaveFileName(this, tr("Save As..."), suggestedFilename.data(), filter);
selectedFile = AzQtComponents::FileDialog::GetSaveFileName(this, tr("Save As..."), suggestedFilename.data(), filter);
// If the selected file is empty that means we just cancelled.
// So we want to break out.
@@ -2527,7 +2526,6 @@ namespace ScriptCanvasEditor
void MainWindow::UpdateWorkspaceStatus(const ScriptCanvasMemoryAsset& memoryAsset)
{
AZ::Data::AssetId fileAssetId = memoryAsset.GetFileAssetId();
AZ::Data::AssetId memoryAssetId = memoryAsset.GetId();
size_t eraseCount = m_loadingAssets.erase(fileAssetId);
Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeTool.cpp
+1 -1
View File
@@ -437,7 +437,7 @@ namespace ScriptCanvasEditor
auto streamer = AZ::Interface<AZ::IO::IStreamer>::Get();
AZ::IO::FileRequestPtr flushRequest = streamer->FlushCache(assetToUpgrade.m_relativePath);
streamer->SetRequestCompleteCallback(flushRequest, [this]([[maybe_unused]] AZ::IO::FileRequestHandle request)
streamer->SetRequestCompleteCallback(flushRequest, []([[maybe_unused]] AZ::IO::FileRequestHandle request)
{
});
streamer->QueueRequest(flushRequest);
Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp
+1 -2
View File
@@ -786,7 +786,7 @@ namespace ScriptCanvasEditor
rowGoToButton->setEnabled(false);
m_inProgressAsset = AZStd::find_if(m_assetsToUpgrade.begin(), m_assetsToUpgrade.end()
, [this, asset](const UpgradeAssets::value_type& assetToUpgrade)
, [asset](const UpgradeAssets::value_type& assetToUpgrade)
{
return assetToUpgrade.GetId() == asset.GetId();
});
@@ -872,7 +872,6 @@ namespace ScriptCanvasEditor
const QTextCursor oldCursor = m_ui->textEdit->textCursor();
QScrollBar* scrollBar = m_ui->textEdit->verticalScrollBar();
const int oldScrollValue = scrollBar->value();
m_ui->textEdit->moveCursor(QTextCursor::End);
QTextCursor textCursor = m_ui->textEdit->textCursor();
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.cpp
-2
View File
@@ -54,8 +54,6 @@ namespace ScriptCanvas
auto lhsIter = lhs.begin();
auto rhsIter = rhs.begin();
const bool isCaseSensitive = false;
for (; lhsIter != lhs.end(); ++lhsIter, ++rhsIter)
{
if (!AZ::StringFunc::Equal(lhsIter->c_str(), rhsIter->c_str()))
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/EBusHandler.h
+3
View File
@@ -8,10 +8,13 @@
#pragma once
#include <AzCore/Debug/Budget.h>
#include <AzCore/RTTI/BehaviorContext.h>
#include "Nodeable.h"
AZ_DECLARE_BUDGET(ScriptCanvas);
struct lua_State;
namespace AZ
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.cpp
+5 -5
View File
@@ -36,6 +36,8 @@
#include <ScriptCanvas/Deprecated/VariableHelpers.h>
////
AZ_DECLARE_BUDGET(ScriptCanvas);
namespace NodeCpp
{
enum Version
@@ -1465,8 +1467,6 @@ namespace ScriptCanvas
return slot.GetDataType();
}
Endpoint endpoint = slot.GetEndpoint();
auto connectedNodes = GetConnectedNodes(slot);
for (auto endpointPair : connectedNodes)
@@ -2885,7 +2885,7 @@ namespace ScriptCanvas
if (node == nullptr)
{
AZStd::string assetName = m_graphRequestBus->GetAssetName();
AZ::EntityId assetNodeId = m_graphRequestBus->FindAssetNodeIdByRuntimeNodeId(endpoint.GetNodeId());
[[maybe_unused]] AZ::EntityId assetNodeId = m_graphRequestBus->FindAssetNodeIdByRuntimeNodeId(endpoint.GetNodeId());
AZ_Warning("Script Canvas", false, "Unable to find node with id (id: %s) in the graph '%s'. Most likely the node was serialized with a type that is no longer reflected",
assetNodeId.ToString().data(), assetName.data());
@@ -2900,7 +2900,7 @@ namespace ScriptCanvas
if (!endpointSlot)
{
AZStd::string assetName = m_graphRequestBus->GetAssetName();
AZ::EntityId assetNodeId = m_graphRequestBus->FindAssetNodeIdByRuntimeNodeId(endpoint.GetNodeId());
[[maybe_unused]] AZ::EntityId assetNodeId = m_graphRequestBus->FindAssetNodeIdByRuntimeNodeId(endpoint.GetNodeId());
AZ_Warning("Script Canvas", false, "Endpoint was missing slot. id (id: %s) in the graph '%s'.",
assetNodeId.ToString().data(), assetName.data());
@@ -2934,7 +2934,7 @@ namespace ScriptCanvas
if (node == nullptr)
{
AZStd::string assetName = m_graphRequestBus->GetAssetName();
AZ::EntityId assetNodeId = m_graphRequestBus->FindAssetNodeIdByRuntimeNodeId(endpoint.GetNodeId());
[[maybe_unused]] AZ::EntityId assetNodeId = m_graphRequestBus->FindAssetNodeIdByRuntimeNodeId(endpoint.GetNodeId());
AZ_Error("Script Canvas", false, "Unable to find node with id (id: %s) in the graph '%s'. Most likely the node was serialized with a type that is no longer reflected",
assetNodeId.ToString().data(), assetName.data());
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/NodeFunctionGeneric.h
+2 -4
View File
@@ -80,9 +80,7 @@ namespace ScriptCanvas
using ResultType = FunctionTraits::result_type;\
static const size_t s_numArgs = FunctionTraits::arity;\
static const size_t s_numNames = SCRIPT_CANVAS_FUNCTION_VAR_ARGS(__VA_ARGS__);\
static const size_t s_argsSlotIndicesStart = 2;\
static const size_t s_resultsSlotIndicesStart = s_argsSlotIndicesStart + s_numArgs;\
static const size_t s_numResults = ScriptCanvas::Internal::extended_tuple_size<ResultType>::value;\
/*static const size_t s_numResults = ScriptCanvas::Internal::extended_tuple_size<ResultType>::value;*/\
\
static const char* GetArgName(size_t i)\
{\
@@ -150,7 +148,7 @@ namespace ScriptCanvas
{
static int indices[] = { inputDatumIndices... };
static_assert(sizeof...(Is) == AZ_ARRAY_SIZE(indices), "size of default values doesn't match input datum indices for them");
std::initializer_list<int> { (MoreHelp(node, indices[Is], AZStd::forward<t_Args>(args)), 0)... };
[[maybe_unused]] std::initializer_list<int> dummy = { (MoreHelp(node, indices[Is], AZStd::forward<t_Args>(args)), 0)... };
}
template<typename ArgType>
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/SubgraphInterfaceUtility.cpp
-1
View File
@@ -13,7 +13,6 @@
namespace SubgraphInterfaceUtilityCpp
{
const constexpr size_t k_uniqueOutIndex = 0;
const constexpr size_t k_signatureIndex = 1;
const constexpr AZ::u64 k_defaultOutIdSignature = 0x3ACF20E73ACF20E7ull;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/BehaviorContextObject.h
+1 -1
View File
@@ -260,7 +260,7 @@ namespace ScriptCanvas
AZ_INLINE BehaviorContextObject* BehaviorContextObject::CreateDefaultBuffer(const AZ::BehaviorClass& behaviorClass)
{
AZ_ALIGN(char buffer[AZStd::Internal::ANY_SBO_BUF_SIZE], 32);
alignas(32) char buffer[AZStd::Internal::ANY_SBO_BUF_SIZE];
AZ::BehaviorObject object = InvokeConstructor(behaviorClass, AZStd::addressof(buffer));
auto bco = aznew BehaviorContextObject(object.m_address, GetAnyTypeInfoObject(behaviorClass), Owned);
behaviorClass.m_destructor(object.m_address, behaviorClass.m_userData);
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Data/Data.h
+2
View File
@@ -26,6 +26,8 @@
#include <AzCore/std/string/string.h>
#include <ScriptCanvas/Core/Core.h>
AZ_DECLARE_BUDGET(ScriptCanvas);
namespace AZ
{
class ReflectContext;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
+1 -3
View File
@@ -34,8 +34,6 @@ namespace ExecutionInterpretedAPICpp
constexpr size_t k_StringFastSize = 32;
constexpr size_t k_MaxNodeableOuts = 64;
constexpr size_t k_UuidSize = 16;
constexpr unsigned char k_Bad = 77;
@@ -551,7 +549,7 @@ namespace ScriptCanvas
{
using namespace ExecutionInterpretedAPICpp;
// Lua: usernodeable, keyCount
const int argsCount = lua_gettop(lua);
[[maybe_unused]] const int argsCount = lua_gettop(lua);
AZ_Assert(argsCount == 2, "InitializeNodeableOutKeys: Error in compiled Lua file, not enough arguments");
AZ_Assert(lua_isuserdata(lua, 1), "InitializeNodeableOutKeys: Error in compiled lua file, 1st argument to SetExecutionOut is not userdata (Nodeable)");
Nodeable* nodeable = AZ::ScriptValue<Nodeable*>::StackRead(lua, 1);
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/NodeableOut/NodeableOutNative.h
+2 -2
View File
@@ -23,7 +23,7 @@ namespace ScriptCanvas
{
auto nodeCallWrapper = [callable = AZStd::forward<Callable>(callable)](AZ::BehaviorValueParameter* result, AZ::BehaviorValueParameter* arguments, int numArguments) mutable
{
constexpr size_t numFunctorArguments = sizeof...(Args);
[[maybe_unused]] constexpr size_t numFunctorArguments = sizeof...(Args);
(void)numArguments;
AZ_Assert(numArguments == numFunctorArguments, "number of arguments doesn't match number of parameters");
AZ_Assert(result, "no null result allowed");
@@ -39,7 +39,7 @@ namespace ScriptCanvas
{
auto nodeCallWrapper = [callable = AZStd::forward<Callable>(callable)](AZ::BehaviorValueParameter*, AZ::BehaviorValueParameter* arguments, int numArguments) mutable
{
constexpr size_t numFunctorArguments = sizeof...(Args);
[[maybe_unused]] constexpr size_t numFunctorArguments = sizeof...(Args);
(void)numArguments;
AZ_Assert(numArguments == numFunctorArguments, "number of arguments doesn't match number of parameters");
AZStd::invoke(callable, *arguments[IndexSequence].GetAsUnsafe<Args>()...);
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp
+2
View File
@@ -23,6 +23,8 @@
#define SCRIPT_CANVAS_RUNTIME_ASSET_CHECK
#endif
AZ_DECLARE_BUDGET(ScriptCanvas);
namespace RuntimeComponentCpp
{
enum class RuntimeComponentVersion : unsigned int
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/ParsingUtilities.cpp
-2
View File
@@ -707,8 +707,6 @@ namespace ScriptCanvas
return false;
}
auto id = execution->GetId();
if (ActivatesSelf(execution))
{
return true;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Grammar/Primitives.cpp
-1
View File
@@ -55,7 +55,6 @@ namespace ScriptCanvas
AZStd::vector<AZStd::string> tokens;
AzFramework::StringFunc::Tokenize(name, tokens, Grammar::k_luaSpecialCharacters);
AZStd::string joinResult;
const size_t length = tokens.size();
for (auto& token : tokens)
{
joinResult.append(token);
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Internal/Nodes/StringFormatted.cpp
+2
View File
@@ -13,6 +13,8 @@
#include <ScriptCanvas/Core/Graph.h>
AZ_DECLARE_BUDGET(ScriptCanvas);
namespace ScriptCanvas
{
namespace Nodes
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/FunctionDefinitionNode.cpp
+1 -1
View File
@@ -166,7 +166,7 @@ namespace ScriptCanvas
}
},
{
[this]()
[]()
{
DisallowReentrantExecutionContract* reentrantContract = aznew DisallowReentrantExecutionContract();
return reentrantContract;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/MethodUtility.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ namespace ScriptCanvas
int tupleGetFuncIndex = -1;
if (tupleGetFuncAttrReader.Read<int>(tupleGetFuncIndex))
{
auto insertIter = tupleGetMethodMap.emplace(tupleGetFuncIndex, behaviorMethod);
[[maybe_unused]] auto insertIter = tupleGetMethodMap.emplace(tupleGetFuncIndex, behaviorMethod);
AZ_Error("Script Canvas", insertIter.second, "Multiple methods with the same TupleGetFunctionIndex attribute"
"has been registered for the class name: %s with typeid: %s",
behaviorClass->m_name.data(), behaviorClass->m_typeId.ToString<AZStd::string>().data())
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Core/ReceiveScriptEvent.cpp
-1
View File
@@ -86,7 +86,6 @@ namespace ScriptCanvas
if (!wasConfigured)
{
AZ::Uuid addressTypeId = m_definition.GetAddressType();
AZ::Uuid addressId = m_definition.GetAddressTypeProperty().GetId();
if (m_definition.IsAddressRequired())
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Logic/Sequencer.cpp
-2
View File
@@ -16,8 +16,6 @@ namespace ScriptCanvas
{
namespace Logic
{
static const int NUMBER_OF_OUTPUTS = 8;
Sequencer::Sequencer()
: Node()
, m_selectedIndex(0)
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorAt.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ namespace ScriptCanvas
if (sourceType == SourceType::SourceInput)
{
ContractDescriptor supportsMethodContract;
supportsMethodContract.m_createFunc = [this]() -> SupportsMethodContract* { return aznew SupportsMethodContract("At"); };
supportsMethodContract.m_createFunc = []() -> SupportsMethodContract* { return aznew SupportsMethodContract("At"); };
contractDescs.push_back(AZStd::move(supportsMethodContract));
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorBack.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ namespace ScriptCanvas
if (sourceType == SourceType::SourceInput)
{
ContractDescriptor supportsMethodContract;
supportsMethodContract.m_createFunc = [this]() -> SupportsMethodContract* { return aznew SupportsMethodContract("Back"); };
supportsMethodContract.m_createFunc = []() -> SupportsMethodContract* { return aznew SupportsMethodContract("Back"); };
contractDescs.push_back(AZStd::move(supportsMethodContract));
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorErase.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ namespace ScriptCanvas
if (sourceType == SourceType::SourceInput)
{
ContractDescriptor supportsMethodContract;
supportsMethodContract.m_createFunc = [this]() -> SupportsMethodContract* { return aznew SupportsMethodContract("Erase"); };
supportsMethodContract.m_createFunc = []() -> SupportsMethodContract* { return aznew SupportsMethodContract("Erase"); };
contractDescs.push_back(AZStd::move(supportsMethodContract));
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorFront.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ namespace ScriptCanvas
if (sourceType == SourceType::SourceInput)
{
ContractDescriptor supportsMethodContract;
supportsMethodContract.m_createFunc = [this]() -> SupportsMethodContract* { return aznew SupportsMethodContract("Front"); };
supportsMethodContract.m_createFunc = []() -> SupportsMethodContract* { return aznew SupportsMethodContract("Front"); };
contractDescs.push_back(AZStd::move(supportsMethodContract));
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorInsert.cpp
+1 -1
View File
@@ -21,7 +21,7 @@ namespace ScriptCanvas
if (sourceType == SourceType::SourceInput)
{
ContractDescriptor supportsMethodContract;
supportsMethodContract.m_createFunc = [this]() -> SupportsMethodContract* { return aznew SupportsMethodContract("Insert"); };
supportsMethodContract.m_createFunc = []() -> SupportsMethodContract* { return aznew SupportsMethodContract("Insert"); };
contractDescs.push_back(AZStd::move(supportsMethodContract));
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Operators/Containers/OperatorPushBack.cpp
+1 -1
View File
@@ -21,7 +21,7 @@ namespace ScriptCanvas
if (sourceType == SourceType::SourceInput)
{
ContractDescriptor supportsMethodContract;
supportsMethodContract.m_createFunc = [this]() -> SupportsMethodContract* { return aznew SupportsMethodContract("PushBack"); };
supportsMethodContract.m_createFunc = []() -> SupportsMethodContract* { return aznew SupportsMethodContract("PushBack"); };
contractDescs.push_back(AZStd::move(supportsMethodContract));
}
}
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Spawning/SpawnNodeable.cpp
+1 -1
View File
@@ -101,7 +101,7 @@ namespace ScriptCanvas::Nodeables::Spawning
return;
}
auto preSpawnCB = [this, translation, rotation, scale]([[maybe_unused]] AzFramework::EntitySpawnTicket::Id ticketId,
auto preSpawnCB = [translation, rotation, scale]([[maybe_unused]] AzFramework::EntitySpawnTicket::Id ticketId,
AzFramework::SpawnableEntityContainerView view)
{
AZ::Entity* rootEntity = *view.begin();
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Variable/VariableData.cpp
-1
View File
@@ -144,7 +144,6 @@ namespace ScriptCanvas
GraphVariable* VariableData::FindVariable(VariableId variableId)
{
AZStd::pair<AZStd::string_view, GraphVariable*> resultPair;
auto foundIt = m_variableMap.find(variableId);
return foundIt != m_variableMap.end() ? &foundIt->second : nullptr;
}
Gems/ScriptCanvas/Code/Source/PerformanceStatistician.cpp
-1
View File
@@ -104,7 +104,6 @@ namespace ScriptCanvas
void PerformanceStatistician::OnStartTrackingRequested()
{
m_accumulatedStats.tickCount = 0;
m_accumulatedTickCountRemaining;
m_accumulatedStartTime = AZStd::chrono::system_clock::now();
}
Gems/ScriptCanvas/Code/Source/SystemComponent.cpp
+1 -1
View File
@@ -260,7 +260,7 @@ namespace ScriptCanvas
}
LockType lock(m_ownedObjectsByAddressMutex);
auto emplaceResult = m_ownedObjectsByAddress.emplace(object, behaviorContextObject);
[[maybe_unused]] auto emplaceResult = m_ownedObjectsByAddress.emplace(object, behaviorContextObject);
AZ_Assert(emplaceResult.second, "Adding second owned reference to memory");
}
Gems/ScriptCanvas/Code/Tests/ScriptCanvasBuilderTests.cpp
-1
View File
@@ -91,7 +91,6 @@ protected:
const char* GetAppRoot() const override { return nullptr; }
const char* GetEngineRoot() const override { return nullptr; }
const char* GetExecutableFolder() const override { return nullptr; }
AZ::Debug::DrillerManager* GetDrillerManager() override { return nullptr; }
void EnumerateEntities(const AZ::ComponentApplicationRequests::EntityCallback& /*callback*/) override {}
void QueryApplicationType(AZ::ApplicationTypeQuery& /*appType*/) const override {}
//////////////////////////////////////////////////////////////////////////