Commit Graph

6533 Commits

Author SHA1 Message Date
jckand-amzn ca94e961f7 Merge branch 'development' of https://github.com/o3de/o3de into jckand/LCGradOptimizations 2021-08-30 10:11:30 -05:00
Chris Galvan 47a5e3bb56 Merge pull request #3649 from aws-lumberyard-dev/cgalvan/FixAssetEditorOpeningInvalidFilesCrash
Implemented helper method of QFileDialog::getSaveFileName to prevent user from saving files with invalid names.
2021-08-30 09:58:21 -05:00
Chris Galvan f43b9ab9cb Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/FixAssetEditorOpeningInvalidFilesCrash 2021-08-30 08:09:47 -05:00
Esteban Papp b065837450 Fix for non-unity file and double declaration of WCHAR (#3657)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-27 17:44:08 -07:00
Junbo Liang d39a6a9085 Read project, region and assume role ARN from environment and update the script canvas graphs to fix automation test failures (#3654)
Fix AWS periodic automation test.s
2021-08-27 15:17:41 -07:00
Chris Galvan 043b218165 Updated invalid filename warning with more explicit message from PR feedback.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-27 15:44:31 -05:00
bosnichd 9876d86d5d Fix two compilation errors exposed when enabling tools support for any restricted platform. (#3633)
* Various fixes and empty boilerplate files required for restricted platforms.

Signed-off-by: bosnichd <bosnichd@amazon.com>

* Add comments to address review feedback.

Signed-off-by: bosnichd <bosnichd@amazon.com>

* Fix two compilation errors exposed when enabling tools support for any restricted platform.
- The simple one: remove menu commands that call OnChangeGameSpec (which has since been removed) from CryEdit.cpp
- The "I almost threw my computer out the window" one: pull PVRTC.cpp out of unity builds, because it indirectly #includes winnt.h, which typedefs wchar_t WCHAR, which causes a complilation error (Error C2632 'wchar_t' followed by 'wchar_t' is illegal ImageProcessingAtom.Editor.Static C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\um\winnt.h 471) if something else in the unity file has also happened to define WCHAR as wchar_t. Enabling tools support for any restricted platform resulted in this happening due to different compile definitions being set for ImageConvert.cpp and BuilderSettingManager.cpp (see Gems/Atom/Asset/ImageProcessingAtom/Code/CMakeLists.txt), which resulted in those two files being pulled out of unity builds, which resulted in the entirely unrelated PVRTC.cpp file being moved from the first thing included by a unity file to the second last thing included by a different unity file, that just happened to include something else (prior to PVRTC.cpp) which was defining WCHAR as wchar_t.

Signed-off-by: bosnichd <bosnichd@amazon.com>
2021-08-27 11:33:28 -06:00
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>
2021-08-27 10:09:58 -07:00
Chris Galvan d590a91fe7 Implemented helper method of QFileDialog::getSaveFileName to prevent user from saving files with invalid names.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-27 11:24:05 -05:00
jckand-amzn b6aa317051 Merge branch 'development' of https://github.com/o3de/o3de into jckand/LCGradOptimizations 2021-08-27 10:02:04 -05:00
hultonha 9e5ef08229 Remove unused lambda capture variable (#3634)
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-08-27 13:06:56 +01:00
hultonha b0330ba26a Expose camera input channels to the UI and ensure the cached values are refreshed when updated (#3607)
* expose camera input channels to the ui and ensure the cached values are refreshed when updated

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* small fixes for tests

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-08-27 09:29:08 +01:00
Esteban Papp 48c959e359 [Windows] Debug build error in OpenImageIO 3rdParty library (#3625)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-26 16:40:54 -07:00
carlitosan c6ab102e6a Merge pull request #3618 from aws-lumberyard-dev/carlitosan/development
add missing [[maybe_unused]] tags to Store() calls of serializers
2021-08-26 16:22:29 -07:00
Esteban Papp 1be95a1e76 Potential Memory Corruption in Release Build (#3559)
* Potential Memory Corruption in Release Build

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

* @lumberyard-employee-dm suggested code

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

* warnings as errors found in VS2022

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

* simplifying some strucutres used and fixing a bug

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

* some unused fixes for VS2022

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

* fix for other platforms

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

* fixes check used in unit tests to be case-insensitive
fixes memory leaks/invalid memory operations in AWSCore tests

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-26 15:59:40 -07:00
jromnoa 9f55212a19 Adds MaterialEditor RHI launch tests (#3558)
* adds MaterialEditor RHI launch tests

* add explicit editor_script parameter to the launch_and_validate_results() call

Signed-off-by: jromnoa <jromnoa@amazon.com>
2021-08-26 16:25:24 -05:00
Chris Galvan a0f6e6e84a Merge pull request #3616 from aws-lumberyard-dev/cgalvan/AddOpenProjectFolderInExplorer
Added context menu on game folder status bar item to open project path in file explorer.
2021-08-26 16:13:33 -05:00
chcurran 34939dcb10 add missing [[maybe_unused]] tags to Store() calls of serializers
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-26 13:14:21 -07:00
santorac 1abab4ca2f Shader hot reload fixes
Merge pull request #3574 from aws-lumberyard-dev/Atom/santorac/MoreShaderHotReloadFixes

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.

Fixed shader variant hot reload which was failing due to mismatched timestamps. The ShaderAsset was using microseconds and the ShaderVariantAsset was using system ticks. Since ticks will always be higher than microseconds, stale variants were not prevented from being used.

AtomSampleViewer's MaterialHotReloadTest script is passing again.
2021-08-26 13:11:28 -07:00
Chris Burel ec0278b899 Configure default Atom assets to be enabled on the linux platform (#3611)
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-08-26 12:57:45 -07:00
bosnichd 0264a3e7a1 Various fixes and empty boilerplate files required for restricted platforms. (#3610)
* Various fixes and empty boilerplate files required for restricted platforms.

Signed-off-by: bosnichd <bosnichd@amazon.com>

* Add comments to address review feedback.

Signed-off-by: bosnichd <bosnichd@amazon.com>
2021-08-26 13:10:54 -06:00
Chris Galvan bec568c8bd Added context menu on game folder status bar item to open project path in file explorer.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-08-26 13:14:30 -05:00
Esteban Papp 0750dd59ca Linux/Clang fix warn-unused and related
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-26 09:58:18 -07:00
SergeyAMZN ebe35eeed6 Merge pull request #3587 from aws-lumberyard-dev/MPWeaponSQ2
LYN-5558 Fixed Blast assets loading in the Launcher
2021-08-26 17:23:47 +01:00
santorac ccd648c600 Removed unnecessary print statements
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-08-26 08:51:28 -07:00
santorac 822a8f31f1 Merge remote-tracking branch 'upstream/development' into Atom/santorac/MoreShaderHotReloadFixes 2021-08-26 08:41:42 -07:00
Esteban Papp 906ace3d03 Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-26 08:23:02 -07:00
bosnichd 040b75c02c Fix PAL.cmake logic, thanks to lumberyard-employee-dm! (#3516)
* Fix PAL.cmake logic, thanks to lumberyard-employee-dm!

Signed-off-by: bosnichd <bosnichd@amazon.com>

* Lowercase the platform name to address review feedback.

Signed-off-by: bosnichd <bosnichd@amazon.com>
2021-08-26 07:31:30 -06:00
pereslav 865d877d8e LYN-5558 Fixed Blast assets loading in the Launcher
Signed-off-by: pereslav <pereslav@amazon.com>
2021-08-26 13:05:45 +01:00
hultonha d5ee6fb36f Expose camera settings to the Editor UI (#3442)
* expose camera settings to the ui

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* improve naming of visibility functions, remove duplication

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-08-26 10:01:22 +01:00
santorac 7aa24fd58f Fixed shader variant hot reload which was failing due to mismatched timestamps. The ShaderAsset was using microseconds and the ShaderVariantAsset was using system ticks. Since ticks will always be higher than microseconds, stale variants were not prevented from being used.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-08-26 00:26:35 -07:00
Jeremy Ong 8485f20bf2 Merge pull request #3566 from aws-lumberyard-dev/FixWhiteBoxCompileError
Add missing AzToolsFramework budget declaration
2021-08-26 00:32:23 -06:00
Jeremy Ong b49b5a7c54 Add missing AzToolsFramework budget declaration
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-08-25 22:02:33 -06:00
Chris Galvan 486157f89b Merge pull request #3428 from aws-lumberyard-dev/cgalvan/FixedTrackViewNodeCrash
Fixed memory stomping leading to Track View nodes with invalid labels and crash.
2021-08-25 19:14:26 -05:00
Esteban Papp e5e271f45a One more fix
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-25 16:42:01 -07:00
Jeremy Ong 8d2383e408 Merge pull request #3493 from aws-lumberyard-dev/windowsdecls
Move undefs of problematic Windows defines to PlatformIncl_Windows.h
2021-08-25 17:32:56 -06:00
amzn-phist db1a89a492 Fix level creation on Linux (#3488)
* Fix level creation on Linux

Creating a new level on linux would fail due to backslashes being used in mkdir.
Fixed the slashes to use the AZ_CORRECT_FILESYSTEM_SEPARATOR.

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

* Removed extra line that wasn't needed

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-08-25 15:43:04 -07:00
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