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

Merge branch 'main' into jckand/FoundationAutoDecoupling

Browse Source
main
jckand-amzn 5 years ago
parent 0c686dfb49 5b5d02baa4
commit 036eb4a269
189 changed files with 1265 additions and 3135 deletions
Show Stats Download Patch File Download Diff File

14
AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test.py
Unescape Escape View File

@ -31,13 +31,13 @@ class TestPythonAssetProcessing(object):
unexpected_lines = [] unexpected_lines = []
expected_lines = [ expected_lines = [
'Mock asset exists', 'Mock asset exists',
'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_positive_1.azmodel) found', 'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_positive.azmodel) found',
'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_negative_1.azmodel) found', 'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_negative.azmodel) found',
'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_positive_1.azmodel) found', 'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_positive.azmodel) found',
'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_negative_1.azmodel) found', 'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_negative.azmodel) found',
'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_positive_1.azmodel) found', 'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_positive.azmodel) found',
'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_negative_1.azmodel) found', 'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_negative.azmodel) found',
'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_center_1.azmodel) found' 'Expected subId for asset (gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_center.azmodel) found'
] ]
timeout = 180 timeout = 180
halt_on_unexpected = False halt_on_unexpected = False

16
AutomatedTesting/Gem/PythonTests/PythonAssetBuilder/AssetBuilder_test_case.py
Unescape Escape View File

@ -38,16 +38,16 @@ def test_azmodel_product(generatedModelAssetPath, expectedSubId):
assetId = azlmbr.asset.AssetCatalogRequestBus(azlmbr.bus.Broadcast, 'GetAssetIdByPath', generatedModelAssetPath, azModelAssetType, False) assetId = azlmbr.asset.AssetCatalogRequestBus(azlmbr.bus.Broadcast, 'GetAssetIdByPath', generatedModelAssetPath, azModelAssetType, False)
assetIdString = assetId.to_string() assetIdString = assetId.to_string()
if (assetIdString.endswith(':' + expectedSubId) is False): if (assetIdString.endswith(':' + expectedSubId) is False):
raise_and_stop(f'Asset has unexpected asset ID ({assetIdString}) for ({generatedModelAssetPath})!') raise_and_stop(f'Asset at path {generatedModelAssetPath} has unexpected asset ID ({assetIdString}) for ({generatedModelAssetPath}), expected {expectedSubId}!')
else: else:
print(f'Expected subId for asset ({generatedModelAssetPath}) found') print(f'Expected subId for asset ({generatedModelAssetPath}) found')
test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_positive_1.azmodel', '10315ae0') test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_positive.azmodel', '1024be55')
test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_negative_1.azmodel', '10661093') test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_z_negative.azmodel', '1052c94e')
test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_positive_1.azmodel', '10af8810') test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_positive.azmodel', '10130556')
test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_negative_1.azmodel', '10f8c263') test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_y_negative.azmodel', '1065724d')
test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_positive_1.azmodel', '100ac47f') test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_positive.azmodel', '10d16e68')
test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_negative_1.azmodel', '105d8e0c') test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_x_negative.azmodel', '10a71973')
test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_center_1.azmodel', '1002d464') test_azmodel_product('gem/pythontests/pythonassetbuilder/geom_group_fbx_cube_100cm_center.azmodel', '10412075')
azlmbr.editor.EditorToolsApplicationRequestBus(azlmbr.bus.Broadcast, 'ExitNoPrompt') azlmbr.editor.EditorToolsApplicationRequestBus(azlmbr.bus.Broadcast, 'ExitNoPrompt')

4
Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.cpp
Unescape Escape View File

@ -35,7 +35,7 @@ namespace AZ
return "Android"; return "Android";
case AZ::IOS: case AZ::IOS:
return "iOS"; return "iOS";
case AZ::MAC: case AZ::MAC_ID:
return "Mac"; return "Mac";
case AZ::PROVO: case AZ::PROVO:
return "Provo"; return "Provo";
@ -213,7 +213,7 @@ namespace AZ
case PlatformId::IOS: case PlatformId::IOS:
platformCodes.emplace_back(PlatformCodeNameiOS); platformCodes.emplace_back(PlatformCodeNameiOS);
break; break;
case PlatformId::MAC: case PlatformId::MAC_ID:
platformCodes.emplace_back(PlatformCodeNameMac); platformCodes.emplace_back(PlatformCodeNameMac);
break; break;
case PlatformId::PROVO: case PlatformId::PROVO:

4
Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.h
Unescape Escape View File

@ -56,7 +56,7 @@ namespace AZ
PC, PC,
ANDROID_ID, ANDROID_ID,
IOS, IOS,
MAC, MAC_ID,
PROVO, PROVO,
SALEM, SALEM,
JASPER, JASPER,
@ -75,7 +75,7 @@ namespace AZ
Platform_PC = 1 << PlatformId::PC, Platform_PC = 1 << PlatformId::PC,
Platform_ANDROID = 1 << PlatformId::ANDROID_ID, Platform_ANDROID = 1 << PlatformId::ANDROID_ID,
Platform_IOS = 1 << PlatformId::IOS, Platform_IOS = 1 << PlatformId::IOS,
Platform_MAC = 1 << PlatformId::MAC, Platform_MAC = 1 << PlatformId::MAC_ID,
Platform_PROVO = 1 << PlatformId::PROVO, Platform_PROVO = 1 << PlatformId::PROVO,
Platform_SALEM = 1 << PlatformId::SALEM, Platform_SALEM = 1 << PlatformId::SALEM,
Platform_JASPER = 1 << PlatformId::JASPER, Platform_JASPER = 1 << PlatformId::JASPER,

2
Code/Framework/AzCore/Platform/Mac/AzCore/PlatformId/PlatformId_Mac.h
Unescape Escape View File

@ -13,5 +13,5 @@
namespace AZ namespace AZ
{ {
static const PlatformID g_currentPlatform = PlatformID::PLATFORM_APPLE_OSX; static const PlatformID g_currentPlatform = PlatformID::PLATFORM_APPLE_MAC;
} }

15
Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
Unescape Escape View File

@ -2008,13 +2008,12 @@ namespace AZ::IO
// if no bind root is specified, compute one: // if no bind root is specified, compute one:
strBindRoot = !bindRoot.empty() ? bindRoot : szFullPath->ParentPath().Native(); strBindRoot = !bindRoot.empty() ? bindRoot : szFullPath->ParentPath().Native();
// Check if archive file disk exist on disk or inside of pak. // Check if archive file disk exist on disk.
bool bFileExists = IsFileExist(szFullPath->Native()); const bool pakOnDisk = FileIOBase::GetDirectInstance()->Exists(szFullPath->c_str());
if (!pakOnDisk && (nFactoryFlags & ZipDir::CacheFactory::FLAGS_READ_ONLY))
if (!bFileExists && (nFactoryFlags & ZipDir::CacheFactory::FLAGS_READ_ONLY))
{ {
// Archive file not found. // Archive file not found.
AZ_TracePrintf("Archive", "Cannot open Archive file %s\n", szFullPath->c_str()); AZ_TracePrintf("Archive", "Archive file %s does not exist\n", szFullPath->c_str());
return nullptr; return nullptr;
} }
@ -2492,8 +2491,6 @@ namespace AZ::IO
void Archive::FindCompressionInfo(bool& found, AZ::IO::CompressionInfo& info, const AZStd::string_view filename) void Archive::FindCompressionInfo(bool& found, AZ::IO::CompressionInfo& info, const AZStd::string_view filename)
{ {
constexpr uint32_t s_compressionTag = static_cast<uint32_t>('Z') << 24 | static_cast<uint32_t>('C') << 16 | static_cast<uint32_t>('R') << 8 | static_cast<uint32_t>('Y');
if (!found) if (!found)
{ {
auto correctedFilename = AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(filename); auto correctedFilename = AZ::IO::FileIOBase::GetDirectInstance()->ResolvePath(filename);
@ -2519,7 +2516,6 @@ namespace AZ::IO
found = true; found = true;
info.m_archiveFilename.InitFromRelativePath(archive->GetFilePath()); info.m_archiveFilename.InitFromRelativePath(archive->GetFilePath());
info.m_compressionTag.m_code = s_compressionTag;
info.m_offset = pFileData->GetFileDataOffset(); info.m_offset = pFileData->GetFileDataOffset();
info.m_compressedSize = entry->desc.lSizeCompressed; info.m_compressedSize = entry->desc.lSizeCompressed;
info.m_uncompressedSize = entry->desc.lSizeUncompressed; info.m_uncompressedSize = entry->desc.lSizeUncompressed;
@ -2539,9 +2535,8 @@ namespace AZ::IO
break; break;
} }
info.m_decompressor = [&s_compressionTag]([[maybe_unused]] const AZ::IO::CompressionInfo& info, const void* compressed, size_t compressedSize, void* uncompressed, size_t uncompressedBufferSize)->bool info.m_decompressor = []([[maybe_unused]] const AZ::IO::CompressionInfo& info, const void* compressed, size_t compressedSize, void* uncompressed, size_t uncompressedBufferSize)->bool
{ {
AZ_Assert(info.m_compressionTag.m_code == s_compressionTag, "Provided compression info isn't supported by this decompressor.");
size_t nSizeUncompressed = uncompressedBufferSize; size_t nSizeUncompressed = uncompressedBufferSize;
return ZipDir::ZipRawUncompress(uncompressed, &nSizeUncompressed, compressed, compressedSize) == 0; return ZipDir::ZipRawUncompress(uncompressed, &nSizeUncompressed, compressed, compressedSize) == 0;
}; };

15
Code/Framework/AzFramework/AzFramework/Archive/ArchiveFindData.cpp
Unescape Escape View File

@ -50,6 +50,7 @@ namespace AZ::IO
, tWrite{ writeTime } , tWrite{ writeTime }
{ {
} }
ArchiveFileIterator::ArchiveFileIterator(FindData* findData, AZStd::string_view filename, const FileDesc& fileDesc) ArchiveFileIterator::ArchiveFileIterator(FindData* findData, AZStd::string_view filename, const FileDesc& fileDesc)
: m_findData{ findData } : m_findData{ findData }
, m_filename{ filename } , m_filename{ filename }
@ -108,13 +109,10 @@ namespace AZ::IO
AZ::StringFunc::Path::GetFullPath(directory.c_str(), searchDirectory); AZ::StringFunc::Path::GetFullPath(directory.c_str(), searchDirectory);
AZ::StringFunc::Path::GetFullFileName(directory.c_str(), pattern); AZ::StringFunc::Path::GetFullFileName(directory.c_str(), pattern);
} }
AZ::IO::FileIOBase::GetDirectInstance()->FindFiles(searchDirectory.c_str(), pattern.c_str(), [&](const char* filePath) -> bool AZ::IO::FileIOBase::GetDirectInstance()->FindFiles(searchDirectory.c_str(), pattern.c_str(), [&](const char* filePath) -> bool
{ {
AZ::IO::FileDesc fileDesc; AZ::IO::FileDesc fileDesc;
AZStd::string filePathEntry{filePath};
AZStd::string fullFilePath;
AZ::StringFunc::Path::GetFullFileName(filePath, fullFilePath);
if (AZ::IO::FileIOBase::GetDirectInstance()->IsDirectory(filePath)) if (AZ::IO::FileIOBase::GetDirectInstance()->IsDirectory(filePath))
{ {
@ -135,9 +133,8 @@ namespace AZ::IO
fileDesc.tAccess = fileDesc.tWrite; fileDesc.tAccess = fileDesc.tWrite;
fileDesc.tCreate = fileDesc.tWrite; fileDesc.tCreate = fileDesc.tWrite;
} }
[[maybe_unused]] auto result = m_mapFiles.emplace(AZStd::move(fullFilePath), fileDesc); [[maybe_unused]] auto result = m_mapFiles.emplace(AZStd::move(filePathEntry), fileDesc);
AZ_Assert(result.second, "Failed to insert FindData entry for %s", fullFilePath.c_str()); AZ_Assert(result.second, "Failed to insert FindData entry for filePath %s", filePath);
return true; return true;
}); });
} }
@ -273,7 +270,9 @@ namespace AZ::IO
} }
auto pakFileIter = m_mapFiles.begin(); auto pakFileIter = m_mapFiles.begin();
fileIterator.m_filename = pakFileIter->first; AZStd::string fullFilePath;
AZ::StringFunc::Path::GetFullFileName(pakFileIter->first.c_str(), fullFilePath);
fileIterator.m_filename = AZStd::move(fullFilePath);
fileIterator.m_fileDesc = pakFileIter->second; fileIterator.m_fileDesc = pakFileIter->second;
fileIterator.m_lastFetchValid = true; fileIterator.m_lastFetchValid = true;

2
Code/Framework/AzFramework/AzFramework/Physics/Ragdoll.h
Unescape Escape View File

@ -102,7 +102,7 @@ namespace Physics
/// Is the ragdoll currently simulated? /// Is the ragdoll currently simulated?
/// @result True in case the ragdoll is simulated, false if not. /// @result True in case the ragdoll is simulated, false if not.
virtual bool IsSimulated() = 0; virtual bool IsSimulated() const = 0;
/// Writes the state for all of the bodies in the ragdoll to the provided output. /// Writes the state for all of the bodies in the ragdoll to the provided output.
/// The caller owns the output state and can safely manipulate it without affecting the physics simulation. /// The caller owns the output state and can safely manipulate it without affecting the physics simulation.

2
Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h
Unescape Escape View File

@ -57,6 +57,6 @@ namespace AzToolsFramework
virtual void StartPlayInEditor() = 0; virtual void StartPlayInEditor() = 0;
virtual void StopPlayInEditor() = 0; virtual void StopPlayInEditor() = 0;
virtual void CreateNewLevelPrefab(AZStd::string_view filename) = 0; virtual void CreateNewLevelPrefab(AZStd::string_view filename, const AZStd::string& templateFilename) = 0;
}; };
} }

6
Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
Unescape Escape View File

@ -265,7 +265,7 @@ namespace AzToolsFramework
return false; return false;
} }
void PrefabEditorEntityOwnershipService::CreateNewLevelPrefab(AZStd::string_view filename) void PrefabEditorEntityOwnershipService::CreateNewLevelPrefab(AZStd::string_view filename, const AZStd::string& templateFilename)
{ {
AZ::IO::Path relativePath = m_loaderInterface->GetRelativePathToProject(filename); AZ::IO::Path relativePath = m_loaderInterface->GetRelativePathToProject(filename);
AzToolsFramework::Prefab::TemplateId templateId = m_prefabSystemComponent->GetTemplateIdFromFilePath(relativePath); AzToolsFramework::Prefab::TemplateId templateId = m_prefabSystemComponent->GetTemplateIdFromFilePath(relativePath);
@ -276,7 +276,7 @@ namespace AzToolsFramework
AZ::Data::AssetInfo assetInfo; AZ::Data::AssetInfo assetInfo;
bool sourceInfoFound = false; bool sourceInfoFound = false;
AzToolsFramework::AssetSystemRequestBus::BroadcastResult( AzToolsFramework::AssetSystemRequestBus::BroadcastResult(
sourceInfoFound, &AzToolsFramework::AssetSystemRequestBus::Events::GetSourceInfoBySourcePath, DefaultLevelTemplateName, sourceInfoFound, &AzToolsFramework::AssetSystemRequestBus::Events::GetSourceInfoBySourcePath, templateFilename.c_str(),
assetInfo, watchFolder); assetInfo, watchFolder);
if (sourceInfoFound) if (sourceInfoFound)
@ -292,7 +292,7 @@ namespace AzToolsFramework
levelDefaultDom.CopyFrom(dom, levelDefaultDom.GetAllocator()); levelDefaultDom.CopyFrom(dom, levelDefaultDom.GetAllocator());
Prefab::PrefabDomPath sourcePath("/Source"); Prefab::PrefabDomPath sourcePath("/Source");
sourcePath.Set(levelDefaultDom, assetInfo.m_relativePath.c_str()); sourcePath.Set(levelDefaultDom, relativePath.c_str());
templateId = m_prefabSystemComponent->AddTemplate(relativePath, AZStd::move(levelDefaultDom)); templateId = m_prefabSystemComponent->AddTemplate(relativePath, AZStd::move(levelDefaultDom));
} }

4
Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.h
Unescape Escape View File

@ -170,7 +170,7 @@ namespace AzToolsFramework
void StartPlayInEditor() override; void StartPlayInEditor() override;
void StopPlayInEditor() override; void StopPlayInEditor() override;
void CreateNewLevelPrefab(AZStd::string_view filename) override; void CreateNewLevelPrefab(AZStd::string_view filename, const AZStd::string& templateFilename) override;
protected: protected:
@ -218,7 +218,5 @@ namespace AzToolsFramework
Prefab::PrefabLoaderInterface* m_loaderInterface; Prefab::PrefabLoaderInterface* m_loaderInterface;
AzFramework::EntityContextId m_entityContextId; AzFramework::EntityContextId m_entityContextId;
AZ::SerializeContext m_serializeContext; AZ::SerializeContext m_serializeContext;
static inline constexpr const char* DefaultLevelTemplateName = "Prefabs/Default_Level.prefab";
}; };
} }

2
Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LineSegmentSelectionManipulator.cpp
Unescape Escape View File

@ -31,7 +31,7 @@ namespace AzToolsFramework
rayProportion, lineSegmentProportion, worldClosestPositionRay, worldClosestPositionLineSegment); rayProportion, lineSegmentProportion, worldClosestPositionRay, worldClosestPositionLineSegment);
AZ::Transform worldFromLocalNormalized = worldFromLocal; AZ::Transform worldFromLocalNormalized = worldFromLocal;
const AZ::Vector3 scale = worldFromLocalNormalized.ExtractScale() * nonUniformScale; const AZ::Vector3 scale = worldFromLocalNormalized.ExtractUniformScale() * nonUniformScale;
const AZ::Transform localFromWorldNormalized = worldFromLocalNormalized.GetInverse(); const AZ::Transform localFromWorldNormalized = worldFromLocalNormalized.GetInverse();
return { (localFromWorldNormalized.TransformPoint(worldClosestPositionLineSegment)) / scale }; return { (localFromWorldNormalized.TransformPoint(worldClosestPositionLineSegment)) / scale };

2
Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/LinearManipulator.cpp
Unescape Escape View File

@ -59,7 +59,7 @@ namespace AzToolsFramework
? CalculateSnappedOffset(localTransform.GetTranslation(), axis, gridSize * scaleRecip) ? CalculateSnappedOffset(localTransform.GetTranslation(), axis, gridSize * scaleRecip)
: AZ::Vector3::CreateZero(); : AZ::Vector3::CreateZero();
const AZ::Vector3 localScale = localTransform.GetScale(); const AZ::Vector3 localScale = AZ::Vector3(localTransform.GetUniformScale());
const AZ::Quaternion localRotation = QuaternionFromTransformNoScaling(localTransform); const AZ::Quaternion localRotation = QuaternionFromTransformNoScaling(localTransform);
// calculate scale amount to snap, to align to round scale value // calculate scale amount to snap, to align to round scale value
const AZ::Vector3 scaleSnapOffset = snapping && !gridSnapAction.m_localSnapping const AZ::Vector3 scaleSnapOffset = snapping && !gridSnapAction.m_localSnapping

2
Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSnapping.h
Unescape Escape View File

@ -113,7 +113,7 @@ namespace AzToolsFramework
/// noise in the value returned when dealing with values far from the origin. /// noise in the value returned when dealing with values far from the origin.
inline float ScaleReciprocal(const AZ::Transform& transform) inline float ScaleReciprocal(const AZ::Transform& transform)
{ {
return Round3(transform.GetScale().GetReciprocal().GetMinElement()); return Round3(1.0f / transform.GetUniformScale());
} }
/// Find the reciprocal of the non-uniform scale. /// Find the reciprocal of the non-uniform scale.

2
Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/ManipulatorSpace.cpp
Unescape Escape View File

@ -39,7 +39,7 @@ namespace AzToolsFramework
AZ::Transform result; AZ::Transform result;
result.SetRotation(m_space.GetRotation() * localTransform.GetRotation()); result.SetRotation(m_space.GetRotation() * localTransform.GetRotation());
result.SetTranslation(m_space.TransformPoint(m_nonUniformScale * localTransform.GetTranslation())); result.SetTranslation(m_space.TransformPoint(m_nonUniformScale * localTransform.GetTranslation()));
result.SetScale(m_space.GetScale() * localTransform.GetScale()); result.SetScale(m_space.GetScale() * localTransform.GetUniformScale());
return result; return result;
} }

39
Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
Unescape Escape View File

@ -809,14 +809,12 @@ namespace AzToolsFramework
EntityIdManipulators& entityIdManipulators, EntityIdManipulators& entityIdManipulators,
OptionalFrame& pivotOverrideFrame, OptionalFrame& pivotOverrideFrame,
ViewportInteraction::KeyboardModifiers& prevModifiers, ViewportInteraction::KeyboardModifiers& prevModifiers,
bool& transformChangedInternally, SpaceCluster spaceCluster) bool& transformChangedInternally, const AZStd::optional<ReferenceFrame> spaceLock)
{ {
AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework); AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzToolsFramework);
entityIdManipulators.m_manipulators->SetLocalPosition(action.LocalPosition()); entityIdManipulators.m_manipulators->SetLocalPosition(action.LocalPosition());
const ReferenceFrame referenceFrame = spaceCluster.m_spaceLock ? spaceCluster.m_currentSpace : ReferenceFrameFromModifiers(action.m_modifiers);
if (action.m_modifiers.Ctrl()) if (action.m_modifiers.Ctrl())
{ {
// moving with ctrl - setting override // moving with ctrl - setting override
@ -826,6 +824,8 @@ namespace AzToolsFramework
} }
else else
{ {
const ReferenceFrame referenceFrame = spaceLock.value_or(ReferenceFrameFromModifiers(action.m_modifiers));
// note: used for parent and world depending on the current reference frame // note: used for parent and world depending on the current reference frame
const auto pivotOrientation = const auto pivotOrientation =
ETCS::CalculateSelectionPivotOrientation( ETCS::CalculateSelectionPivotOrientation(
@ -1298,7 +1298,7 @@ namespace AzToolsFramework
{ {
UpdateTranslationManipulator( UpdateTranslationManipulator(
action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators, m_pivotOverrideFrame, prevModifiers, action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators, m_pivotOverrideFrame, prevModifiers,
m_transformChangedInternally, m_spaceCluster); m_transformChangedInternally, m_spaceCluster.m_spaceLock);
}); });
translationManipulators->InstallLinearManipulatorMouseUpCallback( translationManipulators->InstallLinearManipulatorMouseUpCallback(
@ -1329,7 +1329,7 @@ namespace AzToolsFramework
{ {
UpdateTranslationManipulator( UpdateTranslationManipulator(
action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators, m_pivotOverrideFrame, prevModifiers, action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators, m_pivotOverrideFrame, prevModifiers,
m_transformChangedInternally, m_spaceCluster); m_transformChangedInternally, m_spaceCluster.m_spaceLock);
}); });
translationManipulators->InstallPlanarManipulatorMouseUpCallback( translationManipulators->InstallPlanarManipulatorMouseUpCallback(
@ -1359,7 +1359,7 @@ namespace AzToolsFramework
{ {
UpdateTranslationManipulator( UpdateTranslationManipulator(
action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators, m_pivotOverrideFrame, prevModifiers, action, manipulatorEntityIds->m_entityIds, m_entityIdManipulators, m_pivotOverrideFrame, prevModifiers,
m_transformChangedInternally, m_spaceCluster); m_transformChangedInternally, m_spaceCluster.m_spaceLock);
}); });
translationManipulators->InstallSurfaceManipulatorMouseUpCallback( translationManipulators->InstallSurfaceManipulatorMouseUpCallback(
@ -1437,8 +1437,7 @@ namespace AzToolsFramework
[this, prevModifiers, sharedRotationState] [this, prevModifiers, sharedRotationState]
(const AngularManipulator::Action& action) mutable -> void (const AngularManipulator::Action& action) mutable -> void
{ {
const ReferenceFrame referenceFrame = m_spaceCluster.m_spaceLock ? m_spaceCluster.m_currentSpace : ReferenceFrameFromModifiers(action.m_modifiers); const ReferenceFrame referenceFrame = m_spaceCluster.m_spaceLock.value_or(ReferenceFrameFromModifiers(action.m_modifiers));
const AZ::Quaternion manipulatorOrientation = action.m_start.m_rotation * action.m_current.m_delta; const AZ::Quaternion manipulatorOrientation = action.m_start.m_rotation * action.m_current.m_delta;
// store the pivot override frame when positioning the manipulator manually (ctrl) // store the pivot override frame when positioning the manipulator manually (ctrl)
// so we don't lose the orientation when adding/removing entities from the selection // so we don't lose the orientation when adding/removing entities from the selection
@ -2605,40 +2604,37 @@ namespace AzToolsFramework
if (buttonId == m_spaceCluster.m_localButtonId) if (buttonId == m_spaceCluster.m_localButtonId)
{ {
// Unlock // Unlock
if (m_spaceCluster.m_spaceLock && m_spaceCluster.m_currentSpace == ReferenceFrame::Local) if (m_spaceCluster.m_spaceLock.has_value() && m_spaceCluster.m_spaceLock.value() == ReferenceFrame::Local)
{ {
m_spaceCluster.m_spaceLock = false; m_spaceCluster.m_spaceLock = AZStd::nullopt;
} }
else else
{ {
m_spaceCluster.m_spaceLock = true; m_spaceCluster.m_spaceLock = ReferenceFrame::Local;
m_spaceCluster.m_currentSpace = ReferenceFrame::Local;
} }
} }
else if (buttonId == m_spaceCluster.m_parentButtonId) else if (buttonId == m_spaceCluster.m_parentButtonId)
{ {
// Unlock // Unlock
if (m_spaceCluster.m_spaceLock && m_spaceCluster.m_currentSpace == ReferenceFrame::Parent) if (m_spaceCluster.m_spaceLock.has_value() && m_spaceCluster.m_spaceLock.value() == ReferenceFrame::Parent)
{ {
m_spaceCluster.m_spaceLock = false; m_spaceCluster.m_spaceLock = AZStd::nullopt;
} }
else else
{ {
m_spaceCluster.m_spaceLock = true; m_spaceCluster.m_spaceLock = ReferenceFrame::Parent;
m_spaceCluster.m_currentSpace = ReferenceFrame::Parent;
} }
} }
else if (buttonId == m_spaceCluster.m_worldButtonId) else if (buttonId == m_spaceCluster.m_worldButtonId)
{ {
// Unlock // Unlock
if (m_spaceCluster.m_spaceLock && m_spaceCluster.m_currentSpace == ReferenceFrame::World) if (m_spaceCluster.m_spaceLock.has_value() && m_spaceCluster.m_spaceLock.value() == ReferenceFrame::World)
{ {
m_spaceCluster.m_spaceLock = false; m_spaceCluster.m_spaceLock = AZStd::nullopt;
} }
else else
{ {
m_spaceCluster.m_spaceLock = true; m_spaceCluster.m_spaceLock = ReferenceFrame::World;
m_spaceCluster.m_currentSpace = ReferenceFrame::World;
} }
} }
}; };
@ -3361,8 +3357,7 @@ namespace AzToolsFramework
ViewportInteraction::BuildMouseButtons( ViewportInteraction::BuildMouseButtons(
QGuiApplication::mouseButtons()), m_boxSelect.Active()); QGuiApplication::mouseButtons()), m_boxSelect.Active());
const ReferenceFrame referenceFrame = const ReferenceFrame referenceFrame = m_spaceCluster.m_spaceLock.value_or(ReferenceFrameFromModifiers(modifiers));
m_spaceCluster.m_spaceLock ? m_spaceCluster.m_currentSpace : ReferenceFrameFromModifiers(modifiers);
UpdateSpaceCluster(referenceFrame); UpdateSpaceCluster(referenceFrame);

26
Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h
Unescape Escape View File

@ -106,15 +106,20 @@ namespace AzToolsFramework
World, //!< World space (space aligned to world axes - identity). World, //!< World space (space aligned to world axes - identity).
}; };
//! Grouping of viewport ui related state for controlling the current reference space of the Editor.
struct SpaceCluster struct SpaceCluster
{ {
ViewportUi::ClusterId m_spaceClusterId; SpaceCluster() = default;
ViewportUi::ButtonId m_localButtonId; // disable copying and moving (implicit)
ViewportUi::ButtonId m_parentButtonId; SpaceCluster(const SpaceCluster&) = delete;
ViewportUi::ButtonId m_worldButtonId; SpaceCluster& operator=(const SpaceCluster&) = delete;
AZ::Event<ViewportUi::ButtonId>::Handler m_spaceSelectionHandler;
ReferenceFrame m_currentSpace = ReferenceFrame::Parent; ViewportUi::ClusterId m_spaceClusterId; //!< The id identifying the reference space cluster.
bool m_spaceLock = false; ViewportUi::ButtonId m_localButtonId; //!< Local reference space button id.
ViewportUi::ButtonId m_parentButtonId; //!< Parent reference space button id.
ViewportUi::ButtonId m_worldButtonId; //!< World reference space button id.
AZ::Event<ViewportUi::ButtonId>::Handler m_spaceSelectionHandler; //!< Callback for when a space cluster button is pressed.
AZStd::optional<ReferenceFrame> m_spaceLock; //!< Locked reference frame to use if set.
}; };
//! Entity selection/interaction handling. //! Entity selection/interaction handling.
@ -265,6 +270,9 @@ namespace AzToolsFramework
void SetEntityLocalScale(AZ::EntityId entityId, float localScale); void SetEntityLocalScale(AZ::EntityId entityId, float localScale);
void SetEntityLocalRotation(AZ::EntityId entityId, const AZ::Vector3& localRotation); void SetEntityLocalRotation(AZ::EntityId entityId, const AZ::Vector3& localRotation);
// Responsible for keeping the space cluster in sync with the current reference frame.
void UpdateSpaceCluster(ReferenceFrame referenceFrame);
AZ::EntityId m_hoveredEntityId; //!< What EntityId is the mouse currently hovering over (if any). AZ::EntityId m_hoveredEntityId; //!< What EntityId is the mouse currently hovering over (if any).
AZ::EntityId m_cachedEntityIdUnderCursor; //!< Store the EntityId on each mouse move for use in Display. AZ::EntityId m_cachedEntityIdUnderCursor; //!< Store the EntityId on each mouse move for use in Display.
AZ::EntityId m_editorCameraComponentEntityId; //!< The EditorCameraComponent EntityId if it is set. AZ::EntityId m_editorCameraComponentEntityId; //!< The EditorCameraComponent EntityId if it is set.
@ -297,9 +305,7 @@ namespace AzToolsFramework
AZ::Event<ViewportUi::ButtonId>::Handler m_transformModeSelectionHandler; //!< Event handler for the Viewport UI cluster. AZ::Event<ViewportUi::ButtonId>::Handler m_transformModeSelectionHandler; //!< Event handler for the Viewport UI cluster.
AzFramework::ClickDetector m_clickDetector; //!< Detect different types of mouse click. AzFramework::ClickDetector m_clickDetector; //!< Detect different types of mouse click.
AzFramework::CursorState m_cursorState; //!< Track the mouse position and delta movement each frame. AzFramework::CursorState m_cursorState; //!< Track the mouse position and delta movement each frame.
SpaceCluster m_spaceCluster; //!< Related viewport ui state for controlling the current reference space.
SpaceCluster m_spaceCluster;
void UpdateSpaceCluster(ReferenceFrame referenceFrame);
}; };
//! The ETCS (EntityTransformComponentSelection) namespace contains functions and data used exclusively by //! The ETCS (EntityTransformComponentSelection) namespace contains functions and data used exclusively by

1
Code/Sandbox/Editor/CMakeLists.txt
Unescape Escape View File

@ -173,6 +173,7 @@ ly_add_target(
RUNTIME_DEPENDENCIES RUNTIME_DEPENDENCIES
Legacy::CrySystem Legacy::CrySystem
Legacy::EditorLib Legacy::EditorLib
ProjectManager
) )
ly_add_translations( ly_add_translations(
TARGETS Editor TARGETS Editor

2
Code/Sandbox/Editor/CryEdit.cpp
Unescape Escape View File

@ -3111,7 +3111,7 @@ CCryEditApp::ECreateLevelResult CCryEditApp::CreateLevel(const QString& levelNam
auto* service = AZ::Interface<AzToolsFramework::PrefabEditorEntityOwnershipInterface>::Get(); auto* service = AZ::Interface<AzToolsFramework::PrefabEditorEntityOwnershipInterface>::Get();
if (service) if (service)
{ {
service->CreateNewLevelPrefab((const char*)fullyQualifiedLevelName.toUtf8()); service->CreateNewLevelPrefab(fullyQualifiedLevelName.toUtf8().constData(), DefaultLevelTemplateName);
} }
} }

2
Code/Sandbox/Editor/CryEdit.h
Unescape Escape View File

@ -358,6 +358,8 @@ AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
private: private:
static inline constexpr const char* DefaultLevelTemplateName = "Prefabs/Default_Level.prefab";
struct PythonOutputHandler; struct PythonOutputHandler;
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
AZStd::shared_ptr<PythonOutputHandler> m_pythonOutputHandler; AZStd::shared_ptr<PythonOutputHandler> m_pythonOutputHandler;

4
Code/Sandbox/Editor/res/o3de_editor.ico
Unescape Escape View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:c042fce57915fc749abc7b37de765fd697c3c4d7de045a3d44805aa0ce29901a oid sha256:d717f77fe01f45df934a61bbc215e5322447d21e16f3cebcf2a02f148178f266
size 107016 size 106449

5
Code/Sandbox/Plugins/EditorAssetImporter/AssetImporterPlugin.cpp
Unescape Escape View File

@ -14,6 +14,7 @@
#include <AssetImporterPlugin.h> #include <AssetImporterPlugin.h>
#include <AssetImporterWindow.h> #include <AssetImporterWindow.h>
#include <QtViewPaneManager.h> #include <QtViewPaneManager.h>
#include <SceneAPI/SceneCore/Events/AssetImportRequest.h>
#include <SceneAPI/SceneCore/Utilities/Reporting.h> #include <SceneAPI/SceneCore/Utilities/Reporting.h>
#include <LyViewPaneNames.h> #include <LyViewPaneNames.h>
#include <AzToolsFramework/API/ToolsApplicationAPI.h> #include <AzToolsFramework/API/ToolsApplicationAPI.h>
@ -37,6 +38,10 @@ AssetImporterPlugin::AssetImporterPlugin(IEditor* editor)
opt.showInMenu = false; // this view pane is used to display scene settings, but the user never opens it directly through the Tools menu opt.showInMenu = false; // this view pane is used to display scene settings, but the user never opens it directly through the Tools menu
opt.saveKeyName = "Scene Settings (PREVIEW)"; // user settings for this pane were originally saved with PREVIEW, so ensure that's how they are loaded as well, even after the PREVIEW is removed from the name opt.saveKeyName = "Scene Settings (PREVIEW)"; // user settings for this pane were originally saved with PREVIEW, so ensure that's how they are loaded as well, even after the PREVIEW is removed from the name
AzToolsFramework::RegisterViewPane<AssetImporterWindow>(m_toolName.c_str(), LyViewPane::CategoryTools, opt); AzToolsFramework::RegisterViewPane<AssetImporterWindow>(m_toolName.c_str(), LyViewPane::CategoryTools, opt);
AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
&AzToolsFramework::ToolsApplicationRequests::CreateAndAddEntityFromComponentTags,
AZStd::vector<AZ::Crc32>({ AZ::SceneAPI::Events::AssetImportRequest::GetAssetImportRequestComponentTag() }), "AssetImportersEntity");
} }
void AssetImporterPlugin::Release() void AssetImporterPlugin::Release()

3
Code/Tools/AssetProcessor/native/utilities/ApplicationManager.cpp
Unescape Escape View File

@ -622,13 +622,14 @@ bool ApplicationManager::Activate()
{ {
if (!AssetUtilities::ComputeAssetRoot(m_systemRoot)) if (!AssetUtilities::ComputeAssetRoot(m_systemRoot))
{ {
AZ_Error(AssetProcessor::ConsoleChannel, false, "Unable to compute the asset root for the project, this application cannot launch until this is fixed.");
return false; return false;
} }
auto projectName = AssetUtilities::ComputeProjectName(); auto projectName = AssetUtilities::ComputeProjectName();
if (projectName.isEmpty()) if (projectName.isEmpty())
{ {
AZ_Error(AssetProcessor::ConsoleChannel, false, "Unable to detect name of current game project. Is bootstrap.cfg appropriately configured?"); AZ_Error(AssetProcessor::ConsoleChannel, false, "Unable to detect name of current game project. Configure your game project name to launch this application.");
return false; return false;
} }

8
Code/Tools/AssetProcessor/native/utilities/ApplicationManagerBase.cpp
Unescape Escape View File

@ -1191,6 +1191,7 @@ bool ApplicationManagerBase::Activate()
QDir projectCache; QDir projectCache;
if (!AssetUtilities::ComputeProjectCacheRoot(projectCache)) if (!AssetUtilities::ComputeProjectCacheRoot(projectCache))
{ {
AZ_Error("AssetProcessor", false, "Could not compute project cache root, please configure your project correctly to launch Asset Processor.");
return false; return false;
} }
@ -1200,22 +1201,27 @@ bool ApplicationManagerBase::Activate()
// Shutdown if the disk has less than 128MB of free space // Shutdown if the disk has less than 128MB of free space
if (!CheckSufficientDiskSpace(projectCache.absolutePath(), 128 * 1024 * 1024, true)) if (!CheckSufficientDiskSpace(projectCache.absolutePath(), 128 * 1024 * 1024, true))
{ {
// CheckSufficientDiskSpace reports an error if disk space is low.
return false; return false;
} }
bool appInited = InitApplicationServer(); bool appInited = InitApplicationServer();
if (!appInited) if (!appInited)
{ {
AZ_Error(
"AssetProcessor", false, "InitApplicationServer failed, something internal to Asset Processor has failed, please report this to support if you encounter this error.");
return false; return false;
} }
if (!InitAssetDatabase()) if (!InitAssetDatabase())
{ {
// AssetDatabaseConnection::OpenDatabase reports any errors it encounters.
return false; return false;
} }
if (!ApplicationManager::Activate()) if (!ApplicationManager::Activate())
{ {
// ApplicationManager::Activate() reports any errors it encounters.
return false; return false;
} }
@ -1230,6 +1236,7 @@ bool ApplicationManagerBase::Activate()
m_isCurrentlyLoadingGems = true; m_isCurrentlyLoadingGems = true;
if (!ActivateModules()) if (!ActivateModules())
{ {
// ActivateModules reports any errors it encounters.
m_isCurrentlyLoadingGems = false; m_isCurrentlyLoadingGems = false;
return false; return false;
} }
@ -1299,6 +1306,7 @@ bool ApplicationManagerBase::Activate()
{ {
if (!m_applicationServer->startListening()) if (!m_applicationServer->startListening())
{ {
// startListening reports any errors it encounters.
return false; return false;
} }
} }

4
Code/Tools/ProjectManager/Resources/o3de_editor.ico
Unescape Escape View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:c042fce57915fc749abc7b37de765fd697c3c4d7de045a3d44805aa0ce29901a oid sha256:d717f77fe01f45df934a61bbc215e5322447d21e16f3cebcf2a02f148178f266
size 107016 size 106449

22
Code/Tools/SceneAPI/FbxSceneBuilder/DllMain.cpp
Unescape Escape View File

@ -38,21 +38,8 @@ namespace AZ
{ {
namespace FbxSceneBuilder namespace FbxSceneBuilder
{ {
static AZ::SceneAPI::FbxSceneImporter::FbxImportRequestHandler* g_fbxImporter = nullptr;
static AZStd::vector<AZ::ComponentDescriptor*> g_componentDescriptors; static AZStd::vector<AZ::ComponentDescriptor*> g_componentDescriptors;
void Initialize()
{
// Currently it's still needed to explicitly create an instance of this instead of letting
// it be a normal component. This is because ResourceCompilerScene needs to return
// the list of available extensions before it can start the application.
if (!g_fbxImporter)
{
g_fbxImporter = aznew AZ::SceneAPI::FbxSceneImporter::FbxImportRequestHandler();
g_fbxImporter->Activate();
}
}
void Reflect(AZ::SerializeContext* /*context*/) void Reflect(AZ::SerializeContext* /*context*/)
{ {
// Descriptor registration is done in Reflect instead of Initialize because the ResourceCompilerScene initializes the libraries before // Descriptor registration is done in Reflect instead of Initialize because the ResourceCompilerScene initializes the libraries before
@ -64,6 +51,7 @@ namespace AZ
{ {
// Global importer and behavior // Global importer and behavior
g_componentDescriptors.push_back(FbxSceneBuilder::FbxImporter::CreateDescriptor()); g_componentDescriptors.push_back(FbxSceneBuilder::FbxImporter::CreateDescriptor());
g_componentDescriptors.push_back(FbxSceneImporter::FbxImportRequestHandler::CreateDescriptor());
// Node and attribute importers // Node and attribute importers
g_componentDescriptors.push_back(AssImpBitangentStreamImporter::CreateDescriptor()); g_componentDescriptors.push_back(AssImpBitangentStreamImporter::CreateDescriptor());
@ -110,13 +98,6 @@ namespace AZ
g_componentDescriptors.clear(); g_componentDescriptors.clear();
g_componentDescriptors.shrink_to_fit(); g_componentDescriptors.shrink_to_fit();
} }
if (g_fbxImporter)
{
g_fbxImporter->Deactivate();
delete g_fbxImporter;
g_fbxImporter = nullptr;
}
} }
} // namespace FbxSceneBuilder } // namespace FbxSceneBuilder
} // namespace SceneAPI } // namespace SceneAPI
@ -125,7 +106,6 @@ namespace AZ
extern "C" AZ_DLL_EXPORT void InitializeDynamicModule(void* env) extern "C" AZ_DLL_EXPORT void InitializeDynamicModule(void* env)
{ {
AZ::Environment::Attach(static_cast<AZ::EnvironmentInstance>(env)); AZ::Environment::Attach(static_cast<AZ::EnvironmentInstance>(env));
AZ::SceneAPI::FbxSceneBuilder::Initialize();
} }
extern "C" AZ_DLL_EXPORT void Reflect(AZ::SerializeContext* context) extern "C" AZ_DLL_EXPORT void Reflect(AZ::SerializeContext* context)
{ {

44
Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.cpp
Unescape Escape View File

@ -10,12 +10,16 @@
* *
*/ */
#include <AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h>
#include <AzCore/Serialization/EditContextConstants.inl>
#include <AzCore/Serialization/SerializeContext.h> #include <AzCore/Serialization/SerializeContext.h>
#include <AzFramework/StringFunc/StringFunc.h> #include <AzCore/Serialization/Json/JsonSerialization.h>
#include <AzCore/Settings/SettingsRegistry.h>
#include <AzCore/StringFunc/StringFunc.h>
#include <SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h>
#include <SceneAPI/SceneCore/Containers/Scene.h> #include <SceneAPI/SceneCore/Containers/Scene.h>
#include <SceneAPI/SceneCore/Events/CallProcessorBus.h> #include <SceneAPI/SceneCore/Events/CallProcessorBus.h>
#include <SceneAPI/SceneCore/Events/ImportEventContext.h> #include <SceneAPI/SceneCore/Events/ImportEventContext.h>
#include <SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h>
namespace AZ namespace AZ
{ {
@ -23,10 +27,23 @@ namespace AZ
{ {
namespace FbxSceneImporter namespace FbxSceneImporter
{ {
const char* FbxImportRequestHandler::s_extension = ".fbx"; void SceneImporterSettings::Reflect(AZ::ReflectContext* context)
{
if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context); serializeContext)
{
serializeContext->Class<SceneImporterSettings>()
->Version(2)
->Field("SupportedFileTypeExtensions", &SceneImporterSettings::m_supportedFileTypeExtensions);
}
}
void FbxImportRequestHandler::Activate() void FbxImportRequestHandler::Activate()
{ {
if (auto* settingsRegistry = AZ::SettingsRegistry::Get())
{
settingsRegistry->GetObject(m_settings, "/O3DE/SceneAPI/AssetImporter");
}
BusConnect(); BusConnect();
} }
@ -37,21 +54,31 @@ namespace AZ
void FbxImportRequestHandler::Reflect(ReflectContext* context) void FbxImportRequestHandler::Reflect(ReflectContext* context)
{ {
SceneImporterSettings::Reflect(context);
SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context); SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
if (serializeContext) if (serializeContext)
{ {
serializeContext->Class<FbxImportRequestHandler, SceneCore::BehaviorComponent>()->Version(1); serializeContext->Class<FbxImportRequestHandler, AZ::Component>()->Version(1)->Attribute(
AZ::Edit::Attributes::SystemComponentTags,
AZStd::vector<AZ::Crc32>(
{AssetBuilderSDK::ComponentTags::AssetBuilder,
AssetImportRequest::GetAssetImportRequestComponentTag()}));
} }
} }
void FbxImportRequestHandler::GetSupportedFileExtensions(AZStd::unordered_set<AZStd::string>& extensions) void FbxImportRequestHandler::GetSupportedFileExtensions(AZStd::unordered_set<AZStd::string>& extensions)
{ {
extensions.insert(s_extension); extensions.insert(m_settings.m_supportedFileTypeExtensions.begin(), m_settings.m_supportedFileTypeExtensions.end());
} }
Events::LoadingResult FbxImportRequestHandler::LoadAsset(Containers::Scene& scene, const AZStd::string& path, const Uuid& guid, [[maybe_unused]] RequestingApplication requester) Events::LoadingResult FbxImportRequestHandler::LoadAsset(Containers::Scene& scene, const AZStd::string& path, const Uuid& guid, [[maybe_unused]] RequestingApplication requester)
{ {
if (!AzFramework::StringFunc::Path::IsExtension(path.c_str(), s_extension)) AZStd::string extension;
StringFunc::Path::GetExtension(path.c_str(), extension);
if (!m_settings.m_supportedFileTypeExtensions.contains(extension))
{ {
return Events::LoadingResult::Ignored; return Events::LoadingResult::Ignored;
} }
@ -73,6 +100,11 @@ namespace AZ
return Events::LoadingResult::AssetFailure; return Events::LoadingResult::AssetFailure;
} }
} }
void FbxImportRequestHandler::GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided)
{
provided.emplace_back(AZ_CRC_CE("AssetImportRequestHandler"));
}
} // namespace Import } // namespace Import
} // namespace SceneAPI } // namespace SceneAPI
} // namespace AZ } // namespace AZ

20
Code/Tools/SceneAPI/FbxSceneBuilder/FbxImportRequestHandler.h
Unescape Escape View File

@ -21,12 +21,21 @@ namespace AZ
{ {
namespace FbxSceneImporter namespace FbxSceneImporter
{ {
struct SceneImporterSettings
{
AZ_TYPE_INFO(SceneImporterSettings, "{8BB6C7AD-BF99-44DC-9DA1-E7AD3F03DC10}");
static void Reflect(AZ::ReflectContext* context);
AZStd::unordered_set<AZStd::string> m_supportedFileTypeExtensions;
};
class FbxImportRequestHandler class FbxImportRequestHandler
: public SceneCore::BehaviorComponent : public AZ::Component
, public Events::AssetImportRequestBus::Handler , public Events::AssetImportRequestBus::Handler
{ {
public: public:
AZ_COMPONENT(FbxImportRequestHandler, "{9F4B189C-0A96-4F44-A5F0-E087FF1561F8}", SceneCore::BehaviorComponent); AZ_COMPONENT(FbxImportRequestHandler, "{9F4B189C-0A96-4F44-A5F0-E087FF1561F8}");
~FbxImportRequestHandler() override = default; ~FbxImportRequestHandler() override = default;
@ -38,8 +47,13 @@ namespace AZ
Events::LoadingResult LoadAsset(Containers::Scene& scene, const AZStd::string& path, const Uuid& guid, Events::LoadingResult LoadAsset(Containers::Scene& scene, const AZStd::string& path, const Uuid& guid,
RequestingApplication requester) override; RequestingApplication requester) override;
static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided);
private: private:
static const char* s_extension;
SceneImporterSettings m_settings;
static constexpr const char* SettingsFilename = "AssetImporterSettings.json";
}; };
} // namespace FbxSceneImporter } // namespace FbxSceneImporter
} // namespace SceneAPI } // namespace SceneAPI

2
Code/Tools/SceneAPI/FbxSceneBuilder/Importers/AssImpMeshImporter.cpp
Unescape Escape View File

@ -37,7 +37,7 @@ namespace AZ
SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context); SerializeContext* serializeContext = azrtti_cast<SerializeContext*>(context);
if (serializeContext) if (serializeContext)
{ {
serializeContext->Class<AssImpMeshImporter, SceneCore::LoadingComponent>()->Version(1); serializeContext->Class<AssImpMeshImporter, SceneCore::LoadingComponent>()->Version(2);
} }
} }

5
Code/Tools/SceneAPI/SceneCore/Events/AssetImportRequest.h
Unescape Escape View File

@ -71,6 +71,11 @@ namespace AZ
static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple; static const AZ::EBusHandlerPolicy HandlerPolicy = AZ::EBusHandlerPolicy::Multiple;
using MutexType = AZStd::recursive_mutex; using MutexType = AZStd::recursive_mutex;
static AZ::Crc32 GetAssetImportRequestComponentTag()
{
return AZ_CRC_CE("AssetImportRequest");
}
virtual ~AssetImportRequest() = 0; virtual ~AssetImportRequest() = 0;
//! Fills the given list with all available file extensions, excluding the extension for the manifest. //! Fills the given list with all available file extensions, excluding the extension for the manifest.

4
Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.cpp
Unescape Escape View File

@ -738,7 +738,7 @@ namespace AZ
} }
else if (platformIdentifier == "mac") else if (platformIdentifier == "mac")
{ {
platformId = AzFramework::PlatformId::MAC; platformId = AzFramework::PlatformId::MAC_ID;
} }
else if (platformIdentifier == "android") else if (platformIdentifier == "android")
{ {
@ -790,7 +790,7 @@ namespace AZ
} }
else if (platform == "mac") else if (platform == "mac")
{ {
platformId = AzFramework::PlatformId::MAC; platformId = AzFramework::PlatformId::MAC_ID;
} }
else if (platform == "android") else if (platform == "android")
{ {

2
Gems/Atom/Feature/Common/Code/Source/Decals/DecalFeatureProcessor.cpp
Unescape Escape View File

@ -279,7 +279,7 @@ namespace AZ
if (handle.IsValid()) if (handle.IsValid())
{ {
Quaternion orientation = world.GetRotation(); Quaternion orientation = world.GetRotation();
Vector3 scale = world.GetScale() * nonUniformScale; Vector3 scale = world.GetUniformScale() * nonUniformScale;
SetDecalHalfSize(handle, scale); SetDecalHalfSize(handle, scale);
SetDecalPosition(handle, world.GetTranslation()); SetDecalPosition(handle, world.GetTranslation());

2
Gems/Atom/Feature/Common/Code/Source/Decals/DecalTextureArrayFeatureProcessor.cpp
Unescape Escape View File

@ -285,7 +285,7 @@ namespace AZ
{ {
if (handle.IsValid()) if (handle.IsValid())
{ {
SetDecalHalfSize(handle, nonUniformScale * world.GetScale()); SetDecalHalfSize(handle, nonUniformScale * world.GetUniformScale());
SetDecalPosition(handle, world.GetTranslation()); SetDecalPosition(handle, world.GetTranslation());
SetDecalOrientation(handle, world.GetRotation()); SetDecalOrientation(handle, world.GetRotation());

12
Gems/Atom/Feature/Common/Code/Source/ReflectionProbe/ReflectionProbe.cpp
Unescape Escape View File

@ -209,7 +209,7 @@ namespace AZ
void ReflectionProbe::SetTransform(const AZ::Transform& transform) void ReflectionProbe::SetTransform(const AZ::Transform& transform)
{ {
// retrieve previous scale and revert the scale on the inner/outer extents // retrieve previous scale and revert the scale on the inner/outer extents
AZ::Vector3 previousScale = m_transform.GetScale(); float previousScale = m_transform.GetUniformScale();
m_outerExtents /= previousScale; m_outerExtents /= previousScale;
m_innerExtents /= previousScale; m_innerExtents /= previousScale;
@ -218,12 +218,12 @@ namespace AZ
// avoid scaling the visualization sphere // avoid scaling the visualization sphere
AZ::Transform visualizationTransform = m_transform; AZ::Transform visualizationTransform = m_transform;
visualizationTransform.ExtractScale(); visualizationTransform.ExtractUniformScale();
m_meshFeatureProcessor->SetTransform(m_visualizationMeshHandle, visualizationTransform); m_meshFeatureProcessor->SetTransform(m_visualizationMeshHandle, visualizationTransform);
// update the inner/outer extents with the new scale // update the inner/outer extents with the new scale
m_outerExtents *= m_transform.GetScale(); m_outerExtents *= m_transform.GetUniformScale();
m_innerExtents *= m_transform.GetScale(); m_innerExtents *= m_transform.GetUniformScale();
m_outerAabbWs = Aabb::CreateCenterHalfExtents(m_transform.GetTranslation(), m_outerExtents / 2.0f); m_outerAabbWs = Aabb::CreateCenterHalfExtents(m_transform.GetTranslation(), m_outerExtents / 2.0f);
m_innerAabbWs = Aabb::CreateCenterHalfExtents(m_transform.GetTranslation(), m_innerExtents / 2.0f); m_innerAabbWs = Aabb::CreateCenterHalfExtents(m_transform.GetTranslation(), m_innerExtents / 2.0f);
@ -232,14 +232,14 @@ namespace AZ
void ReflectionProbe::SetOuterExtents(const AZ::Vector3& outerExtents) void ReflectionProbe::SetOuterExtents(const AZ::Vector3& outerExtents)
{ {
m_outerExtents = outerExtents * m_transform.GetScale(); m_outerExtents = outerExtents * m_transform.GetUniformScale();
m_outerAabbWs = Aabb::CreateCenterHalfExtents(m_transform.GetTranslation(), m_outerExtents / 2.0f); m_outerAabbWs = Aabb::CreateCenterHalfExtents(m_transform.GetTranslation(), m_outerExtents / 2.0f);
m_updateSrg = true; m_updateSrg = true;
} }
void ReflectionProbe::SetInnerExtents(const AZ::Vector3& innerExtents) void ReflectionProbe::SetInnerExtents(const AZ::Vector3& innerExtents)
{ {
m_innerExtents = innerExtents * m_transform.GetScale(); m_innerExtents = innerExtents * m_transform.GetUniformScale();
m_innerAabbWs = Aabb::CreateCenterHalfExtents(m_transform.GetTranslation(), m_innerExtents / 2.0f); m_innerAabbWs = Aabb::CreateCenterHalfExtents(m_transform.GetTranslation(), m_innerExtents / 2.0f);
m_updateSrg = true; m_updateSrg = true;
} }

32
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.cpp
Unescape Escape View File

@ -21,18 +21,42 @@ namespace AZ
{ {
namespace Render namespace Render
{ {
bool EditorAttachmentComponentVersionConverter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
{
if (classElement.GetVersion() < 2)
{
float uniformScaleOffset = 1.0f;
int scaleElementIndex = classElement.FindElement(AZ_CRC_CE("Scale Offset"));
if (scaleElementIndex != -1)
{
AZ::Vector3 oldScaleValue = AZ::Vector3::CreateOne();
AZ::SerializeContext::DataElementNode& dataElementNode = classElement.GetSubElement(scaleElementIndex);
if (dataElementNode.GetData<AZ::Vector3>(oldScaleValue))
{
uniformScaleOffset = oldScaleValue.GetMaxElement();
}
classElement.RemoveElement(scaleElementIndex);
}
classElement.AddElementWithData(context, "Uniform Scale Offset", uniformScaleOffset);
}
return true;
}
void EditorAttachmentComponent::Reflect(AZ::ReflectContext* context) void EditorAttachmentComponent::Reflect(AZ::ReflectContext* context)
{ {
AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context); AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(context);
if (serializeContext) if (serializeContext)
{ {
serializeContext->Class<EditorAttachmentComponent, EditorComponentBase>() serializeContext->Class<EditorAttachmentComponent, EditorComponentBase>()
->Version(1) ->Version(2, &EditorAttachmentComponentVersionConverter)
->Field("Target ID", &EditorAttachmentComponent::m_targetId) ->Field("Target ID", &EditorAttachmentComponent::m_targetId)
->Field("Target Bone Name", &EditorAttachmentComponent::m_targetBoneName) ->Field("Target Bone Name", &EditorAttachmentComponent::m_targetBoneName)
->Field("Position Offset", &EditorAttachmentComponent::m_positionOffset) ->Field("Position Offset", &EditorAttachmentComponent::m_positionOffset)
->Field("Rotation Offset", &EditorAttachmentComponent::m_rotationOffset) ->Field("Rotation Offset", &EditorAttachmentComponent::m_rotationOffset)
->Field("Scale Offset", &EditorAttachmentComponent::m_scaleOffset) ->Field("Uniform Scale Offset", &EditorAttachmentComponent::m_uniformScaleOffset)
->Field("Attached Initially", &EditorAttachmentComponent::m_attachedInitially) ->Field("Attached Initially", &EditorAttachmentComponent::m_attachedInitially)
->Field("Scale Source", &EditorAttachmentComponent::m_scaleSource); ->Field("Scale Source", &EditorAttachmentComponent::m_scaleSource);
@ -70,7 +94,7 @@ namespace AZ
->Attribute(AZ::Edit::Attributes::Min, -AZ::RadToDeg(AZ::Constants::TwoPi)) ->Attribute(AZ::Edit::Attributes::Min, -AZ::RadToDeg(AZ::Constants::TwoPi))
->Attribute(AZ::Edit::Attributes::Max, AZ::RadToDeg(AZ::Constants::TwoPi)) ->Attribute(AZ::Edit::Attributes::Max, AZ::RadToDeg(AZ::Constants::TwoPi))
->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnTargetOffsetChanged) ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnTargetOffsetChanged)
->DataElement(0, &EditorAttachmentComponent::m_scaleOffset, "Scale offset", "Local scale offset from target entity") ->DataElement(0, &EditorAttachmentComponent::m_uniformScaleOffset, "Scale offset", "Local scale offset from target entity")
->Attribute(AZ::Edit::Attributes::Step, 0.1f) ->Attribute(AZ::Edit::Attributes::Step, 0.1f)
->Attribute(AZ::Edit::Attributes::Min, 0.001f) ->Attribute(AZ::Edit::Attributes::Min, 0.001f)
->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnTargetOffsetChanged) ->Attribute(AZ::Edit::Attributes::ChangeNotify, &EditorAttachmentComponent::OnTargetOffsetChanged)
@ -128,7 +152,7 @@ namespace AZ
{ {
AZ::Transform offset = AZ::ConvertEulerDegreesToTransform(m_rotationOffset); AZ::Transform offset = AZ::ConvertEulerDegreesToTransform(m_rotationOffset);
offset.SetTranslation(m_positionOffset); offset.SetTranslation(m_positionOffset);
offset.MultiplyByScale(m_scaleOffset); offset.MultiplyByUniformScale(m_uniformScaleOffset);
return offset; return offset;
} }

2
Gems/AtomLyIntegration/CommonFeatures/Code/Source/Animation/EditorAttachmentComponent.h
Unescape Escape View File

@ -88,7 +88,7 @@ namespace AZ
AZ::Vector3 m_rotationOffset = AZ::Vector3::CreateZero(); AZ::Vector3 m_rotationOffset = AZ::Vector3::CreateZero();
//! Offset from target entity's scale. //! Offset from target entity's scale.
AZ::Vector3 m_scaleOffset = AZ::Vector3::CreateOne(); float m_uniformScaleOffset = 1.0f;
//! Observe scale information from the specified source. //! Observe scale information from the specified source.
AttachmentConfiguration::ScaleSource m_scaleSource = AttachmentConfiguration::ScaleSource::WorldScale; AttachmentConfiguration::ScaleSource m_scaleSource = AttachmentConfiguration::ScaleSource::WorldScale;

4
Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/QuadLightDelegate.cpp
Unescape Escape View File

@ -76,12 +76,12 @@ namespace AZ
float QuadLightDelegate::GetWidth() const float QuadLightDelegate::GetWidth() const
{ {
return m_shapeBus->GetQuadWidth() * GetTransform().GetScale().GetX(); return m_shapeBus->GetQuadWidth() * GetTransform().GetUniformScale();
} }
float QuadLightDelegate::GetHeight() const float QuadLightDelegate::GetHeight() const
{ {
return m_shapeBus->GetQuadHeight() * GetTransform().GetScale().GetY(); return m_shapeBus->GetQuadHeight() * GetTransform().GetUniformScale();
} }
} // namespace Render } // namespace Render

1
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/3rdParty/Python/.gitignore vendored
Unescape Escape View File

@ -0,0 +1 @@
pyside2-tools

5
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Editor/Scripts/bootstrap.py
Unescape Escape View File

@ -81,8 +81,8 @@ settings = config.get_config_settings()
if __name__ == '__main__': if __name__ == '__main__':
"""Run this file as main""" """Run this file as main"""
_G_DEBUG = True _G_DEBUG = False
_G_TEST_PYSIDE = True _G_TEST_PYSIDE = False
_config = get_dccsi_config() _config = get_dccsi_config()
_settings = config.get_config_settings() _settings = config.get_config_settings()
@ -121,7 +121,6 @@ if __name__ == '__main__':
import PySide2 import PySide2
_LOGGER.info(f'PySide2: {PySide2}') _LOGGER.info(f'PySide2: {PySide2}')
_LOGGER.info(f'QTFORPYTHON_PATH: {_settings.QTFORPYTHON_PATH}')
_LOGGER.info(f'LY_BIN_PATH: {_settings.LY_BIN_PATH}') _LOGGER.info(f'LY_BIN_PATH: {_settings.LY_BIN_PATH}')
_LOGGER.info(f'QT_PLUGIN_PATH: {_settings.QT_PLUGIN_PATH}') _LOGGER.info(f'QT_PLUGIN_PATH: {_settings.QT_PLUGIN_PATH}')
_LOGGER.info(f'QT_QPA_PLATFORM_PLUGIN_PATH: {_settings.QT_QPA_PLATFORM_PLUGIN_PATH}') _LOGGER.info(f'QT_QPA_PLATFORM_PLUGIN_PATH: {_settings.QT_QPA_PLATFORM_PLUGIN_PATH}')

13
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/Launchers/Windows/Env_Core.bat
Unescape Escape View File

@ -68,14 +68,17 @@ IF "%DEV_REL_PATH%"=="" (set DEV_REL_PATH=..\..\..\..)
echo DEV_REL_PATH = %DEV_REL_PATH% echo DEV_REL_PATH = %DEV_REL_PATH%
:: You can define the project name :: You can define the project name
:: if not defined we just use the DCCsi path as standin IF "%LY_PROJECT_NAME%"=="" (
IF "%LY_PROJECT%"=="" ( for %%a in (%CD%..\..\..) do set LY_PROJECT_NAME=%%~na
for %%a in (%CD%..\..\..) do set LY_PROJECT=%%~na
) )
echo LY_PROJECT_NAME = %LY_PROJECT_NAME%
:: if not defined we just use the DCCsi path as stand-in
IF "%LY_PROJECT%"=="" (set LY_PROJECT=%CD%)
echo LY_PROJECT = %LY_PROJECT% echo LY_PROJECT = %LY_PROJECT%
:: set up the default project path (dccsi) :: set up the default project path (dccsi)
:: if not set we lso use the DCCsi path as standin :: if not set we also use the DCCsi path as stand-in
CD /D ..\..\ CD /D ..\..\
IF "%LY_PROJECT_PATH%"=="" (set LY_PROJECT_PATH=%CD%) IF "%LY_PROJECT_PATH%"=="" (set LY_PROJECT_PATH=%CD%)
echo LY_PROJECT_PATH = %LY_PROJECT_PATH% echo LY_PROJECT_PATH = %LY_PROJECT_PATH%
@ -88,7 +91,7 @@ pushd %ABS_PATH%
:: Change to root Lumberyard dev dir :: Change to root Lumberyard dev dir
CD /d %LY_PROJECT_PATH%\%DEV_REL_PATH% CD /d %LY_PROJECT_PATH%\%DEV_REL_PATH%
set LY_DEV=%CD% IF "%LY_DEV%"=="" (set LY_DEV=%CD%)
echo LY_DEV = %LY_DEV% echo LY_DEV = %LY_DEV%
:: Restore original directory :: Restore original directory
popd popd

2
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/readme.txt
Unescape Escape View File

@ -29,7 +29,7 @@ A general goal of the DCCsi is be self-maintained, and to not taint the users in
So we boostrap additional access to site-packages in our userSetup.py: So we boostrap additional access to site-packages in our userSetup.py:
"C:\Depot\Lumberyard\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\SDK\Maya\Scripts\userSetup.py" "C:\Depot\Lumberyard\Gems\AtomLyIntegration\TechnicalArt\DccScriptingInterface\SDK\Maya\Scripts\userSetup.py"
We don't want users to have to install or use Python2.7 although with maya and possibly other dcc tools we don't have that control. Maya still is on Python2.7, so instead of forcing another install of python we can just use mayapy to manage extensions. We don't want users to have to install or use Python2.7 although with maya and possibly other dcc tools we don't have that control. Maya 2020 and earlier versions are still on Python2.7, so instead of forcing another install of python we can just use mayapy to manage extensions.
Pip may already be installed, you can check like so (your maya install path may be different): Pip may already be installed, you can check like so (your maya install path may be different):

18
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/SDK/Maya/requirements.txt
Unescape Escape View File

@ -4,14 +4,14 @@
# #
# pip-compile --generate-hashes requirements.txt # pip-compile --generate-hashes requirements.txt
# #
cachetools==3.1.1 \
--hash=sha256:428266a1c0d36dc5aca63a2d7c5942e88c2c898d72139fca0e97fdd2380517ae \
--hash=sha256:8ea2d3ce97850f31e4a08b0e2b5e6c34997d7216a9d2c98e0f3978630d4da69a
# via -r requirements.txt
certifi==2020.6.20 \ certifi==2020.6.20 \
--hash=sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3 \ --hash=sha256:5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3 \
--hash=sha256:8fc0819f1f30ba15bdb34cceffb9ef04d99f420f68eb75d901e9560b8749fc41 --hash=sha256:8fc0819f1f30ba15bdb34cceffb9ef04d99f420f68eb75d901e9560b8749fc41
# via -r requirements.txt # via -r requirements.txt
cachetools==3.1.1 \
--hash=sha256:428266a1c0d36dc5aca63a2d7c5942e88c2c898d72139fca0e97fdd2380517ae \
--hash=sha256:8ea2d3ce97850f31e4a08b0e2b5e6c34997d7216a9d2c98e0f3978630d4da69a
# via -r requirements.txt
click==7.1.2 \ click==7.1.2 \
--hash=sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a \ --hash=sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a \
--hash=sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc --hash=sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc
@ -68,6 +68,16 @@ unipath==1.1 \
--hash=sha256:09839adcc72e8a24d4f76d63656f30b5a1f721fc40c9bcd79d8c67bdd8b47dae \ --hash=sha256:09839adcc72e8a24d4f76d63656f30b5a1f721fc40c9bcd79d8c67bdd8b47dae \
--hash=sha256:e6257e508d8abbfb6ddd8ec357e33589f1f48b1599127f23b017124d90b0fff7 --hash=sha256:e6257e508d8abbfb6ddd8ec357e33589f1f48b1599127f23b017124d90b0fff7
# via -r requirements.txt # via -r requirements.txt
qdarkstyle==3.0.2 \
--hash=sha256:55d149cf5f40ee297397f1818e091118cefb855a4a9c5c38566c47acd2d8c7ae \
--hash=sha256:7c791535cc20b3cc1e8e1bf6b88dabe53cb0615983df702be83597e73ada2558
# via -r c:\temp\requirements.txt
qtpy==1.9.0 \
--hash=sha256:2db72c44b55d0fe1407be8fba35c838ad0d6d3bb81f23007886dc1fc0f459c8d \
--hash=sha256:fa0b8363b363e89b2a6f49eddc162a04c0699ae95e109a6be3bb145a913190ea
# via
# -r c:\temp\requirements.txt
# qdarkstyle
wincertstore==0.2 \ wincertstore==0.2 \
--hash=sha256:22d5eebb52df88a8d4014d5cf6d1b6c3a5d469e6c3b2e2854f3a003e48872356 \ --hash=sha256:22d5eebb52df88a8d4014d5cf6d1b6c3a5d469e6c3b2e2854f3a003e48872356 \
--hash=sha256:780bd1557c9185c15d9f4221ea7f905cb20b93f7151ca8ccaed9714dce4b327a --hash=sha256:780bd1557c9185c15d9f4221ea7f905cb20b93f7151ca8ccaed9714dce4b327a

8
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/__init__.py
Unescape Escape View File

@ -83,13 +83,13 @@ _LY_DEV = os.getenv(constants.ENVAR_LY_DEV,
check_stub='engine.json')) check_stub='engine.json'))
# get/set the project name # get/set the project name
_LY_PROJECT_TAG = os.getenv(constants.ENVAR_LY_PROJECT, _LY_PROJECT_NAME = os.getenv(constants.ENVAR_LY_PROJECT,
config_utils.get_current_project(_LY_DEV)) config_utils.get_current_project().name)
# project cache log dir path # project cache log dir path
_DCCSI_LOG_PATH = Path(os.getenv(constants.ENVAR_DCCSI_LOG_PATH, _DCCSI_LOG_PATH = Path(os.getenv(constants.ENVAR_DCCSI_LOG_PATH,
Path(_LY_DEV, Path(_LY_DEV,
_LY_PROJECT_TAG, _LY_PROJECT_NAME,
'Cache', 'Cache',
'pc', 'user', 'log', 'logs'))) 'pc', 'user', 'log', 'logs')))
@ -223,7 +223,7 @@ if _G_DEBUG:
_LOGGER.debug('MODULE_PATH: {}'.format(_MODULE_PATH)) _LOGGER.debug('MODULE_PATH: {}'.format(_MODULE_PATH))
_LOGGER.debug('LY_DEV_PATH: {}'.format(_LY_DEV)) _LOGGER.debug('LY_DEV_PATH: {}'.format(_LY_DEV))
_LOGGER.debug('DCCSI_PATH: {}'.format(_DCCSIG_PATH)) _LOGGER.debug('DCCSI_PATH: {}'.format(_DCCSIG_PATH))
_LOGGER.debug('LY_PROJECT_TAG: {}'.format(_LY_PROJECT_TAG)) _LOGGER.debug('LY_PROJECT_TAG: {}'.format(_LY_PROJECT_NAME))
_LOGGER.debug('DCCSI_LOG_PATH: {}'.format(_DCCSI_LOG_PATH)) _LOGGER.debug('DCCSI_LOG_PATH: {}'.format(_DCCSI_LOG_PATH))

38
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/config_utils.py
Unescape Escape View File

@ -137,8 +137,9 @@ def get_dccsi_config(dccsi_dirpath=return_stub_dir()):
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
def get_current_project(dev_folder=get_stub_check_path()): def get_current_project_cfg(dev_folder=get_stub_check_path()):
"""Uses regex in lumberyard Dev\\bootstrap.cfg to retreive project tag str""" """Uses regex in lumberyard Dev\\bootstrap.cfg to retreive project tag str
Note: boostrap.cfg will be deprecated. Don't use this method anymore."""
boostrap_filepath = Path(dev_folder, "bootstrap.cfg") boostrap_filepath = Path(dev_folder, "bootstrap.cfg")
if boostrap_filepath.exists(): if boostrap_filepath.exists():
bootstrap = open(str(boostrap_filepath), "r") bootstrap = open(str(boostrap_filepath), "r")
@ -153,6 +154,33 @@ def get_current_project(dev_folder=get_stub_check_path()):
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
# -------------------------------------------------------------------------
def get_current_project():
"""Gets o3de project via .o3de data in user directory"""
from azpy.constants import PATH_USER_O3DE_BOOTSTRAP
from collections import OrderedDict
from box import Box
bootstrap_box = None
try:
bootstrap_box = Box.from_json(filename=PATH_USER_O3DE_BOOTSTRAP,
encoding="utf-8",
errors="strict",
object_pairs_hook=OrderedDict)
except FileExistsError as e:
_LOGGER.error('File does not exist: {}'.format(PATH_USER_O3DE_BOOTSTRAP))
if bootstrap_box:
# this seems fairly hard coded - what if the data changes?
project_path=Path(bootstrap_box.Amazon.AzCore.Bootstrap.project_path)
return project_path.resolve()
else:
return None
# -------------------------------------------------------------------------
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
def bootstrap_dccsi_py_libs(dccsi_dirpath=return_stub_dir()): def bootstrap_dccsi_py_libs(dccsi_dirpath=return_stub_dir()):
"""Builds and adds local site dir libs based on py version""" """Builds and adds local site dir libs based on py version"""
@ -194,7 +222,11 @@ if __name__ == '__main__':
_LOGGER.info('LY_DEV: {}'.format(get_stub_check_path('engine.json'))) _LOGGER.info('LY_DEV: {}'.format(get_stub_check_path('engine.json')))
_LOGGER.info('LY_PROJECT: {}'.format(get_current_project(get_stub_check_path('bootstrap.cfg')))) # this will be deprecated and shouldn't work soon (returns None)
_LOGGER.info('LY_PROJECT: {}'.format(get_current_project_cfg(get_stub_check_path('bootstrap.cfg'))))
# new o3de version
_LOGGER.info('LY_PROJECT: {}'.format(get_current_project()))
_LOGGER.info('DCCSI_PYTHON_LIB_PATH: {}'.format(bootstrap_dccsi_py_libs(return_stub_dir('dccsi_stub')))) _LOGGER.info('DCCSI_PYTHON_LIB_PATH: {}'.format(bootstrap_dccsi_py_libs(return_stub_dir('dccsi_stub'))))

14
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/constants.py
Unescape Escape View File

@ -26,6 +26,7 @@ So we can make an update here once that is used elsewhere.
import os import os
import sys import sys
import site import site
from os.path import expanduser
import logging as _logging import logging as _logging
# for this module to perform standalone # for this module to perform standalone
@ -91,6 +92,9 @@ TAG_DIR_DCCSI_SDK = str('SDK')
TAG_DIR_LY_BUILD = str('build') TAG_DIR_LY_BUILD = str('build')
TAG_QT_PLUGIN_PATH = str('QT_PLUGIN_PATH') TAG_QT_PLUGIN_PATH = str('QT_PLUGIN_PATH')
TAG_O3DE_FOLDER = str('.o3de')
TAG_O3DE_BOOTSTRAP = str('bootstrap.setreg')
# filesystem markers, stub file names. # filesystem markers, stub file names.
STUB_LY_DEV = str('engine.json') STUB_LY_DEV = str('engine.json')
STUB_LY_ROOT_PROJECT = str('ly_project_stub') STUB_LY_ROOT_PROJECT = str('ly_project_stub')
@ -221,10 +225,17 @@ TAG_DEFAULT_PY = str('Launch_pyBASE.bat')
# config file stuff # config file stuff
FILENAME_DEFAULT_CONFIG = str('DCCSI_config.json') FILENAME_DEFAULT_CONFIG = str('DCCSI_config.json')
# new o3de related paths
PATH_USER_O3DE = str('{home}\\{o3de}').format(home=expanduser("~"),
o3de=TAG_O3DE_FOLDER)
PATH_USER_O3DE_REGISTRY = str('{0}\\Registry').format(PATH_USER_O3DE)
PATH_USER_O3DE_BOOTSTRAP = str('{reg}\\{file}').format(reg=PATH_USER_O3DE_REGISTRY,
file=TAG_O3DE_BOOTSTRAP)
#python and site-dir #python and site-dir
TAG_DCCSI_PY_VERSION_MAJOR = str(3) TAG_DCCSI_PY_VERSION_MAJOR = str(3)
TAG_DCCSI_PY_VERSION_MINOR = str(7) TAG_DCCSI_PY_VERSION_MINOR = str(7)
TAG_DCCSI_PY_VERSION_RELEASE = str(5) TAG_DCCSI_PY_VERSION_RELEASE = str(10)
TAG_PYTHON_EXE = str('python.exe') TAG_PYTHON_EXE = str('python.exe')
TAG_TOOLS_DIR = str('Tools\\Python') TAG_TOOLS_DIR = str('Tools\\Python')
TAG_PLATFORM = str('windows') TAG_PLATFORM = str('windows')
@ -314,6 +325,7 @@ if __name__ == '__main__':
_stash_dict['QTFORPYTHON_PATH'] = Path(PATH_QTFORPYTHON_PATH) _stash_dict['QTFORPYTHON_PATH'] = Path(PATH_QTFORPYTHON_PATH)
_stash_dict['QT_PLUGIN_PATH'] = Path(PATH_QT_PLUGIN_PATH) _stash_dict['QT_PLUGIN_PATH'] = Path(PATH_QT_PLUGIN_PATH)
_stash_dict['SAT_INSTALL_PATH'] = Path(PATH_SAT_INSTALL_PATH) _stash_dict['SAT_INSTALL_PATH'] = Path(PATH_SAT_INSTALL_PATH)
_stash_dict['PATH_USER_O3DE_BOOTSTRAP'] = Path(PATH_USER_O3DE_BOOTSTRAP)
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
# py 2 and 3 compatible iter # py 2 and 3 compatible iter

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_down.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:afe9402162c5b4527f12c863d389ee9d75b53a1069b7e177497beba389d91d35
size 525

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_down_disabled.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dc1e37e22cb75f616d6ada02cce006bae7fb1da515b15afea0fc98fcc542a092
size 547

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_down_focus.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c7c9c4c8c5bdc755cc026aa23044f546010c0d1e079ecba34ceb8f0eb9e44bde
size 530

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_down_pressed.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6111d15f1dc946742b00317bda789a5c625333f65a362f38931dabc50afb2067
size 518

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_left.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8ac79e7fbd6be51465e0b685dca32c1236f95ad76ab8c5877ec73d20a1de4365
size 546

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_left_disabled.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a86de88cf4ee32c352776caf46d5512d27679da8b571ea7e791287495fad4514
size 569

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_left_focus.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5c5b8427bd1497006b8adbcbc445f11b07ec388a3398fe2997f65bdc56f2644f
size 565

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_left_pressed.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:95ad920de52fd198f1af6d569917be20dc24a39dabdbe6c555c812d424bd9736
size 541

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_right.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cb5b2d9b40652764f074dcea9856d6748b0efeac57ef58f306efa999f4b411c1
size 518

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_right_disabled.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6a38dcd5b4078df430fa05780844af3e88e0a8e01c1fa910482e4c217354d728
size 553

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_right_focus.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5f60b2dfce514a6f558134b942f255ddf81ca3dc77b0d899a87f6d4cbac38e26
size 543

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_right_pressed.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:84379a7bd6ffa75692648c6fce328616e8a009d7ea3a83c2288f82ecce37e729
size 544

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_up.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d7ee7bfb0c60d4687c8a0dcc38a12ee7cacaa2cbb9eb0ae24faa82b992ade445
size 512

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_up_disabled.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:571b1afb9c2d7e01f56b75e1526dd0a3ffd49a60a4bcb7981ba34823b44a74c0
size 538

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_up_focus.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:45d805ec94b8144bf121ba74ee96dd27f2f8c0890b2eca5e78df39cb5266f94d
size 530

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/arrow_up_pressed.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d49428a947ea424fabedd5a08e1d78e0bc57dc8a2d5a231b5d9ec06977870f5a
size 518

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/base_icon.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d33b23ed0d8450413a2582d8f00bcb808d39f7e09ff394cee1669a4b7e79207e
size 1256

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/base_icon_disabled.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d33b23ed0d8450413a2582d8f00bcb808d39f7e09ff394cee1669a4b7e79207e
size 1256

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/base_icon_focus.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d33b23ed0d8450413a2582d8f00bcb808d39f7e09ff394cee1669a4b7e79207e
size 1256

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/base_icon_pressed.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d33b23ed0d8450413a2582d8f00bcb808d39f7e09ff394cee1669a4b7e79207e
size 1256

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_closed.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:56776b4655640d46eb1031b9c19c2341fdfe1201c774a84bc5c2801fbcfefc37
size 350

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_closed_disabled.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d48862b1c68efdf376551d1c35d5d3a68e2ce9809e7c2723f42ece7c77fca009
size 373

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_closed_focus.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:62cc47f4b7751e22ffe4b26289ecc632b4a2c4e5c33ac79864fcfb32398b1139
size 380

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_closed_pressed.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ad6e74b57c8876fa28c3a43d1a38369415790507d65d758ea3e77b796c401da2
size 372

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_end.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:63324c154ead46027729bcf307ba45fbeb5a8de3ec5e8cef55d315a84a087115
size 142

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_end_disabled.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8a8b091785c84d37de57aacb7fe5a9b854933cc94b9b6f1f6e0b155879c7d6d0
size 146

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_end_focus.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4f89a6b105df07325dcf7bdcea2165bb065dd99b648aa12ae4e0c6693e04d0a2
size 146

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_end_pressed.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:76f44758619badecf11b3b0d9914612e584ad750a695c942811fe215457b25be
size 146

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_line.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:50a35383d40b4e8a646931e4057cd25045f05a48208e2cb9d9935be76b53bf94
size 130

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_line_disabled.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ba7550922e9d244620f8f9ad76fe546d542764eba02378f81b188dec5fd7438a
size 134

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_line_focus.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:52bec8528e3c8edd583136d90a37f46bcb45e0d406fc0fb680a8b4d75cfeb731
size 134

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_line_pressed.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1b8d2c9a8593a52221c91d2a8c2d3cbd837e408a5f6d1dcad6f79328a13a3bcf
size 134

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_more.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5087f4f06a9718230e1aec2ba681f3432ecd2640a135b4e90c7b009188ec4c29
size 155

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_more_disabled.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dec80a2e8439a0787e10aee70a365e30b5d1f43c29e4c33989cc6cd2f5cac478
size 162

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_more_focus.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:39930fd3e240c9ad94d748d6cda73b2943682fc4825edd1240e882be18c06198
size 162

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_more_pressed.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0d07da719927b26db1c3087bbfe7203510fce077efe9e121935b3aefbb49b95d
size 162

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_open.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:05a1980b268f598ebb3520067679a8beb4fa3f00da9c87dd93be2642718ceb44
size 354

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_open_disabled.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:047c00f910dd279e871a6329ea533816d8b458063539b8efbe9949d7363996bf
size 375

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_open_focus.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6bc79f30e3fdc52ec30eb0e9c6b03d1538f7c8c7855033d24d5f993e8ceb9cc1
size 367

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/branch_open_pressed.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aa65cf58b8a02bf5f4142ad80de05aba868245c55a790af6ba0230bfd01a2a06
size 369

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_checked.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:95c1c1651a13f0562383087549a35a97bbb7899c7d3717d79d4624485b72bf9f
size 452

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_checked_disabled.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:80a1d02e6ac7e5d0439b2a077ab8cf82739853ce46ac1556d4035e3bba713242
size 467

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_checked_focus.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:64d5ed4d01a9778912b98c9147eb67431560acb5805d1d0832a765c441b9ed9b
size 441

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_checked_pressed.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f0ffa46106a643a71835056acce66ebe09745a9e6d91fac30ff1caf0589a6677
size 418

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_indeterminate.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8b291eb9180c0e27d1de6ff008ff4259b2c675a65efa94866a66c7c932fc1260
size 581

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_indeterminate_disabled.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8c7d3d64e8cb5e2f8bc6620b0d58492a56800fc78fc0229a5fa495d3a43987a1
size 614

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_indeterminate_focus.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:43d494685f5d2ed740b69f04fefe0e757626db94685ecc8f4411c6c68a626a5a
size 576

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_indeterminate_pressed.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7af182d82449663ac37955e45ccc3f8fc86d185649fa9bed24c10167351bd5ee
size 563

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_unchecked.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:232451d0bd9cf1d54c777862030b667cd5078f2f4ff387ec03c44d56eb207c03
size 397

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_unchecked_disabled.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7b54771eaad56ee45f8871248ee1c6b18035aa732f9e4e9257d008a73be04c25
size 386

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_unchecked_focus.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ae293d387fda8a89d68fc3f15db07ef084e3537a033d02351ff918cfcc82ea8a
size 394

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/checkbox_unchecked_pressed.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f8ccf5cb638a090f0e64f6d336e4c6312cfaf53971afd0f00cd16d0c0759f1b4
size 403

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_horizontal.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:256f010c3084112888189bcbea2995a37f8acbf12d61a4a261a94aca797cd964
size 117

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_horizontal_disabled.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:85522a94ec26125f65dcafc6158665f40ea570e4a08cbdfbbdf5f6772b887eb7
size 121

3
Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/azpy/shared/ui/resources/qdarkstyle/rc/line_horizontal_focus.png
Unescape Escape View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ae4766527d9e5a2226107ede231878118538e8be89f2dc2ac92b7c5a68ad0fc6
size 120

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save