Commit Graph

6703 Commits

Author SHA1 Message Date
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
2021-08-25 15:40:41 -07:00
Esteban Papp b9daf7f7c3 Enabling several warnings on MSVC that are not enabled by default and are good to have 2021-08-25 15:38:09 -07:00
Esteban Papp fded2bafad More PR comments/fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-25 15:35:37 -07:00
Jeremy Ong 032366f9c9 Move undefs of problematic Windows defines to PlatformIncl_Windows.h
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-08-25 16:30:41 -06:00
Jeremy Ong d53026f186 Merge pull request #3490 from aws-lumberyard-dev/gitignorechange
Add CMakeUserPresets.json file to gitignore
2021-08-25 16:23:23 -06:00
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
2021-08-25 14:50:05 -07:00
Chris Galvan 4b672a0a32 Fixed merge conflict.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-25 16:13:22 -05:00
jckand-amzn c30642d855 Renaming test files for standardization and setting optimized tests to run alongside existing
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-08-25 16:13:10 -05:00
Esteban Papp 058f6e0f22 PR comments/fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-25 14:06:26 -07:00
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>
2021-08-25 15:04:38 -06:00
Chris Galvan d211771253 Updating PR to change lower API to return AZStd::string instead of const char* for safety.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-25 15:28:42 -05:00
Chris Galvan c3b6725118 Merge pull request #3461 from aws-lumberyard-dev/daimini/ui-editor-fix
Fix UI Editor crashing on initialization when restoring from layout.
2021-08-25 15:13:47 -05:00
Jeremy Ong 4a05d6f7ec Add CMakeUserPresets.json file to gitignore
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-08-25 14:06:47 -06:00
amzn-phist 9f6434fc68 Fix an issue with project-centric ninja builds [Linux] (#3429)
* Fix an issue with project-centric ninja builds

Normalizes relative paths when adding engine.json as a cmake configure dependency.
It should match the dependency added later which uses absolute path.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Fix typo

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-08-25 12:16:40 -07:00
Esteban Papp b1246dcc08 CMakeLists.txt frrom templates are not being installed (#3456)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-25 12:12:36 -07:00
Esteban Papp b8aab28759 Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp
2021-08-25 11:52:55 -07:00
Chris Galvan b4687fa72f Merge pull request #3418 from aws-lumberyard-dev/jckand/EditorAutomationOptimization
Editor automation optimizations with TestAutomationBase/parallelization
2021-08-25 13:49:15 -05:00
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
2021-08-25 11:47:19 -07:00
carlitosan 803bff70e4 Merge pull request #3438 from aws-lumberyard-dev/carlitosan/development
Bug fixes for SC editor asset scan in version explorer widget
2021-08-25 11:41:22 -07:00
Esteban Papp e2acd66c46 Fixes Guid formatting
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-25 11:37:35 -07:00
lumberyard-employee-dm b53182fdb6 Fixed invalid variable access in register.py (#3433)
* Fixed invalid variable access in register.py

The register_restricted_path and register_template_path methods did not specify the parameter for project path

Updated register_o3de_object_path function to pass in absolute paths to the engine or project in order to make relative paths to the registered o3de object to it.

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

* Fixed register_*_path resolve calls in register.py

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-08-25 13:29:24 -05:00
Luis Sempé 63cad40db2 Merge pull request #3435 from aws-lumberyard-dev/scripting/slottypeselectorwidget
Improved layout and behavior of the SlotTypeSelector widget
2021-08-25 11:06:41 -07:00
chcurran 6bd5cd7bde Fix release build warning error
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-25 10:53:34 -07:00
Danilo Aimini d270031e59 Set allocator to the UI Editor HierarchyWidget to prevent initialization error when restoring layout
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-08-25 10:37:27 -07:00
puvvadar ebbe4b99a4 Add const to some funcs and fix a comment
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-25 10:21:29 -07:00
Chris Galvan d64c034fee Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/FixedTrackViewNodeCrash 2021-08-25 12:05:09 -05:00
jckand-amzn a3868068d5 Merge branch 'development' of https://github.com/o3de/o3de into jckand/EditorAutomationOptimization 2021-08-25 11:33:17 -05:00
Jeremy Ong e091450e80 Merge pull request #3394 from aws-lumberyard-dev/Budgets
Add budget registration/tracking system and prepare driller redcode
2021-08-25 09:03:25 -06:00
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>
2021-08-25 09:28:41 +01:00
Jeremy Ong c3e83387db Address additional PR feedback
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-08-24 19:33:34 -06:00
chcurran be9ad98b24 remove commented out debugging artifacts
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-24 17:46:25 -07:00
chcurran 214700a73e Finish repair for scanning for upgrade tool
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-24 17:38:34 -07:00
lsemp3d 4545e2fb33 Improved layout and behavior of the SlotTypeSelector widget
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2021-08-24 16:27:55 -07:00
puvvadar 2ef5e956ba Fix a function header comment
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-24 16:26:32 -07:00
jckand-amzn 082273b543 Whitespace cleanup
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-08-24 18:19:38 -05:00
puvvadar decf15df21 Move packet dispatch to return an enum that includes a pending option
Signed-off-by: puvvadar <puvvadar@amazon.com>
2021-08-24 16:19:38 -07:00
jckand-amzn 789d5904da More test filename cleanup/re-org and enabled existing tests alongside optimized tests
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-08-24 18:18:19 -05:00
Esteban Papp cd5df6b372 Some more fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-24 16:16:36 -07:00
Mikhail Naumov bb90c4ddfe Disabling RootSpawnable warning (#3427)
* Disabling RootSpawnable warning

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* Revert "Disabling RootSpawnable warning"

This reverts commit c14e8d93945043498ab494bf608312cf5e1ad50d.

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>

* commenting out warning

Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-24 15:43:26 -07:00
santorac 3b424bd545 Fixed a shader hot reload issue where the new root shader variant asset was not getting saved in the Shader object during OnAssetReloaded, it was only saved during OnAssetReady.
MaterialHotReloadTest 06_VerticalPattern now passes.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-08-24 15:40:47 -07:00
Jeremy Ong a9b4ad3486 Compile out tracker in release mode
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-08-24 16:38:43 -06:00
Esteban Papp f22ecc7830 of course, was disabling/enabling the warning
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-24 15:15:40 -07:00
chcurran 26f6a714c8 initial fix for version scan
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-24 15:14:20 -07:00
Esteban Papp f94043dc83 Adds functions so targets can define install directories/files 2021-08-24 15:12:02 -07:00
jckand-amzn cb1d680a56 Removing sandbox tests from main suite
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-08-24 16:43:16 -05:00
jckand-amzn 2f8d029832 Moving 2 tests to sandbox that are intermittently failing on Jenkins but passing locally
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-08-24 16:35:11 -05:00
jckand-amzn 4458a245d1 Adding xfail marker to test run, and updating CMakeLists to point to the optimized test file
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-08-24 16:19:01 -05:00
jckand-amzn fb39aa5b86 Removing old test files
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-08-24 16:14:15 -05:00
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>
2021-08-24 14:10:59 -07:00
jckand-amzn b466788cc4 Updating editor_test.py to allow for per-test null_renderer overrides
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-08-24 16:10:36 -05:00