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

Integrating latest from github/staging

Browse Source 
Integrating up through commit 5e1bdae
This commit is contained in:
alexpete
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp
+12 -13
View File
@@ -145,26 +145,25 @@ namespace ScriptCanvasBuilder
}
}
{
AssetBuilderSDK::JobDescriptor copyDescriptor;
copyDescriptor.m_priority = 2;
copyDescriptor.m_critical = true;
copyDescriptor.m_jobKey = s_scriptCanvasCopyJobKey;
copyDescriptor.SetPlatformIdentifier("pc");
copyDescriptor.m_additionalFingerprintInfo = AZStd::string(GetFingerprintString())
.append(AZStd::string::format("|%zu", fingerprint));
response.m_createJobOutputs.push_back(copyDescriptor);
}
for (const AssetBuilderSDK::PlatformInfo& info : request.m_enabledPlatforms)
{
if (info.HasTag("tools"))
{
AssetBuilderSDK::JobDescriptor copyDescriptor;
copyDescriptor.m_priority = 2;
copyDescriptor.m_critical = true;
copyDescriptor.m_jobKey = s_scriptCanvasCopyJobKey;
copyDescriptor.SetPlatformIdentifier(info.m_identifier.c_str());
copyDescriptor.m_additionalFingerprintInfo = AZStd::string(GetFingerprintString()).append("|").append(AZStd::to_string(static_cast<AZ::u64>(fingerprint)));
response.m_createJobOutputs.push_back(copyDescriptor);
}
AssetBuilderSDK::JobDescriptor jobDescriptor;
jobDescriptor.m_priority = 2;
jobDescriptor.m_critical = true;
jobDescriptor.m_jobKey = s_scriptCanvasProcessJobKey;
jobDescriptor.SetPlatformIdentifier(info.m_identifier.c_str());
jobDescriptor.m_additionalFingerprintInfo = AZStd::string(GetFingerprintString())
.append(AZStd::string::format("|%zu", fingerprint));
jobDescriptor.m_additionalFingerprintInfo = AZStd::string(GetFingerprintString()).append("|").append(AZStd::to_string(static_cast<AZ::u64>(fingerprint)));
// Graph process job needs to wait until its dependency asset job finished
for (const auto& sourceDependency : sourceFileDependencies)
{
Gems/ScriptCanvas/Code/Builder/ScriptCanvasFunctionBuilderWorker.cpp
+11 -12
View File
@@ -124,20 +124,19 @@ namespace ScriptCanvasBuilder
AZStd::hash_combine(fingerprint, nodeComponent->GenerateFingerprint());
}
}
{
AssetBuilderSDK::JobDescriptor copyDescriptor;
copyDescriptor.m_priority = 2;
copyDescriptor.m_critical = true;
copyDescriptor.m_jobKey = s_scriptCanvasCopyJobKey;
copyDescriptor.SetPlatformIdentifier("pc");
copyDescriptor.m_additionalFingerprintInfo = AZStd::string(GetFingerprintString())
.append(AZStd::string::format("|%zu", fingerprint));
response.m_createJobOutputs.push_back(copyDescriptor);
}
for (const AssetBuilderSDK::PlatformInfo& info : request.m_enabledPlatforms)
{
if (info.HasTag("tools"))
{
AssetBuilderSDK::JobDescriptor copyDescriptor;
copyDescriptor.m_priority = 2;
copyDescriptor.m_critical = true;
copyDescriptor.m_jobKey = s_scriptCanvasCopyJobKey;
copyDescriptor.SetPlatformIdentifier(info.m_identifier.c_str());
copyDescriptor.m_additionalFingerprintInfo = AZStd::string(GetFingerprintString()).append("|").append(AZStd::to_string(static_cast<AZ::u64>(fingerprint)));
response.m_createJobOutputs.push_back(copyDescriptor);
}
AssetBuilderSDK::JobDescriptor jobDescriptor;
jobDescriptor.m_priority = 2;
jobDescriptor.m_critical = true;
Gems/ScriptCanvas/Code/CMakeLists.txt
+8 -4
View File
@@ -86,7 +86,6 @@ ly_add_target(
ly_add_target(
NAME ScriptCanvas ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
NAMESPACE Gem
OUTPUT_NAME Gem.ScriptCanvasGem.869a0d0ec11a45c299917d45c81555e6.v0.1.0
FILES_CMAKE
scriptcanvasgem_game_files.cmake
INCLUDE_DIRECTORIES
@@ -105,7 +104,9 @@ ly_add_target(
AZ::AzCore
AZ::AzFramework
Gem::ScriptEvents.Static
RUNTIME_DEPENDENCIES
Gem::ScriptEvents
Gem::ExpressionEvaluation
)
if(PAL_TRAIT_BUILD_HOST_TOOLS)
@@ -172,9 +173,9 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
)
ly_add_target(
NAME ScriptCanvas.Editor MODULE
NAME ScriptCanvas.Editor GEM_MODULE
NAMESPACE Gem
OUTPUT_NAME Gem.ScriptCanvasGem.Editor.869a0d0ec11a45c299917d45c81555e6.v0.1.0
FILES_CMAKE
scriptcanvasgem_editor_shared_files.cmake
COMPILE_DEFINITIONS
@@ -199,6 +200,9 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS)
3rdParty::Qt::Widgets
Legacy::EditorCore
AZ::AzQtComponents
Gem::GraphCanvas.Editor
Gem::ScriptEvents.Editor
Gem::ExpressionEvaluation
)
endif()
Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp
+1 -1
View File
@@ -580,7 +580,7 @@ namespace ScriptCanvasEditor
AZStd::string tempFilename;
AzFramework::StringFunc::Path::GetFullFileName(targetFilename.data(), tempFilename);
AZStd::string tempPath = AZStd::string::format("@cache@/scriptcanvas/%s.temp", tempFilename.data());
AZStd::string tempPath = AZStd::string::format("@usercache@/scriptcanvas/%s.temp", tempFilename.data());
AZStd::array<char, AZ::IO::MaxPathLength> resolvedPath{};
AZ::IO::FileIOBase::GetInstance()->ResolvePath(tempPath.data(), resolvedPath.data(), resolvedPath.size());
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/TranslationUtilities.cpp
+1 -14
View File
@@ -27,8 +27,7 @@ namespace TranslationUtilitiesCPP
using namespace ScriptCanvas::Translation;
const char* k_namespaceNameNative = "AutoNative";
const char* k_fileDirectoryPathNative = "@engroot@/Gems/ScriptCanvas/Include/ScriptCanvas/AutoNative";
const char* k_fileDirectoryPathLua = "@engroot@/DebugScriptCanvas2LuaOutput/";
const char* k_fileDirectoryPathLua = "@usercache@/DebugScriptCanvas2LuaOutput/";
const char* k_space = " ";
const size_t k_maxTabs = 20;
@@ -113,18 +112,6 @@ namespace TranslationUtilitiesCPP
return AZ::Failure(AZStd::string("FileIOBase unavailable"));
}
if (!fileIO->GetAlias("@engroot@"))
{
const char* engineRoot = nullptr;
AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
if (engineRoot == nullptr)
{
return AZ::Failure(AZStd::string("no engine root"));
}
fileIO->SetAlias("@engroot@", engineRoot);
}
// \todo get a (debug) file path based on the extension
const AZStd::string filePath = TranslationUtilitiesCPP::GetDebugLuaFilePath(source, extension);
Gems/ScriptCanvas/Code/Tests/ScriptCanvasBuilderTests.cpp
+2 -1
View File
@@ -87,8 +87,9 @@ protected:
AZ::SerializeContext* GetSerializeContext() override { return m_serializeContext; }
AZ::BehaviorContext* GetBehaviorContext() override { return nullptr; }
AZ::JsonRegistrationContext* GetJsonRegistrationContext() override { return nullptr; }
const char* GetExecutableFolder() const override { return nullptr; }
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 {}