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

Merge branch 'main' into hultonha_LYN-2315_camera-phase-2

Browse Source
This commit is contained in:
hultonha
2021-04-29 14:32:57 +01:00
parent f24e3b2891 9e27929d10
commit 1f7f771378
2198 changed files with 2937 additions and 19198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp
+1 -1
View File
@@ -809,7 +809,7 @@ namespace AzFramework
#if defined(AZ_ENABLE_TRACING)
if (message.m_assetType == AZ::Data::s_invalidAssetType)
{
AZ_TracePrintf("AssetCatalog", "Registering asset \"%s\" via AssetSystem message, but type is not set.", relativePath.c_str());
AZ_TracePrintf("AssetCatalog", "Registering asset \"%s\" via AssetSystem message, but type is not set.\n", relativePath.c_str());
}
#endif
Code/Framework/AzFramework/AzFramework/FileTag/FileTag.cpp
+8 -7
View File
@@ -12,11 +12,13 @@
#include <AzCore/Serialization/Utils.h>
#include <AzCore/IO/FileIO.h>
#include <AzCore/IO/Path/Path.h>
#include <AzCore/IO/SystemFile.h>
#include <AzCore/std/algorithm.h>
#include <AzCore/std/string/wildcard.h>
#include <AzCore/std/string/regex.h>
#include <AzCore/std/string/conversions.h>
#include <AzCore/Utils/Utils.h>
#include <AzCore/XML/rapidxml.h>
#include <AzFramework/API/ApplicationAPI.h>
#include <AzFramework/Asset/FileTagAsset.h>
@@ -31,7 +33,7 @@ namespace AzFramework
const char* ExcludeFileName = "exclude";
const char* IncludeFileName = "include";
const char* FileTags[] = { "ignore", "error", "productdependency", "editoronly", "shader" };
const char EngineName[] = "Engine";
constexpr AZ::IO::PathView EngineAssetSourceRelPath = "Assets/Engine";
void LowerCaseFileTags(AZStd::vector<AZStd::string>& fileTags)
{
@@ -107,7 +109,7 @@ namespace AzFramework
}
AZ::Outcome<AZStd::string, AZStd::string> FileTagManager::AddTagsInternal(AZStd::string filePath, FileTagType fileTagType, AZStd::vector<AZStd::string> fileTags, AzFramework::FileTag::FilePatternType filePatternType)
{
{
if (!NormalizeFileAndLowerCaseTags(filePath, filePatternType, fileTags))
{
return AZ::Failure(AZStd::string::format("Unable to normalize file (%s). Unable to remove the file.\n", filePath.c_str()));
@@ -243,11 +245,10 @@ namespace AzFramework
AZStd::string FileTagQueryManager::GetDefaultFileTagFilePath(FileTagType fileTagType)
{
AZStd::string destinationFilePath;
const char* engineRoot = nullptr;
AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
AzFramework::StringFunc::Path::ConstructFull(engineRoot, EngineName, fileTagType == FileTagType::Exclude ? ExcludeFileName : IncludeFileName, AzFramework::FileTag::FileTagAsset::Extension(), destinationFilePath, true);
return destinationFilePath;
auto destinationFilePath = AZ::IO::FixedMaxPath(AZ::Utils::GetEnginePath()) / EngineAssetSourceRelPath;
destinationFilePath /= fileTagType == FileTagType::Exclude ? ExcludeFileName : IncludeFileName;
destinationFilePath.ReplaceExtension(AzFramework::FileTag::FileTagAsset::Extension());
return destinationFilePath.String();
}
bool FileTagQueryManager::Load(const AZStd::string& filePath)
Code/Framework/AzFramework/AzFramework/Network/NetBindingComponent.cpp
+2 -2
View File
@@ -44,8 +44,8 @@ namespace AzFramework
"Network Binding", "The Network Binding component marks an entity as able to be replicated across the network")
->ClassElement(AZ::Edit::ClassElements::EditorData, "")
->Attribute(AZ::Edit::Attributes::Category, "Networking")
->Attribute(AZ::Edit::Attributes::Icon, "Editor/Icons/Components/NetBinding.svg")
->Attribute(AZ::Edit::Attributes::ViewportIcon, "Editor/Icons/Components/Viewport/NetBinding.png")
->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/NetBinding.svg")
->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/NetBinding.png")
->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://docs.aws.amazon.com/lumberyard/latest/userguide/component-network-binding.html")
->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c));
}
Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableAssetHandler.cpp
+1 -1
View File
@@ -81,7 +81,7 @@ namespace AzFramework
const char* SpawnableAssetHandler::GetBrowserIcon() const
{
return "Editor/Icons/Components/Viewport/EntityInSlice.png";
return "Icons/Components/Viewport/EntityInSlice.png";
}
void SpawnableAssetHandler::GetAssetTypeExtensions(AZStd::vector<AZStd::string>& extensions)