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

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
+4 -8
View File
@@ -1188,8 +1188,8 @@ namespace AZ::IO
if (az_archive_verbosity)
{
char fileNameBuffer[AZ_MAX_PATH_LEN];
const char* fileName = AZ::IO::FileIOBase::GetDirectInstance()->GetFilename(fileHandle, fileNameBuffer, AZ_ARRAY_SIZE(fileNameBuffer))
? fileNameBuffer : "unknown";
[[maybe_unused]] const char* fileName = AZ::IO::FileIOBase::GetDirectInstance()->GetFilename(fileHandle, fileNameBuffer,
AZ_ARRAY_SIZE(fileNameBuffer)) ? fileNameBuffer : "unknown";
AZ_TracePrintf("Archive", R"(Perf Warning: First call to read file "%s" made from multiple threads concurrently)" "\n",
fileName);
}
@@ -1914,7 +1914,6 @@ namespace AZ::IO
AZ::IO::StackString pathStr{ szPathIn };
// Determine if there is a period ('.') after the last slash to determine if the path contains a file.
// This used to be a strchr on the whole path which could contain a period in a path, such as network domain paths (domain.user).
bool bPathContainsFile = false;
size_t findDotFromPos = pathStr.rfind(AZ_CORRECT_FILESYSTEM_SEPARATOR);
if (findDotFromPos == AZ::IO::StackString::npos)
{
@@ -2046,7 +2045,6 @@ namespace AZ::IO
uint8_t pMem[dwChunkSize];
uint32_t dwSize = 0;
AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();
if (!fileIO)
@@ -2453,11 +2451,13 @@ namespace AZ::IO
ArchiveLocationPriority Archive::GetPakPriority() const
{
int pakPriority = aznumeric_cast<int>(ArchiveVars{}.nPriority);
#if defined(AZ_ENABLE_TRACING)
if (auto console = AZ::Interface<AZ::IConsole>::Get(); console != nullptr)
{
AZ::GetValueResult getCvarResult = console->GetCvarValue("sys_PakPriority", pakPriority);
AZ_Error("Archive", getCvarResult == AZ::GetValueResult::Success, "Lookup of 'sys_PakPriority console variable failed with error %s", AZ::GetEnumString(getCvarResult));
}
#endif
return static_cast<ArchiveLocationPriority>(pakPriority);
}
@@ -2580,10 +2580,6 @@ namespace AZ::IO
return static_cast<EStreamSourceMediaType>(0);
}
ZipDir::CachePtr pZip;
uint32_t archFlags;
ZipDir::FileEntry* pFileEntry = FindPakFileEntry(szFullPath->Native(), archFlags, &pZip, false);
enum StreamMediaType : int32_t
{
TypeUnknown = 0,
Code/Framework/AzFramework/AzFramework/Archive/ZipDirCache.cpp
+1 -1
View File
@@ -831,7 +831,7 @@ namespace AZ::IO::ZipDir
//arrFiles.SortByFileOffset();
size_t nSizeCDR = arrFiles.GetStats().nSizeCDR;
void* pCDR = m_allocator->Allocate(nSizeCDR, alignof(uint8_t), 0, "Cache::WriteCDR");
size_t nSizeCDRSerialized = arrFiles.MakeZipCDR(m_lCDROffset, pCDR);
[[maybe_unused]] size_t nSizeCDRSerialized = arrFiles.MakeZipCDR(m_lCDROffset, pCDR);
AZ_Assert(nSizeCDRSerialized == nSizeCDR, "Serialized CDR size %zu does not match size in memory %zu", nSizeCDRSerialized, nSizeCDR);
if (m_encryptedHeaders == ZipFile::HEADERS_ENCRYPTED_TEA)
{
Code/Framework/AzFramework/AzFramework/Archive/ZipDirStructures.cpp
-1
View File
@@ -343,7 +343,6 @@ namespace AZ::IO::ZipDir
{
AZ::IO::HandleType realFileHandle = m_fileHandle;
size_t nFileSize = ~0;
int64_t offset = 0;
AZ::u64 fileSize = 0;
if (!m_fileIOBase->Size(realFileHandle, fileSize))
Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp
-1
View File
@@ -1014,7 +1014,6 @@ namespace AzFramework
behaviorContext->Constant("EditorTransformComponentTypeId", BehaviorConstant(AZ::EditorTransformComponentTypeId));
behaviorContext->Class<AZ::TransformConfig>()
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Attribute(AZ::Script::Attributes::ConstructorOverride, &AZ::TransformConfigConstructor)
->Enum<(int)AZ::TransformConfig::ParentActivationTransformMode::MaintainOriginalRelativeTransform>("MaintainOriginalRelativeTransform")
->Enum<(int)AZ::TransformConfig::ParentActivationTransformMode::MaintainCurrentWorldTransform>("MaintainCurrentWorldTransform")
Code/Framework/AzFramework/AzFramework/Dependency/Dependency.inl
-2
View File
@@ -167,8 +167,6 @@ namespace AzFramework
for (auto && bound : m_bounds)
{
bool satisfies = false;
if (bound.m_comparison == Comp::TwiddleWakka)
{
// Lower bound
Code/Framework/AzFramework/AzFramework/Entity/BehaviorEntity.cpp
-2
View File
@@ -33,7 +33,6 @@ namespace AzFramework
if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
{
behaviorContext->Class<BehaviorComponentId>("ComponentId")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Attribute(AZ::Script::Attributes::Storage, AZ::Script::Attributes::StorageType::Value)
->Constructor()
->Method("IsValid", &BehaviorComponentId::IsValid)
@@ -136,7 +135,6 @@ namespace AzFramework
if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
{
behaviorContext->Class<BehaviorEntity>("Entity")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Attribute(AZ::Script::Attributes::Storage, AZ::Script::Attributes::StorageType::Value)
->Attribute(AZ::Script::Attributes::ConstructorOverride, &Internal::BehaviorEntityScriptConstructor)
->Constructor()
Code/Framework/AzFramework/AzFramework/IO/RemoteFileIO.cpp
-4
View File
@@ -643,8 +643,6 @@ namespace AZ
return ResultCode::Error;
}
bool bSourceExcluded = false;
bool bDestinationExcluded = false;
//else both are remote so just issue the remote copy command
AzFramework::AssetSystem::FileCopyRequest request(sourceFilePath, destinationFilePath);
@@ -697,8 +695,6 @@ namespace AZ
}
//we are going to access shared memory so lock and copy the results into our memory
bool bSourceExcluded = false;
bool bDestinationExcluded = false;
//if the source and destination are the same, shortcut
if (!strcmp(sourceFilePath, destinationFilePath))
Code/Framework/AzFramework/AzFramework/Input/System/InputSystemComponent.cpp
-2
View File
@@ -130,13 +130,11 @@ namespace AzFramework
if (AZ::BehaviorContext* behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
{
behaviorContext->EBus<InputSystemNotificationBus>("InputSystemNotificationBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Attribute(AZ::Script::Attributes::Category, "Input")
->Handler<InputSystemNotificationBusBehaviorHandler>()
;
behaviorContext->EBus<InputSystemRequestBus>("InputSystemRequestBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Attribute(AZ::Script::Attributes::Category, "Input")
->Event("RecreateEnabledInputDevices", &InputSystemRequestBus::Events::RecreateEnabledInputDevices)
;
Code/Framework/AzFramework/AzFramework/Network/NetBindingComponent.cpp
-1
View File
@@ -56,7 +56,6 @@ namespace AzFramework
if (behaviorContext)
{
behaviorContext->EBus<NetBindingHandlerBus>("NetBindingHandlerBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::Preview)
->Event("IsEntityBoundToNetwork", &NetBindingHandlerBus::Events::IsEntityBoundToNetwork)
->Event("IsEntityAuthoritative", &NetBindingHandlerBus::Events::IsEntityAuthoritative)
Code/Framework/AzFramework/AzFramework/Physics/CollisionBus.cpp
-1
View File
@@ -22,7 +22,6 @@ namespace Physics
behaviorContext->EBus<Physics::CollisionFilteringRequestBus>("CollisionFilteringBus")
->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
->Attribute(AZ::Script::Attributes::Module, "physics")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::Preview)
->Attribute(AZ::Script::Attributes::Category, "PhysX")
->Event("SetCollisionLayer", &Physics::CollisionFilteringRequestBus::Events::SetCollisionLayer)
->Event("GetCollisionLayerName", &Physics::CollisionFilteringRequestBus::Events::GetCollisionLayerName)
Code/Framework/AzFramework/AzFramework/Script/ScriptNetBindings.cpp
+2 -2
View File
@@ -93,9 +93,9 @@ namespace AzFramework
"DataSet31","DataSet32"
};
if (s_chunkIndex > AZ_ARRAY_SIZE(s_nameArray) && AZ_ARRAY_SIZE(s_nameArray) >= 0)
if ((s_chunkIndex >= AZ_ARRAY_SIZE(s_nameArray)) && (AZ_ARRAY_SIZE(s_nameArray) >= 0))
{
s_chunkIndex = s_chunkIndex%AZ_ARRAY_SIZE(s_nameArray);
s_chunkIndex = s_chunkIndex % AZ_ARRAY_SIZE(s_nameArray);
}
return s_nameArray[s_chunkIndex++];
Code/Framework/AzFramework/AzFramework/Visibility/BoundsBus.cpp
-1
View File
@@ -21,7 +21,6 @@ namespace AzFramework
if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
{
behaviorContext->EBus<BoundsRequestBus>("BoundsRequestBus")
->Attribute(AZ::Script::Attributes::ExcludeFrom, AZ::Script::Attributes::ExcludeFlags::Preview)
->Event("GetWorldBounds", &BoundsRequestBus::Events::GetWorldBounds)
->Event("GetLocalBounds", &BoundsRequestBus::Events::GetLocalBounds);
}
Code/Framework/AzFramework/AzFramework/Visibility/IVisibilitySystem.h
-3
View File
@@ -35,7 +35,6 @@ namespace AzFramework
{
TYPE_None = 0,
TYPE_Entity = 1 << 0, // All entities
TYPE_NetEntity = 1 << 1, // NetBound entities
TYPE_RPI_Cullable = 1 << 2 // Cullable by the render system
};
@@ -113,6 +112,4 @@ namespace AzFramework
static const AZ::EBusAddressPolicy AddressPolicy = AZ::EBusAddressPolicy::Single;
};
using IVisibilitySystemRequestBus = AZ::EBus<IVisibilitySystem, IVisibilitySystemRequests>;
}
Code/Framework/AzFramework/AzFramework/azframework_files.cmake
+3
View File
@@ -426,4 +426,7 @@ set(FILES
Visibility/EntityVisibilityBoundsUnionSystem.cpp
Visibility/EntityVisibilityQuery.h
Visibility/EntityVisibilityQuery.cpp
Dependency/Dependency.h
Dependency/Dependency.inl
Dependency/Version.h
)
Code/Framework/AzFramework/Platform/Mac/AzFramework/Input/Devices/Mouse/InputDeviceMouse_Mac.mm
+1
View File
@@ -290,6 +290,7 @@ namespace AzFramework
UpdateSystemCursorVisibility();
const bool shouldBeDisabled = (m_systemCursorState == SystemCursorState::ConstrainedAndHidden) ||
(m_systemCursorState == SystemCursorState::ConstrainedAndVisible);
if (!shouldBeDisabled)
{
DestroyDisabledSystemCursorEventTap();