Commit Graph

7178 Commits

Author SHA1 Message Date
Danilo Aimini 5a4476a0e4 Minor fixes to variable names and comments.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-09-21 10:26:41 -07:00
amzn-tommy c6ad920a46 Merge remote-tracking branch 'upstream/development' into Atom/amzn-tommy/ATOM-16504_StandardMultilayerPBR_Displacement_nil
Signed-off-by: amzn-tommy <waltont@amazon.com>
2021-09-21 10:11:07 -07:00
amzn-tommy ed61f47b7f Cleaner initialization of heightMinMax plus a comment in StandardMultilayerPBR_Common.azsli to indicate that the .lua needs to be updated if the .azsli enum changes.
Signed-off-by: amzn-tommy <waltont@amazon.com>
2021-09-21 10:10:54 -07:00
AMZN-Olex f85a7dfeeb Merged dev
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-09-21 12:57:57 -04:00
Chris Galvan 2bba8fe9a3 Clarified behavior in comment.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-09-21 11:57:17 -05:00
Danilo Aimini b8c78caa2f Remove nested FocusModeFramework namespace
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-09-21 09:48:09 -07:00
Danilo Aimini 29d7fcb55e Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/setup 2021-09-21 09:41:36 -07:00
Chris Galvan 4e46cb0a01 Prevent crash in Landscape Canvas when creating a prefab from an open graph.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-09-21 11:14:47 -05:00
Guthrie Adams b69fe3a145 Merge branch 'development' into Atom/guthadam/atomtools_support_ly_set_gem_variant_to_load 2021-09-21 11:07:18 -05:00
Guthrie Adams 0d3e35fb70 Merge branch 'development' into Atom/guthadam/atomtools_updating_cmake_config_plus_bootstrap 2021-09-21 10:42:58 -05:00
Guthrie Adams 04ee676e2f Merge pull request #4213 from aws-lumberyard-dev/Atom/guthadam/material_component_clear_and_repair_commands
Adding new commands to the material component for managing, removing, repairing material slots
2021-09-21 10:36:56 -05:00
pereslav dc0bb00c10 Added an error check in case of a requested spawnable is not networked
Signed-off-by: pereslav <pereslav@amazon.com>
2021-09-21 14:58:33 +01:00
AMZN-Igarri 7fca57a169 Fixed Assert (#4234)
Signed-off-by: igarri <igarri@amazon.com>
2021-09-21 14:55:10 +01:00
pereslav 895974db57 Removed spawn/despawn events from the spawnable system. Used NetworkSpawnableHolderComponent instead
Signed-off-by: pereslav <pereslav@amazon.com>
2021-09-21 14:50:06 +01:00
Guthrie Adams 88ee878025 deleting platform specific code from ME and SMC
fixed ME viewport

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-09-20 23:13:51 -05:00
dmcdiar db5fd91ac9 Merge branch 'development' into Atom/dmcdiar/ATOM-4126 2021-09-20 18:22:45 -07:00
Guthrie Adams 847e8058e0 Merge branch 'Atom/guthadam/atomtools_updating_cmake_config' into Atom/guthadam/atomtools_updating_cmake_config_plus_bootstrap 2021-09-20 19:14:09 -05:00
Guthrie Adams 63533bf067 Merge branch 'development' into Atom/guthadam/atomtools_updating_cmake_config 2021-09-20 19:13:16 -05:00
Danilo Aimini 9d7e5ce1af Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/setup 2021-09-20 17:11:09 -07:00
puvvadar d7e29c00c7 Merge pull request #4228 from aws-lumberyard-dev/LYN6808_Multiplayer_PreRender_CompilerErrorFix
LYN6808: Fix Compiler Error Due to EntityPreRenderEvent
2021-09-20 17:04:24 -07:00
amzn-tommy d15d7c3a85 Modify CalcOverallHeightRange to not return nil
Signed-off-by: amzn-tommy <waltont@amazon.com>
2021-09-20 16:24:28 -07:00
jromnoa 3685f1bff2 move shader asset builder test into test_Atom_MainSuite_Optimized.py, update CMakeLists.txt, and move all imports inside the test class for hydra_ShaderAssetBuilder_RecompilesShaderAsChainOfDependenciesChanges.py (#4205)
Signed-off-by: jromnoa <jromnoa@amazon.com>
2021-09-20 15:21:23 -07:00
Gene Walters 465f91c7f5 Fix compiler error because EntityPreRenderEvent only takes one float for deltaTime now
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-09-20 14:59:28 -07:00
kberg-amzn 52004f6cb5 Merge pull request #4120 from aws-lumberyard-dev/LYN6527_MoveMPSampleComponents_into_MultiplayerGem
Move Multiplayer Sample Components into Multiplayer Gem
2021-09-20 13:50:00 -07:00
Danilo Aimini 9c400bbd9d Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/setup 2021-09-20 13:44:41 -07:00
Danilo Aimini 489a93cf91 Remove assert for edge case that can actually happen in normal circumstances, simply return false in those cases.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-09-20 13:44:25 -07:00
lumberyard-employee-dm b9d1af9f46 Fixed calculation of each archive file data offset. (#4204)
* Fixed calculation of each archive file data offset.

The location of a file entry in a Zip file is calculated after the local file
header + the length of the filename + the length of the extra field
length per the ZIP file spec.
https://pkware.cachefly.net/webdocs/casestudies/APPNOTE.TXT

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

* Removed bIndependentBlocks variable

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-09-20 15:44:07 -05:00
dmcdiarmid-ly 16e806abff Merge pull request #4200 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-16437
Instance the ray tracing BLAS objects
2021-09-20 13:42:47 -07:00
Guthrie Adams fcc6af58f5 Merge branch 'development' into Atom/guthadam/material_component_clear_and_repair_commands 2021-09-20 15:25:44 -05:00
Guthrie Adams 376a6040d8 Addressing PR feedback
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-09-20 15:24:03 -05:00
jckand-amzn e4479fff4a Dynamic Vegetation automated test conversion/optimization (#4175)
* Initial batch of optimized Dynamic Vegetation tests

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

* Adding another round of optimized Dynamic Vegetation tests

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

* Adding more optimized Dynamic Vegetation tests

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

* Adding another round of optimized Dynamic Vegetation tests

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

* Final batch of converted Dynamic Vegetation tests

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

* Re-organizing/cleaning up TestSuite files

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

* Running optimized tests without xfail marker for Jenkins test

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

* Corrected path on CMakeLists.txt to point to the correct TestSuite file for optimized tests

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

* Adding xfail mark to DistanceBetweenFilter tests due to Editor deadlock

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

* Updating CMakeLists to build Launcher

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

* Updating xfail for DistanceBetweenFilter tests to skips as they timeout and cause cascading test failures

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

* Re-added xfail marker to optimized tests

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

* Correcting a few typos

Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-09-20 15:08:43 -05:00
Guthrie Adams 5a2ae1d483 Merge branch 'development' into Atom/guthadam/material_component_clear_and_repair_commands 2021-09-20 15:05:21 -05:00
Danilo Aimini 71bf614912 Changed FocusOnOwningPrefab to return Outcome. Added comments and error checking.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-09-20 12:18:23 -07:00
dmcdiar 154b6dc461 Added a mutex to protect the mesh and BLAS lists in the RayTracingFeatureProcessor
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
2021-09-20 12:13:29 -07:00
Danilo Aimini bd6705a06e Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/setup 2021-09-20 11:58:39 -07:00
Danilo Aimini 594981f130 Remove the PrefabEditManager. Introduce the FocusMode system on the Editor side, and a PrefabFocusHandler on the Prefab side to handle focus.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-09-20 11:58:31 -07:00
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
2021-09-20 11:40:57 -07:00
dmcdiar 2bd01f09fb Removed modelToWorldInverse from the stencil Srg.
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
2021-09-20 11:37:17 -07:00
puvvadar 6565b91854 Merge pull request #3912 from aws-lumberyard-dev/mp_blending_cleanup
NetworkTime cleanup and reworking how network interpolation can be approached
2021-09-20 10:08:29 -07:00
Guthrie Adams 45c0430f96 Merge branch 'Atom/guthadam/atomtools_updating_cmake_config' into Atom/guthadam/atomtools_updating_cmake_config_plus_bootstrap 2021-09-20 11:58:23 -05:00
Chris Burel 8c7e80f11c Add support for marking 3rdParty libraries as supplied by the host system (#4179)
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-09-20 09:51:03 -07:00
jonawals 4aff76343f Provisional implemenation and testing of central state tracker to track viewport editing modes. (#4112)
* Provisional impl and testing of central state tracker.

Signed-off-by: John <jonawals@amazon.com>

* Add missing namespace comment.

Signed-off-by: John <jonawals@amazon.com>

* ViewportEditorModeState -> ViewportEditorModes

Signed-off-by: John <jonawals@amazon.com>

* ViewportEditorModesTracker -> ViewportEditorModeTracker

Signed-off-by: John <jonawals@amazon.com>

* GetEditorModeState ->GetViewportEditorModes

Signed-off-by: John <jonawals@amazon.com>

* GetNumTrackedViewports -> GetTrackedViewportCount

Signed-off-by: John <jonawals@amazon.com>

* IsViewportStateBeingTracked -> IsViewportModeTracked

Signed-off-by: John <jonawals@amazon.com>

* Fix API comments.

Signed-off-by: John <jonawals@amazon.com>

* Delete hangover file.

Signed-off-by: John <jonawals@amazon.com>

* Delete more hangover files.

Signed-off-by: John <jonawals@amazon.com>

* Minor member name refactor.

Signed-off-by: John <jonawals@amazon.com>

* Refactor nonclemanture.

Signed-off-by: John <jonawals@amazon.com>

* Rename Enter/ExitMode to Register/UnregisterMode.

Signed-off-by: John <jonawals@amazon.com>

* Error and warning msgs now return AZ::Outcomes.

Signed-off-by: John <jonawals@amazon.com>

* Change all nomenclature to Activate/Deactivate for consistency.

Signed-off-by: John <jonawals@amazon.com>

* Change tense of notification bus methods.

Signed-off-by: John <jonawals@amazon.com>

* Fix malformed string format.

Signed-off-by: John <jonawals@amazon.com>

* Fix malformed string format (again).

Signed-off-by: John <jonawals@amazon.com>

* Fix Linux warning.

Signed-off-by: John <jonawals@amazon.com>
2021-09-20 17:37:09 +01:00
Guthrie Adams b8a2c602cc Merge branch 'development' into Atom/guthadam/atomtools_updating_cmake_config 2021-09-20 11:27:04 -05:00
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>
2021-09-20 11:13:47 -05:00
Gene Walters 25469a9e1c Merge branch 'upstream/development' into LYN6527_MoveMPSampleComponents_into_MultiplayerGem 2021-09-20 09:12:03 -07:00
Chris Burel 3812e60ab6 Add support for keyboard events from xcb (#3971)
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-09-20 09:09:50 -07:00
AMZN-Olex 78148ead7c Unittests for IsHierarchyEnabled
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-09-20 11:56:40 -04:00
jckand-amzn a4424ea820 Adding xfail mark to LayerBlender test due to Launcher crash on quit (#4173)
Signed-off-by: jckand-amzn <jckand@amazon.com>
2021-09-20 10:49:04 -05:00
AMZN-nggieber 357e823323 Add Initial Gem Repository Management Screen (#4172)
* Adds the gem repo screen with the UI built but with mocked data and not connected to the o3de scripts

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

* Changed name of added to enabled, disabled define, removed unused functions

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

* Added eof nl to qss

Signed-off-by: nggieber <nggieber@amazon.com>
2021-09-20 08:36:29 -07:00
AMZN-Olex bcc77d75db Merge branch 'development' of https://github.com/o3de/o3de into Network/olex/hierarchy_component_phase1_pr 2021-09-20 09:58:43 -04:00