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

Gems/ScriptCanvas

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-20 18:01:54 -07:00
parent 2f5a39176d
commit 323d642e65
37 changed files with 16 additions and 101 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([saveInfo](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/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/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
+3 -5
View File
@@ -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);
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
@@ -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();
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/Node.cpp
-2
View File
@@ -1461,8 +1461,6 @@ namespace ScriptCanvas
return slot.GetDataType();
}
Endpoint endpoint = slot.GetEndpoint();
auto connectedNodes = GetConnectedNodes(slot);
for (auto endpointPair : connectedNodes)
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/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/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/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/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/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationStates/UtilityStates.h
-1
View File
@@ -139,7 +139,6 @@ namespace ScriptCanvasDeveloper
void OnStateActionsComplete() override;
private:
int m_row = 0;
int m_rowCount = 0;
MoveMouseToViewRowAction* m_mouseToRow = nullptr;
Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/NodePaletteFullCreation.cpp
-2
View File
@@ -92,8 +92,6 @@ namespace ScriptCanvasDeveloperEditor
int m_heightOffset = 0;
int m_maxRowHeight = 0;
int creationCounter = 100;
};
void NodePaletteFullCreationAction()
Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorMouseActions.cpp
+1 -1
View File
@@ -155,7 +155,6 @@ namespace ScriptCanvasDeveloper
m_startPosition = QCursor::pos();
}
QPointF currentPosition = QCursor::pos();
QPointF targetPoint = m_targetPosition;
float percentage = aznumeric_cast<float>(m_tickCount)/aznumeric_cast<float>(m_tickDuration);
@@ -170,6 +169,7 @@ namespace ScriptCanvasDeveloper
#if defined(AZ_COMPILER_MSVC)
INPUT osInput = { 0 };
QPointF currentPosition = QCursor::pos();
osInput.type = INPUT_MOUSE;
osInput.mi.mouseData = 0;
Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/VariableActions.cpp
-1
View File
@@ -275,7 +275,6 @@ namespace ScriptCanvasDeveloper
}
QRegion region = m_graphPalette->visibleRegion();
QRect boundingRegion = region.boundingRect();
m_indexIsVisible = region.contains(m_graphPalette->visualRect(m_displayIndex).center());
}
Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/UtilityStates.cpp
-1
View File
@@ -187,7 +187,6 @@ namespace ScriptCanvasDeveloper
DeleteVariableRowFromPaletteState::DeleteVariableRowFromPaletteState(int row)
: NamedAutomationState("DeleteVariableRowFromPaletteState")
, m_row(row)
, m_clickAction(Qt::MouseButton::LeftButton)
, m_deleteAction(VK_DELETE)
{
Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTestDialog.h
-2
View File
@@ -133,7 +133,5 @@ namespace ScriptCanvasDeveloper
QLabel* m_errorTestLabel = nullptr;
QLabel* m_runLabel = nullptr;
QMainWindow* m_scriptCanvasWindow = nullptr;
QWindow* m_canvasWindow = nullptr;
};
}
Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/VariableTests.cpp
-1
View File
@@ -669,7 +669,6 @@ namespace ScriptCanvasDeveloper
VariableLifeCycleTest::VariableLifeCycleTest(AZStd::string name, AZStd::vector<ScriptCanvas::Data::Type> dataTypes, CreateVariableAction::CreationType creationType)
: EditorAutomationTest(name.c_str())
, m_creationType(creationType)
, m_typesToMake(dataTypes)
{
m_variableTypeId = "ActiveVariableTypeId";
Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/VariableTests.h
-3
View File
@@ -256,14 +256,11 @@ namespace ScriptCanvasDeveloper
int SetupNextVariable();
CreateVariableAction::CreationType m_creationType = CreateVariableAction::CreationType::AutoComplete;
ScriptCanvas::VariableId m_activeVariableId;
AZStd::vector<CreateVariableAction*> m_createVariables;
AZStd::vector<ScriptCanvas::Data::Type> m_typesToMake;
bool m_createVariablesNodesViaContextMenu = true;
bool m_closedGraph = false;
int m_activeIndex = 0;
GraphCanvas::ViewId m_viewId;
Gems/ScriptCanvasDeveloper/Code/Editor/Source/WrapperMock.cpp
-1
View File
@@ -67,7 +67,6 @@ namespace ScriptCanvasDeveloper
ScriptCanvasEditor::NodeIdPair nodePair;
const AZ::Vector2 scenePointVec2 = AZ::Vector2(aznumeric_cast<float>(scenePoint.x()), aznumeric_cast<float>(scenePoint.y()));
if (result == addMock)
{
ScriptCanvasEditor::EditorGraphRequestBus::EventResult(nodePair, scriptCanvasId, &ScriptCanvasEditor::EditorGraphRequests::CreateCustomNode, azrtti_typeid<Mock>(), AZ::Vector2(aznumeric_cast<float>(scenePoint.x()), aznumeric_cast<float>(scenePoint.y())));
Gems/ScriptCanvasPhysics/Code/Tests/ScriptCanvasPhysicsTest.cpp
-3
View File
@@ -313,7 +313,6 @@ namespace ScriptCanvasPhysicsTests
.WillByDefault(Return(m_hitResult));
// given raycast data
const AZ::Vector3 start = AZ::Vector3::CreateZero();
const AZ::Vector3 direction = AZ::Vector3(0.f,1.f,0.f);
const float distance = 1.f;
const AZStd::string collisionGroup = "default";
@@ -346,7 +345,6 @@ namespace ScriptCanvasPhysicsTests
.WillByDefault(Return(m_hitResult));
// given raycast data
const AZ::Vector3 start = AZ::Vector3::CreateZero();
const AZ::Vector3 direction = AZ::Vector3(0.f,1.f,0.f);
const float distance = 1.f;
const AZStd::string collisionGroup = "default";
@@ -385,7 +383,6 @@ namespace ScriptCanvasPhysicsTests
.WillByDefault(Return(m_hitResult));
// given shapecast data
const AZ::Vector3 start = AZ::Vector3::CreateZero();
const AZ::Vector3 direction = AZ::Vector3(0.f,1.f,0.f);
const float distance = 1.f;
const AZStd::string collisionGroup = "default";
Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Core.cpp
+3 -3
View File
@@ -360,16 +360,16 @@ TEST_F(ScriptCanvasTestFixture, ValueTypes)
double numberDoubleValue = *numberDouble.GetAs<double>();
Datum numberHex(Datum(0xff));
/*int numberHexValue =*/ *numberHex.GetAs<int>();
[[maybe_unused]] int numberHexValue = *numberHex.GetAs<int>();
Datum numberPi(Datum(3.14f));
float numberPiValue = *numberPi.GetAs<float>();
Datum numberSigned(Datum(-100));
/*int numberSignedValue =*/ *numberSigned.GetAs<int>();
[[maybe_unused]] int numberSignedValue = *numberSigned.GetAs<int>();
Datum numberUnsigned(Datum(100u));
/*unsigned int numberUnsignedValue =*/ *numberUnsigned.GetAs<unsigned int>();
[[maybe_unused]] unsigned int numberUnsignedValue = *numberUnsigned.GetAs<unsigned int>();
Datum numberDoublePi(Datum(6.28));
double numberDoublePiValue = *numberDoublePi.GetAs<double>();
Gems/ScriptCanvasTesting/Code/Tests/ScriptCanvas_Variables.cpp
-4
View File
@@ -207,28 +207,24 @@ TEST_F(ScriptCanvasTestFixture, RemoveVariableTest)
GraphVariableManagerRequestBus::EventResult(addPropertyOutcome, scriptCanvasId, &GraphVariableManagerRequests::AddVariable, "FirstVector3", vector3Datum1, false);
EXPECT_TRUE(addPropertyOutcome);
EXPECT_TRUE(addPropertyOutcome.GetValue().IsValid());
const VariableId firstVector3Id = addPropertyOutcome.GetValue();
++numVariablesAdded;
addPropertyOutcome = AZ::Failure(AZStd::string("Uninitialized"));
GraphVariableManagerRequestBus::EventResult(addPropertyOutcome, scriptCanvasId, &GraphVariableManagerRequests::AddVariable, "SecondVector3", vector3Datum2, false);
EXPECT_TRUE(addPropertyOutcome);
EXPECT_TRUE(addPropertyOutcome.GetValue().IsValid());
const VariableId secondVector3Id = addPropertyOutcome.GetValue();
++numVariablesAdded;
addPropertyOutcome = AZ::Failure(AZStd::string("Uninitialized"));
GraphVariableManagerRequestBus::EventResult(addPropertyOutcome, scriptCanvasId, &GraphVariableManagerRequests::AddVariable, "FirstVector4", vector4Datum, false);
EXPECT_TRUE(addPropertyOutcome);
EXPECT_TRUE(addPropertyOutcome.GetValue().IsValid());
const VariableId firstVector4Id = addPropertyOutcome.GetValue();
++numVariablesAdded;
addPropertyOutcome = AZ::Failure(AZStd::string("Uninitialized"));
GraphVariableManagerRequestBus::EventResult(addPropertyOutcome, scriptCanvasId, &GraphVariableManagerRequests::AddVariable, "ProjectionMatrix", behaviorMatrix4x4Datum, false);
EXPECT_TRUE(addPropertyOutcome);
EXPECT_TRUE(addPropertyOutcome.GetValue().IsValid());
const VariableId projectionMatrixId = addPropertyOutcome.GetValue();
++numVariablesAdded;
addPropertyOutcome = AZ::Failure(AZStd::string("Uninitialized"));