Gems/ScriptCanvas
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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");
|
||||
};
|
||||
|
||||
@@ -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([saveInfo](AZ::Data::AssetId /*assetId*/)
|
||||
{
|
||||
}));
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -744,7 +744,6 @@ namespace ScriptCanvasEditor::Nodes
|
||||
return graphCanvasNodeId;
|
||||
}
|
||||
|
||||
auto busId = senderNode->GetBusSlotId();
|
||||
for (const auto& slot : senderNode->GetSlots())
|
||||
{
|
||||
if (slot.IsVisible())
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
-1
@@ -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))
|
||||
{
|
||||
|
||||
@@ -258,7 +258,7 @@ namespace ScriptCanvasEditor
|
||||
|
||||
QObject::connect(pasteAction,
|
||||
&QAction::triggered,
|
||||
[dockWidget, varId](bool)
|
||||
[dockWidget](bool)
|
||||
{
|
||||
GraphVariablesTableView::HandleVariablePaste(dockWidget->GetActiveScriptCanvasId());
|
||||
});
|
||||
|
||||
@@ -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);
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -725,7 +725,7 @@ namespace ScriptCanvasEditor
|
||||
spinner->SetIsBusy(true);
|
||||
rowGoToButton->setEnabled(false);
|
||||
|
||||
m_inProgressAsset = AZStd::find_if(m_assetsToUpgrade.begin(), m_assetsToUpgrade.end(), [this, asset](const UpgradeAssets::value_type& assetToUpgrade)
|
||||
m_inProgressAsset = AZStd::find_if(m_assetsToUpgrade.begin(), m_assetsToUpgrade.end(), [asset](const UpgradeAssets::value_type& assetToUpgrade)
|
||||
{
|
||||
return assetToUpgrade.GetId() == asset.GetId();
|
||||
});
|
||||
@@ -807,7 +807,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();
|
||||
|
||||
Reference in New Issue
Block a user