Merge branch 'main' into non-uniform-scale-mesh

Code/CryEngine/Cry3DEngine/cvars.cpp

@@ -922,7 +922,7 @@ void CVars::Init()
         "Will not render CGFs past the given amount of drawcalls\n"
         "(<=0 off (default), >0 draw calls limit)");
 
-    REGISTER_CVAR(e_CheckOctreeObjectsBoxSize, 1, VF_NULL, "CryWarning for crazy sized COctreeNode m_objectsBoxes");
+    REGISTER_CVAR(e_CheckOctreeObjectsBoxSize, 1, VF_NULL, "Warning for crazy sized COctreeNode m_objectsBoxes");
     REGISTER_CVAR(e_DebugGeomPrep, 0, VF_NULL,  "enable logging of Geom preparation");
     DefineConstIntCVar(e_GeomCaches, 1, VF_NULL, "Activates drawing of geometry caches");
     REGISTER_CVAR(e_GeomCacheBufferSize, 128, VF_CHEAT, "Geometry cache stream buffer upper limit size in MB. Default: 128");

Code/CryEngine/CrySystem/AZCrySystemInitLogSink.cpp

@@ -35,7 +35,7 @@ namespace AZ
             }
 
             AZ::OSString msgBoxMessage;
-            msgBoxMessage.append("CrySystem could not initialize correctly for the following reason(s):");
+            msgBoxMessage.append("O3DE could not initialize correctly for the following reason(s):");
 
             for (const AZ::OSString& errMsg : m_errorStringsCollected)
             {
@@ -47,7 +47,7 @@ namespace AZ
             Trace::Output(nullptr, msgBoxMessage.c_str());
             Trace::Output(nullptr, "\n==================================================================\n");
 
-            EBUS_EVENT(AZ::NativeUI::NativeUIRequestBus, DisplayOkDialog, "CrySystem Initialization Failed", msgBoxMessage.c_str(), false);
+            EBUS_EVENT(AZ::NativeUI::NativeUIRequestBus, DisplayOkDialog, "O3DE Initialization Failed", msgBoxMessage.c_str(), false);
         }
     } // namespace Debug
 } // namespace AZ

Code/CryEngine/CrySystem/SystemWin32.cpp

@@ -605,7 +605,7 @@ void CSystem::DebugStats([[maybe_unused]] bool checkpoint, [[maybe_unused]] bool
     {
         if (!dbgmodules[i].handle)
         {
-            CryLogAlways("WARNING: <CrySystem> CSystem::DebugStats: NULL handle for %s", dbgmodules[i].name.c_str());
+            CryLogAlways("WARNING: CSystem::DebugStats: NULL handle for %s", dbgmodules[i].name.c_str());
             nolib++;
             continue;
         }
@@ -642,7 +642,7 @@ void CSystem::DebugStats([[maybe_unused]] bool checkpoint, [[maybe_unused]] bool
         }
         else
         {
-            CryLogAlways("WARNING: <CrySystem> CSystem::DebugStats: could not retrieve function from DLL %s", dbgmodules[i].name.c_str());
+            CryLogAlways("WARNING: CSystem::DebugStats: could not retrieve function from DLL %s", dbgmodules[i].name.c_str());
             nolib++;
         };
 #endif
@@ -1066,7 +1066,7 @@ void CSystem::FatalError(const char* format, ...)
 
     if (szSysErrorMessage)
     {
-        CryLogAlways("<CrySystem> Last System Error: %s", szSysErrorMessage);
+        CryLogAlways("Last System Error: %s", szSysErrorMessage);
     }
 
     if (GetUserCallback())

Code/Framework/AzCore/AzCore/Asset/AssetManager.cpp

@@ -1117,7 +1117,7 @@ namespace AZ
             return asset;
         }
 
-        void AssetManager::UpdateDebugStatus(AZ::Data::Asset<AZ::Data::AssetData> asset)
+        void AssetManager::UpdateDebugStatus(const AZ::Data::Asset<AZ::Data::AssetData>& asset)
         {
             if(!m_debugAssetEvents)
             {

Code/Framework/AzCore/AzCore/Asset/AssetManager.h

@@ -358,7 +358,7 @@ namespace AZ
 
             Asset<AssetData> GetAssetInternal(const AssetId& assetId, const AssetType& assetType, AssetLoadBehavior assetReferenceLoadBehavior, const AssetLoadParameters& loadParams = AssetLoadParameters{}, AssetInfo assetInfo = AssetInfo(), bool signalLoaded = false);
 
-            void UpdateDebugStatus(AZ::Data::Asset<AZ::Data::AssetData> asset);
+            void UpdateDebugStatus(const AZ::Data::Asset<AZ::Data::AssetData>& asset);
 
             /**
             * Gets a root asset and dependencies as individual async loads if necessary.

Code/Framework/AzCore/AzCore/Debug/EventTrace.h

@@ -42,9 +42,8 @@ namespace AZ
     }
 }
 
-#define AZ_TRACE_METHOD_NAME_CATEGORY(name, category) AZ::Debug::EventTrace::ScopedSlice AZ_JOIN(ScopedSlice__, __LINE__)(name, category);
-
 #ifdef AZ_PROFILE_TELEMETRY
+#   define AZ_TRACE_METHOD_NAME_CATEGORY(name, category) AZ::Debug::EventTrace::ScopedSlice AZ_JOIN(ScopedSlice__, __LINE__)(name, category);
 #   define AZ_TRACE_METHOD_NAME(name) \
         AZ_TRACE_METHOD_NAME_CATEGORY(name, "") \
         AZ_PROFILE_SCOPE(AZ::Debug::ProfileCategory::AzTrace, name)
@@ -53,6 +52,7 @@ namespace AZ
         AZ_TRACE_METHOD_NAME_CATEGORY(AZ_FUNCTION_SIGNATURE, "") \
         AZ_PROFILE_FUNCTION(AZ::Debug::ProfileCategory::AzTrace)
 #else
+#   define AZ_TRACE_METHOD_NAME_CATEGORY(name, category)
 #   define AZ_TRACE_METHOD_NAME(name) AZ_TRACE_METHOD_NAME_CATEGORY(name, "")
 #   define AZ_TRACE_METHOD() AZ_TRACE_METHOD_NAME(AZ_FUNCTION_SIGNATURE)
 #endif

Code/Framework/AzFramework/AzFramework/Asset/AssetCatalog.cpp

@@ -617,9 +617,9 @@ namespace AzFramework
             // won't free the mutex until the load is complete.
             // So instead, queue the notification until the next tick, so that it doesn't occur within the AssetCatalogRequestBus mutex, and also
             // so that the entire AssetCatalog initialization is complete.
-            AZ::TickBus::QueueFunction([catalogRegistryFile]()
+            AZ::TickBus::QueueFunction([catalogRegistryString = AZStd::string(catalogRegistryFile)]()
                 {
-                    AssetCatalogEventBus::Broadcast(&AssetCatalogEventBus::Events::OnCatalogLoaded, catalogRegistryFile);
+                    AssetCatalogEventBus::Broadcast(&AssetCatalogEventBus::Events::OnCatalogLoaded, catalogRegistryString.c_str());
                 });
         }
     }

Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/EditorContextMenu.cpp

@@ -65,7 +65,7 @@ namespace AzToolsFramework
 
                 if (!contextMenu.m_menu->isEmpty())
                 {
-                    contextMenu.m_menu->popup(QCursor::pos());
+                    contextMenu.m_menu->exec(QCursor::pos());
                 }
             }
         }

Code/LauncherUnified/Launcher.cpp

@@ -313,7 +313,7 @@ namespace O3DELauncher
                 return "Failed to initialize the CrySystem Interface";
 
             case ReturnCode::ErrCryEnvironment:
-                return "Failed to initialize the CryEngine global environment";
+                return "Failed to initialize the global environment";
 
             case ReturnCode::ErrAssetProccessor:
                 return "Failed to connect to AssetProcessor while the /Amazon/AzCore/Bootstrap/wait_for_connect value is 1\n."

Code/LauncherUnified/Platform/iOS/O3DEApplicationDelegate_iOS.mm

@@ -39,15 +39,15 @@ namespace
 }
 
 
-@interface LumberyardApplicationDelegate_iOS : NSObject<UIApplicationDelegate>
+@interface O3DEApplicationDelegate_iOS : NSObject<UIApplicationDelegate>
 {
 }
-@end    // LumberyardApplicationDelegate_iOS Interface
+@end    // O3DEApplicationDelegate_iOS Interface
 
-@implementation LumberyardApplicationDelegate_iOS
+@implementation O3DEApplicationDelegate_iOS
 
 
-- (int)runLumberyardApplication
+- (int)runO3DEApplication
 {
 #if AZ_TESTS_ENABLED
 
@@ -55,7 +55,7 @@ namespace
     return static_cast<int>(ReturnCode::ErrUnitTestNotSupported);
 
 #else
-    using namespace LumberyardLauncher;
+    using namespace O3DELauncher;
 
     PlatformMainInfo mainInfo;
     mainInfo.m_updateResourceLimits = IncreaseResourceLimits;
@@ -79,19 +79,19 @@ namespace
 #endif // AZ_TESTS_ENABLED
 }
 
-- (void)launchLumberyardApplication
+- (void)launchO3DEApplication
 {
-    const int exitCode = [self runLumberyardApplication];
+    const int exitCode = [self runO3DEApplication];
     exit(exitCode);
 }
 
 - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
 {
-    // prevent the lumberyard runtime from running when launched in a xctest environment, otherwise the
+    // prevent the o3de runtime from running when launched in a xctest environment, otherwise the
     // testing framework will kill the "app" due to the lengthy bootstrap process
     if ([[NSProcessInfo processInfo] environment][@"XCTestConfigurationFilePath"] == nil)
     {
-        [self performSelector:@selector(launchLumberyardApplication) withObject:nil afterDelay:0.0];
+        [self performSelector:@selector(launchO3DEApplication) withObject:nil afterDelay:0.0];
     }
     return YES;
 }
@@ -132,4 +132,4 @@ namespace
         &AzFramework::IosLifecycleEvents::Bus::Events::OnDidReceiveMemoryWarning);
 }
 
-@end // LumberyardApplicationDelegate_iOS Implementation
+@end // O3DEApplicationDelegate_iOS Implementation

Code/LauncherUnified/Platform/iOS/O3DEApplication_iOS.mm

@@ -16,12 +16,12 @@
 #include <AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h>
 
 
-@interface LumberyardApplication_iOS : UIApplication
+@interface O3DEApplication_iOS : UIApplication
 {
 }
-@end    // LumberyardApplication_iOS Interface
+@end    // O3DEApplication_iOS Interface
 
-@implementation LumberyardApplication_iOS
+@implementation O3DEApplication_iOS
 
 - (void)touchesBegan: (NSSet<UITouch*>*)touches withEvent: (UIEvent*)event
 {
@@ -65,4 +65,4 @@
     [self touchesEnded: touches withEvent: event];
 }
 
-@end // LumberyardApplication_iOS Implementation
+@end // O3DEApplication_iOS Implementation

Code/LauncherUnified/Platform/iOS/platform_ios_files.cmake

@@ -13,8 +13,8 @@ set(FILES
     Launcher_iOS.mm
     Launcher_Traits_iOS.h
     Launcher_Traits_Platform.h
-    LumberyardApplication_iOS.mm
-    LumberyardApplicationDelegate_iOS.mm
+    O3DEApplication_iOS.mm
+    O3DEApplicationDelegate_iOS.mm
     ../Common/Apple/Launcher_Apple.mm
     ../Common/Apple/Launcher_Apple.h
     ../Common/UnixLike/Launcher_UnixLike.cpp

Code/LauncherUnified/launcher_generator.cmake

@@ -18,6 +18,21 @@ foreach(project_name project_path IN ZIP_LISTS LY_PROJECTS_TARGET_NAME LY_PROJEC
     # If the project_path is relative, it is evaluated relative to the ${LY_ROOT_FOLDER}
     # Otherwise the the absolute project_path is returned with symlinks resolved
     file(REAL_PATH ${project_path} project_real_path BASE_DIRECTORY ${LY_ROOT_FOLDER})
+    if(NOT project_name)
+        if(NOT EXISTS ${project_real_path}/project.json)
+            message(FATAL_ERROR "The specified project path of ${project_real_path} does not contain a project.json file")
+        else()
+            # Add the project_name to global LY_PROJECTS_TARGET_NAME property
+            file(READ "${project_real_path}/project.json" project_json)
+            string(JSON project_name ERROR_VARIABLE json_error GET ${project_json} "project_name")
+            if(json_error)
+                message(FATAL_ERROR "There is an error reading the \"project_name\" key from the '${project_real_path}/project.json' file: ${json_error}")
+            endif()
+            message(WARNING "The project located at path ${project_real_path} has a valid \"project name\" of '${project_name}' read from it's project.json file."
+                " This indicates that the ${project_real_path}/CMakeLists.txt is not properly appending the \"project name\" "
+                "to the LY_PROJECTS_TARGET_NAME global property. Other configuration errors might occur")
+        endif()
+    endif()
     ################################################################################
     # Monolithic game
     ################################################################################

Code/Sandbox/Editor/CryEdit.cpp

@@ -5702,7 +5702,7 @@ extern "C" int AZ_DLL_EXPORT CryEditMain(int argc, char* argv[])
         int exitCode = 0;
 
         BOOL didCryEditStart = CCryEditApp::instance()->InitInstance();
-        AZ_Error("Editor", didCryEditStart, "CryEditor did not initialize correctly, and will close."
+        AZ_Error("Editor", didCryEditStart, "O3DE Editor did not initialize correctly, and will close."
             "\nThis could be because of incorrectly configured components, or missing required gems."
             "\nSee other errors for more details.");
 

Code/Sandbox/Editor/CryEditDoc.cpp

@@ -1931,7 +1931,7 @@ void CCryEditDoc::Fetch(const QString& holdName, const QString& relativeHoldPath
     if (!LoadXmlArchiveArray(arrXmlAr, holdFilename, holdPath))
     {
         QMessageBox::critical(QApplication::activeWindow(), "Error", "The temporary 'Hold' level failed to load successfully.  Your level might be corrupted, you should restart the Editor.", QMessageBox::Ok);
-        AZ_Error("CryEditDoc", false, "Fetch failed to load the Xml Archive");
+        AZ_Error("EditDoc", false, "Fetch failed to load the Xml Archive");
         return;
     }
 

Code/Sandbox/Editor/LegacyViewportCameraController.cpp

@@ -342,7 +342,6 @@ bool LegacyViewportCameraControllerInstance::HandleInputChannelEvent(const AzFra
                 m_inRotateMode = true;
             }
 
-            shouldConsumeEvent = true;
             shouldCaptureCursor = true;
         }
         else if (state == InputChannel::State::Ended)

Code/Sandbox/Editor/ViewManager.cpp

@@ -37,7 +37,7 @@
 #include <AzFramework/API/AtomActiveInterface.h>
 #include <AzCore/Console/IConsole.h>
 
-AZ_CVAR(bool, ed_useAtomNativeViewport, false, nullptr, AZ::ConsoleFunctorFlags::Null, "Use the new Atom-native Editor viewport (experimental, not yet stable");
+AZ_CVAR(bool, ed_useAtomNativeViewport, true, nullptr, AZ::ConsoleFunctorFlags::Null, "Use the new Atom-native Editor viewport (experimental, not yet stable");
 
 bool CViewManager::IsMultiViewportEnabled()
 {

Code/Sandbox/Editor/ViewportManipulatorController.cpp

@@ -21,8 +21,8 @@
 
 #include <QApplication>
 
-static const auto ManipulatorPriority = AzFramework::ViewportControllerPriority::Highest;
-static const auto InteractionPriority = AzFramework::ViewportControllerPriority::High;
+static const auto ManipulatorPriority = AzFramework::ViewportControllerPriority::High;
+static const auto InteractionPriority = AzFramework::ViewportControllerPriority::Low;
 
 namespace SandboxEditor
 {