Cry Legacy: the Lessening (#5961)

* Generic Cleanup Removals: * Unused cvars,member variables and defines * Windows media center edition support routines * CSystem - removed debug_GetCallStackRaw/GetRootWindowMessageHandler/ UnloadDLL/ShutdownModuleLibraries Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Fix CryMessageBox return values in Windows build Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove named selection group and a few smaller unused functionalities Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove ObjectManager export functionality + 2 deprecated functions Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove object legacy freeze/hide support from ObjectManager Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove ObjectManager duplicate name dection, as well as object renaming Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove ObjectManager serialization and selection callbacks Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * ObjectManager - remove MoveObjects/HitTestObject/EndEditParams and related members/functions Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove a bunch of unused clone related functionality + misc Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * ObjectManager - misc removals Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * ObjectManager - more removals Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove unused object selection/retrieval in ObjectManager and LoadObjects in ObjectLoader Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * CBaseObject - remove unused material layers mask support Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * More CBaseObject cleanups. Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * CBaseObject - remove SubObj functions and IMouseCreateCallback Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove unused procedural floor management, helper scale and tags. Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * CBaseObject - remove more unused methods. Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Removals in multiple places. CBaseObject - unused `OBJTYPE_DUMMY` flag removed, member `IsSameClass` CObjectArchive removed unused methods/members CObjectManager removed unused `Update` method Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * More removals IDisplayViewport - HitTestLine/GetGridStep/setHitcontext/ GetConstructionPlane Unused Cry_Matrix44 template specializations. Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * O3DE.exe Project-Centric "Open Editor" fix (#5852) * The O3DE.exe Open Editor button now attempts to open the Editor in the build directory of the project being opened. If their is no Editor within the build directory of the Project, it uses the Editor.exe in the current O3DE.exe executable directory if it exists Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Engine .gitignore now ignores the build directory if placed in the AutomatedTesting project Previously it was just ignoring a `[Bb]uild` directory if it was directly within the engine root. This change matches the behavior of the project templates. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Renamed the ProjectUtils GetEditorDirectory function to GetEditorExecutablePath Added a platform specific implementation for retrieving the path to the Editor executable in the GetEditorExectuablePath function. It first attempts to locate the Editor via checking the project build directory for an Editor executable before falling back to checking the binary directory of the currently running O3DE executable. Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * Correct the MacOS GetEditorExecutablePath to return the Editor path Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Adding missing C++20 std::erase implementations (#5735) There were already implementations for std::erase_if. This adds the counterpart AZStd::erase versions resolves #5734 Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * More removals and refactors `ShowMessage` and `CryMessageBox` return void now Simplify code in `CSystem::WarningV` Remove unused `CryGetTicksPerSec` Remove unused WinBase functionality Replace `nanosleep` call in WinBase with `std::this_thread::sleep_for` Remove unused Win32Wrapper routines Remove unused IFunctorBase.h and IEntityObjectListener.h Fix VectorAndArray.cpp compilation Use QMessageBox instead of CryMessageBox in the editor. Remove empty ArchiveVars platform specific files Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Fix test code. Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove an unused function Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * CBaseObject and undo description removals. Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * A bunch of removals * Remove IRenderNode * Remove editor's KDTree * Remove StatObjBus, InstanceStatObjEventBus::ReleaseData is redundant ( same functionality in the only available handler is triggered by `OnCryEditorCloseScene`) * Remove CExportManager::AddStatObj/AddMeshes/AddMesh, IExportManager::ExportSingleStatObj * Remove CIconManager/IIconManager::GetObject * Remove CBaseObject::IntersectRayMesh * Remove IIndexedMesh and related structs. * Unused IUndoObject::GetDescription and all derived implementations. * Unused CUndoBaseLibrary/CUndoBaseLibraryManager * Unused Matrix34_tpl typedefs * Legacy Xml classes cleanup Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * Remove unused `Vec3ToVector3D` helper Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> * fix - remove unused static variable Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com> Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-11-29 19:21:06 +01:00
parent a3835d8545
commit 56904d1799
115 changed files with 355 additions and 6354 deletions
@@ -53,10 +53,8 @@
 // Compiler traits ...
 #define AZ_TRAIT_COMPILER_DEFINE_AZSWNPRINTF_AS_SWPRINTF 1
 #define AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE 1
-#define AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE 0
 #define AZ_TRAIT_COMPILER_DEFINE_GETCURRENTPROCESSID 1
 #define AZ_TRAIT_COMPILER_DEFINE_REFGUID 0
-#define AZ_TRAIT_COMPILER_DEFINE_SASSERTDATA_TYPE 1
 #define AZ_TRAIT_COMPILER_DEFINE_WCSICMP 1
 #define AZ_TRAIT_COMPILER_INT64_T_IS_LONG 1
 #define AZ_TRAIT_COMPILER_OPTIMIZE_MISSING_DEFAULT_SWITCH_CASE 0
@@ -53,10 +53,8 @@
 // Compiler traits ...
 #define AZ_TRAIT_COMPILER_DEFINE_AZSWNPRINTF_AS_SWPRINTF 1
 #define AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE 1
-#define AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE 0
 #define AZ_TRAIT_COMPILER_DEFINE_GETCURRENTPROCESSID 1
 #define AZ_TRAIT_COMPILER_DEFINE_REFGUID 1
-#define AZ_TRAIT_COMPILER_DEFINE_SASSERTDATA_TYPE 1
 #define AZ_TRAIT_COMPILER_DEFINE_WCSICMP 0
 #define AZ_TRAIT_COMPILER_INT64_T_IS_LONG 1
 #define AZ_TRAIT_COMPILER_OPTIMIZE_MISSING_DEFAULT_SWITCH_CASE 1
@@ -53,10 +53,8 @@
 // Compiler traits ...
 #define AZ_TRAIT_COMPILER_DEFINE_AZSWNPRINTF_AS_SWPRINTF 1
 #define AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE 1
-#define AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE 1
 #define AZ_TRAIT_COMPILER_DEFINE_GETCURRENTPROCESSID 1
 #define AZ_TRAIT_COMPILER_DEFINE_REFGUID 1
-#define AZ_TRAIT_COMPILER_DEFINE_SASSERTDATA_TYPE 1
 #define AZ_TRAIT_COMPILER_DEFINE_WCSICMP 0
 #define AZ_TRAIT_COMPILER_INT64_T_IS_LONG 0
 #define AZ_TRAIT_COMPILER_OPTIMIZE_MISSING_DEFAULT_SWITCH_CASE 1
@@ -53,10 +53,8 @@
 // Compiler traits ...
 #define AZ_TRAIT_COMPILER_DEFINE_AZSWNPRINTF_AS_SWPRINTF 0
 #define AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE 0
-#define AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE 0
 #define AZ_TRAIT_COMPILER_DEFINE_GETCURRENTPROCESSID 0
 #define AZ_TRAIT_COMPILER_DEFINE_REFGUID 0
-#define AZ_TRAIT_COMPILER_DEFINE_SASSERTDATA_TYPE 0
 #define AZ_TRAIT_COMPILER_DEFINE_WCSICMP 0
 #define AZ_TRAIT_COMPILER_INT64_T_IS_LONG 0
 #define AZ_TRAIT_COMPILER_OPTIMIZE_MISSING_DEFAULT_SWITCH_CASE 1
@@ -53,10 +53,8 @@
 // Compiler traits ...
 #define AZ_TRAIT_COMPILER_DEFINE_AZSWNPRINTF_AS_SWPRINTF 1
 #define AZ_TRAIT_COMPILER_DEFINE_FS_ERRNO_TYPE 1
-#define AZ_TRAIT_COMPILER_DEFINE_FS_STAT_TYPE 1
 #define AZ_TRAIT_COMPILER_DEFINE_GETCURRENTPROCESSID 1
 #define AZ_TRAIT_COMPILER_DEFINE_REFGUID 1
-#define AZ_TRAIT_COMPILER_DEFINE_SASSERTDATA_TYPE 1
 #define AZ_TRAIT_COMPILER_DEFINE_WCSICMP 0
 #define AZ_TRAIT_COMPILER_INT64_T_IS_LONG 0
 #define AZ_TRAIT_COMPILER_OPTIMIZE_MISSING_DEFAULT_SWITCH_CASE 1
@@ -46,11 +46,6 @@ namespace AZ::IO
        "If set to 0, tells Archive to try to open the file on the file system first othewise check mounted paks.\n"
        "If set to 1, tells Archive to try to open the file in pak first, then go to file system.\n"
        "If set to 2, tells the Archive to only open files from the pak");
-    AZ_CVAR(int, sys_PakMessageInvalidFileAccess, ArchiveVars{}.nMessageInvalidFileAccess, nullptr, AZ::ConsoleFunctorFlags::Null,
-        "Message Box synchronous file access when in game");
-
-    AZ_CVAR(int, sys_PakWarnOnPakAccessFailures, ArchiveVars{}.nWarnOnPakAccessFails, nullptr, AZ::ConsoleFunctorFlags::Null,
-        "If 1, access failure for Paks is treated as a warning, if zero it is only a log message.");
    AZ_CVAR(int, sys_report_files_not_found_in_paks, 0, nullptr, AZ::ConsoleFunctorFlags::Null,
        "Reports when files are searched for in paks and not found. 1 = log, 2 = warning, 3 = error");
    AZ_CVAR(int32_t, az_archive_verbosity, 0, nullptr, AZ::ConsoleFunctorFlags::Null,
@@ -9,8 +9,6 @@

 #pragma once

-#include <AzFramework/Archive/ArchiveVars_Platform.h>
-
 namespace AZ::IO
 {
    enum class FileSearchPriority
@@ -39,25 +37,10 @@ namespace AZ::IO
 #else
        inline static constexpr bool IsReleaseConfig{};
 #endif
-        int nReadSlice{};
-        int nSaveTotalResourceList{};
-        int nSaveFastloadResourceList{};
-        int nSaveMenuCommonResourceList{};
        int nSaveLevelResourceList{};
-        int nValidateFileHashes{ IsReleaseConfig ? 0 : 1 };
-        int nUncachedStreamReads{ 1 };
-        int nInMemoryPerPakSizeLimit{ 6 }; // Limits in MB
-        int nTotalInMemoryPakSizeLimit{ 30 };
-        int nLoadCache{};
-        int nLoadModePaks{};
-        int nStreamCache{ STREAM_CACHE_DEFAULT };
        FileSearchPriority m_fileSearchPriority{ GetDefaultFileSearchPriority()};
        int nMessageInvalidFileAccess{};
        int nLogInvalidFileAccess{ IsReleaseConfig ? 0 : 1 };
-        int nDisableNonLevelRelatedPaks{ 1 };
-        int nWarnOnPakAccessFails{ 1 }; // Whether to treat failed pak access as a warning or log message
-        int nSetLogLevel{ 3 };
-        int nLogAllFileAccess{};

    };
 }
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#define STREAM_CACHE_DEFAULT 0
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzFramework/Archive/ArchiveVars_Android.h>
@@ -27,8 +27,6 @@ set(FILES
    AzFramework/Input/User/LocalUserId_Platform.h
    ../Common/Default/AzFramework/Input/User/LocalUserId_Default.h
    AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Android.cpp
-    AzFramework/Archive/ArchiveVars_Platform.h
-    AzFramework/Archive/ArchiveVars_Android.h
    AzFramework/Process/ProcessCommon.h
    AzFramework/Process/ProcessWatcher_Android.cpp
    AzFramework/Process/ProcessCommunicator_Android.cpp
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#define STREAM_CACHE_DEFAULT 0
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzFramework/Archive/ArchiveVars_Linux.h>
@@ -28,6 +28,4 @@ set(FILES
    AzFramework/Input/User/LocalUserId_Platform.h
    ../Common/Default/AzFramework/Input/User/LocalUserId_Default.h
    ../Common/Unimplemented/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Unimplemented.cpp
-    AzFramework/Archive/ArchiveVars_Platform.h
-    AzFramework/Archive/ArchiveVars_Linux.h
 )
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#define STREAM_CACHE_DEFAULT 0
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzFramework/Archive/ArchiveVars_Mac.h>
@@ -30,8 +30,6 @@ set(FILES
    AzFramework/Input/User/LocalUserId_Platform.h
    ../Common/Default/AzFramework/Input/User/LocalUserId_Default.h
    ../Common/Unimplemented/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Unimplemented.cpp
-    AzFramework/Archive/ArchiveVars_Platform.h
-    AzFramework/Archive/ArchiveVars_Mac.h
    ../Common/Apple/AzFramework/Utils/SystemUtilsApple.h
    ../Common/Apple/AzFramework/Utils/SystemUtilsApple.mm
 )
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzFramework/Archive/ArchiveVars_Windows.h>
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#define STREAM_CACHE_DEFAULT 0
@@ -32,6 +32,4 @@ set(FILES
    AzFramework/Input/User/LocalUserId_Platform.h
    ../Common/Default/AzFramework/Input/User/LocalUserId_Default.h
    ../Common/Unimplemented/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Unimplemented.cpp
-    AzFramework/Archive/ArchiveVars_Platform.h
-    AzFramework/Archive/ArchiveVars_Windows.h
 )
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#pragma once
-
-#include <AzFramework/Archive/ArchiveVars_iOS.h>
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#pragma once
-
-#define STREAM_CACHE_DEFAULT 0
@@ -27,8 +27,6 @@ set(FILES
    AzFramework/Input/User/LocalUserId_Platform.h
    ../Common/Default/AzFramework/Input/User/LocalUserId_Default.h
    ../Common/Apple/AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Apple.mm
-    AzFramework/Archive/ArchiveVars_Platform.h
-    AzFramework/Archive/ArchiveVars_iOS.h
    AzFramework/Process/ProcessCommon.h
    AzFramework/Process/ProcessWatcher_iOS.cpp
    AzFramework/Process/ProcessCommunicator_iOS.cpp
@@ -10,6 +10,7 @@

 #include <AzCore/base.h>
 #include <AzCore/EBus/EBus.h>
+#include <AzCore/Math/Vector2.h>

 class CVegetationMap;
 struct CVegetationInstance;