Commit Graph

997 Commits (development)

Author SHA1 Message Date
Nicholas Van Sickle a9c05372d5 API tweaks
- Use ref types
- Support using rapidjson::Value in lieu of rapidjson::Document
- Use the existing JSON comparison util function in tests

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Esteban Papp f062b563c8 Improving runtime and making the whole duration manageable
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 215cb9b52f Adds mulit-threaded tests
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp fb6e6e339f
Add CRC validator (#5857)
* Adds crc validation checks

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes invalid CRCs

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Changes test to smoke suite

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* excludes some test data from the validator

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* uses pathlib instead of os.path

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixes wrong path to test scripts

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Escape not needed

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp febaebc386 PR comment (NULL->nullptr)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Nicholas Van Sickle 5dbe9e387b Address some review feedback, remove DomBackendRegistry
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
lumberyard-employee-dm 879012b1ae
Added the --regset-file option for setreg file loading (#5768)
The SettingsRegistryMergeUtils.cpp now supports specifying a path to a JSON Merge Patch formated settings registry file via the --regset-file option.
The option supports specify an anchor key to merge the settings underneath that is separated from the filepath via "::"
Ex. `--regset-file="Registry/custom.setreg::/Custom/Anchor"`

An AZ::Console command of "sr_regset-file" has also been added to allow merging of a setting registry file as well.

closes #5767

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Scott Romero 12efc84632
[development] minor Profiler gem fixes (#5473)
Fixed incorrect frame boundary guess when loading a profile capture
Added some missing default initializers
Removed implicit dependency on Atom timing marker constants
Fixed issue with small visualizer viewport bounds when loading a saved capture

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
4 years ago
rgba16f 768a196b63
Add a way to set the vsync_interval CVar from code (#5813)
* Add a way to set the render vsync from code

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update change with PR feedback. Missing whitespace plus a comment on why the assignment is outside the value changed check

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
Mike Balfour c0fb80fd99
Workaround for Editor freeze. (#6004)
GHI bug https://github.com/o3de/o3de/issues/5866 describes a scenario in which the Editor freezes on 6-thread CPUs.  This occurs because the Job Manager ends up with only 2 threads.  The freeze occurs when the main thread spawns a culling job and blocks on it, a Mesh Feature Processor job spawns processing jobs and blocks on them, and a Material/ShaderVariant load queues an asset load and blocks on it.  No new jobs can get started, and the main thread can't continue to process the asset load, so it freezes.
This workaround boosts the minimum number of threads from 2 to 3 by default, which fixes this specific scenario.  The longer-term fix would be to fix any jobs that block on other jobs to no longer block, so that even 1 job thread would work correctly.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
4 years ago
lumberyard-employee-dm ca94e58399
Added SerializeContext Reflection of FixedMaxPath class (#4453)
* Added SerializeContext Reflection of FixedMaxPath class

Added UnitTest for validating path clas reflection

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the paths loaded during the serialization to use test path
separator

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Artur K 56904d1799
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>
4 years ago
Nicholas Van Sickle 5e4bdac2e1 Merge remote-tracking branch 'upstream/development' into nvsickle/GenericDomJson 4 years ago
Esteban Papp 160235e86f Removing commented code of different options for getting memory usage of a process
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
amzn-sean b882eddca8
fix dev break. AZStd::fixed_vector cannot be constexp error (#5995)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
lumberyard-employee-dm 97106f9e60
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>
4 years ago
Tom Hulton-Harrop 5bd751531d
Update return type for viewport screen functions (#5803)
* update return type for viewport screen functions

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add tests for AZ::Matrix3x4::CreateFromMatrix4x4 and add TransformPoint to Matrix3x4

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update NDC -> Ndc

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates following review feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates and improvements following PR feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add forward declaration of Matrix3x4 type

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update where forward declarations are defined for Matrix3x4

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
4 years ago
chcurran 30bcddc694 fixed unit testing code
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Esteban Papp 3273b7621d Fixes a recursive loop
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 35c1751694 simplification of code
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 1909d43dcc initial version ported from an old implementation
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
AMZN-koppersr 389f29f0e7 Performance improvement for fixed_vector
AZStd::fixed_vector had all its functions marked with constexpr, but this requires all member variables to be fully initialized. This meant that the internal array used to store elements always has to be fully initialized. This was done for trivial classes but not for non-trivial classes. As a result trivial classes always did a memset (or more optimized versions for smaller buffers) while the non-trivial version couldn't actually be stored in a constexpr variable. Since AZStd::fixed_vector is meant to be dynamic the choice was made to remove the constexpr from all non-static member functions in favor of avoiding the overhead of memset, which profiling showed was a considerable overhead depending on the reserved size. If a truly constexpr array is needed than AZStd::array is a better choice as that's designed to not by dynamic.

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
4 years ago
chcurran 205b2c27ee SC Editor serialization update in JSON
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Esteban Papp dbc5d7a8bc
Cherry-pick of Linux deb package to stabilization (#5778)
* Cherry-pick 49e8f35858

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Merging differences from development of other changes that need to be there for deb packaging

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Picks a needed change for the installer

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes warning in mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Takes version from environment if defined

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Do not pick up version if it is empty string since that will also break version comparison

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* creating temp directories if they dont exist

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removing a dependency to itself (Multiplayer.Builders is an alias of Multiplayer.Editor)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Filters which runtime dependencies are passed from private build dependencies to only those that are actual targets.
This avoids something like a "d3d12" private build dependency from being passed to the runtime dependencies

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Chris Galvan 6e14713ea6 Added property handler for SourceHandle type.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
amzn-mike af85060856
[SPEC-7644] Cherry Pick - ParallelDeepAssetReferences is failing intermittently (#5797)
* [SPEC-7644] ParallelDeepAssetReferences is failing intermittently (#5721)

* Fixed race condition caused by trying to handle asset ready event before asset container has finished filling out all the data structures.

Added check to only handle asset ready once init is complete
Added unit test to verify fix

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Re-enable test

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add missing space to error message

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add comment on sleep

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Collapse nested namespace

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Collapse nested namespace

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit 56900484fc)

# Conflicts:
#	Code/Framework/AzCore/AzCore/Asset/AssetContainer.cpp

* Fix indentation

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
Esteban Papp 49e8f35858
Creates a deb package (#5567)
* configure/generation working

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Generates deb package forLinux

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes to EngineFinder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* changes the owner of the installed folder so it is writable by the user

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* jenkins scripts

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes execution permission for scripts

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes wrong parameter to build for linux

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removal of clang parameters in build_config.json

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Simplifies and fixes build configs

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixes to EngineFinder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Adds linux deb package upload and small fixes/organization cleanup

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixes checksum generation

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Some more small fixes for reviewing

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Test if this space is necessary for cpack

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* More fixes for installer jobs

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Adding eval to variables that need to double-expand

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Removing unused variables being passed

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Do not remove symlink

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Use cmake_path for concatenating paths

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removing quotes so the variable expands

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* cleaned up some variables that have way too many ways to be passed

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Multiple fixes for Jenkins

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Cleanup/re-organization

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixes some temp variables so we can run cpack jenkins jobs locally

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Delays cmake download to install step
Cleanup on installer_windows.cmd, we already have the path to cpack (same as cmake, which is added to the path)
Some simplification in the windows installer generation, we now generate the same even if we dont upload

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes mac install

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* CPack can generate hashes for us
Defiine CPACK_OUTPUT_FILE_PREFIX to prevent the exe/msi from ending in the bin dir
Remove unnecessary generation of folder from 3rdPartyPacakges which fails when including from cpack

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* multiple fixes

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixes typo

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* more fixes

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes for linux/mac/windows (fixing discrepancies with Jenkins)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* uploads to S3 from the upload directory and fixes the latest upload

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Adds ERROR_VARIABLE to S3 upload to find a Jenkins issue

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* printing command invocation to try to figure out the errors

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Changes the hashing algorithm to sha256 and fixes the cmd used to call to pythojn

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* wrong path being passed in mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removes compiler parameters from a config job (after rebase)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* more fixes fro deb packaging job

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* small fix for fingerprint patching for latest

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Changing extension of public key and leaving better TODO places for code signing

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Removes sdl as a dependency, leaving it commented since it is needed for wwise

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixes runtime copy during install, makes it more consistent with regular runtime dependencies and optimizes copy when there is already an install

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* $ENV{DESTDIR} and CMAKE_INSTALL_PREFIX cannot be used in cmake_path because the CMAKE_INSTALL_PREFIX is absolute

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixing some runtime_dependencies optimizations, we cannot take size of a bundle

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes warning in mac for an unused variable

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes a variable that was being passed to fix qt frameworks

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* More fixes for Jenkins

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Updates email to use for maintainer to match certificate

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* make directory because in some cases the dependency is copied before the actual library and the directory has to be created

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fix for a new warning/error in linux

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* The sha file is created after the upload happens, so creating it

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* remove the size comparison for install since it stomps over the copy from the target and doesnt trigger stripping

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
amzn-mike 56900484fc
[SPEC-7644] ParallelDeepAssetReferences is failing intermittently (#5721)
* Fixed race condition caused by trying to handle asset ready event before asset container has finished filling out all the data structures.

Added check to only handle asset ready once init is complete
Added unit test to verify fix

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Re-enable test

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add missing space to error message

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add comment on sleep

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Collapse nested namespace

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Collapse nested namespace

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
lumberyard-employee-dm 9d22c98c26
Add support for configuring default Archive File Search Mode through a Cache Var (#5668)
* Renamed ArchiveLocationPriority enum to FileSearchPriority and made it a proper enum class

Added an ArchiveVars.cpp which checks the a new define: `LY_ARCHIVE_FILE_SEARCH_MODE_DEFAULT`
That define represents the default value to use for the Archive system search mode

Moved the FileSearchLocation enum to the ArchiveVars.h header

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the AssetBundleComponent to use AZ::IO::Path for level dirs

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added a LY_ARCHIVE_FILE_SEARCH_MODE cache variable

The Cache Variable default value is to Archive File Search Mode to PakOnly
in Release. This can be overridden using a value for all configurations
by specifying a number of 0, 1 or 2.
Alternatively a generator expression can be used to set the Archive File
Search Mode in specific configurations.
For example to set the FileSearchMode to 1 in profile and 2 in release
the following LY_ARCHIVE_FILE_SEARCH_MODE value can be used
`$<$<CONFIG:profile>:1>$<$<CONFIG:release>:2>`

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated AssetBundler(Batch) VS Debugger arguments to populate the
project-path optoin if a single project is configured.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Add support for serializing older versions of the AssetBundleManifest

This is done by attaching the "ObjectStreamWriteElementOverride"
attribute to the AssetBundleManifest reflection.
That attribute contains a function which outputs an older serialized
version of the AssetBundleManifest based on the `m_bundleVersion` member
value.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* AZStd::variant Serialization fix

The AttributeData<T> type is no longer suitable for storing the
ObjectStreamWriterOverrideCB function

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
amzn-sean e2772fca21
Fix large delta on next frame when turning t_simulationTickDeltaOverride off. (#5716)
This was due to incorrectly setting m_lastSimulationTickTimeUs when t_simulationTickDeltaOverride was enabled to the override.
m_lastSimulationTickTimeUs is now always set to the current time so the delta calculation will always be correct.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
amzn-sean e4563c0058
Update RPISystem::GetCurrentTime() to use TimeSystem (#5613)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
Artur K dc98a56d45
Clang/Clazy pass over AzCore (#5045)
* Multiple cleanups ( tidy etc. )

Coalesce nested namespaces.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Multiple cleanups ( tidy etc. ) cntd.

Converted Uuid into POD ( defaulted the constructor )
Add `&/const &` to `for` loops that benefit from their use
Some Qt optimizations ( string ref, prevent container detaches, etc. )
Replace `::bind` in a few places.
Replaced the use of AZ_CRC with AZ_CRC_CE in a few places.
Replace a few `typedef`s with `using`s

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Linux compilation fix.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Apply review suggestions.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix vs2019 build

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Small clang re-format in StringFunc.cpp

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Apply reviewer's suggestions.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
4 years ago
amzn-mike 4b37e742d3
Add interface to allow disabling global AZ Core test environment trace bus suppression (#5594)
* Add interface to allow disabling global AZ Core test environment trace bus suppression

Update BaseAssetManagerTest class to disable the suppression by default
Update specific asset manager tests that rely on the trace bus suppression to ReEnable it

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Remove nodiscard

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Remove unique_ptr for disable token

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix move operator

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Switch to having individual flags for suppression of each type of output

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add cvar to force stacktrace output.

Clean up whitespace

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
amzn-mike 555776fd7f
Fix AssetBus connection policy to re-lock the mutex afterward since some destructors in the calling methods are still altering the context (#5575) (#5664)
Also made the unlock conditional.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit 63713ca284)
4 years ago
Tommy Walton 214b47a0d5 Merge commit 'b20a9b5f39b025475d74f166a2634f74b835fdca' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 564bf0c819 Merge commit 'fc547d902c2e110b671a095b9731aff18154e68d' into amzn-tommy/gitflow_211116_o3de2 4 years ago
Tommy Walton 4ab3bd487f Merge commit 'e0d736dd844a82b0c232739540a168078e63e276' into amzn-tommy/gitflow_211116_o3de2 4 years ago
bosnichd b20a9b5f39
Some modifications required for restricted platforms: (#5624)
- Replace AZ_TRAIT_MAX_JOB_MANAGER_WORKER_THREADS with AZ_TRAIT_THREAD_NUM_JOB_MANAGER_WORKER_THREADS that allows the number of threads created by the job manager to be set directly.
- Add AZ_TRAIT_THREAD_NUM_TASK_GRAPH_WORKER_THREADS that allows the number of threads created by the task graph to be set directly.
- Add a define that forces the AsyncUploadQueue to use the primary copy queue instead of creating a secondary copy queue.

Signed-off-by: bosnichd <bosnichd@amazon.com>
4 years ago
amzn-mike 8b7e538dd3
Cherry Pick: [LYN-7463] Fix insert streaming request failure (#5604) (#5622)
* Fix race condition where asset would finish loading and another request would start before the streamer request could be cleared

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Re-enable disabled test which was failing for the same reason.

Fix test timeout which was way too long.
Reduce test iterations to keep test time safely under 5 seconds.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Instead of using a mutex, re-order the statements to remove the streamer request first

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
(cherry picked from commit 0cea59d669)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
amzn-mike 63713ca284
Fix AssetBus connection policy to re-lock the mutex afterward since some destructors in the calling methods are still altering the context (#5575)
Also made the unlock conditional.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
amzn-sj fc547d902c
Add message to indicate Json serialization of bitset is not supported (#5590)
Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
amzn-mike 0cea59d669
[LYN-7463] Fix insert streaming request failure (#5604)
* Fix race condition where asset would finish loading and another request would start before the streamer request could be cleared

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Re-enable disabled test which was failing for the same reason.

Fix test timeout which was way too long.
Reduce test iterations to keep test time safely under 5 seconds.

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Instead of using a mutex, re-order the statements to remove the streamer request first

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
amzn-sean 38a03817bb
Removal and Replacement of the CryTimer (gEnv->pTimer) (#5409)
Replaced and removed the CryTimer (gEnv->pTimer). The new TimeSystem is a merger of the current time functionality found in the engine.

* Rename TimeSystemComponent.h/.cpp to TimeSystem.h/.cpp
* Adding New TimeSystem
* remove old timer cvars
* small improvements to the time system.
 - updated parts to use the time conversion functions.
 - in AdvanceTickDeltaTimes applying t_simulationTickScale is now uses doubles instead of floats.
* Replace gEnv->pTimer / ITimer usages with TimeSystem
* Updating usages of AZ::TimeMs{ 0 } and AZ::TimeUs{ 0 } to AZ::Time::ZeroTimeMs and AZ::Time::ZeroTimeUs
* red code the CryTimer
* using TimeUs instead of TimeMs is some cases + updating usages of old cvars to new

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
rgba16f 57adfd795e
Add a name to JobManager (#5576)
* Add a name to JobManager, all worker threads use that name to label their threads

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* update with PR feedback, changed to use AZStd::fixed_string::format

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Fix copy paste errors using local variable names

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
chcurran facfdf4e7a Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Nicholas Van Sickle 2c2c1d8137
Merge pull request #5562 from aws-lumberyard-dev/nvsickle/StabToDevNov21
Merge `stabilization/2110` as of `fac3d0b1bf` into `development`
4 years ago
galibzon e0d736dd84
Fixed the other call to CreateVariable (#5561)
in favor of CreateVariableEx

Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com>
4 years ago
bosnichd 19acf94606
Remove the legacy ViewSystem and some other tangentially related legacy code. (#5558)
Signed-off-by: bosnichd <bosnichd@amazon.com>
4 years ago
Nicholas Van Sickle 8d5dd4e35f Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Tom Hulton-Harrop 2812ec2024
Fix brute force mesh intersection function (#5447)
* fix brute force mesh intersection function

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add test for brute force ray intersection fix

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* refactor tests to remove as much duplication and provide API for future tests if required

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* small updates after review feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update following review feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* fix for pointer offset

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
4 years ago
galibzon f24c3d3457
ASV Trace::Assert Environment.h(438) You are using an invalid variable, (#5521)
the owner has removed it!

This fixes the issue by forcing NameDictionary to not transfer
ownership. This means ComponentApplication()::Destroy will fully destroy
the NameDictionary before the OS::Allocator is destroyed.

In Windows the bug was not happening when running AssetProcessorBatch
because for Windows, _exit() is called before the application shutsdown
forcing all module to properly decrease the reference count of
EnvironmentVaqriableHolderBase::m_useCount for NameDictionary.

In MacOS, there's no _exit() so when the NameDictionary destructor was being called
before existing the application the reference count wouldn't be 0, and
would eventually try to destry the NameDictionary BUT the OS::Allocator
was already destroyed.

Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com>
4 years ago
Nicholas Van Sickle 609469d5e4 Fix a couple build issues
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle e9a57380bb Generic DOM: Add DomBackend abstraction and JSON support
This change adds a `DomBackend` interface and a `DomBackendRegistry` for backend discovery (currently not hooked up to anything) alongside a JSON backend implementation.

The JSON backend comes with a small suite of unit and performance tests. The unit tests validate generic DOM conversion to and from serialized JSON and rapidjson::Document objects (the support for which lives in `JsonSerializationUtils.h`).

The performance tests show a throughput decrease compared to directly using the rapidjson serializer when mirroring our current pattern of copying strings from the serialized JSON representation, but with the coming in-memory store we have the opportunity to keep the buffer in memory and deserialize in-situ using rapidjson's API, which is consistently at least 100MiB/s faster on my machine (Ryzen Threadripper 3970X). The first parameter is the nested object complexity (N*N, objects with N keys comprised of arrays with N values) and the second parameter is the base size of the strings within each entry of this object.
```
----------------------------------------------------------------------------------------------------------------------
Benchmark                                                            Time             CPU   Iterations UserCounters...
----------------------------------------------------------------------------------------------------------------------
DomJsonBenchmark/DomDeserializeToDocumentInPlace/10/5            0.050 ms        0.050 ms        10000 bytes_per_second=355.816M/s
DomJsonBenchmark/DomDeserializeToDocumentInPlace/10/50           0.057 ms        0.057 ms        11200 bytes_per_second=386.064M/s
DomJsonBenchmark/DomDeserializeToDocumentInPlace/100/5            4.77 ms         4.88 ms          112 bytes_per_second=364.046M/s
DomJsonBenchmark/DomDeserializeToDocumentInPlace/100/500          11.6 ms         11.7 ms           64 bytes_per_second=554.518M/s
DomJsonBenchmark/DomDeserializeToDocumentWithCopies/10/5         0.084 ms        0.084 ms         7467 bytes_per_second=212.55M/s
DomJsonBenchmark/DomDeserializeToDocumentWithCopies/10/50        0.099 ms        0.100 ms         6400 bytes_per_second=220.608M/s
DomJsonBenchmark/DomDeserializeToDocumentWithCopies/100/5         8.22 ms         8.16 ms           90 bytes_per_second=217.847M/s
DomJsonBenchmark/DomDeserializeToDocumentWithCopies/100/500       23.2 ms         22.9 ms           30 bytes_per_second=283.56M/s
DomJsonBenchmark/JsonUtilsDeserializeToDocument/10/5             0.070 ms        0.070 ms        11200 bytes_per_second=255.049M/s
DomJsonBenchmark/JsonUtilsDeserializeToDocument/10/50            0.086 ms        0.087 ms         8960 bytes_per_second=253.258M/s
DomJsonBenchmark/JsonUtilsDeserializeToDocument/100/5             6.86 ms         6.84 ms          112 bytes_per_second=260.033M/s
DomJsonBenchmark/JsonUtilsDeserializeToDocument/100/500           22.8 ms         22.9 ms           32 bytes_per_second=283.158M/s
```

For `AZ::DOM::Document`, the current plan is to offer helper methods that can load from a file path or string using a given backend that can take advantage of in-place parsing by internally storing the serialized buffer.

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
lsemp3d 934c0f2ec7 Made SerializeContext and BehaviorContext consistent with their class name
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
lsemp3d d3b8b761fd Improved messaging on assert about argument types lacking reflection for scripting
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
lumberyard-employee-dm 5fc4551ac0
[LYN-8041] Enable relocation of the Project Game Release Layout (#5380)
* Enable relocation of the Project Game Release Layout

Relocating the Project Game Release Layout to another directory on the file system failed due to the querying of the engine root failing due to the ComponentApplication::m_engineRoot not using the project path stored in the SettingsRegisry if the engine root cannot be detected

Removed the ApplicationRequestBus GetEngineRoot function.
The ComponentApplicationRequestBus has a function of the same name that returns the same path.

Removed the deprecated GetAppRoot function.
The path it returns has no defined value. It was not the engine root or the project root.
Removed unused CFileUtil and CFileUtil_impl functions that were invoking the ApplicationREquestBus GetEngineRoot function.
On the way to update the functions it was discovered that they aren't called

Added a CalculateBranchToken overload that can populate a fixed_string to avoid heap allocations

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Protect against an empty list of artifacts to remove when generating the
engine.pak

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
AMZN-koppersr 83db368706 Merge branch 'development' into Prefabs/SpawnableEntityAlias 4 years ago
lumberyard-employee-dm 1998c53882
Non MSVC Release build fix (#5428)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Chris Burel 33d5109fe8
Merge `stabilization/2110` as of `20edb35cdc` into `development` (#5319) 4 years ago
AMZN-koppersr 8ccccdcaf1 Merge branch 'development' into Prefabs/SpawnableEntityAlias 4 years ago
Jeremy Ong 6b6eb2c936 Remove markers that occupy <2us for 99% of events
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
chcurran 0175e9d3cb Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux 4 years ago
Chris Burel 4ba2c06386 Merge branch stabilization/2110 into development
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Chris Burel 6c7bc7a296 Merge branch stabilization/2110 into development
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
AMZN-koppersr 0decc57dfc Merge branch 'development' into Prefabs/SpawnableEntityAlias 4 years ago
lumberyard-employee-dm 627012840d
Update how Project Filepaths are calculated when not supplied via command line (#5194)
* Fixed the return value of the ConvertToAbsolutePath function

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added the generated cmake_dependencies.*.setreg files to engine.pak (#5073)

* Copied the generated cmake_dependencies.*.setreg file to the Cache
directory

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed the platform name from the bootstrap.game.*.setreg

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Update how the project related file paths are determined when not
supplied.

The project-path determination now goes back to only detecting a "project.json" file.
It no longer attempts to detect a "Cache" directory

The project-cache-path determination now in addition to checking the
project_cache_path key searches for a "Cache" directory.

The project-path defaults to executable folder if it cannot be detected.

The copying of generated executable folder Registry directory contents
to the product cache is now removed after the archive step.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the invocation of the AssetProcessor in Jenkins to supply an
absolute path to the project.

The project-path is no longer treated as relative to the engine root,
but instead relative to the current working directory at application
startup.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added constant for the storing the name of Cache directory

Fixed typos and grammatical errors in the SettingsRegistryMergeUtils.cpp

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated UnitTest prepend the EngineRoot path to "AutomatedTesting" when
setting the project path.

This is needed now that the project-path isn't treated relative to the
EngineRoot if it is not absolute.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fix AssetSeedManagerTest and PlatformAddressedAssetCatalogManagerTest

Instead of trying to used the AutomatedTesting directory as the project root, the temp directory created during the test is used as the project root.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Moved the setting of the project cache root folder and project
asset platform root folder into the `if (!projectCachePath.empty())`
block

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removing the scan up logic for the "Cache" directory.

This is no longer needed to locate the project cache path in a Project Game Release Layout.

Because the project path defaults to the executable directory if, it is not found, the Cache directory will be set to the "Cache" directory within the executable directory.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
AMZN-stankowi 6b5f5bc666
Bundled release build bug fixes cherry picked from development (#5270)
* Fixed some files missed when groundplane_521 was renamed to 512 (#4958)

* Fixed references to 521x521 to reference the correct 512x512 FBX file

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed asset hints

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Moved the Asset Catalog loading from LmbrCentral to the AzFramework::Application (#4568)

* Moved the loading of the AssetCatalog from LmbrCentralSystemComponent to AzFramework Application

Modified the AssetCatalog::InitializeCatalog function to no longer rely on the TickBus to send out the `AssetCatalogEventBus::OnCatalogLoaded` event.
It now queues a function on the AssetCatalogRequestBus to send the OnCatalogLoaded event as soon as the dispatching for the AssetCatalogRequestBus has completed on the current thread.
This is done by updating the AssetCatalogRequestBus to use EBus ThreadDispatchPolicy to add a callback to invoke any queued function has soon a thread has finished dispatching and has released its DispatchMutex

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the AssetCatalogRequestBus to add a custom DispatchLockGuard

The AssetCatalogRequestBus uses the custom lock guard to dispatch queued
events after it has unlocked it's context mutex for the current thread.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed GetContext call from the
AssetCatalogRequests::PostThreadDispatchInvoker

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the definition of FileTagQueryManager::GetDefaultFileTagFilePath
function to return a path

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the AZ_CONSOLEFREEFUNC macro to actually use the _NAME

The _NAME parameter was not being used before, resulting in the Console
stringified name of the function being used.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed CrySystem dependencies from the BundlingSystemComponent

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Moved the loading of the AssetCatalog from LmbrCentralSystemComponent to AzFramework Application

Modified the AssetCatalog::InitializeCatalog function to no longer rely on the TickBus to send out the `AssetCatalogEventBus::OnCatalogLoaded` event.
It now queues a function on the AssetCatalogRequestBus to send the OnCatalogLoaded event as soon as the dispatching for the AssetCatalogRequestBus has completed on the current thread.
This is done by updating the AssetCatalogRequestBus to use EBus ThreadDispatchPolicy to add a callback to invoke any queued function has soon a thread has finished dispatching and has released its DispatchMutex

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the AssetCatalogRequestBus to add a custom DispatchLockGuard

The AssetCatalogRequestBus uses the custom lock guard to dispatch queued
events after it has unlocked it's context mutex for the current thread.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed GetContext call from the
AssetCatalogRequests::PostThreadDispatchInvoker

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the definition of FileTagQueryManager::GetDefaultFileTagFilePath
function to return a path

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the AZ_CONSOLEFREEFUNC macro to actually use the _NAME

The _NAME parameter was not being used before, resulting in the Console
stringified name of the function being used.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed CrySystem dependencies from the BundlingSystemComponent

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Addded missing template parameter to AssetCatalogRequests

The fixes the compile error.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding AssetBus::MultiHandler::BusDisconnect call

The BlastSystemComponent was connecting to the Bus, but not
disconnecting from it, causing an assert to fire to it being a
multi-thread bus

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added support for DataDrive lifecycle events to the ComponentApplication

The events are using the SettingsRegistry NotifyEvent to track when
certain keys are modified to signal handlers.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Corrected invalid JSON creation in ModuleManager::DeactivateEntities

Resolved clang warning about used type alias

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fix for dangling reference in lambda registered to the SettingsRegistry
Notifier event

This was causing the EditorPythonBinding tests to crash due to the
following circumstances.

First Python has created an instance of a SettingsRegistryProxy
Second the SettingsRegistry sends an event during the time when the
SettingsRegistryProxy exists.

This issue was exposed due to the ComponentApplication Lifecycle events
using the SettingsRegistry to dispatch during various times of the
application workflow.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added the generated cmake_dependencies.*.setreg files to engine.pak (#5073)

* Copied the generated cmake_dependencies.*.setreg file to the Cache
directory

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed the platform name from the bootstrap.game.*.setreg

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixes for release builds with DCO fix (#5164)

* This set of changes is work toward allowing release builds to work with asset bundler generated bundles and legacy, non-prefab levels. This requires some other in-flight changes before this work is complete.

    Updated engine seed list + fixed automated test
    ComponentApplicationLifecycle has the ability to automatically register events if asked to register a handler and the event doesn't exist. This is only intended for cases where you need to register a handler early in startup before the settings registry file is loaded.
    Added two new lifecycle events: One after the system entity has been activated, and one after the system interface has been created.
    If you load an archive before the system entity has been activated, archive.cpp caches information about those archives until that time, so it can finish registration. This is because the serialization system and BundlingSystemComponent both need to be available to do this registration, but the bundles have to be loaded before those are initialized so that the settings registry file can be loaded.
    Fixed an error were mounted pak files were searching for levels.pak and not level.pak, and not finding them. I'm pretty sure this logic doesn't do anything functional either way, but I've been testing legacy levels with this change and they work now.
    Moved wildcard pak loading to where engine.pak is loaded. This is because the settings registry file that defines the IO stack to spin up must be available early in application startup, and this file must be within a mounted pak file. If you're using asset bundler generated bundles, they need to be loaded at this time so that file can be loaded.
    Atom's BootstrapSystemComponent.cpp no longer initializes on AssetCatalogLoaded, and instead initializes on the ApplicationLifecycle event SystemInterfaceCreated. This is because the base assetcatalog.xml file is really just a development time concept, this file should not be used in packaged release builds, because those builds will make use of delta catalogs in each bundle loaded. The asset catalog contains the list of all assets that were in the cache at development time, and this contains content that developers don't want to ship, and they may want to specifically hide from their customers, so data miners don't find secrets about upcoming game content.

Recovering from a branch that had incorrect DCO

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed an incorrect ebus disconnect and removed an include that's no longer needed

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed a copy and paste typo from trying to recover the previous pull request

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated product IDs for the settings registry builder to no longer collide with the JSON builder. Now they are based on a hash of the configuration.
Updated the engine default seed list to include the new asset ID info for the renamed bootstrap file

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated the path to the application lifecycle events, because runtime settings aren't included in the merged bootstrap file.
Addressed some feedback on printing out a string view on an error

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Removed a test that uses old assets that aren't relevant. We may not need this test anymore, but if we do we've backlogged a task to create a new test to cover this behavior without using old assets.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Renamed SystemInterfaceCreated event to LegacySystemInterfaceCreated
Removed SystemEntityActivated event. Now that I have the rest of the fixes in this pull request, this new event wasn't needed, the already existing SystemComponentsActivated event does what I need.
Changed list to vector

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
rgba16f [Amazon] 5c072a5d51
Part 2 of enabling Atom to use TaskGraph
Enable Atom CullingScene to use TaskGraph
Enable Atom PNG save to use TaskGraph for red/blue color channel swap on save out.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
Mike Balfour 6d7be70133
Merge pull request #5202 from aws-lumberyard-dev/mbalfour/gitflow_211102_o3de
Merging stabilization/2110 to development
4 years ago
lumberyard-employee-dm a9f7ab4aaf
Fixed the return value of the ConvertToAbsolutePath function (#5195)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
amzn-mike 6da75821c5
Move Exception PrintCallstack call before any ebus calls to help track down issue with crash during an exception (#5188)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
AMZN-stankowi 6d592d78cd
Fixes for release builds with DCO fix (#5164)
* This set of changes is work toward allowing release builds to work with asset bundler generated bundles and legacy, non-prefab levels. This requires some other in-flight changes before this work is complete.

    Updated engine seed list + fixed automated test
    ComponentApplicationLifecycle has the ability to automatically register events if asked to register a handler and the event doesn't exist. This is only intended for cases where you need to register a handler early in startup before the settings registry file is loaded.
    Added two new lifecycle events: One after the system entity has been activated, and one after the system interface has been created.
    If you load an archive before the system entity has been activated, archive.cpp caches information about those archives until that time, so it can finish registration. This is because the serialization system and BundlingSystemComponent both need to be available to do this registration, but the bundles have to be loaded before those are initialized so that the settings registry file can be loaded.
    Fixed an error were mounted pak files were searching for levels.pak and not level.pak, and not finding them. I'm pretty sure this logic doesn't do anything functional either way, but I've been testing legacy levels with this change and they work now.
    Moved wildcard pak loading to where engine.pak is loaded. This is because the settings registry file that defines the IO stack to spin up must be available early in application startup, and this file must be within a mounted pak file. If you're using asset bundler generated bundles, they need to be loaded at this time so that file can be loaded.
    Atom's BootstrapSystemComponent.cpp no longer initializes on AssetCatalogLoaded, and instead initializes on the ApplicationLifecycle event SystemInterfaceCreated. This is because the base assetcatalog.xml file is really just a development time concept, this file should not be used in packaged release builds, because those builds will make use of delta catalogs in each bundle loaded. The asset catalog contains the list of all assets that were in the cache at development time, and this contains content that developers don't want to ship, and they may want to specifically hide from their customers, so data miners don't find secrets about upcoming game content.

Recovering from a branch that had incorrect DCO

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed an incorrect ebus disconnect and removed an include that's no longer needed

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Fixed a copy and paste typo from trying to recover the previous pull request

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated product IDs for the settings registry builder to no longer collide with the JSON builder. Now they are based on a hash of the configuration.
Updated the engine default seed list to include the new asset ID info for the renamed bootstrap file

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated the path to the application lifecycle events, because runtime settings aren't included in the merged bootstrap file.
Addressed some feedback on printing out a string view on an error

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Removed a test that uses old assets that aren't relevant. We may not need this test anymore, but if we do we've backlogged a task to create a new test to cover this behavior without using old assets.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Renamed SystemInterfaceCreated event to LegacySystemInterfaceCreated
Removed SystemEntityActivated event. Now that I have the rest of the fixes in this pull request, this new event wasn't needed, the already existing SystemComponentsActivated event does what I need.
Changed list to vector

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
4 years ago
Mike Balfour bad4c1a276 Merge commit '8f56dc10c33ae73acaa99c8690e8bc91a1cec2bc' into mbalfour/gitflow_211102_o3de 4 years ago
Mike Balfour 122a28c4b4 Merge commit '1228738bb2da5ccf7e3d7a1219a90afab5189d6b' into mbalfour/gitflow_211102_o3de 4 years ago
Chris Burel 8f56dc10c3
Perform sse float comparisons with the floating-point intrinsics (#5115)
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Guthrie Adams 7ba7928559 Removing redundant registration of script assets
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
AMZN-ScottR 2d7c6af97c Merge branch 'development' into profiler_capture_api
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
AMZN-ScottR 4721f44b92 [profiler_capture_api] more changes based on PR feedback
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
chcurran 6c130c7a86 Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux 4 years ago
AMZN-ScottR b2e6711196 [profiler_capture_api] fixed clang compile error
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
AMZN-AlexOteiza e871dff70e
Added two complex prefab tests (#5089)
* Added two complex prefab tests

* Fix compile error

* Added extra methods, fixed test failure

* Addressed PR commments

* More PR comments

* Fix space

* Fix ar error
4 years ago
AMZN-ScottR 90509c7fa2 [profiler_capture_api] removed now unnecessary ProfilerRequests EBus alias after AZ::Interface conversion
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
AMZN-ScottR eb713fb3a8 Merge branch 'development' into profiler_capture_api
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
AMZN-ScottR fc94ede439 [profiler_capture_api] fixed runtime issues with BehaviorInterfaceProxy reflection
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
lumberyard-employee-dm b9147c60a0
Added the generated cmake_dependencies.*.setreg files to engine.pak (#5073)
* Copied the generated cmake_dependencies.*.setreg file to the Cache
directory

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed the platform name from the bootstrap.game.*.setreg

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
chcurran 1b9f6c385d Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux 4 years ago
AMZN-koppersr 48f2487d3c Updates in preparation for adding entity aliases to spawnables.
The following has been changed:
- AssetDataStream can now return the stored streaming deadline and priority.
- RootSpawnable now has an event that's called just before root spawnable spawns entities. This is an immediate event unlike the other events that are queued.

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
4 years ago
AMZN-ScottR e7ed2c2a83 [profiler_capture_api] updated ProfilerRequests reflection to be as AZ::Interface
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
AMZN-ScottR f90074adb6 [profiler_capture_api] added utility for reflecting AZ::Interfaces through the BehaviorContext
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
Nicholas Van Sickle c5c043ecc5
Add Generic DOM visitor interface (#4852)
* Add Generic DOM visitor interface

Just the visitor interface from the [Generic DOM RFC](https://github.com/o3de/sig-content/blob/main/rfcs/rfc-10-generic-dom.md) with a few hardening changes so that we can align on it early:
- Clarified Lifetimes with an enum, extended it to cover the by-ref opaque values as well
- Added an explicit error type so that serializers can provide logging friendly rejections
- Did a first pass on documentation
- Added Visitor capabilities introspection and support for raw strings
4 years ago
AMZN-ScottR a2c42ab072 [profiler_capture_api] started migration of ProfilerRequests EBus to AZ::Interface
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
AMZN-ScottR 57a69978b9 [profiler_capture_api] replace profiler capture location cvar with setting registry entry
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
AMZN-ScottR 6b1198584b Merge branch 'development' into profiler_capture_api
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
lumberyard-employee-dm b3b646dad9
Moved the Asset Catalog loading from LmbrCentral to the AzFramework::Application (#4568)
* Moved the loading of the AssetCatalog from LmbrCentralSystemComponent to AzFramework Application

Modified the AssetCatalog::InitializeCatalog function to no longer rely on the TickBus to send out the `AssetCatalogEventBus::OnCatalogLoaded` event.
It now queues a function on the AssetCatalogRequestBus to send the OnCatalogLoaded event as soon as the dispatching for the AssetCatalogRequestBus has completed on the current thread.
This is done by updating the AssetCatalogRequestBus to use EBus ThreadDispatchPolicy to add a callback to invoke any queued function has soon a thread has finished dispatching and has released its DispatchMutex

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the AssetCatalogRequestBus to add a custom DispatchLockGuard

The AssetCatalogRequestBus uses the custom lock guard to dispatch queued
events after it has unlocked it's context mutex for the current thread.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed GetContext call from the
AssetCatalogRequests::PostThreadDispatchInvoker

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the definition of FileTagQueryManager::GetDefaultFileTagFilePath
function to return a path

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the AZ_CONSOLEFREEFUNC macro to actually use the _NAME

The _NAME parameter was not being used before, resulting in the Console
stringified name of the function being used.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed CrySystem dependencies from the BundlingSystemComponent

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Moved the loading of the AssetCatalog from LmbrCentralSystemComponent to AzFramework Application

Modified the AssetCatalog::InitializeCatalog function to no longer rely on the TickBus to send out the `AssetCatalogEventBus::OnCatalogLoaded` event.
It now queues a function on the AssetCatalogRequestBus to send the OnCatalogLoaded event as soon as the dispatching for the AssetCatalogRequestBus has completed on the current thread.
This is done by updating the AssetCatalogRequestBus to use EBus ThreadDispatchPolicy to add a callback to invoke any queued function has soon a thread has finished dispatching and has released its DispatchMutex

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the AssetCatalogRequestBus to add a custom DispatchLockGuard

The AssetCatalogRequestBus uses the custom lock guard to dispatch queued
events after it has unlocked it's context mutex for the current thread.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed GetContext call from the
AssetCatalogRequests::PostThreadDispatchInvoker

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the definition of FileTagQueryManager::GetDefaultFileTagFilePath
function to return a path

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the AZ_CONSOLEFREEFUNC macro to actually use the _NAME

The _NAME parameter was not being used before, resulting in the Console
stringified name of the function being used.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed CrySystem dependencies from the BundlingSystemComponent

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Addded missing template parameter to AssetCatalogRequests

The fixes the compile error.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding AssetBus::MultiHandler::BusDisconnect call

The BlastSystemComponent was connecting to the Bus, but not
disconnecting from it, causing an assert to fire to it being a
multi-thread bus

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added support for DataDrive lifecycle events to the ComponentApplication

The events are using the SettingsRegistry NotifyEvent to track when
certain keys are modified to signal handlers.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Corrected invalid JSON creation in ModuleManager::DeactivateEntities

Resolved clang warning about used type alias

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fix for dangling reference in lambda registered to the SettingsRegistry
Notifier event

This was causing the EditorPythonBinding tests to crash due to the
following circumstances.

First Python has created an instance of a SettingsRegistryProxy
Second the SettingsRegistry sends an event during the time when the
SettingsRegistryProxy exists.

This issue was exposed due to the ComponentApplication Lifecycle events
using the SettingsRegistry to dispatch during various times of the
application workflow.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
AMZN-ScottR c6d3e7900c [profiler_capture_api] updated ProfilerRequests::StartCapture signature as per PR feedback
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
AMZN-ScottR 471436b0fc [profiler_capture_api] added cvar/console access for profiler capture
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
AMZN-ScottR 6ddfb6500f [profiler_capture_api] fixed ambiguous LogLevel type in some unity file scenarios
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
AMZN-ScottR 1f2eaface9 [profiler_capture_api] merging overlapping profiler EBuses into AzCore
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
santorac bf2997f960 Merge remote-tracking branch 'upstream/development' into Atom/rbarrand/MaterialVersionUpdate 4 years ago
SJ c871224dae
Support for importing Json files (#4609)
* Initial support for importing Json files within other Json files

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add some test cases for testing/iterating on the Json import work. Fix MacOS AzTestRunner module loading bug.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* The import resolver can take the allocator as a parameter to Load/StoreImports() instead of storing a copy.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Fix assert

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Some rework of the JsonImport feature. Base test cases pass. More complex test cases need to be added.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Add test case for testing nested imports.
2. Initialize rapidjson value to fix assert.
3. Fix bug found in merge patch creation.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Update the Resolver class member functions to return proper result codes.
2. Add the wrapper functions for resolving/restoring imports to the JsonSerialization class.
3. Add new test case.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add test cases for import + patches. Fix bug found when patching import. Rename test cases.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Add ApplyPatch() function to BaseJsonImporter.
2. Move patch logic out of ResolveImport() and into ApplyPatch()
3. Get rid of the custom RestoreImport implementation in the tests since it was the same as the base version.
4. Add test case for patching nested imports.
5. Update merge patch outcome reporting logic to work for nested object patches.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Add a CreatePatch() function to BaseJsonImporter to match the ApplyPatch() function.
2. Reorganize some responsibilities between RestoreImports(), RestoreImport() and CreatePatch() to make ResolveImports() and RestoreImports() more symmetrical.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Combine result code in code path where we add empty object to path

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add test case for inserting a new import into an existing object.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Use == instead of Compare() for comparing file paths.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Address some PR feedback.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Address additional PR feedback

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add missing includes to fix non-unity build

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Fix build error. Address additional feedback.

Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
santorac a0b1dec929 Added support for material version updates in MaterialSourceData. This is necessary for tools like Material Editor and Asset Processor to work with the latest property names.
- Added MaterialSourceData::ApplyVersionUpdates() for updating the properties. This should be called by tools after loading the MaterialSourceData. (But can be omitted if a tool wants to read the data exactly as it appears in the .material file).
- Updated MaterialTypeSourceData::FindProperty to support applying version update renames, including a ApplyPropertyRenames utility function, which are necessary for MaterialSourceData to be able to find the necessary property definitons while loading.
- Added a new context struct to JsonMaterialPropertyValueSerializer for passing down the material type version number, to help with applying property renames.
- Renamed the .material file format "propertyLayoutVersion" to "materialTypeVersion" which is more accurate. This shouldn't hurt existing data as this field wasn't actually used for anything before.
- Updated Material Editor to again store the material type version number in .material files.

MaterialSourceDataTests updates...
- Updated to include both a .materialtype file and a MaterialTypeAsset for the test material type. Both are used by the MaterialTypeSourceData class.
- The default test material type now includes some version update steps; these are only used for version update tests and won't impact the other test functions.
- Updated the path for storing temp files to disk, to just be in a "temp" folder in the exe path. (Originally they were saved to the gem folder near MaterialSourceDataTests.cpp, but at some point someone changed it to be under the exe folder, so there's no reason to use the full gem path anymore).

MaterialTypeSourceDataTests updates...
- Moved some code that was accidentally added to LoadAllFieldsUsingOldFormat but should have been in LoadAndStoreJson_AllFields.
- Added test cases for unsupported version update operations

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
amzn-mike f31b47f775
Switch stacktrace output to use Output function instead of AZ_Printf to avoid it being suppressed accidentally (#4805)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
chcurran 658da08495 Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux 4 years ago
lumberyard-employee-dm 357df2bb4b
Added anchor key parameter to the SettingsRegistry MergeSettings (#4650)
* Added anchor key parameter to the SettingsRegistry MergeSettings

This allows the MergeSettings function to write JSON data anchored
underneath the supplied anchor path.

Upgraded the SignalNotifiers calls in SetObject, MergeSettings and
MergeSettingsFileInternal to query the type of the merge value at the anchor path
and supply that as the type to the notification event.

Also the the above functions now supply the anchor key root as the
path that was modified instead of assuming root ""

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed whitespace inconsistencies in SettingsRegistryImpl

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added a queue for storing SignalNotifier calls when a thread is
currently signaling.

The queued calls are invoked by that thread after it has signaled it's
current queue of events

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
chcurran 42d286f8a6 Merge branch 'development' of https://github.com/o3de/o3de into sc-editor-asset-redux 4 years ago
Esteban Papp 8829ceb0f8 Merge branch 'development' into issues/exception_handling
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzFramework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp
4 years ago
Esteban Papp 7651ba621c
Remove old "Integ" functionality from tests (#4688)
* fixes some warnings for newer versions of VS2022

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* more warning fixes

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* remove integ test filters from AzTest

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* remove integ test handling from AzTestRunner

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* changes integ tests of gridmate to regular tests and disables failing ones

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removes the Integ from the EMotionFX tests, but leaves them disabled since they are failing

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removes the Integ from the HttpRequestor tests and disables it since is not passing

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* changing integ tests for DISABLED, these ones are using files that are not there

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixes linux build
gridmate tests that were Integ are now disabled

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixes linux warnings

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
ffarahmand-DPS 606de5427b
Fixes debug console autocomplete issues (#4223)
* Fixed a crash caused by large autocomplete results in the debug console. A fixed vector was growing beyond its allocated size.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>

* Fixes printing duplicate autocomplete results, caused by looping over multiple CVARs registered with the same name. Also adds an erase to prevent undefined behavior.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>

* Adds a test case for autocomplete duplication in the event of multiple cvars existing under the same name. Two matching cvars are created and checked against the number of matches produced by autocomplete.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>

* Added two safety checks and made a pointer const as per reviewer feedback.

Signed-off-by: ffarahmand-DPS <ffarahmand@digitalpilgrims.com>
4 years ago
Esteban Papp 17b5312ce5 PR comments
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp c5da705b46 fixes typo
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 07a52d2dfc Merge branch 'development' into issues/exception_handling
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp e078580f2c Changes GTEST_OS_SUPPORTS_DEATH_TEST to the right define which is GTEST_HAS_DEATH_TEST
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 3e729638b5 adds unhandled exception test
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 88cc3c774a adds stack trace conversion from native
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Chris Galvan 4d4f99767f
Merge pull request #4594 from pollend/chore/update-IntersectSegment-cleanup
Clean-up IntersectSegment  and improve documentation
4 years ago
chcurran 0b646ac693 initial scriptcanvas source handle
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Esteban Papp 6a2020ec6c fixes some warnings for newer versions of VS2022
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
lumberyard-employee-dm 97e9f4dc7d
[LYN-6838] Various Monolithic shutdown fixes for the GameLauncher (#4564)
* Added a stateless allocator which uses AZ_OS_MALLOC/AZ_OS_FREE to
allocate memory for objects in static memory.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the Maestro and LyShine Anim Nodes to use the
stateless_allocator for its static containers.

This prevents crashes in static de-init due to the SystemAllocator being
destroyed at that poitn

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the EBus AllocatorType to use the EBusEnvironmentAllocator

Because the EBus Context resides in static memory, the SystemAllocator
lifetime is shorter than the EBus Context.

This results in shutdown crashes in monolithic builds due to all of the
gem modules being linked in as static libraries and the EBus context now
destructing at the point of the executable static de-init, instead of
the module de-init, where the SystemAllocator would still be around.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed an assortment of shutdown issues due to deleting objects after
AZ allocators are no longer available

Fixed the NameDictionary IsReady() function to not assert when the
dictionary when invoked after the environment variable it was stored in
was destroyed.
Updated the NameData destructor to check that the NameDictionary
IsReady() before attempting to remove itself from the dictionary

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed NameDictionary destory workflow, to reset the EnvironmentVariable
instance

Updated the EnvironmentVariable instance to store the NameDictionary as a
value.

Added a rvalue reference `Set` function overload to the
EnvironmentVariable class to support move only types.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Clang 6.0.0 build fixes

The C++17 std::launder feature isn't available in that compiler version

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Michael Pollind 63da5847c1 chore: correct documentation and correct method return.
- change return for IntersectSegmentTriangleCCW to bool
- change return for IntersectSegmentTriangle to bool

Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Michael Pollind 02d8596d87 chore: improject documentation for IntersectSegment
- change return of IntersectRayDisk to bool
- change return of IntersectRayBox to bool
- move [out] after @param

Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Scott Romero a95c609bd8
[development] Migrate Atom CPU timing stats tracking to use global stats profiler (#4549)
This change is a preparation for moving the CPU profiler/visualization system from Atom into its own Gem by removing the dependency on local time tracking object AZ::RHI::CpuTimingStatistics

Full changes include:
- Removed all usage of AZ::RHI::CpuTimingStatistics
-- Replaced with pushing to AZ::Statistics::StatisticalProfilerProxy global instance
- Promoted VariableTimer from AZ::RHI to AZ::Debug
- Removed now unused CpuTimingStatistics.h

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
4 years ago
Allen Jackson 3b89f7e1cd
{lyn7283} added test for assetHint Json Serialzier callback logic (#4586)
* {lyn7283} adding unit test for the assetHint Json Serialzier callback logic

AssetTracker_Callback_Works will regress the functionality

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* clean up of the jsonRegistrationContext

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
4 years ago
Michael Pollind 1c3b293cd3 fix comments replace /** with //!
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Artur K b91d503a82
Add AZStd::lerp math function, based on C++20 (#3468)
* Add AZStd::lerp math function, based on c++20

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Add unit test for AZStd::lerp, based on libc++ ones

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* written a reduced set of lerp tests, but now the license is correct

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Update Code/Framework/AzCore/AzCore/std/math.h

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Update Code/Framework/AzCore/Tests/AZStd/Math.cpp

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* fix the github suggestion merge

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Copy some AZ::Lerp tests to std::lerp test suite + clang-format

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Cleanup lerp test cases

Remove comments that suggested very heavy tests that required things like `for every t1..`

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix unit test compilation issues

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* fix whitespace issue

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Use `TypeParam` in TYPED_TEST

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Remove unneeded new-lines

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* remove unused infinity

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Michael Pollind afa8bb9226 chore: update intersect and improve documentation
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
lumberyard-employee-dm 7b1dd01d1d
Implemented a deferred LoadLevel queue for the SpawnableLevelSystem (#4561)
* Moved the SettingsRegistryTests.cpp and
SettingsRegistryMergeUtilsTests.cpp to the Settings folder

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Implemented a deferred level load queue, that allows the
SpawnableLevelSystem to re-run the last LoadLevel command that occured
before it was constructed.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added SettingsRegistryVisitorUtils to reduce Array and Object visitor
boilerplate.

The VisitArray and VisitObject functions allows iteration over each
element of array and object respectively via a callback.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed the queuing logic for levels that attempt to load before the SpawnableLevelSystem is available

Only the last level name that could not load is stored off and deferred until the SpawnableLevelsystem is created.

Made the FieldVisitor AggregateTypes constructor protected and added a comment specifying the expected values.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Bring in the SettingsRegistry::Visitor::Visit functions into scope to fix MSVC compilation errors.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Changed the list of supported SettingsRegistry types to visit to an enum to constrain the values to Array and/or Object.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
lumberyard-employee-dm e4d3ab118c
Console changes: Added a new SettingsRegistry root key for executing (#4567)
console commands.

The new key is "/O3DE/Autoexec/ConsoleCommands" and the only difference
with the "/Amazon/AzCore/Runtime/ConosleCommands" key is that it isn't
excluded by the SettingsRegistryBuilder.

Due to not being excluded by the SettingsRegistryBuilder this key can be
used to forward console commands to the aggregate
`bootstrap.game.<config>.<platform>.setreg` files.

For GameLauncher specific console commands it is recommend to be put them in
.setreg file that uses the "game" specialization, such as
"autoexec.game.setreg".

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
lumberyard-employee-dm b7c2401056
Added a ThreadDispatch Policy to the EBus code (#4405)
* Added a ThreadDispatch Policy to the EBus code

The ThreadDispatch Policy can be configured by authors of an EBusTraits to
invoke a callback function after an EBus has finished it's dispatching
mechanism on a specific thread.

It takes into account recursive calls as well and will only invoke the
PostDispatch callback after all callstack entries for the current thread
are cleared.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Clang build fix

The Traits type is dependent on the template parameter, therefore the compiler needs to be told that the ThreadDispatchPolicy is a type and not a value.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed DispatchLockGuard cxall in the TerrainWorldRendererComponent.cpp

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added EBusTrait for configuring the DispatchLockGuard

Removed the ThreadPolicy trait, now that the DispatchLockGuard for the
EBus Context can be configured.

Used the DispatchLockGuard template along with the
IsInDispatchThisThread function to determine when an EBus has finished
dispatching on thread and released it's Context Mutex.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Tweaked comment format for the IsInDispatch function


Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed explicit GetContext call from ThreadDispatchTestBus.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Clang EBus Test fix for DispatchLockGuard trait

Due to the clang compiler evalating constants within templates at the time of declaration, the LocklessDispatch value supplied to the template was always false resulting in the LocklessDispatch feature always locking.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Allen Jackson dcadfe6e1f
Feature json assetloading assethints (#4554)
* capture assets using SerializedAssetTracker in LoadInstanceFromPrefabDom()
assign assets using asset hints where the asset ID is not valid
switch up SerializedAssetTracker to store pointers instead of copies of Asset<>

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* PoC for the AssetFixUp strategy


Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* clean up of PoC

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
4 years ago
Jeremy Ong e0a1164a92
Merge pull request #4424 from aws-lumberyard-dev/rgba16f/AZJobToIdle
Move Job system towards being used for Idle tasks
4 years ago
rgba16f 4b92aa34b7 Updated with PR feedback. Created a common function to calculate the number of worker threads.
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
rgba16f a2c16fa24f adjust the default number of worker threads created by the TaskGraph & Job systems
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
AMZN-AlexOteiza d1947c68c9
Added extra output and callstack information for improving debugging automated tests (#4528)
Signed-off-by: AMZN-AlexOteiza <aljanru@amazon.co.uk>
4 years ago
rgba16f 49dd0d6331 Update with PR feedback. Use direct ratio on hardware concurrency with a set min and an a number excluded for O3DE threads
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
amzn-mike 5cee9b43b7
Squashed commit of Procedural Prefab work (#4481)
* Squashed commit of the following:

commit 964a45ead662f502ff0d63ae3528a9aa18a760f4
Merge: 8d4c1dee78 799ab8585b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Oct 1 16:16:47 2021 -0500

    Merge branch 'development' into Feature_LY-5384_ProceduralPrefabs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

    # Conflicts:
    #	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.h

commit 8d4c1dee782a1b82ded14d11f7fe879c865980a7
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Fri Oct 1 15:49:22 2021 -0500

    fixing non-unity build

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit e83431b3be58f36a875b5187c03cd67368d91726
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Fri Oct 1 12:42:38 2021 -0500

    fixing Gems/Multiplayer/Code/Source/Components/NetworkCharacterComponent.cpp:172:28: error: member access into incomplete type 'AZ::BehaviorContext'

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit b0523867d9605aff67710f4ab6030f327cd5558f
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Fri Oct 1 10:23:56 2021 -0500

    fix for error: unused variable 'targetInstanceRef'

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 387c42ac1a4268ff8b2701c0c914e384b355e629
Merge: d87b41997e 0fb821a44b
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Fri Oct 1 10:00:46 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' of https://github.com/aws-lumberyard-dev/o3de into Feature_LY-5384_ProceduralPrefabs

commit d87b41997eec9a6b0d03c1040901904d68b873fb
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 30 18:03:38 2021 -0500

    fixing non-unity build

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 0fb821a44b788ab1cca61dce7c1fbdbedc2f37c0
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 30 15:43:50 2021 -0500

    adding header for validation

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 30f5135f63286ce8f752df5787937f9543589cb5
Merge: 2d9e1b9f16 103dc6cfcf
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 30 11:20:15 2021 -0500

    Merge branch 'development' into Feature_LY-5384_ProceduralPrefabs
    added a few headers as well

    # Conflicts:
    #	Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 2d9e1b9f16f8861df92c58f0f83974859e615b1f
Merge: 39ee7a8a80 af84e71638
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 29 14:22:39 2021 -0500

    Merge pull request #244 from aws-lumberyard-dev/feature_lyn5880_procprefab_tooling_updates

    {lyn5880} adding Instantiate Procedural Prefab to the Editor

commit af84e716384de048c8555fe5ccdc293e885896f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 29 14:21:09 2021 -0500

    updated based on feeback

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 9c83f6086203e14becb60af5ae937e8e609eb9ed
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 29 11:35:30 2021 -0500

    small include tweak

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 11ac99a87097621796af79329bf9d9344155049e
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 29 10:08:53 2021 -0500

    moved the seg reg key to the CPP file
    removed the Queue Load

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 39ee7a8a803a032652b122b73fba7007abbdbf88
Merge: 0fc7d5f361 8b4f5ded51
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 29 08:24:57 2021 -0500

    Merge pull request #241 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonExample

    Add example prefab script and FBX with 2 meshes to test it

commit 941f6a00d1a6222f10acfcd55a2017be6352f723
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 28 16:07:47 2021 -0500

    make sure the AZ::IO::SystemFile::Exists() before returning fullPath

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 8b4f5ded510d8c6ef47a2d2380fa49c7f6e1fd4e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 28 14:03:11 2021 -0500

    Move sceneJobHandler reset out of exception block.  Add more info to error messages

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 0c82937fcd90d0c606c330f6d3e4cec8eca7edb3
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 28 13:04:37 2021 -0500

    {lyn5880} adding Instantiate Procedural Prefab to the Editor

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 0fc7d5f3610f95dcdd97614a282b9f4eabfc93dc
Merge: ea90e321d7 8ca6acc67d
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 28 09:23:54 2021 -0500

    Merge pull request #235 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset

     {ly5395} adding asset loading logic for procedural prefabs

commit 8ca6acc67dcbd375df9813acbf0062a8a5c7809a
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Mon Sep 27 13:52:21 2021 -0500

    added AZ::Prefab::PrefabGroupAssetHandler::s_Extension
    optimized headers

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit e446aaa4e9951e474f832299f8149142dbf6e85f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Sep 27 09:12:40 2021 -0500

    Remove some whitespace

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit ea90e321d737cd7bafbe617f9b5fbbeae3c4a7e9
Merge: f4c9fc50c3 5ae3c67cc7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Sep 27 09:04:58 2021 -0500

    Merge pull request #238 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonScript

    Fixes to support writing a python script to generate a prefab

commit b69ebbae17826b59f3f4fb675c57be5582acf628
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 17:51:17 2021 -0500

    Use raise_error instead of print

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 407b8d804841f0ba87a0c82405c9d1319435e2da
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 17:47:20 2021 -0500

    Add scene_mesh_to_prefab.py example ProceduralPrefab script and multiple_mesh_one_material FBX which uses the script

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 5ae3c67cc70603ec70f53c03ee716982b55b759a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 14:50:47 2021 -0500

    Test entity cleanup

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 55da78dda5ef9bc558b65bf99d551ffebd38acef
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 14:50:28 2021 -0500

    Make CastWithTypeName only return true if the object can be successfully cast

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 9f2e85bb691a86910d14477f94b9e631ee343e0b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 14:49:28 2021 -0500

    Remove RemoveAllTemplates API from scripting API and use prefab system interface version instead

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 41d46d1f00a16243d3fffda32186fcd7964db78a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 13:19:51 2021 -0500

    Store watch folder in scene so source relative path can be calculated

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f4c9fc50c3ac4c3fc68e98d78b72c4f1f571b516
Merge: de2612b3b9 8bd3c0acdd
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 23 14:10:31 2021 -0500

    Merge pull request #239 from aws-lumberyard-dev/fix_LY5384_script_processing_rule

    {ly5384} script processing rule behavior more stateless

commit 8bd3c0acdd874d6421d25cc77c80da9906afefc2
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 22 15:19:30 2021 -0500

    {ly5384} script processing rule beahvior more stateless

    Made the script processing rule beahvior more stateless so that the
    script name needs to be discovered each time.

    Disconnet from the bus after each scene script builder usage.

    Before it would be possible that the same script can be run more than
    once for each asset.

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 7afd9d4a9911adb1dc665361a09486e6852ba4f8
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 22 13:27:12 2021 -0500

    Update scene_data.py to latest PrefabGroup format

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 74d1ba8853d62b75786d68a6bdeb1bfb2ca52346
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 22 13:26:27 2021 -0500

    Fix GetNodeContent to return a GraphObjectProxy wrapping a nullptr instead of just returning a nullptr which causes issues for python

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit ca4127353e139f9d853784ca6a74e5deeb82d6f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 17:48:15 2021 -0500

    AZ::JsonSerializationUtils update

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 30a76be51c37c1718e9b215f33b172a10bd74f08
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 17:21:52 2021 -0500

    revert odd README.md merge issue
    added alias for PrefabBuilder.Tools

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 6c83d47d51898bcdc17c10578f0198bccd09c834
Merge: 46cb4c2a87 de2612b3b9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 16:52:58 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset

    # Conflicts:
    #	Gems/Prefab/PrefabBuilder/CMakeLists.txt

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 46cb4c2a8711f1adad22be24420922365707c409
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 16:43:19 2021 -0500

    added ProceduralPrefabAssetTest to cover basics for ProceduralPrefabAsset

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit de2612b3b9a28ef130fc92d1c9d68c90790cf132
Merge: f03bbb236e 3117c54657
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 16:28:59 2021 -0500

    Merge pull request #232 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_linux_compile

    {ly5384} Fixing Linux build issues.

commit 3117c54657cb21ae2ef200dbfd1cd046c617089d
Merge: 15fddd1795 f03bbb236e
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 16:28:48 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into fix_ly5384_ProceduralPrefabs_linux_compile

commit f03bbb236eab3458fc433d35f9fb84dae88922d6
Merge: f297aa232a fccf900982
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 15:52:07 2021 -0500

    Merge pull request #233 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_merge_fix

    fixing an API merge compile error

commit fccf9009829b182254064ba17ab3b6e7d44919fa
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 15:50:58 2021 -0500

    fixing an API merge compile error

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 762743b54744258007d8f124be95654ee6f18533
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:10:46 2021 -0500

    Make sure EntityUtilityComponent is loaded in AssetBuilderApplication

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 8c4ab65598e3ebb3a0ae621feb22ef5b57e7de27
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:09:03 2021 -0500

    Clean up entities and templates after python script is done

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 50a1f2a1a4f09cbd3e6256a210cd14a0fdb5b815
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Sep 20 14:05:12 2021 -0500

    ScriptProcessorRuleBehavior resets entity context

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 51a6af053d95e90e582a25ae51c5730a7e2b0973
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:40:37 2021 -0500

    Add add_prefab_group

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f297aa232a2cd9ad5583b3e2b4aa1ce793c07d92
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 11:53:25 2021 -0500

    Fix merge compile issue

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit fc40f5e75efbb87382bf6227966f2f905ccf6d75
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 11:18:44 2021 -0500

    {ly5395} adding asset loading logic for procedural prefabs

    * enabling the Prefab gem for tool work
    * enabling prefab gem for AutomatedTesting
    * AssetTypeInfoHandler for procedural prefab
    * EnableCatalogForAsset for procedural prefab
    * RegisterHandler for AssetManager

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 7a2250db337fbfc693e3cf57458eb56f419b32d6
Merge: c1f3e14304 751a0fab4f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:32:37 2021 -0500

    Merge remote-tracking branch 'origin/Feature_LY-5384_ProceduralPrefabs' into origin_Feature_LY-5384_ProceduralPrefabs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 12440233ccd987d41c248df57cee913ebb2ae2f6
Merge: 751a0fab4f f8d39e2671
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 10:25:50 2021 -0500

    Merge remote-tracking branch 'origin' into feature_lyn5394_procprefab_asset

commit c1f3e143048a914ab2d89146685ca5fe409dda27
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Sep 20 14:03:53 2021 -0500

    Fix merge issue

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 1990ec370df81d4b77b4646553c2b13dce18c638
Merge: 23d02ed416 fc8697edd5
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:21:10 2021 -0500

    Merge branch 'development' into origin_Feature_LY-5384_ProceduralPrefabs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

    # Conflicts:
    #	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp

commit 751a0fab4f932ec3d7683e2d46a187eefc7addbf
Merge: 23d02ed416 7b8d5629dd
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 10:10:06 2021 -0500

    Merge pull request #229 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset

    {lyn5394} adding ProceduralPrefabAsset to AZ Tools Framework

commit 15fddd1795ff07e8d6ce8840a2d675713b63655c
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 10:04:06 2021 -0500

    {ly5384} Fixing Linux build issues.

    * symbols "struct FindComponent" and "AZ::Component* FindComponent()" defined in the same scope, renamed function to FindComponentHelper
    * wrapped the AZ::ComponentId return for both cases

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 23d02ed4165a1db9e738057aad0b7613be8105da
Merge: 0a31e39a25 0f3680a996
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 09:44:30 2021 -0500

    Merge pull request #228 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_Misc

    Reflect Prefab/Entity constants and add failure unit tests

commit 7b8d5629dd04ca1ed75c9828dbb0949f12eb2ca3
Merge: 78fe2cec6f 0a31e39a25
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 17:37:29 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset

commit 78fe2cec6fbcea9217d0b23ec056e19f144fc9a9
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 17:27:57 2021 -0500

    Updated PrefabBuilder to point to new asset type for the procedural prefab

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 4da4e026582c8e7bf0fe9c7c7b39f15189c67b78
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 16:56:13 2021 -0500

    {lyn5394} adding Prefab/Procedural/ProceduralPrefabAsset to AZ Tools Framework

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit c2fb7b9ccb4b7d4e8080b8830d4ceeb66cd3972c
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 16:45:03 2021 -0500

    Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior

    {LYN5393} Adding Prefab Group Behavior to output Procedural Prefab

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 0a31e39a25d36c63827424adc883e873aee20b71
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 16:45:03 2021 -0500

    Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior

    {LYN5393} Adding Prefab Group Behavior to output Procedural Prefab

commit 0f3680a9968cbbbcb9558811f8dbd287a97447ae
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 13:53:22 2021 -0500

    Add failure tests and some test cleanup

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 834eab4c4bf151dfb9e49eb0a5e1f20486b6c05c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 13:34:03 2021 -0500

    Reflect InvalidTemplateId, fix reflection for InvalidComponentId

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 30de326dfbc28bbb9481bf282eb35c427469c847
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:55:16 2021 -0500

    Fix merge issues

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 4bcf6b7b4f2d6285f244226b065bff65ba565094
Merge: 20c5cd7259 28fec42242
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:28:26 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs_EntityManagement' into Feature_LY-5384_ProceduralPrefabs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 20c5cd7259235d26f1aa11e2d61ac6b8a57b8638
Merge: 050e26d609 6845942fa4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:24:44 2021 -0500

    Merge pull request #200 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_CreatePrefab

    API Update: Wrap PrefabSystemComponentInterface behavior

commit 6845942fa419b2b6d5a0103f8d30e6515948310e
Merge: 58a51c738e 65da78dcc2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:07:33 2021 -0500

    Merge pull request #208 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_SavePrefabToString

    API Update: AzToolsFramework::Prefab::PrefabLoaderInterface

commit 65da78dcc22c4251696ebb75680928ecf83d6733
Merge: e0c5e060ab 58a51c738e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:07:06 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs_CreatePrefab' into Feature_LY-5384_ProceduralPrefabs_SavePrefabToString

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

    # Conflicts:
    #	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
    #	Code/Framework/AzToolsFramework/Tests/Prefab/PrefabScriptingTests.cpp

commit 28fec422426640540bd21b2275c7b7a90e4f8e71
Merge: c1b8b5190f d825305202
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 09:58:36 2021 -0500

    Merge pull request #212 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentManagement

    API Update: Editor Entity Component Functions

commit d825305202d5a02d60dd20fb5d0cc0ecb73f562a
Merge: c280964b98 88fa6983d1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 09:58:09 2021 -0500

    Merge pull request #218 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentExplore

    API Update: Editor Component JSON Helper Functions

commit a56daadc45e5ad8511aa5160c3afc245ca10fb83
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 15 16:48:41 2021 -0500

    m_prefabGroupBehavior.release() -> m_prefabGroupBehavior.reset()
    adding error messages for the prefab processing
    fixed typo

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit c1a03351f55f9e8f5161c0ef0288c8e64050e399
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 15 16:32:42 2021 -0500

    reduced the JSON for the testing framework to tree types only

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 0008866baa7882ec106e134049e2bd7b95113796
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 15 16:25:00 2021 -0500

    enable ProceduralPrefabAsset JsonRegistrationContext

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 58a51c738e1bbd5bcad27cf1c0add4760bb8cffa
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 15 14:31:59 2021 -0500

    Remove unneeded include

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit e0c5e060ab8a9cb2cfce4c083f276ab064aa08ea
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 15 14:20:04 2021 -0500

    Cleanup whitespace

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 88fa6983d19ac3a0d7c4073ea390c36794d2603b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 15 13:49:20 2021 -0500

    FindMatchingComponents now returns a vector of ComponentDetails which includes base class info (non-recursive)

    Fixed a memory leak
    Moved const to header

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit b57a9d4261aea85a8ddb1036307d8ad296cac859
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 15 10:49:32 2021 -0500

    updated the DOM logic for the asset loading sake

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit f55ee9f5eabbeac998028f027e1c8adf55419a9d
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 14 13:23:13 2021 -0500

    Update CreateStringPermissive to stop when enough data has been collected.

    Update unit tests.
    Fixed out of bounds behavior in EntityUtilityComponent usage of CreateStringPermissive.
    Updated AssetTreeFilterModel to cap the string length

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 6d6707dea8cd072261d65e0a508d1179df3892d4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 14 10:55:38 2021 -0500

    Rename GetComponentJson to GetComponentDefaultJson.

    Clean up GetComponentTypeIdFromName

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f4380d37a40ada353f7156b0d06b7ab60b72a151
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 14 10:29:04 2021 -0500

    Move scripting ebus and handler into separate files

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 572cb58f854aa2368b18f8cf70154d471dfac047
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 10 20:27:41 2021 -0400

    Renamed SearchComponents to FindMatchingComponents

    Added missing printf formatting

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 050e26d60931700e226a4d1a5d02d6a1d4c69915
Merge: 542bdfc5d7 c1b8b5190f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 10 09:31:08 2021 -0400

    Merge pull request #201 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement

    API Update: Editor Entity Management - Add some comments and error handling

commit 875d5dc466b65d893a44e11aa9467c45cf7994e9
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 10 09:13:43 2021 -0400

    Move bus and handler code into separate files

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit a2d94e24fb2cd1993835f17e7129000c00926cf7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 17:25:35 2021 -0400

    Add comments

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 16f507377f4f04c88028833f69327bd11b401b87
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 17:16:33 2021 -0400

    Add error messages

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 2e6d7d40dc731989128fbe829141057b3558c88b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 16:54:20 2021 -0400

    Cleanup code

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 963891eaeb8d616bb071f2a7b50cdabd994241a2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 3 10:48:40 2021 -0500

    Add and update unit tests

    Reflect APIs to behavior context

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 664be8eca54293407e5ce2d631375d907c1bb2f6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 2 13:00:02 2021 -0500

    Add Search and Component json output APIs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit e94fe64f366009d06b889954d292c37ea4f96fe2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 13:37:44 2021 -0400

    Make bus handler private

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 345a1b0d5edef99d5a8ea2bce2f4f3478652a4f1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 12:30:13 2021 -0400

    Address feedback

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit c280964b983635bed9e8bbfb94b2188403287d4c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 10:12:49 2021 -0500

    Address feedback

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 3b819ee827fc4c19312f2d2bc5788e2cc36de4f4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 3 16:06:10 2021 -0500

    Update unit test to verify components on saved prefab

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 0b63c0e316ec621ed17edf36109b7cd1d50ef606
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 3 12:52:46 2021 -0500

    Expand test

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit ea59416626d9b43599cf8847585e599f8fa5fd22
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 1 17:32:14 2021 -0500

    Add error handling

    Add component creation
    Add error testing

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 9d0f2ae33eadba0216bd245157b94692792b1a86
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 17:31:28 2021 -0500

    enabling ProductDependencies test again

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 15d1e4730df31e71e7e3ee6d4914f19b233c1b7f
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 17:23:26 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior

    # Conflicts:
    #	Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
    #	Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
    #	Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit ce2e4602bde26fbb34b43c73f820a97b9e229b5a
Merge: 5ad0aac747 542bdfc5d7
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 17:14:07 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior

    # Conflicts:
    #	Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
    #	Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
    #	Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 542bdfc5d762c07938f9a0f8e729070f1df9edfc
Merge: 3e7564c944 4899f67986
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 17:09:10 2021 -0500

    Merge pull request #207 from aws-lumberyard-dev/feature_lyn5392_proc_prefab_group

    {lyn5392} Adding PrefabGroup scene manifest rule

commit 4899f67986992b7eeb5cc3b750493ed21ec7b4f3
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 16:33:24 2021 -0500

    removing unneeded AZStd::move() calls

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 5ad0aac7472d24bb85990d36399a466288ecfdbc
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 16:17:52 2021 -0500

    cleaned up the code
    finalized the unit tests
    fixed the code based on the tests... FTW!

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 24f289dd31292c4b9f5e5848ddc94efd986b4341
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 1 13:06:20 2021 -0500

    Add FindComponentByTypeName and UpdateComponentForEntity APIs

    Add unit tests

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit c1b8b5190f973d2429731308f50c7c962d64301e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 1 14:02:17 2021 -0500

    Fix bus connect that should have been a bus disconnect

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit fde870d6c92e131875ec6aadda2365203a538379
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 1 12:57:04 2021 -0500

    Fix up includes

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 8ceddd0efc90d33bc34b5287176497356e57abf9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 08:43:23 2021 -0500

    WIP

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 3cc9135d87efde24430dbf1cd112bcf9b95ecaa0
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Aug 31 14:44:37 2021 -0500

    Rename files

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f056b3d9578ae2f49dbc172a5929306047620be6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Aug 31 14:14:34 2021 -0500

    Remove 'editor' from bus/component name

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 0fb7a0788e879eb9dc241291f05f0acffc0b0156
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Aug 31 09:18:37 2021 -0500

    {lyn5392} Adding PrefabGroup scene manifest rule

    * Adding PrefabGroup abstraction and concrete classes to fill out in a scene manifest
    * has reflections for serialization & behavior
    * testing the behavior using Lua
    * testing the serialization using JSON

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit b1756307bff9f86ae0ae1354bae8f470d19b4487
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Aug 30 17:52:18 2021 -0500

    Reflect SaveTemplateToString

    Add unit test

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit ddd2bb89041c5fb8b6add2cfc02c454baab9a7d6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Aug 30 12:46:17 2021 -0500

    Add warning/error messages, update module

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit e839c1cbcc340859fc6ee5cff2d802660944194b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Aug 30 11:17:25 2021 -0500

    Add some comments and error handling

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 347f787cc88405541889e842151de81a70598dd1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 17:16:45 2021 -0500

    Fix line endings

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit be26ab1cb16221ba879c10652b430ea31547d868
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 15:28:00 2021 -0500

    Add CreatePrefabTemplate

    Add unit test

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 3e7564c944497b7b6cce94dbce486ed8c4561f33
Merge: 5a3c289fac 07841ee749
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Aug 30 10:20:20 2021 -0500

    Merge pull request #199 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement

    Add editor entity creation and unit test

commit 07841ee749d2a1bc22352cbec3076ac087348676
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 16:44:57 2021 -0500

    Fix line endings

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 35bc3b89cd1fcc126114ea7d61cdd21e88699080
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 15:03:35 2021 -0500

    Setup CreateEditorReadyEntity to use a custom entity context

    Add unit test

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 82519b15510a4ec1b2daf4d883a2c4c3d9c0a347
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 09:29:20 2021 -0500

    Add EditorEntityUtilityComponent for managing entities from the behavior context

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f8d39e2671
Merge: 43603cad5e 575faa4443
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Wed Aug 11 15:29:33 2021 -0500

    Merge pull request #3049 from aws-lumberyard-dev/cgalvan/gitflow_210811

    Merged stabilization/2106 to main

commit 575faa4443
Merge: 43603cad5e 4b817a6483
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Wed Aug 11 14:13:27 2021 -0500

    Merge remote-tracking branch 'upstream/stabilization/2106' into cgalvan/gitflow_210811

    Signed-off-by: Chris Galvan <chgalvan@amazon.com>

commit 43603cad5e
Merge: d9cce28a53 bb52475ce8
Author: Terry Michaels <miterenc@amazon.com>
Date:   Mon Jul 19 14:55:51 2021 -0500

    Merge pull request #2271 from aws-lumberyard-dev/Foundation/miterenc/ContributingUpdate

    Updating CONTRIBUTING.md

commit bb52475ce8
Author: Terry Michaels <miterenc@amazon.com>
Date:   Mon Jul 19 14:55:14 2021 -0500

    Updated text to be more descriptive

    Signed-off-by: Terry Michaels <miterenc@amazon.com>

commit 697dfad486
Author: Terry Michaels <miterenc@amazon.com>
Date:   Mon Jul 19 14:27:24 2021 -0500

    Fixed typo

    Signed-off-by: Terry Michaels <miterenc@amazon.com>

commit 650e1ab44d
Author: Terry Michaels <miterenc@amazon.com>
Date:   Mon Jul 19 14:19:46 2021 -0500

    Updating CONTRIBUTING.md

    Signed-off-by: Terry Michaels <miterenc@amazon.com>

commit d9cce28a53
Merge: e7f787572e 486ba58628
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Mon Jul 12 14:06:57 2021 -0500

    Merge pull request #2096 from aws-lumberyard-dev/cgalvan/gitflow_210712_main

    Merged stabilization/2106 to main

commit 486ba58628
Merge: e7f787572e 7cfde884d9
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Mon Jul 12 11:12:41 2021 -0500

    Merged stabilization/2106 to development; Resolved merge conflicts

    Signed-off-by: Chris Galvan <chgalvan@amazon.com>

commit e7f787572e
Author: Nicholas Lawson <70027408+lawsonamzn@users.noreply.github.com>
Date:   Tue Jul 6 08:03:35 2021 -0700

    Updates licenses to APACHE-2.0 OR MIT (#1685)

    Not to be committed before 7/6/2021

    Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>

commit 837e1c7370
Merge: d30de01752 efcbe2c4a1
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Fri Jul 2 12:11:27 2021 -0500

    Merge pull request #1764 from aws-lumberyard-dev/cgalvan/gitflow_210702

    Merged stabilization/2106 to main

commit efcbe2c4a1
Merge: d30de01752 0c43493e29
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Fri Jul 2 10:20:42 2021 -0500

    Merge remote-tracking branch 'upstream/stabilization/2106' into cgalvan/gitflow_210702

    Signed-off-by: Chris Galvan <chgalvan@amazon.com>

commit d30de01752
Author: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
Date:   Mon Jun 28 11:20:36 2021 -0700

    Updating LFS config to new endpoint (#1624)

    Signed-off-by: AMZN-alexpete

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* fix for "warning C4100: 'outputValueTypeId': unreferenced formal"

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* Material Editor: Added alternate skybox toggle to the toolbar

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* Squashed commit of the following:

commit 964a45ead662f502ff0d63ae3528a9aa18a760f4
Merge: 8d4c1dee78 799ab8585b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Oct 1 16:16:47 2021 -0500

    Merge branch 'development' into Feature_LY-5384_ProceduralPrefabs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

    # Conflicts:
    #	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.h

commit 8d4c1dee782a1b82ded14d11f7fe879c865980a7
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Fri Oct 1 15:49:22 2021 -0500

    fixing non-unity build

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit e83431b3be58f36a875b5187c03cd67368d91726
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Fri Oct 1 12:42:38 2021 -0500

    fixing Gems/Multiplayer/Code/Source/Components/NetworkCharacterComponent.cpp:172:28: error: member access into incomplete type 'AZ::BehaviorContext'

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit b0523867d9605aff67710f4ab6030f327cd5558f
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Fri Oct 1 10:23:56 2021 -0500

    fix for error: unused variable 'targetInstanceRef'

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 387c42ac1a4268ff8b2701c0c914e384b355e629
Merge: d87b41997e 0fb821a44b
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Fri Oct 1 10:00:46 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' of https://github.com/aws-lumberyard-dev/o3de into Feature_LY-5384_ProceduralPrefabs

commit d87b41997eec9a6b0d03c1040901904d68b873fb
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 30 18:03:38 2021 -0500

    fixing non-unity build

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 0fb821a44b788ab1cca61dce7c1fbdbedc2f37c0
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 30 15:43:50 2021 -0500

    adding header for validation

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 30f5135f63286ce8f752df5787937f9543589cb5
Merge: 2d9e1b9f16 103dc6cfcf
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 30 11:20:15 2021 -0500

    Merge branch 'development' into Feature_LY-5384_ProceduralPrefabs
    added a few headers as well

    # Conflicts:
    #	Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFrameworkModule.cpp

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 2d9e1b9f16f8861df92c58f0f83974859e615b1f
Merge: 39ee7a8a80 af84e71638
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 29 14:22:39 2021 -0500

    Merge pull request #244 from aws-lumberyard-dev/feature_lyn5880_procprefab_tooling_updates

    {lyn5880} adding Instantiate Procedural Prefab to the Editor

commit af84e716384de048c8555fe5ccdc293e885896f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 29 14:21:09 2021 -0500

    updated based on feeback

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 9c83f6086203e14becb60af5ae937e8e609eb9ed
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 29 11:35:30 2021 -0500

    small include tweak

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 11ac99a87097621796af79329bf9d9344155049e
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 29 10:08:53 2021 -0500

    moved the seg reg key to the CPP file
    removed the Queue Load

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 39ee7a8a803a032652b122b73fba7007abbdbf88
Merge: 0fc7d5f361 8b4f5ded51
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 29 08:24:57 2021 -0500

    Merge pull request #241 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonExample

    Add example prefab script and FBX with 2 meshes to test it

commit 941f6a00d1a6222f10acfcd55a2017be6352f723
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 28 16:07:47 2021 -0500

    make sure the AZ::IO::SystemFile::Exists() before returning fullPath

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 8b4f5ded510d8c6ef47a2d2380fa49c7f6e1fd4e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 28 14:03:11 2021 -0500

    Move sceneJobHandler reset out of exception block.  Add more info to error messages

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 0c82937fcd90d0c606c330f6d3e4cec8eca7edb3
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 28 13:04:37 2021 -0500

    {lyn5880} adding Instantiate Procedural Prefab to the Editor

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 0fc7d5f3610f95dcdd97614a282b9f4eabfc93dc
Merge: ea90e321d7 8ca6acc67d
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 28 09:23:54 2021 -0500

    Merge pull request #235 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset

     {ly5395} adding asset loading logic for procedural prefabs

commit 8ca6acc67dcbd375df9813acbf0062a8a5c7809a
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Mon Sep 27 13:52:21 2021 -0500

    added AZ::Prefab::PrefabGroupAssetHandler::s_Extension
    optimized headers

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit e446aaa4e9951e474f832299f8149142dbf6e85f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Sep 27 09:12:40 2021 -0500

    Remove some whitespace

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit ea90e321d737cd7bafbe617f9b5fbbeae3c4a7e9
Merge: f4c9fc50c3 5ae3c67cc7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Sep 27 09:04:58 2021 -0500

    Merge pull request #238 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_PythonScript

    Fixes to support writing a python script to generate a prefab

commit b69ebbae17826b59f3f4fb675c57be5582acf628
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 17:51:17 2021 -0500

    Use raise_error instead of print

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 407b8d804841f0ba87a0c82405c9d1319435e2da
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 17:47:20 2021 -0500

    Add scene_mesh_to_prefab.py example ProceduralPrefab script and multiple_mesh_one_material FBX which uses the script

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 5ae3c67cc70603ec70f53c03ee716982b55b759a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 14:50:47 2021 -0500

    Test entity cleanup

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 55da78dda5ef9bc558b65bf99d551ffebd38acef
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 14:50:28 2021 -0500

    Make CastWithTypeName only return true if the object can be successfully cast

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 9f2e85bb691a86910d14477f94b9e631ee343e0b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 14:49:28 2021 -0500

    Remove RemoveAllTemplates API from scripting API and use prefab system interface version instead

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 41d46d1f00a16243d3fffda32186fcd7964db78a
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 24 13:19:51 2021 -0500

    Store watch folder in scene so source relative path can be calculated

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f4c9fc50c3ac4c3fc68e98d78b72c4f1f571b516
Merge: de2612b3b9 8bd3c0acdd
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 23 14:10:31 2021 -0500

    Merge pull request #239 from aws-lumberyard-dev/fix_LY5384_script_processing_rule

    {ly5384} script processing rule behavior more stateless

commit 8bd3c0acdd874d6421d25cc77c80da9906afefc2
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 22 15:19:30 2021 -0500

    {ly5384} script processing rule beahvior more stateless

    Made the script processing rule beahvior more stateless so that the
    script name needs to be discovered each time.

    Disconnet from the bus after each scene script builder usage.

    Before it would be possible that the same script can be run more than
    once for each asset.

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 7afd9d4a9911adb1dc665361a09486e6852ba4f8
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 22 13:27:12 2021 -0500

    Update scene_data.py to latest PrefabGroup format

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 74d1ba8853d62b75786d68a6bdeb1bfb2ca52346
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 22 13:26:27 2021 -0500

    Fix GetNodeContent to return a GraphObjectProxy wrapping a nullptr instead of just returning a nullptr which causes issues for python

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit ca4127353e139f9d853784ca6a74e5deeb82d6f9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 17:48:15 2021 -0500

    AZ::JsonSerializationUtils update

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 30a76be51c37c1718e9b215f33b172a10bd74f08
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 17:21:52 2021 -0500

    revert odd README.md merge issue
    added alias for PrefabBuilder.Tools

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 6c83d47d51898bcdc17c10578f0198bccd09c834
Merge: 46cb4c2a87 de2612b3b9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 16:52:58 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset

    # Conflicts:
    #	Gems/Prefab/PrefabBuilder/CMakeLists.txt

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 46cb4c2a8711f1adad22be24420922365707c409
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 16:43:19 2021 -0500

    added ProceduralPrefabAssetTest to cover basics for ProceduralPrefabAsset

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit de2612b3b9a28ef130fc92d1c9d68c90790cf132
Merge: f03bbb236e 3117c54657
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 16:28:59 2021 -0500

    Merge pull request #232 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_linux_compile

    {ly5384} Fixing Linux build issues.

commit 3117c54657cb21ae2ef200dbfd1cd046c617089d
Merge: 15fddd1795 f03bbb236e
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 16:28:48 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into fix_ly5384_ProceduralPrefabs_linux_compile

commit f03bbb236eab3458fc433d35f9fb84dae88922d6
Merge: f297aa232a fccf900982
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 15:52:07 2021 -0500

    Merge pull request #233 from aws-lumberyard-dev/fix_ly5384_ProceduralPrefabs_merge_fix

    fixing an API merge compile error

commit fccf9009829b182254064ba17ab3b6e7d44919fa
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 15:50:58 2021 -0500

    fixing an API merge compile error

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 762743b54744258007d8f124be95654ee6f18533
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:10:46 2021 -0500

    Make sure EntityUtilityComponent is loaded in AssetBuilderApplication

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 8c4ab65598e3ebb3a0ae621feb22ef5b57e7de27
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:09:03 2021 -0500

    Clean up entities and templates after python script is done

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 50a1f2a1a4f09cbd3e6256a210cd14a0fdb5b815
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Sep 20 14:05:12 2021 -0500

    ScriptProcessorRuleBehavior resets entity context

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 51a6af053d95e90e582a25ae51c5730a7e2b0973
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:40:37 2021 -0500

    Add add_prefab_group

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f297aa232a2cd9ad5583b3e2b4aa1ce793c07d92
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 11:53:25 2021 -0500

    Fix merge compile issue

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit fc40f5e75efbb87382bf6227966f2f905ccf6d75
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 11:18:44 2021 -0500

    {ly5395} adding asset loading logic for procedural prefabs

    * enabling the Prefab gem for tool work
    * enabling prefab gem for AutomatedTesting
    * AssetTypeInfoHandler for procedural prefab
    * EnableCatalogForAsset for procedural prefab
    * RegisterHandler for AssetManager

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 7a2250db337fbfc693e3cf57458eb56f419b32d6
Merge: c1f3e14304 751a0fab4f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:32:37 2021 -0500

    Merge remote-tracking branch 'origin/Feature_LY-5384_ProceduralPrefabs' into origin_Feature_LY-5384_ProceduralPrefabs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 12440233ccd987d41c248df57cee913ebb2ae2f6
Merge: 751a0fab4f f8d39e2671
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 10:25:50 2021 -0500

    Merge remote-tracking branch 'origin' into feature_lyn5394_procprefab_asset

commit c1f3e143048a914ab2d89146685ca5fe409dda27
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Sep 20 14:03:53 2021 -0500

    Fix merge issue

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 1990ec370df81d4b77b4646553c2b13dce18c638
Merge: 23d02ed416 fc8697edd5
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 10:21:10 2021 -0500

    Merge branch 'development' into origin_Feature_LY-5384_ProceduralPrefabs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

    # Conflicts:
    #	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp

commit 751a0fab4f932ec3d7683e2d46a187eefc7addbf
Merge: 23d02ed416 7b8d5629dd
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 10:10:06 2021 -0500

    Merge pull request #229 from aws-lumberyard-dev/feature_lyn5394_procprefab_asset

    {lyn5394} adding ProceduralPrefabAsset to AZ Tools Framework

commit 15fddd1795ff07e8d6ce8840a2d675713b63655c
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Sep 21 10:04:06 2021 -0500

    {ly5384} Fixing Linux build issues.

    * symbols "struct FindComponent" and "AZ::Component* FindComponent()" defined in the same scope, renamed function to FindComponentHelper
    * wrapped the AZ::ComponentId return for both cases

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 23d02ed4165a1db9e738057aad0b7613be8105da
Merge: 0a31e39a25 0f3680a996
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 21 09:44:30 2021 -0500

    Merge pull request #228 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_Misc

    Reflect Prefab/Entity constants and add failure unit tests

commit 7b8d5629dd04ca1ed75c9828dbb0949f12eb2ca3
Merge: 78fe2cec6f 0a31e39a25
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 17:37:29 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5394_procprefab_asset

commit 78fe2cec6fbcea9217d0b23ec056e19f144fc9a9
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 17:27:57 2021 -0500

    Updated PrefabBuilder to point to new asset type for the procedural prefab

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 4da4e026582c8e7bf0fe9c7c7b39f15189c67b78
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 16:56:13 2021 -0500

    {lyn5394} adding Prefab/Procedural/ProceduralPrefabAsset to AZ Tools Framework

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit c2fb7b9ccb4b7d4e8080b8830d4ceeb66cd3972c
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 16:45:03 2021 -0500

    Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior

    {LYN5393} Adding Prefab Group Behavior to output Procedural Prefab

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 0a31e39a25d36c63827424adc883e873aee20b71
Merge: 30de326dfb a56daadc45
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Thu Sep 16 16:45:03 2021 -0500

    Merge pull request #210 from aws-lumberyard-dev/feature_lyn5393_proc_prefab_behavior

    {LYN5393} Adding Prefab Group Behavior to output Procedural Prefab

commit 0f3680a9968cbbbcb9558811f8dbd287a97447ae
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 13:53:22 2021 -0500

    Add failure tests and some test cleanup

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 834eab4c4bf151dfb9e49eb0a5e1f20486b6c05c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 13:34:03 2021 -0500

    Reflect InvalidTemplateId, fix reflection for InvalidComponentId

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 30de326dfbc28bbb9481bf282eb35c427469c847
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:55:16 2021 -0500

    Fix merge issues

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 4bcf6b7b4f2d6285f244226b065bff65ba565094
Merge: 20c5cd7259 28fec42242
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:28:26 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs_EntityManagement' into Feature_LY-5384_ProceduralPrefabs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 20c5cd7259235d26f1aa11e2d61ac6b8a57b8638
Merge: 050e26d609 6845942fa4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:24:44 2021 -0500

    Merge pull request #200 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_CreatePrefab

    API Update: Wrap PrefabSystemComponentInterface behavior

commit 6845942fa419b2b6d5a0103f8d30e6515948310e
Merge: 58a51c738e 65da78dcc2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:07:33 2021 -0500

    Merge pull request #208 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_SavePrefabToString

    API Update: AzToolsFramework::Prefab::PrefabLoaderInterface

commit 65da78dcc22c4251696ebb75680928ecf83d6733
Merge: e0c5e060ab 58a51c738e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 10:07:06 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs_CreatePrefab' into Feature_LY-5384_ProceduralPrefabs_SavePrefabToString

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

    # Conflicts:
    #	Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
    #	Code/Framework/AzToolsFramework/Tests/Prefab/PrefabScriptingTests.cpp

commit 28fec422426640540bd21b2275c7b7a90e4f8e71
Merge: c1b8b5190f d825305202
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 09:58:36 2021 -0500

    Merge pull request #212 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentManagement

    API Update: Editor Entity Component Functions

commit d825305202d5a02d60dd20fb5d0cc0ecb73f562a
Merge: c280964b98 88fa6983d1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 16 09:58:09 2021 -0500

    Merge pull request #218 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_ComponentExplore

    API Update: Editor Component JSON Helper Functions

commit a56daadc45e5ad8511aa5160c3afc245ca10fb83
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 15 16:48:41 2021 -0500

    m_prefabGroupBehavior.release() -> m_prefabGroupBehavior.reset()
    adding error messages for the prefab processing
    fixed typo

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit c1a03351f55f9e8f5161c0ef0288c8e64050e399
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 15 16:32:42 2021 -0500

    reduced the JSON for the testing framework to tree types only

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 0008866baa7882ec106e134049e2bd7b95113796
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 15 16:25:00 2021 -0500

    enable ProceduralPrefabAsset JsonRegistrationContext

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 58a51c738e1bbd5bcad27cf1c0add4760bb8cffa
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 15 14:31:59 2021 -0500

    Remove unneeded include

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit e0c5e060ab8a9cb2cfce4c083f276ab064aa08ea
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 15 14:20:04 2021 -0500

    Cleanup whitespace

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 88fa6983d19ac3a0d7c4073ea390c36794d2603b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 15 13:49:20 2021 -0500

    FindMatchingComponents now returns a vector of ComponentDetails which includes base class info (non-recursive)

    Fixed a memory leak
    Moved const to header

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit b57a9d4261aea85a8ddb1036307d8ad296cac859
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 15 10:49:32 2021 -0500

    updated the DOM logic for the asset loading sake

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit f55ee9f5eabbeac998028f027e1c8adf55419a9d
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 14 13:23:13 2021 -0500

    Update CreateStringPermissive to stop when enough data has been collected.

    Update unit tests.
    Fixed out of bounds behavior in EntityUtilityComponent usage of CreateStringPermissive.
    Updated AssetTreeFilterModel to cap the string length

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 6d6707dea8cd072261d65e0a508d1179df3892d4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 14 10:55:38 2021 -0500

    Rename GetComponentJson to GetComponentDefaultJson.

    Clean up GetComponentTypeIdFromName

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f4380d37a40ada353f7156b0d06b7ab60b72a151
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Sep 14 10:29:04 2021 -0500

    Move scripting ebus and handler into separate files

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 572cb58f854aa2368b18f8cf70154d471dfac047
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 10 20:27:41 2021 -0400

    Renamed SearchComponents to FindMatchingComponents

    Added missing printf formatting

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 050e26d60931700e226a4d1a5d02d6a1d4c69915
Merge: 542bdfc5d7 c1b8b5190f
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 10 09:31:08 2021 -0400

    Merge pull request #201 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement

    API Update: Editor Entity Management - Add some comments and error handling

commit 875d5dc466b65d893a44e11aa9467c45cf7994e9
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 10 09:13:43 2021 -0400

    Move bus and handler code into separate files

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit a2d94e24fb2cd1993835f17e7129000c00926cf7
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 17:25:35 2021 -0400

    Add comments

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 16f507377f4f04c88028833f69327bd11b401b87
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 17:16:33 2021 -0400

    Add error messages

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 2e6d7d40dc731989128fbe829141057b3558c88b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 16:54:20 2021 -0400

    Cleanup code

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 963891eaeb8d616bb071f2a7b50cdabd994241a2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 3 10:48:40 2021 -0500

    Add and update unit tests

    Reflect APIs to behavior context

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 664be8eca54293407e5ce2d631375d907c1bb2f6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 2 13:00:02 2021 -0500

    Add Search and Component json output APIs

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit e94fe64f366009d06b889954d292c37ea4f96fe2
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 13:37:44 2021 -0400

    Make bus handler private

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 345a1b0d5edef99d5a8ea2bce2f4f3478652a4f1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 12:30:13 2021 -0400

    Address feedback

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit c280964b983635bed9e8bbfb94b2188403287d4c
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 9 10:12:49 2021 -0500

    Address feedback

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 3b819ee827fc4c19312f2d2bc5788e2cc36de4f4
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 3 16:06:10 2021 -0500

    Update unit test to verify components on saved prefab

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 0b63c0e316ec621ed17edf36109b7cd1d50ef606
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Sep 3 12:52:46 2021 -0500

    Expand test

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit ea59416626d9b43599cf8847585e599f8fa5fd22
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 1 17:32:14 2021 -0500

    Add error handling

    Add component creation
    Add error testing

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 9d0f2ae33eadba0216bd245157b94692792b1a86
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 17:31:28 2021 -0500

    enabling ProductDependencies test again

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 15d1e4730df31e71e7e3ee6d4914f19b233c1b7f
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 17:23:26 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior

    # Conflicts:
    #	Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
    #	Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
    #	Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit ce2e4602bde26fbb34b43c73f820a97b9e229b5a
Merge: 5ad0aac747 542bdfc5d7
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 17:14:07 2021 -0500

    Merge branch 'Feature_LY-5384_ProceduralPrefabs' into feature_lyn5393_proc_prefab_behavior

    # Conflicts:
    #	Gems/Prefab/PrefabBuilder/PrefabGroup/PrefabGroupTests.cpp
    #	Gems/Prefab/PrefabBuilder/prefabbuilder_files.cmake
    #	Gems/Prefab/PrefabBuilder/prefabbuilder_tests_files.cmake

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 542bdfc5d762c07938f9a0f8e729070f1df9edfc
Merge: 3e7564c944 4899f67986
Author: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 17:09:10 2021 -0500

    Merge pull request #207 from aws-lumberyard-dev/feature_lyn5392_proc_prefab_group

    {lyn5392} Adding PrefabGroup scene manifest rule

commit 4899f67986992b7eeb5cc3b750493ed21ec7b4f3
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 16:33:24 2021 -0500

    removing unneeded AZStd::move() calls

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 5ad0aac7472d24bb85990d36399a466288ecfdbc
Author: Jackson <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 16:17:52 2021 -0500

    cleaned up the code
    finalized the unit tests
    fixed the code based on the tests... FTW!

    Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

commit 24f289dd31292c4b9f5e5848ddc94efd986b4341
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 1 13:06:20 2021 -0500

    Add FindComponentByTypeName and UpdateComponentForEntity APIs

    Add unit tests

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit c1b8b5190f973d2429731308f50c7c962d64301e
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 1 14:02:17 2021 -0500

    Fix bus connect that should have been a bus disconnect

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit fde870d6c92e131875ec6aadda2365203a538379
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 1 12:57:04 2021 -0500

    Fix up includes

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 8ceddd0efc90d33bc34b5287176497356e57abf9
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Wed Sep 1 08:43:23 2021 -0500

    WIP

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit 3cc9135d87efde24430dbf1cd112bcf9b95ecaa0
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Aug 31 14:44:37 2021 -0500

    Rename files

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f056b3d9578ae2f49dbc172a5929306047620be6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Tue Aug 31 14:14:34 2021 -0500

    Remove 'editor' from bus/component name

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 0fb7a0788e879eb9dc241291f05f0acffc0b0156
Author: jackalbe <23512001+jackalbe@users.noreply.github.com>
Date:   Tue Aug 31 09:18:37 2021 -0500

    {lyn5392} Adding PrefabGroup scene manifest rule

    * Adding PrefabGroup abstraction and concrete classes to fill out in a scene manifest
    * has reflections for serialization & behavior
    * testing the behavior using Lua
    * testing the serialization using JSON

    Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

commit b1756307bff9f86ae0ae1354bae8f470d19b4487
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Aug 30 17:52:18 2021 -0500

    Reflect SaveTemplateToString

    Add unit test

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit ddd2bb89041c5fb8b6add2cfc02c454baab9a7d6
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Aug 30 12:46:17 2021 -0500

    Add warning/error messages, update module

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit e839c1cbcc340859fc6ee5cff2d802660944194b
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Aug 30 11:17:25 2021 -0500

    Add some comments and error handling

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 347f787cc88405541889e842151de81a70598dd1
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 17:16:45 2021 -0500

    Fix line endings

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit be26ab1cb16221ba879c10652b430ea31547d868
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 15:28:00 2021 -0500

    Add CreatePrefabTemplate

    Add unit test

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 3e7564c944497b7b6cce94dbce486ed8c4561f33
Merge: 5a3c289fac 07841ee749
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Aug 30 10:20:20 2021 -0500

    Merge pull request #199 from aws-lumberyard-dev/Feature_LY-5384_ProceduralPrefabs_EntityManagement

    Add editor entity creation and unit test

commit 07841ee749d2a1bc22352cbec3076ac087348676
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 16:44:57 2021 -0500

    Fix line endings

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 35bc3b89cd1fcc126114ea7d61cdd21e88699080
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 15:03:35 2021 -0500

    Setup CreateEditorReadyEntity to use a custom entity context

    Add unit test

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 82519b15510a4ec1b2daf4d883a2c4c3d9c0a347
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Aug 27 09:29:20 2021 -0500

    Add EditorEntityUtilityComponent for managing entities from the behavior context

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit f8d39e2671
Merge: 43603cad5e 575faa4443
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Wed Aug 11 15:29:33 2021 -0500

    Merge pull request #3049 from aws-lumberyard-dev/cgalvan/gitflow_210811

    Merged stabilization/2106 to main

commit 575faa4443
Merge: 43603cad5e 4b817a6483
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Wed Aug 11 14:13:27 2021 -0500

    Merge remote-tracking branch 'upstream/stabilization/2106' into cgalvan/gitflow_210811

    Signed-off-by: Chris Galvan <chgalvan@amazon.com>

commit 43603cad5e
Merge: d9cce28a53 bb52475ce8
Author: Terry Michaels <miterenc@amazon.com>
Date:   Mon Jul 19 14:55:51 2021 -0500

    Merge pull request #2271 from aws-lumberyard-dev/Foundation/miterenc/ContributingUpdate

    Updating CONTRIBUTING.md

commit bb52475ce8
Author: Terry Michaels <miterenc@amazon.com>
Date:   Mon Jul 19 14:55:14 2021 -0500

    Updated text to be more descriptive

    Signed-off-by: Terry Michaels <miterenc@amazon.com>

commit 697dfad486
Author: Terry Michaels <miterenc@amazon.com>
Date:   Mon Jul 19 14:27:24 2021 -0500

    Fixed typo

    Signed-off-by: Terry Michaels <miterenc@amazon.com>

commit 650e1ab44d
Author: Terry Michaels <miterenc@amazon.com>
Date:   Mon Jul 19 14:19:46 2021 -0500

    Updating CONTRIBUTING.md

    Signed-off-by: Terry Michaels <miterenc@amazon.com>

commit d9cce28a53
Merge: e7f787572e 486ba58628
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Mon Jul 12 14:06:57 2021 -0500

    Merge pull request #2096 from aws-lumberyard-dev/cgalvan/gitflow_210712_main

    Merged stabilization/2106 to main

commit 486ba58628
Merge: e7f787572e 7cfde884d9
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Mon Jul 12 11:12:41 2021 -0500

    Merged stabilization/2106 to development; Resolved merge conflicts

    Signed-off-by: Chris Galvan <chgalvan@amazon.com>

commit e7f787572e
Author: Nicholas Lawson <70027408+lawsonamzn@users.noreply.github.com>
Date:   Tue Jul 6 08:03:35 2021 -0700

    Updates licenses to APACHE-2.0 OR MIT (#1685)

    Not to be committed before 7/6/2021

    Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>

commit 837e1c7370
Merge: d30de01752 efcbe2c4a1
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Fri Jul 2 12:11:27 2021 -0500

    Merge pull request #1764 from aws-lumberyard-dev/cgalvan/gitflow_210702

    Merged stabilization/2106 to main

commit efcbe2c4a1
Merge: d30de01752 0c43493e29
Author: Chris Galvan <chgalvan@amazon.com>
Date:   Fri Jul 2 10:20:42 2021 -0500

    Merge remote-tracking branch 'upstream/stabilization/2106' into cgalvan/gitflow_210702

    Signed-off-by: Chris Galvan <chgalvan@amazon.com>

commit d30de01752
Author: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
Date:   Mon Jun 28 11:20:36 2021 -0700

    Updating LFS config to new endpoint (#1624)

    Signed-off-by: AMZN-alexpete

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* fix for "warning C4100: 'outputValueTypeId': unreferenced formal"

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* Squashed commit of the following:

commit dbd3526517bcb6553402cbc0af1f02e1f68e0707
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Mon Oct 4 14:30:56 2021 -0500

    Increased scene manifest max size to size_t::max to match default json size limit

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit ea4a9ffd23feb3beeadc9bf6ca765c96980e9e6d
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Oct 1 19:15:25 2021 -0500

    Switch to querying cache location from Settings Registry

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 1c197996132625b8e26856fc92a30f9862d9dfdb
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Fri Oct 1 14:42:32 2021 -0500

    Update to look in cache for generated manifest instead of source folder

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit cf3c32791fd71dc48066f9783c8859d386370b95
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Thu Sep 30 11:09:40 2021 -0500

    Added generated manifest to dependency tracking.  Updated unit tests

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 56cb0d27982e61c2cf123b765def8b5c9e21b021
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 29 15:51:52 2021 -0500

    Moved manifest size const to header and used that in scene builder

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 7c8016a0ba6000090b29371f253b7906c9f3d141
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 29 15:21:06 2021 -0500

    Add doc comment

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit 45fd5473f5ed6fe4fe93f8d629857852bcbe5e03
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 29 15:11:36 2021 -0500

    Clean up code and add unit test

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

commit d0e610cad380e2278bc18552a4d1c71c64a5d339
Author: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
Date:   Wed Sep 29 13:21:58 2021 -0500

    Source dependency reporting WIP

    Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

    # Conflicts:
    #	Gems/SceneProcessing/Code/Source/SceneBuilder/SceneBuilderWorker.cpp

(cherry picked from commit d6464dcee20ea4e6f2d40f0d3301f24be5f4dee6)
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add comment on unit test globals, fix indentation

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Cleaned up scene_mesh_to_prefab.py

Added comments
Removed raise_error function
Made mesh_group_name cleanup more comprehensive

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* fix for "warning C4100: 'message': unreferenced formal"

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

Co-authored-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
Co-authored-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Nicholas Lawson 977d58e1a8
Update ZLIB min req osx ios and android to reasonable limits (#4473)
This also updates the name of the zlib library to uppercase ZLIB which conforms to normal CMake standards .
Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
4 years ago
rgba16f be166d68b8 Reduce the default worker thread priority for the Job system, Job system is now aimed at long running or idle tasks
Add cvars to control the number of worker threads created by the TaskGraph and Job systems. The cvars are scales on the hw concurrency of the cpu.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
lumberyard-employee-dm f648cb1fd8
Update the FileIO Aliases (#4186)
* Update the FileIOAlias naming to make the cache, project root and engine
root paths more clear

The alias of `@root@`, `@assets@`, and `@projectplatformcache@` has been
collapsed to `@projectproductassets@`

The alias of `@devroot@` and `@engroot@` has been collapsed to
`@engroot@`

The alias of `@devassets@` and `@projectroot@` has been collapsed to
`@projectroot@`

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated use of devassets and devroot properties in python

Those properties now use projectroot and engroot

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updating the alias @engroot@ alias path comment in each platform specific LocalFileIO_*.cpp file

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed hardcoded size of 9 for the product asset alias.

The ResolvePath function now just appends the @projectproductassets@
alias with the input path

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Remove duplicate @projectproductassets@ check in ProcessFileTreeRequest

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fix for typos in Hydra python test

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated LocalFileIO::Copy call on Windows to use the Unicode aware CopyFileW API

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the AWSMetreicsGemAllocatorFixture to properly suppress asset
cache write errors for Test file creation.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed unneeded call to set the @projectproductasstes@ alias at the bottom of the AssetSeedManagerTest SetUp

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added a deprecated alias map to the FileIO System

When a deprecated alias is accessed, the FileIO System logs an AZ_Error and indicates the alias that should be used

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated python test scripts to use the projectroot binding

Retrieving the AutomatedTesting project path based on "<devroot>/AutomatedTesting" has been removed.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated references to devroot and devgame within the codebase

The GetAbsoluteDevGameFolderPath functions has been replaced with direct call to AZ::Utils::GetProjectPath
The GetAbsoluteDevRootFolderPath functions has been replaced with direct calls to AZ::Utils::GetEnginePath

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated <engroot>/AutomatedTesting references to projectroot


Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Replaced references that assumes the project path is <engroot>/AutomatedTesting with <projectroot> in the AutomatedTesting python test

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Correct casing in emfxworkspace file


Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed newly added AppendPathParts function
Removed the Path constructors which accepts a PathIterable instance

The PathIterable isn't safe to return to a user of the Path class as it might be referencing temporary paths supplied via PathView arguments

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed unused parameter warning

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Undid change to the LexicallyProximate function to set the path result to the base path.

It needs to return the *this path if the pathResult is empty

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Moved the LocalFileIO ConvertToAbsolutePath implementations to AZ::Utils

Fixed the ConvertToAbsolutePath implementation for Unix platforms to use a buffer that is size PATH_MAX(4096 on all our supported Unix platforms).
Because the buffer before was AZ::IO::MaxPathLength which as a size of 1024, this was resulting in the Unix `realpath` function smashing the stack when it converts a path to an absolute path that is longer than 1024 characters

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the EditorCore.Tests to attach the AZ Environment to the EditorCore shared library that is statically loaded on launch.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed for DeprecatedAlaisesKeyVisitor Visit function causing the non string_view overloads being hidden causing a hidden base class function warning

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Changed the AWSMetricsGemMock to use a temporary for writing test assets

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the LocalFileIO::ResolvePath function to use HasRootPath to determine if a path starts with a root path such as "D:", "D:/" or "/"

IsAbsolute was not the corect check as the path of "D:" is a relative
path.
To be absolute according to the Windows the path must have a root
directory. i.e "D:/" or "D:\"

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed absolute path comment from LocalFile_UnixLike.cpp and LocalFile_Android.cpp FindFiles implementations
Updated the ConvertToAlias to supply an AZ::IO::FixedMaxPath

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Replaced usage of the @projectproductassets@ alias with @engroot@ when referring to the LmbrCentral source folder in the CopyDependencyBuilderTest and the SeedBuilderTests

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the ScriptCanvas Upgrade Tool to output backed up files to the
Project User Path instead of the engine root

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed whitespacing issues in Application.cpp

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Remove unnecessary creation of a FixedMaxPath in the UpgradeTool.cpp

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Modified testSeedFolder variable in the SeedBuilderTests to use the
@engroot@ alias instead of @projectproductassets@/.. alias when
referring to the LmbrCentral Gem source path

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated references to the Project Asset Cache in the PythonTests.

Those tests no longer use the logic `azlmbr.paths.projectroot / "Cache" / "pc"` to retrieve a path to the cache root but instead the `azlmbr.paths.projectproductassets` constant

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed the FileIO Deprecated Alias test on Windows

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removing @projectsourceassets@ alias, as it is only used once.

Updated the PhysX EditorSystemComponent.cpp to query the ProjectPath
form the SettingsRegistry.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Replaced @projectproductassets@ alias with @products@

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Rollback changes to the PhysX EditorSystemComponent.cpp

The changes to use the ProjectPath from the SettingsRegistry has been implemented in PR #4497

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
lumberyard-employee-dm 14474dbac7
Swapped the order in which the engine.pak is searched (#4455)
* Swapped the order in which the engine.pak is searched

First the Project Cache Root folder is searched before falling back to
the Executable Directory

Removed the need for the engine.json and project.json in a project
release layout when a "Cache" directory exist at the root.
The project root uses the the first "Cache" directory it finds by scanning upwards as if fails to find a
project.json,
The engine root use the project root, if it fails to reconcile the
engine path using project.json "engine" key and the o3de_manifest.json
"engines_path" object.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed Generation of the engine.json and project.json in Release
Install builds.

The project and engine path can be determined based on the Cache
directory location.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added missing space for enginePakOpened

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding missing endif() and bracket argument terminator.


Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Stephen Tramer 678c9a9fe9
Merge pull request #4449 from FiniteStateGit/issue-913
AzCore/Ebus/Ebus.h: Fix docs urls Issue#913
4 years ago
Scott Romero 1e4faca332
[development] Revived the statistical profiler (#4378)
- Removed unused RunningStatisticsManager.cpp
 - Updated stats profiler proxy to use budgets
 - Fixed and re-enabled stats profiler tests
 - Enabled StatisticalProfilerProxySystemComponent in runtime

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
4 years ago
lumberyard-employee-dm 0a8170f52a
Added IsDirectory function to SystemFile (#4454)
* Added IsDirectory function to SystemFile

This takes the implementation in LocalFileIO and uses it for SystemFile
and then just has LocalFileIO call the SystemFile implementation

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed logic to detect the WinApi FILE_ATTRIBUTE_DIRECTORY attribute

Updated the FileIO.cpp test to use AZ::IO::Path and removed direct uses
of AZStd::string

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding googletest printers for string and Path classes

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the SystemFile_WinAPI functions to use AZStd::to_wstring

This makes the the SystemFile function convert from UTF-8 to UTF-16

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Yaakuro 093f321b68
Fix issue that gives wrong results for running debugger (#4434)
* Fix issue that gives wrong results for running debugger

Signed-off-by: Yaakuro <y1@codeposer.net>

* Remove redundant part.

Signed-off-by: Yaakuro <y1@codeposer.net>
4 years ago
kberg-amzn 5acb360fbb
Merge pull request #4253 from aws-lumberyard-dev/MigrationFixup
Migration fixup
4 years ago
bosnichd 29b5f4c9e5
Added Floor, Ceil, and Round functions to AZ::Vector2/3/4 (#4470)
https://github.com/o3de/o3de/issues/4216
Signed-off-by: bosnichd <bosnichd@amazon.com>
4 years ago
FiniteStateGit 49cfc67f61
AzCore/Ebus/Ebus.h: Fix docs urls Issue#913
Signed-off-by: FiniteStateGit <31811688+FiniteStateGit@users.noreply.github.com>
4 years ago
kberg-amzn bf136a567b Some shutdown crash fixes, reverted a whitespace, and added some basic unit tests for time additions
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Esteban Papp f3e6adce7f
LYN-6882 release builds are executing code in asserts (#4305)
* adding Windows/release to PR-validation builds

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* changing trace back to expand to nothing for release

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* typo

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* more fixes

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixing some more unused variable cases

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* renaming file in ScriptCanvas that causes a msbuild warning

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* reverting a previous change

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
lumberyard-employee-dm 18b947fd00
Changed the AssetManager DispatchEvents function to continously pump the (#4432)
AssetBus of queued functions until empty.

This replicates the old behavior of the EBusQueuePolicy::Execute
function that would continue to execute functions if new ones were added
during the execution of the current queue.

Split the TestFixture class from the AssetHandler and EBus handler for the DynamicSliceInstanceSpawnerTests and
PrefabInstanceSpawnerTest.
This avoids the AssetMananager destructor from deleting the test fixture
if the call to UnregisterHandler is ever removed. This also allows the
memory allocators to get online earlier.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
kberg-amzn 865ed60007 merging latest dev
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
SJ b984335b30
[Android] Fix black screen on Android when app is launched (#4418)
* When copying the runtime dependency setreg files to the cache, the name of the registry directory should be all lower case

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Lower case the registry folder name when looking in the asset cache.

Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
amzn-phist fec77632ef
Archive Component - Rewrite and additional work on Archive and Asset Bundler (#4332)
* Fix issues with seedlist for AutomatedTesting

Fixes error reporting so it will show the file hint in the tool.
Removes any missing assets from the .seed file.
Remove an unnecessary dependency from AutomatedTesting dependencies
file.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Make ArchiveComponent use AZ::IO::IArchive

Initial changes that will get the sychronous calls in ArchiveComponent
to use IArchive interface rather than external zip/7z tools.

Some of the asynchronous api are still in place, anything that wasn't
being used has been removed for now.  This may change later if we move
towards all the api being asynchronous.  Until then, we can't remove the
reliance upon the external archive tools completely.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Updates AZStd::thread constructors

Adds a variadic constructor which forwards args to the functor.
Because of our thread_desc extension, there was confusion on the
arugments, so the args were reordered to take the thread_desc first,
before the functor and args.
Also the thread_desc is taken as reference rather than by pointer.
Update callsites to account for this change.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Async operation of ArchiveComponent api

This sets up the ArchiveComponent to operate asynchronously.  It uses
promise/future to transfer results to caller.

This is still broken, there's a few things that need to get fixed up,
but this is a good checkpoint for the work as it solidifies the api,
cleans up a bunch of unused code, and compiles.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Removes the platform-specific ArchiveComponen

These are no longer needed, as they control the direct interaction with
host OS tools like 7za.exe or /bin/zip.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Removes the platform-specific files from cmake

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Removes the 7za.exe (and legal notice)

This tool is no longer needed in the repo.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fixes usage of IArchive::GetFullPath()

This changed to return a PathView, updated to reflect that.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fix promises and threads

Make sure promises are only set exactly once.  This meant reworking some
of the initial error checking.
Detach threads when created.  Adds [[nodiscard]] to the functions that
return a future.  Since threads are detached, the future is the main way
to get communication from the thread.
Clean up interface, add comments.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* More edits to thread creation

Changes to thread construction to account for parameter change.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fix some remaining issues with ArchiveComponent

Put created threads inside a container, then join them at Deactivate.
Fix asset bundler case when injecting a file with no working directory.
Fix thread constructor that applies args to a function.
Fix lambdas to take string args by value rather than reference.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fixes some remaining bugs in ArchiveComponent

Open archive as read-only during extract & list operations.
Fixes paths issues.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fix initialize of opaque thread handle in thread_UnixLike.h

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Removed unused variable in AssetBundleComponent.cpp to fix compiler warning

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fix some issues with archives

File paths in the CDR and the local headers need to match, but there
were issues with path separators and case that made it possible to get
invalid headers errors in some archives.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Adds some new ArchiveComponent unit tests

Adds new tests for extraction of archive and adding files from a file
list to an archive.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fix file data offset issues when opening archives

When opening an INestedArchive it would run through the CDR headers to
create file entries in the zip cache.  The offsets to the compressed
data were being calculated incorrectly because they were using the CDR
headers rather than jumping to the local file headers and getting
offsets from those sizes.

Removed and refactored some archive validation flow and zip cache
factory init methods to either init default or init w/ additional
validation checks.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Addresses PR feedback

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Address more points of feedback in PR

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Address additional PR feedback

 Fixes up some error checks and uses of strings vs paths.
 Enable archive component tests on Linux so we can see if they will
 pass.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Address PR feedback

Change the INestedArchive interface to list files as AZ::IO::Path.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Disabling the ArchiveComponent tests on Linux

They failed so we will revisit them to attempt a fix.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Rename a member variable to be more accurate

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Address feedback on PR

Bump version of Archive Components for serialize context.
Improve error messages during archive open and validation.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Revert recent changes

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
rgba16f [Amazon] e1c49e436d
convert atom to task graph (#4230)
* Intial attempt to convert the Atom/RHI/FrameScheduler to use the new TaskGraph api

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Avoid enqueuing work on the active task thread if the submitted task
graph is waitable

When submitting a task graph, supplying a wait event implies that
dependent jobs must occur on threads that do not wait on the event (in
the absence of work stealing). This change prevents this by adding a
notion of a task thread enable/disable state, and prohibiting dependent
jobs from being enqueued on waiting threads.

Signed-off-by: Jeremy Ong <jcong@amazon.com>

* Convert RPI/Scene to use TaskGraph pass 1, Culling jobs remain on the old system

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* RemoveTask Graph changes from the FrameScheduler::ExecuteGroups, use old job system instead

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Per review, removing commented out code

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Cleanup debug code, & build fix

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Add a cvar & interface to query whether to use jobs or task graph

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Make TaskGraph assert if you try to wait inside a job

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Fix TaskTest SpawnSubgraph to account for the new TaskGraphEvent assert on wait in a running task

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* 3 minor cleanups. 1) Events always store a ptr to their executor 2) Fix clang compile error 3) remove an early out.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Fix double group end that was causing assert/crash plus misc minor diff's with development

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Fix deallocation failure on deactivation of the TaskGraphSystemComponent. Also make the system component account for multiple creation in Unit Tests.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update with PR feedback
1) Rename UseTaskGraph to IsTaskGraphActive & update related code
2) prefer TaskExecutor::SetInstance
3) add comments and remove commented out code

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Fix incorrect RTTI name for TaskGraphActiveInterface

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Move TaskGraphSystemComponent CRC calculation to a shared variable

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

Co-authored-by: Jeremy Ong <jcong@amazon.com>
4 years ago
SergeyAMZN 08e020f2b1
Merge pull request #4251 from aws-lumberyard-dev/nvsickle/RevertFrameTimer
Revert "Refresh rate driven rendering tick logic (#3375)"
4 years ago
lumberyard-employee-dm 090aa8f053
Removed ununeeded includes from EBus EBus.h and Policies.h (#4256)
* Removed ununeeded includes from EBus EBus.h and Policies.h

Updated the locations which needed those includes

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding missing include for <memory> to AWsClientAuthBus.h

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Remove the while true loop in the EBusQueuePolicy Execute() function

The while true loop in Execute was for allowing additional functions to be queued in the middle of execution of current list of functions.
That functionality was dangerous, because if a queued function added itself during execution unconditionally, then it would result in an infinite loop

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the AssetManager::DispatchEvents function to pump the AssetBus event queue until empty

Queued Events on the AssetBus is able to queue additional events on that Bus during execution of those events.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Changed the AssetManager::DispatchEvents function to only execute the
AssetBus queued events once

Changed the AssetJobsFloodTest.AssetWithNoLoadReference_LoadDependencies_BehaviorObeyed test to dispatch events until the OnAssetContainerReady callback is signaled.

This happens after every asset load to make sure that the
expiring AssetContainer instances are removed from `AssetManager::m_ownedAssetContainer` container before retrying to load the same asset.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added a MaxTimeoutSeconds constant for the maximum amount of the time to run a single DispatchEvents loop

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Artur K f44169f7fa
Cleanup SerializeContext.h pt.1 (#4264)
* Remove AssetSerializer inclusion from SerializeContext header

Moved a few Reflect methods to new cpp files.

In addition, some preparations for further header dependency reductions.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix smoke test lua failures.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Windows build fixes.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Missing license headers

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix white-space issues.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Code review fix for AzToolsFramework/AssetEditor/AssetEditorBus.h

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix inheritance list wrapping broken by older clang-format

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
srikappa-amzn 27e93e3af7 Merge branch 'development' into Prefab/DestroyGameEntitySupport
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
kberg-amzn 0a829f9661 Merging latest development
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
lumberyard-employee-dm 2ce7bbd945
Moved the SettingsRegistryFileReader class to more general IO Reader (#4189)
The new FileReader class allows using either a FileIOBase or SystemFile
classes for reading files.
If a non-nullptr FileIOBase is supplied, the FileIOBase is used,
otherwise SystemFile is used.

Updated the SettingsRegistryMergeUtils
`MergeSettingsToRegistry_ConfigFile` function to use the FileReader.

This allows .cfg such as the autoexec.cfg to be read using FileIO,
therefore allowing it to be read from the engine.pak file.

Because the AZ::Console::ExecuteConfigFile uses the
`MergeSettingsToRegistry_ConfigFile` function for merging *.cfg files to
the SettingsRegistry, this allows the AZ::Console to run console
commands from files within pak files thanks to the ArchiveFileIO being
the default FileIOBase instance

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
srikappa-amzn dcc325dfaa Added function comments for new entity functions
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
SergeyAMZN 66a875bf79
Merge pull request #4261 from aws-lumberyard-dev/MPSpawnableHolderUpdate
Updated NetworkSpawnableHolderComponent to use TransformBus instead o…
4 years ago
pereslav 4d11025d64 Fixed Entity::GetTransform to work for the components of an activating entity. Made the cached transform lazy evaluated.
Signed-off-by: pereslav <pereslav@amazon.com>
4 years ago
srikappa-amzn 28c056e4fd Added comments and changed some function names
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
kberg-amzn f837f0494b many bug fixes
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
srikappa-amzn 3c882230ed Store the spawn ticket id inside entity instead of maintaining a map of entity to ticket
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
amzn-tommy 1e5e6094f5 Expose Transform::CreateLookAt to behavior context to use with hydra tests
Signed-off-by: amzn-tommy <waltont@amazon.com>
4 years ago
kberg-amzn e8aeb9b101 Format fixing
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn d28bcbe027 Reverts changes to component application and adds further client migration handling hookup
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
nvsickle bcfe3d3878 Revert "Refresh rate driven rendering tick logic (#3375)"
This reverts commit db63dcbcd9.

Signed-off-by: nvsickle <nvsickle@amazon.com>
4 years ago
kberg-amzn 011bd5d10e merging latest development
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
kberg-amzn 8401ee409b merging latest development
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Scott Romero 36bcf5849a
[development] Migrated Atom CPU profiler to utilize new AzCore Profiler interface and related macros (#4160)
- Added new interface type AZ::Debug::Profiler to externally register profiler systems
 - Modified the Atom CPU profiler to register as an AzCore profiler
 -- This allows full engine markers to be visualized in the associated ImGui tool
 - Converted all AZ_ATOM_PROFILE_* macros to use AZ_PROFILE_* macros instead

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
4 years ago
SJ 1f542838bb
[Mac] Generate O3DE SDK app bundle that can be notarized and distributed (#4150)
* [Mac] Initial support for building with hardened runtime enabled and code signing the binaries and bundles generated by the CMake install process.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Move call to ly_post_install_step
2. Entitlements should only be added for executables
3. Change use of CMake exec_program to newer execute_process
4. Remove broken symlinks from embedded Python frameworks
5. Run post install code signing only if hardened runtime is enabled

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove unnecessary flag

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove unnecessary additional call to condesign python inside a bundle

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Move commonly used install functions for codesigning, copying files, and fixing frameworks to a utility script
2. Remove unnecessary wait in the Editor/AP launchers I added earlier.
3. Codesign 3rd party libraries for distribution.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Codesigning on 3rd party libs should only happen when hardened runtime is enabled.
2. Change the order of the if blocks in Editor's main_dummy.cpp. This was causing strange notarization issues because it wass too similar to AP's main executable.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add new line to end of file

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Move architecture specification to PAL_mac cmake file. 2. Codesign failure should be fatal.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Address some PR feedback

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove unnecessary comment. Change if to use IN_LIST.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* HOME may not always be defined. Adding alternate POSIX way of determining HOME.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Checking in partial work to get O3DE SDK built as an app bundle. Has a bunch of debug code that needs to be cleaned up.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove this and add it back later with fixed casing.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Adding file back with fixed case

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Add entitlements sparingly(only when necessary)
2. Convert entitlements to plist files which we can directly pass to codesign
3. Install python site-packages in the o3de_sdk launcher and then launch the project manger.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Move hardened runtime check to codesigning functions only. This way, non-hardened runtime install is identical to the former except for codesign. Makes it easy for QA to test internally.
2. Move cmake min version for install to the pre-install steps.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Remove the dummy launchers for AssetProcessor and Editor
2. Add loader_path to the rpaths of binaries outside an app bundle so that the dynamic loader can load their dependencies if any.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove file named main_dummy.cpp

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add O3DE SDK launcher

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add missing runtime dependencies to gems

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Update the path to binaries when codesigning to the correct one.
2. Remove some debug messages.
3. Move installed binary path setreg generation to the target install function. This way, we get the correct path to the bundle accounting for different configs and subdirectories.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add explanatory comments.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. ly_install_add_install_path_setreg cannot be called during install target because the runtime dependencies are already processed by then.
2. The SDK launcher now uses the ProjectManager's bundle setreg to find the path to the installed binaries

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Update path to install relative binaries after merge from dev

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Only one config of the SDK launcher needs to be installed. Preinstall steps should not be run per config, but only once.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Install python dependencies using the get_python.sh script.
2. Replace any reference to hard-coded package name/version numbers with variables.
3. Add one more missing runtime dependency.
4. Misc. PR feedback.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Remove the need for setreg files in all tool bundle. Project binary path can be used instead.
2. Move O3DE_SDK_Launcher to Code/Tools/BundleLauncher
3. Add ly_install_run_script() function for install(SCRIPT) functionality.
4. Address some other PR feedback.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add source permission when installing O3DE_SDK executable.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Rename setreg file to add specialization tag.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove LY_BUILD_PERMUTATION that's not needed

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. Add BinariesInstallPath.setreg to all our bundles like before. This is now only added during the install process though.
2. Fix path in Install_common.cmake

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Fix comment

Signed-off-by: amzn-sj <srikkant@amazon.com>
4 years ago
kberg-amzn 6e84495975 Changes to make client and entity migration functional, needed in the event of a host quitting necessitating a host migration
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Steve Pham 2b092bae81
Fix missing virtual destructor causing debug build failure (#4174)
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
lumberyard-employee-dm 58c227ceb1
Implemented C++23 deleted nullptr_t constructor/assignment for AZStd string classes (#4158)
* Added string and string_view class constructor overloads which is deleted that prevents initializing them from a nullptr or an integer type

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed locations where string and string_view were initialized with
nullptr

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fix IArchive::IsInstalledToHDD signature

Updated calls to ConvertAbsolutePathToAliasedPath to use an
list initialization instead of nullptr

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
lumberyard-employee-dm 447832dd81
Updated the GameApplication to mount the engine.pak (#4128)
* Updated the GameApplication to mount the engine.pak

This allows loading the autoexec.cfg and bootstrap.game.<config>.<platform>.setreg from the engine.pak files
The engine.pak is searched for in the following order: <ExecutableDirectory>/engine.pak, followed by <ProjectCacheRoot>/engine.pak

Removed a lot of unused APIs from the AZ::IO::Archive feature suite
Updated many of the AZ::IO::Archive classes to use AZ::IO::Path internally.
The logic to search for files within an Archive has been updated to use AZ::IO::Path and to remove case-insensitve string comparisons
Somehow removed the CryFile dependency on anything Cry

Updated the Settings Registry to support reading from the FileIOBase and therefore Archive files in the GameLauncher via the `SetUseFileIO` function

Removed AzFramework Dependency on md5 3rdParty library

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Linux build fix

Added an include of <stdio.h> before the <rapidxml/rapidxml.h> include as it usesnprintf.

Added `static` to the constexpr constants in ExtractFileDescription in SettingsRegistryImpl.cpp to fix clang compile issue

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the case used to mount the Engine PAK file in the GameApplication to be Engine.pak to match the other locations where it is mounted

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the proper FFont call to FileIOBase::Size to supply the correct
integer type of AZ::u64 instead of size_t
This fixes building on platforms where size_t is type defined to be
unsigned long

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed segmentation fault in Archive::Unregister when outputing the filename of the Archive file being closed

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fix calls to OpenPack in the Legacy LevelSystem

The LevelSystem was calling the incorrect overload of OpenPack that
accepts BindRoot for the mounted level.pak instead of the overload that
that passes a memory block object.

This was causing the level pak files to be mounted using an invalid
directory, causing file accesses inside the level pak to fail.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the error messages in the ZipDir CacheFactory class to use AZ_Warning directly

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the ArchiveFileIO m_trackedFiles container to store mapped type as an AZ::IO::Path

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Esteban Papp bbe437819b
Enables override/virtual warnings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
lumberyard-employee-dm ce72e32cfc
Fixed issue where two Paths could compare equal to each other, but hash differently (#4126)
* Fixed issue where two Paths could compare equal to each other, but hash
differently

This issue is caused by the Path comparison logic using the path
separator of the left path in a comparison of two paths(left and right)
to determine whether the PathComparison is case-sensitive or not.

The logic has been updated to only perform a non-case-sensitive path
comparison if both paths are using the WindowsPathSeperator of `\`

Also fixed issue with the Hashing algorihtm of the Path class to always
hash the root directory as if it is `/`.
This allows a path of "C:\foo" and "C:/foo" to hash to the equivalent
value.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* MS Build Tools 14.29 workaround around suppressing warnings using the external header feature

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Esteban Papp 36b7cb2814 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/Memory/HeapSchema.h
#	Code/Framework/AzCore/AzCore/Memory/HphaSchema.h
#	Code/Framework/AzCore/AzCore/Memory/MallocSchema.h
#	Code/Framework/AzCore/AzCore/Memory/OverrunDetectionAllocator.h
4 years ago
lumberyard-employee-dm 4e8d4c0c51
Added a max_size function to all AZStd container style allocator functions (#4106)
* Added a max_size function to all AZStd container style allocator
functions

The max_size functions returns the maximum value that a single contiguous
allocation value returns

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the BestFitExternalMapSchema and MallocSchema
GetMaxContiguousAllocationSize function

Those functions now return a Max allocation size of
AZ_CORE_MAX_ALLOCATOR size to indicate the maximum size for a single
allocation

Changed the IAllocatorAllocator::GetMaxContiguousAllocationSize function
from a pure virtual function to regular virtual function

Removed the left over String.cpp test to validate that the issue with
the allocator::max_size() function was occuring

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Esteban Papp 988a6b7443 PR comments
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp ee2e728760 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Nicholas Van Sickle db63dcbcd9
Refresh rate driven rendering tick logic (#3375)
* Implement sync interval and refresh rate API for RenderViewportWidget

Signed-off-by: nvsickle <nvsickle@amazon.com>

* Measure actual frame timings in the viewport info overlay.

Takes the median of the sum of (frame end - frame begin) to provide more a more representative view of when frames begin and end.

Note: Until VSync is internally supported by the event loop, this will produce nearly identical frame timings as the frame will spend as much time as needed synchronously waiting on a vblank.

Signed-off-by: nvsickle <nvsickle@amazon.com>

* Make frame timing per-pipeline, wire up refresh rate info to ViewportContext

Signed-off-by: nvsickle <nvsickle@amazon.com>

* POC: Frame limit pipeline rendering

Signed-off-by: nvsickle <nvsickle@amazon.com>

* Switch Editor tick to every 0ms to allow better tick accumulation behavior

Signed-off-by: nvsickle <nvsickle@amazon.com>

* Move RPISystemComponent to the tick bus, remove tick accumulation logic

Signed-off-by: nvsickle <nvsickle@amazon.com>

* Add `AddToRenderTickAtInterval` to RenderPipeline API

This allows a pipeline to update at a set cadence, instead of rendering every frame or being directly told when to tick.

Signed-off-by: nvsickle <nvsickle@amazon.com>

* Make ViewportContext enforce a target framerate

-Adds GetFpsLimit/SetFpsLimit for actively limiting FPS
-Calculates a render tick interval based on vsync and the vps limit and updates the current pipeline

Signed-off-by: nvsickle <nvsickle@amazon.com>

* Add r_fps_limit and ed_inactive_viewport_fps_limit cvars

Signed-off-by: nvsickle <nvsickle@amazon.com>

* Quick null check from a crash I bumped into

Signed-off-by: nvsickle <nvsickle@amazon.com>

* Fix off-by-one on FPS calculation (shouldn't include the not-yet-rendered frame)

Signed-off-by: nvsickle <nvsickle@amazon.com>

* Clarify frame time begin initialization

Signed-off-by: nvsickle <nvsickle@amazon.com>

* Fix TrackView export.

Signed-off-by: nvsickle <nvsickle@amazon.com>

* Address some reviewer feedback, revert RPISystem API change, fix CPU profiler.

Signed-off-by: nvsickle <nvsickle@amazon.com>

* Add g_simulation_tick_rate

Signed-off-by: nvsickle <nvsickle@amazon.com>

* Address review feedback, make frame limit updates event driven

Signed-off-by: nvsickle <nvsickle@amazon.com>

* Remove timestamp update from ComponentApplication::Tick

Signed-off-by: nvsickle <nvsickle@amazon.com>
4 years ago
Esteban Papp 880e3c99be PR comments
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 5965760612 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Chris Burel 72cd282ad2
Avoid redefining `PRI` macros on Linux (#4055)
* Avoid redefining `PRI` macros on Linux

The fixed width 64-bit integer types are defined differently per platform.
Some platforms define it as "long", others define it as "long long". For
consistency, `AZ::u64` or `AZ::s64` is always defined to "long long".
However, this causes problems for formatting those types, because on
platforms where `uint64_t` is a `long`, `PRIu64` gives the wrong format
string for `AZ::u64`. Previously this was fixed by redefining the `PRI`
macros so that they work for `AZ::u64`, but that breaks the ability to
format `uint64_t`.

We could add an AZ-specific version of the `PRI` macros for 64-bit integer
types, but we don't really need to, since they are `long long` on every
platform we support.

 * Use `%ll` for `AZ::u64`
 * Use `PRIu64` for `uint64_t`

Signed-off-by: Chris Burel <burelc@amazon.com>

* Avoid redefining `PRI` macros in CryCommon

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Mike Balfour 280796e1f4
Fix GHI 4041 Terrain Shader Crash (#4050)
The terrain feature processor was crashing due to an invalid shader name.  The shader name has been fixed, but the feature processor has also been hardened so that it no longer crashes if a shader fails to load.
Also, while testing, this inadvertently exposed a second crash in EntitySerializer that occurs when components don't serialize in correctly.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
4 years ago
Esteban Papp 81749ac318
Improves numeric_cast compilation (#3995)
* Improves numeric_cast compilation:
before: 872s
after: 824s (5.5% reduction)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
bosnichd d366620818
More PAL related changes required for restricted platforms. (#4037)
Signed-off-by: bosnichd <bosnichd@amazon.com>
4 years ago
lumberyard-employee-dm e638f27572
Fixed PathView `MakeRelativeTo` and `Append` functions path segment comparisons (#3628)
* Fixed PathView `MakeRelativeTo` and `Append` functions path segment
comparisons  when using the Windows path separator of '\'

The PathSegment comparisons were case-sensitive in both those functions
and now use `Internal::ComparePathSegments` function to perform the
appropriate case comparison based on the path separator value of the
Path class

Reverted the LocalFileIO::CheckInvalidWrite function back to not
lowercasing the assets alias and input path before invoking
`PathView::IsRelativeTo`

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Simplified the LocalFileIO::ConvertToAliasBuffer logic

Fix for the ArchiveTest
`IResourceList_Add_AbsolutePath_RemovesAndReplacesWithAlias` and
`TestArchiveViaFileIO` test

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added a PathIterable structure stores a non-heap container of normalized path segments of an input path.

Moved the PathParser logic to a PathParser.inl file

Removed dependency of the PathView::IsRelativeTo logic on FixedMaxPath
There is no longer a 1024 character limit when determining if a path is relative to a base
Added a GetNormalPathParts and AppendNormalPathParts to function and removed LexicallyNormalInplace to share the logic for creating a normalized path between IsRelativeTo and LexicallyNormal

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Clang PathIterable.inl build fix

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed Normalize and Relative Path functions initialize the result paths

With the correct path separator for the paths being transformed

Ported over the Custom Path Root Separator logic to the PathParser.inl

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated he Shader Preprocessor include path gather.

It now uses AZ::IO::Path for the path operations and checks if the path
exist before adding it to the list of include paths.

Finally the set logic has been removed for a simpler find_if check to
see if the include path already since in the project include paths

This fixes the Asset Processing issues with shader includes due to the
Path.inl changes

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed tail recursion call to AppendNormalPathParts to supply a PathView with the same path separator as the parent call

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding reference qualifier overloads to the Path class Native function

Removed the conversion operators from the Path class for converting to a
string_type&/const string_type&

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Artur K 3a4937456a
Build time reduction: AzStdOnDemandReflection (#3111)
* Move a few specializations from AzStdOnDemandReflection.inl to cpp file

This reduces compilation time and produced profile/debug file sizes.

The specializations for string and string_view are only implemented for 'char' type, since
others are not used anywhere.

Extracted `Reflect` method from `ClientAuthAWSCredentials` to a cpp file.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Windows build fixes.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Added missing license.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix missing spaces in template argument lists

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Clang format on ClientAuthAWSCredentials.cpp

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Merge upstream development and fix linux build.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
4 years ago
Esteban Papp 9f6d4125b8 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
carlitosan 52460189aa
Merge pull request #3964 from aws-lumberyard-dev/carlitosan/development
Upgrades and stability fixes for version explorer
4 years ago
AMZN-koppersr a62cb8cf2b
Merge pull request #3999 from aws-lumberyard-dev/Prefab/IncreaseReadFileSizeLimit
Set max file size limits for AZ::JsonSerializationUtils::ReadJsonFile and AZ::Utils::ReadFile
4 years ago
kberg-amzn 4c864ebf01 merging latest development
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Esteban Papp f414cd3966 More fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
srikappa-amzn 7bf5894513 Set max file size limit as default parameter for ReadFile
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
srikappa-amzn 1e7af75d94 Merge branch 'development' into Prefab/IncreaseReadFileSizeLimit
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
Esteban Papp d58bda5bbf WIP
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
chcurran 32515f33d4 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 4 years ago
Esteban Papp 860b28c10b more fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
srikappa-amzn 5a6daf4352 Maximize read file size limit and set it to 1MiB for Atom use cases
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
kberg-amzn 7e9b6116da Update component application tick to use the ITime interface and respect simulation t_scale settings
Signed-off-by: kberg-amzn <karlberg@amazon.com>
4 years ago
Esteban Papp c805d443d2 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CryCommon/IConsole.h
#	Code/Legacy/CrySystem/LocalizedStringManager.h
#	Code/Legacy/CrySystem/XConsole.h
#	Code/Legacy/CrySystem/XConsoleVariable.h
#	Code/Legacy/CrySystem/XML/XmlUtils.cpp
#	cmake/Platform/Common/Clang/Configurations_clang.cmake
4 years ago
Esteban Papp cc00a535d7 more Code/Framework fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp f30ac72040 fixing AzCore for linux/windows virtual warn
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 46c6923bf7
Enabling warnings around format security
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
chcurran 64ab627f03 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 4 years ago
Esteban Papp aad2c214a4 Merge branch 'development' into cmake/warn_virtual
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp e20c270580
Fixes install failures when RenderDoc and/or PIX are enabled
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
hultonha 6cc9a33845
Add a new implementation for cone/ray intersect to simplify code and fix issue with current implementation (#3902)
* add a new implementation for cone/ray intersect to simplify and fix existing issue

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* move new ray/cone intersection function to AzToolsFramework - repond to PR comments

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* updates following PR feedback

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add additional comment to give more context to the intersection function

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update google test expect usage

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Esteban Papp c6593bbdd3 double assignation of the same thing
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp a63954d6cf simplifying how PIX is passed
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp b28349be73 Fixes for Android
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 2e79451280 Fixes AzCore for MSVC
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
chcurran e1e1779ec6 Fix for file size limit in JSON
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Esteban Papp dc4424b131 Merge branch 'development' into issues/3202
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h
4 years ago
Artur K 567c0ae24d
Modernization + AZStd::function compare fix. (#3680)
* Modernization + small fix.

Modernize ( `bool`/`override`/other) code in AzCore, AzFramework, AzQtComponents, AzToolsFramework, etc.
Replaced a `bind` or two, use `using` in a few places as well.

Fix nullptr comparison of AZStd::function.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Apply review-based changes

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
4 years ago
moraaar 34dc8e3cbc
Fixed unused variable warnings (#3880)
- Fixed error in iOS profile non-unity build error: unused variable 'INVALID_OFFSET'. The global variable is static const only visible to the cpp, removed since it's not used.
- Fixed error in windows release 'timeoutSeconds': unreferenced formal parameter

Signed-off-by: moraaar <moraaar@amazon.com>
4 years ago
Esteban Papp 26d277cc14 Merge branch 'development' into issues/3202
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 451f267d58
Changes the cast for WinAPI mutex (#3843)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
bosnichd 82659f24e9
Add support for a custom path root separator using a trait. (#3678)
* - Add support for a custom path root separator using a trait.
- Ensure to set both FilePathKey_ProjectUserPath and FilePathKey_ProjectLogPath to a writeable storage location on non-host platforms.

Signed-off-by: bosnichd <bosnichd@amazon.com>

* Remove az_trait_validator.py, as our PAL guidance no longer dictates that all traits must be defined for all platforms.

Signed-off-by: bosnichd <bosnichd@amazon.com>

* Updated based on review feedback.

Signed-off-by: bosnichd <bosnichd@amazon.com>
4 years ago
Esteban Papp d838a0fcbc
Android release fixes (#3788)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 39cf45e544
Setting /permissive- to make MSVC more "standard" (#3701)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp afbc449562
Enabling several warnings in Clang that required just small fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 7248029e67 Android fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp c128760ed0 removes leftover of performance build
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
AMZN-AlexOteiza d784ff8c57
Added debugger attachment utilities to the engine, fixed crash when showing console variables, improvements to timeout handling and small cleanup (#3591)
* Added debugger attachment utilities to the engine, fixed crash when showing console variables

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Removed unused variables

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Removed unneded check

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Small fix for crashes/timeouts

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Removed unused variable, fixed compile error

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Fix compile

Signed-off-by: Garcia Ruiz <aljanru@amazon.co.uk>

* Addressed esteban comments

* Addressed tom comments

Co-authored-by: Garcia Ruiz <aljanru@amazon.co.uk>
4 years ago
Chris Galvan 3a9268c955
Merge pull request #3685 from aws-lumberyard-dev/cgalvan/UpdateProjectConfiguratorReferences
Updated remaining Project Configurator references to Project Manager and consolidated JsonUtils API usage.
4 years ago
Steve Pham fa0f2a1007
Fix unused warnings release (#3677)
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Linux
* Release build fix for Mac
* Release build fix for iOS

Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
Chris Galvan 194205c453 Replaced AzFramework::FileFunc JSON utils API calls with AzCore::JsonUtils APIs that appear to have been duplicated. Also fixed up improper Project Configurator -> Project Manager comment replacements.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Qing Tao 9fac26e6a6
Update o3de to use new packages of ISPCTexComp and squish-ccr (#3556)
Update package name and hash
Add compressor names.
Update ImageProcessingAtom unit tests.
Removed some unused test assets under ImageProcessingAtom
Enalbe ISPC to all the platforms.
Better error message with compression/decompression
Add temp folder to git ignore
added ispccompressor for all platform. valid it with linux
Update windows package hashes.
Removed AZ_TRAIT_IMAGEPROCESSING_USE_ISPC_TEXTURE_COMPRESSOR
Minor refactor with image processing unit tests.

Signed-off-by: qingtao <qingtao@amazon.com>
4 years ago
Esteban Papp 906ace3d03 Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Jeremy Ong 8d2383e408
Merge pull request #3493 from aws-lumberyard-dev/windowsdecls
Move undefs of problematic Windows defines to PlatformIncl_Windows.h
4 years ago
Esteban Papp ae4cfc3bd3 Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/Math/Guid.h
#	cmake/Platform/Common/MSVC/Configurations_msvc.cmake
4 years ago
Esteban Papp b9daf7f7c3
Enabling several warnings on MSVC that are not enabled by default and are good to have 4 years ago
Jeremy Ong 032366f9c9 Move undefs of problematic Windows defines to PlatformIncl_Windows.h
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Esteban Papp f20d17398c Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Objects/TrackGizmo.cpp
4 years ago
Esteban Papp 058f6e0f22 PR comments/fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Artur K 45b2336dce
Legacy cleanup (#3383)
* WIP - small legacy cleanup

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* More cleanups + build fixes

Use AZstd instead of std types in a few places.
Remove m_nameTable.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Legacy code cleanups

Remove unused methods using legacy functionality

* EditorViewportWidget::AdjustObjectPosition
* DisplayContext - remove `renderer` pointer
* DisplayContext - log errors when functions using `renderer` are called
* CTrackGizmo::DrawAxis - log errors when function uses `renderer`.
* Legacy CCamera - remove Project, Unproject and CalcScreenBounds
* Remove all unused methods from Cry_GeoDistance.h/Cry_GeoIntersect.h
* Remove Lineseg_Triangle from Cry_GeoOverlap.h
* IEntityRenderState.h - remove unused types
* SMeshColor remove Lerp method and associated constructor.
* IMaterial.h - remove unused types and a few methods
* IRenderMesh.h - remove a few unused methods and use int8 instead of
byte
* IRender.h - remove almost all of the contents
* IShader.h - remove unused types and a few methods
* IStatObj.h - remove unused types and a few methods
* SSystemGlobalEnvironment - remove `renderer` pointer
* IRenderGraph - remove 2 unused methods
* physinterface.h - remove almost all of the contents
* CXmlUtils no longer inherits ISystemEventListener
* CXmlNode no longer has custom new/delete
* Remove IRenderer from some test mocks.

Removed files:
* CryName.h
* Cry_MatrixDiag.h
* Cry_XOptimise.h
* HeapAllocator.h
* IRendererMock.h
* PoolAllocator.h

Things to consider:
* Remove GetMemoryUsage & friends.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Apply review suggestions

IMovieSystem.h - remove unused includes.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Move unreachable code to `#if 0` block

This is hopefully temporary measure until the original functionality is
re-implemented

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix bad merge I messed up.

Fix bad merge I messed up, by re-removing FrameProfiler.h from crycommon_files.cmake (this was removed in an earlier commit this morning: https://github.com/o3de/o3de/pull/3394).

Signed-off-by: bosnichd <bosnichd@amazon.com>

* Update Code/Framework/AzCore/AzCore/std/string/string_view.h

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* implement review suggestion

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* following review, using LYSHINE_ATOM_TODO to guard

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Remove commented out include

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* EditorViewportWidget.cpp: Convert commented out code to  guarded one

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

Co-authored-by: bosnichd <bosnichd@amazon.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Esteban Papp 6b96be82ea Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CrySystem/Log.cpp
#	Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.cpp
#	Code/Tools/Standalone/Source/Driller/AreaChart.hxx
#	Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
#	Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
#	Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
4 years ago
Esteban Papp e2acd66c46 Fixes Guid formatting
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Jeremy Ong e091450e80
Merge pull request #3394 from aws-lumberyard-dev/Budgets
Add budget registration/tracking system and prepare driller redcode
4 years ago
hultonha 7fbfda0371
Fix mouse capture behavior for Editor Viewport (#3417)
* first pass of fixes for cursor capture and context menu

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* restore previous behavior of HandleMouseMoveEvent

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* tidy-up from previous cursor/input changes

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add missing casts

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* small updates to support tests

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* additional tests and some tidy-up

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* small updates before publishing PR (comment/naming updates)

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add missing parameter to MouseInteractionEvent constructor

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Jeremy Ong c3e83387db Address additional PR feedback
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Jeremy Ong a9b4ad3486 Compile out tracker in release mode
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Chris Burel 86770deefa
Add linux equivalents for all the places that enumerate platforms (#3325)
* Add linux equivalents for all the places that enumerate platforms

Signed-off-by: Chris Burel <burelc@amazon.com>

* Fix the AssetFileInfoListComparisonTest fixture to not hardcode the PC platform

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
Jeremy Ong c37c0cab08 Refactor budget definitions as named functions instead of template specializations
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Jeremy Ong 5e04c3737f Add preliminary budget tracking system and remove driller integration
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Jeremy Ong 07a14bdce1 Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller
NOTE: The memory driller is still intact for now to avoid needing to
modify allocators, but the frame/cpu portions of driller and the
standalone executable are now gone.

Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Esteban Papp d91dbe3d92 Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 5361cf3b26 Merge branch 'development' into cmake/win_fix_wnew
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
carlitosan 4e0399b283
Merge pull request #3309 from aws-lumberyard-dev/carlitosan/development
JSON serialization of SC Editor Assets
4 years ago
Esteban Papp 5ca84cb07e Merge branch 'development' into cmake/win_fix_wnew
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CryCommon/Cry_Camera.h
#	Code/Legacy/CryCommon/IShader.h
4 years ago
Esteban Papp 9c7b55a31d Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h
#	Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h
#	Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
#	Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
4 years ago
AMZN-koppersr 0d74d3ed5d
Merge pull request #3377 from aws-lumberyard-dev/mnaumov/LYN-4539
Allowing prefabs with missing components to load, and clarifying error message
4 years ago
Esteban Papp a2cab41cdc trying a better fix for winioctl issue
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 63a2925720 more fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Mikhail Naumov 90912759f7 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-4539
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
Esteban Papp b820c36c80 clang is more specific where the modifier should be
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
chcurran 794c22c02e merge latest
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Mikhail Naumov f7eaa4490f fixing syntax errors
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
Mikhail Naumov f224d657be Ronald's feedback
Co-authored-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
Esteban Papp 6bdef50444 Code/Framework
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Mikhail Naumov 875918deda Allowing prebas with missing components to load, and clarifying error message
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
Esteban Papp 53dfb1a39e remove unnecessary ALIGN macros
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 7558a3d233 fixes for Android
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
chcurran d7d2e84fee Added all the missing serializer support, fixed up serialization notification
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Esteban Papp c07b9d31bf PR comments/improvements
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp e98bab8a75 fixing format strings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp d4ee5423a9 Code/Framework/AzCore
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp b96b99363c Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 9245a31196 more fixes for Code
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp c8c29b1aff
Enable warning MSVC 4296: 'operator': expression is always false 4 years ago
Esteban Papp 8bc9ed3d01
removing some rad leftovers (#3366)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp b3023242d0 Merge branch 'development' into cmake/win_fix_warn_4296
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp a35464ca08 more fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
puvvadar 4e618db62d
Merge pull request #3082 from aws-lumberyard-dev/MultiplayerForwardDeclControllerErrorFix
Fix Multiplayer AutoComponent Delete Incomplete Type Compile Error
4 years ago
Esteban Papp cf6c7c4d8d some unused fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 62a0041245 enable warning 4296: 'operator': expression is always false
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp d098b25b03
Adding support for ASan (Windows/MSVC) and fixing AzCore 4 years ago
Esteban Papp a97bccbf38 some fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
lumberyard-employee-dm f7831be7ce
Adding missing AssetManager_private.h header to cmake (#3030)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Esteban Papp 61f7fe5dc5 Merge branch 'development' into cmake/AddressSanitizer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 68b04fa6c1 Merge branch 'development' into cmake/AddressSanitizer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Legacy/CryCommon/LegacyAllocator.h
4 years ago
Esteban Papp f8e99cd7dd Merge branch 'development' into cmake/SPEC-2513_w4244
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
#	Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
4 years ago
Jeremy Ong fdc464c6fd
Merge pull request #3272 from aws-lumberyard-dev/PIX
Profiler spring cleaning
4 years ago
lumberyard-employee-dm 586678a5f9
Added a deferred queue to the AZ Console class (#3298)
* Added a deferred queue to the AZ Console class

An AZ Console instance will now store any console commands that could be
dispatched from a configuration file into a deferred queue, that can be
invoked later.

This can be used to defer execution of console commands in configuration files such as
.cfg, .setreg and .setregpatch files that are defined in gem modules that
have not been loaded yet.
The defered execution can then be invoked at any point later in the
application

Updated the Component Application CreateCommon function to invoke deferred console commands
after all the gems have loaded

fixes #2062

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed variable shadowing in the Console Deferred Command Test

Updated commit for the ClearDeferredQueue function to just mention
clearing the queue

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Filtered out execution of the ConsoleRootCommandKey as a console command

The AZ::Console notification handler is tracking changes to the fields
of "/Amazon/AzCore/Runtime/ConsoleCommands" and it's children.

Now the "/Amazon/AzCore/Runtime/ConsoleCommands" field is the
ConsoleRootCommandKey and not an actual console command so it shouldn't
attempt to be invoked

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Moved the execution of deferred console commands after linking deferred
functors

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Moved the execution of deferred console commands into CreateModuleClass
hook

Any module that loads using the ModuleManager system will attempt to
execute any deferred console commands to allow newly registered commands
from that module to be dispatched.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Jeremy Ong cf44a4ad67 Address additional PR feedback
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Esteban Papp cb7108e336 Addresses comments around AZ_TRAIT_UNIT_TEST_NAME_COUNT from PR
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Jeremy Ong f1349a3f60 Clean up vestigial PIX references in Atom
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Jeremy Ong ec6e9407f6 Remove RAD (pending future interface for external profiler registration)
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Jeremy Ong 11d4543442 Reintroduce StatisticalProfiler and associated classes in deactivated
state

Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Jeremy Ong 5f2fe83c5b Remove test associated with frame profiler going away
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Jeremy Ong a5f072f7a9 Remove statistics profiler
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Jeremy Ong df9b4d4a2f Deprecate profiler categories based on global enum
(to be supplanted by registered budgets in the future)

Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Jeremy Ong d15d40fec6 Add Windows PIX runtime support
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
chcurran c701522adc update error messaging, remove unnecessary comments
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 1d1cea34dd Undo artifacts for JsonUtils sojourn into AzToolsFramework
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago