Commit Graph

885 Commits (57499860e0244c9e49e55d086ce94de5e4fedf58)

Author SHA1 Message Date
Nicholas Van Sickle bbd00adade Address some AZ::Dom::Value feedback
- Use a vector for shared string storage (to avoid the double heap allocation for AZStd::string)
- Use a shared heap allocated any for opaque types (instead of an unsafe ref)
- Add a string comparison key lookup benchmark to measure the impact of Name

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Mike Balfour 1845eba6ee Fixed compile error.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
4 years ago
Mike Balfour a07534ea51 Merge commit '7e5115114ca9500abf67095acb71fbb6087d06c8' into mbalfour/gitflow_211220_stabilization_2111RTE 4 years ago
Nicholas Van Sickle 748f2a5c05 Merge remote-tracking branch 'upstream/development' into nvsickle/GenericDomDocument 4 years ago
amzn-sean fea4d0e6b1
adding TimeSystem unit tests (#6446)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
Michael Pollind e58d8815f1 chore: add assertions to plane to ensure normalization
Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Michael Pollind 2ddf55474e
chore: remove "using namespace " from AZCore Memory (#6373)
* chore: remove "using namespace " from AZCore Memory

REF: https://github.com/o3de/o3de/issues/6281

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: fix formatting

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: fix indentation for AllocatorBase.cpp

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: fix formatting

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: address minor checkstyle problems

Signed-off-by: Michael Pollind <mpollind@gmail.com>
4 years ago
Benjamin Jillich d20aa935ba
Quaternion to scaled-axis angle representation (and back) helpers (#6421)
Direct conversion helpers for quaternion to the scaled axis-angle representation and back without the need to convert them first to the axis-angle format and manually scale (or normalize on the way back). This also avoids having to deal with the special case of an identity representation which is 0,0,0 in the scaled axis-angle format while our convention for axis-angle is 0,1,0 for the axis and 0 for the angle.

Added unit tests that check the conversion round-trips from quaternion -> (scaled) axis-angle -> quaternion as well as comparing the scaled axis-angle representations from the direct helper functions as well as the axis-angle while manually scaling/normalizing.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
4 years ago
Nicholas Van Sickle 10cb618ba6 Merge remote-tracking branch 'upstream/development' into nvsickle/GenericDomDocument 4 years ago
Nicholas Van Sickle 352b4ab690 Make DomValue final
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
amzn-sean 33bfdc0bd3
corrected implementation of GetRealElapseTime (#6422)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
Chris Galvan 50e06ea8c5
Merge pull request #6328 from tjmgd/bug-lua-debugging-62
Fix: Lua script debugging loading problem
4 years ago
Chris Galvan 0a31483faa
Merge pull request #6333 from tjmgd/bug-lua-breakpoint-67
Fix: Lua breakpoint error
4 years ago
lumberyard-employee-dm dc9d1a2f31 Introduced a Json Serializer for the AzCore mutable path classes
Added UnitTest for Json Serialization of AzCore Path types

resolves #2477

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Nicholas Van Sickle f71b134a84 Ensure JsonSerializer::StoreTypeName stores the correct type for generic types
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle aa9799a63b Use the high perf allocator for DomValueWriter
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
amzn-mike 71bb200e0a
[LYN-7064] Hot Loading of Procedural Prefabs (#4923)
* Prefab hotloading - load and maintain asset references

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

* Working hotloading

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

* Clean up code, add comments

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

* Add missing includes

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

* Add event for template removal.

Clear ProceduralPrefabSystemComponent lookup when templates are removed.

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

* Add unit test.

Fix missing include, make sure source name is set

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

* Fix missing include

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

* Fix missing include

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

* Update comments to make ebus event behavior more clear

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

* Fix missing include

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

* Fix missing includes

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

* Fix missing include

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

* Fix temp directory usage which doesn't work on linux

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

* Fix temp directory usage which doesn't work on linux

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

* Use AZ::IO::Path for comparison.  Print paths on failure

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

* Fix unit test - register asset with catalog so it can be looked up later

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
Nicholas Van Sickle 946a77e914 Document ValueWriter, add basic OpaqueValue handling
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle af91cea8ef Add copy-on-write note
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle 202226c2cb Document short string usage
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle d044f51a89 Remove DomDocument for now
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle 8da04f15d3 Add some Value documentation
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle 0216d0ae9f Clarify shared string semantics
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle e080ade885 Switch high perf allocator back on for containers, modest perf boost
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle d9ac3c2120 Tidy up Type enum
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle cc120c772c Add RapidjsonCopyAndMutate to compare w/ shallow copy
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle c53c97cf5f Add another round of benchmarks
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle 1f2635d24b Switch to the high pref heap allocator, roll back pool interface changes
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle 809ee2dce9 Fix "force string copy" logic
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle 1af39a5c5c Add benchmarks, some light optimizations like SSO
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
chcurran 8357fa34e9 fixed unit testing code
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
chcurran 23267fd862 SC Editor serialization update in JSON
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Chris Galvan befd84cf0b Added property handler for SourceHandle type.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
chcurran 31c627defc initial scriptcanvas source handle
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Artur K 53b88d4752
Preapre codebase for FileRequest compiletime improvements (#6192)
* Preapre codebase for FileRequest compiletime improvements

This is preparing grounds for the next PR that will contain the 'meat'
of the changes.

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

* Remove spurious newline.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
4 years ago
T.J. McGrath-Daly bb3821df45 Fix: Lua breakpoint error
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
4 years ago
T.J. McGrath-Daly 53429d838e Fix: Lua script debugging loading problem
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
4 years ago
Nicholas Van Sickle 947951b6c7 Add copy on write tests
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle 15e0bb1693 Add tests, fix missing bool in Accept and operator[] insert
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle a2d474cc4f Add some intial tests
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle e7c92b5658 Move ValueWriter out, add DeepCompareIsEqual
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Gene Walters 4b3d1452fd
Merge pull request #6066 from aws-lumberyard-dev/LYN-8514_AutomatedReviewServerLogChecks
Updating Multiplayer PyTests To Check Server Logs
4 years ago
Nicholas Van Sickle fada7ace23 Add visitor support to Value
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
galibzon 76e09a36d9
Make math classes & EntityId visible in Lua Documentation. (#6261)
Small change in behavior context attribute for a few
classes so they become visible when extracting Lua symbols
from the ScriptContextDebug() API.

From:
Attribute(AZ::Script::Attributes::ExcludeFrom,
    AZ::Script::Attributes::ExcludeFlags::All)

To:
Attribute(AZ::Script::Attributes::ExcludeFrom,
    AZ::Script::Attributes::ExcludeFlags::ListOnly)

It seems the previous code was simply trying to hide those symbols from
the Script Canvas node palette. But it was also, seemingly unintentional,
hiding those symbol from Lua Documentation.

Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com>
4 years ago
Nicholas Van Sickle f36255b22a Initial value implementation
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Gene Walters f97707a28a Removing hand-written /n from all AZLOG_ now that we properly add \n automatically
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
lsemp3d 72bfd8bdf8 Script Canvas node translation system and naming consistency
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
Gene Walters b123379380 Properly adding newlines when using LogInternalV; removing the need of hand-placed newlines to AZ_LOG
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Esteban Papp 5cca52e73c Merge branch 'development' into redcode/driller_removal
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/azcore_files.cmake
#	Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red_sRGB.tif
4 years ago
Esteban Papp cd5306febf Merging from development
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Nicholas Van Sickle 3d8664ee92
Merge pull request #5511 from aws-lumberyard-dev/nvsickle/GenericDomJson
Generic DOM: Add DomBackend abstraction and JSON support
4 years ago
Nicholas Van Sickle 6cf805256b Make backend write API string-based
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
carlitosan 15e26b7515 merge development
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
Gene Walters 9ae3da7acd Merge branch 'upstream/development' into LYN-8514_AutomatedReviewServerLogChecks 4 years ago
Nicholas Van Sickle ea9d7c9d82 Add optional size parameter to ReadFromBufferInPlace
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle 1c42cd98cc Address a bit more review feedback
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Steve Pham be252d797d
Remove disabled failed asset load tests trait from linux (#6100)
* Remove trait AZ_TRAIT_DISABLE_FAILED_ASSET_LOAD_TESTS for Linux

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
4 years ago
Nicholas Van Sickle 8165f54c05 Use temporary lifetimes for test
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Esteban Papp 03adf700fe Merge branch 'development' into redcode/driller_removal
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Nicholas Van Sickle 037a93406a Fix a couple format string issues
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle f2f7dad972 Remove FormatVisitorErrorMessage
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Esteban Papp bfae86dcf9 Adds missing header needed for mac/ios
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 799cc68de2 no message
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Nicholas Van Sickle 016e261f36 Add DomUtils
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Esteban Papp 620690f2d6 Fixes Windows release build
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Gene Walters e2d1cdc9a5 Update Logger to use fixed_string
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
lumberyard-employee-dm c3fdbfb926
Updated the ComponentApplication Settings Registry initialization to no (#6108)
longer read form the users `~/.o3de/Registry` directory in non
debug/profile configurations.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Esteban Papp 5f41e404a5 PR comment
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 7817ed76bf Removes FileIOEventBus
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Nicholas Van Sickle 59a2216584 Fix a build issue
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle 4dbce4275b Refactor the interface after some chatting with @amazon-employee-dm
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Esteban Papp af19b53dde Removes FileIOBus
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 498673ada0 Removes Driller from AzCore
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Gene Walters d4e7a9cf16 Removing adding the null-terminator by hand. _vsnprintf_s already does this. Even if the buffer is too small, the /0 is still at the end
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
Esteban Papp 5dfd40d056 Removes leftover from profiler tool
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Gene Walters efcbc7ccd7 Removing code which was supposed to add a newline, but never did. The comment said it was required because of an assumption with Trace, but clearly Trace doesn't make that assumption
Signed-off-by: Gene Walters <genewalt@amazon.com>
4 years ago
carlitosan 6bd0308339 Merge remote-tracking branch 'origin/development' into sc-editor-asset-redux
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
4 years ago
Esteban Papp 59ef6f983f Removes Driller from ScriptCanvas
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp de06bb75e5 Fixes some unit tests due to the removal of the MemoryDriller
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 19ddeeded9 Removes ThreadDrillerEvents, replaces handlers with TreadEventBus
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 8bde44d5fb Removes TraceMessageDrillerBus
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 1b01ec18b0 Replaces handlers of TraceMessageDrillerBus with handlers of TraceMessageBus
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 59714fb31d Removes MemoryDrillerBus
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp c3f035c4e3 Removes AssetMemoryAnalyzer that relies on the MemoryDrillerBus
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 95ed1015a5 Removes the MemoryDriller
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 075eeee0bd Removes PlatformMemoryInstrumentation.h and PLATFORM_MEMORY_INSTRUMENTATION_ENABLED
This was part of another instrumentation framework that was never fully integrated

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 3f6246ccbe Removes recording of memory records through the MemoryDriller
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 47de333e94 Removes m_enableDrilling
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Nicholas Van Sickle 1aaa267585 Fix one last bit of minor feedback
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle 2dddb97b7c One last round of stray review feedback I missed
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle d519d4cb03 Improve performance for both in-place and copy parsing (faster than `AZ::JsonSerializationUtils::ReadJsonString` now!)
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
Nicholas Van Sickle e0508ddefc Make JsonBackend templated
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
lumberyard-employee-dm e8750f8096
Rename sr_regset-file CVar to sr_regset_file (#6067)
The Legacy Cry XConsole code validates that CVars only contain
underscore and alphanumeric characters via an Assert in `debug`
configurations.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
amzn-mike 828431f185
Update AssetManager unit tests to not interact with the disk (#5815)
* Changed AssetManager tests to use memory streams for asset reading/writing

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

* Fix compilation on non-unity builds

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

* Fixed handling of path lookups when test folder path is non-empty

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

* Add more detailed error message for "asset is not loaded"

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

* Make numThreads a constexpr

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

* Add FindFile function

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

* Remove unused lambda capture

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

* Remove trailing whitespace

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

* Add size to assert

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
Nicholas Van Sickle f87021d856 Expose JSON parse flag options
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
4 years ago
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 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
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