birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,080 Commits 3 Branches 3 Tags
1dcc20fd76bc83c98c9da42e5e1b2cad4c786912
Commit Graph

7080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guthrie Adams 1dcc20fd76 Merge branch 'development' into Atom/guthadam/atomtools_support_ly_set_gem_variant_to_load 2021-09-22 09:04:38 -05:00
Guthrie Adams 6a1b685ea7 fixing duplicate define 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-09-22 09:03:24 -05:00
SergeyAMZN 35517c4e6a Merge pull request #4023 from aws-lumberyard-dev/MPSpawnableRework 
Reworked net entities instantiation in order to fix entity references…
 2021-09-22 10:50:35 +01:00
Benjamin Jillich 8b74395560 EMotionFX: Basic profile instrumentation for anim graph (#4240) 
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2021-09-22 10:15:20 +02:00
hultonha b865d2aec1 Add support for camera reference frames to support camera yaw in certain situations (#4088) 
* proof of concept change for fixing camera yaw rotation being ignored

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

* updates to fully support camera roll

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

* small fixes for PR

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

* undo changes in EditorCameraComponent

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

* add test to verify interaction between editor viewport view entity change and modular camera controller

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

* add additional tests for updated camera behaviors

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

* revert change to Camera Gem Output Name

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

* move location of new files

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

* fix tab/spaces issue

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

* remove static from potentially unused functions

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

* set camera lib name in CMakeLists.txt file

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

* cosmetic CMakeLists.txt change

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-09-22 09:08:24 +01:00
Guthrie Adams 59c4beeeaf Merge branch 'development' into Atom/guthadam/atomtools_support_ly_set_gem_variant_to_load 2021-09-22 01:39:25 -05:00
Guthrie Adams 7910803e82 removing ly_add_target_dependencies 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-09-22 01:38:12 -05:00
Guthrie Adams 7db46da755 updating SMC Linux config 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-09-22 00:35:19 -05:00
Guthrie Adams 9bd23dc5d8 reverting call to AWSNativeSDKInit::InitializationManager::Shutdown() 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-09-22 00:04:55 -05:00
dmcdiarmid-ly 2c55ad5379 Merge pull request #4202 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-4126 
Change the Reflection Probe component to an OBB
 2021-09-21 20:23:57 -07:00
dmcdiar df42377fc6 Minor changes to forward pass IBL specular 
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
 2021-09-21 17:10:32 -07:00
Mike Chang 39a4e05492 Change installer domain to o3debinaries.org (#4244) 
* Change installer domain to o3debinaries.org

* Removed 3p license parameter

Signed-off-by: Mike Chang <changml@amazon.com>
 2021-09-21 15:24:14 -07:00
dmcdiar 3961d2724e Merge branch 'development' into Atom/dmcdiar/ATOM-4126 2021-09-21 15:14:58 -07:00
mrieggeramzn 50fabb1bf7 Atom/mriegger/fixupname (#4187) 
* Removing atom from the Decal (atom) name
* Decal component can take advantage of non-uniform scale option
* Using the base class nonuniform scale property rather than firing an event
* removing pragma optimize off
* Python tests need the updated name

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
 2021-09-21 15:06:55 -07:00
dmcdiar e5cc029c76 Converted ReflectionProbe Srg indices to ShaderInputNameIndex 
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
 2021-09-21 14:40:26 -07:00
Guthrie Adams 0bcf275ed2 updated/removed platform specific files 
fixed warning message

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-09-21 16:39:04 -05:00
hershey5045 30da67fe7d Editor HDR Color Grading Component implemented under the PostFx stack (#4159) 
* Add HDR color grading pass and shaders.

* Remove color grading pass from light adaptation parent pass due to failing ASV tests. This will be added back later on.

* Editor HDR Color Grading Component implemented under the PostFx stack (#219)

* Add softmin/max for unbounded color grading properties.

* Revert channel mixer properties to vector3. Refactor mix to weight. Fix color grading pass to convert any color variable into vec4.

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

Co-authored-by: Robin <rbarrand@amazon.com>
 2021-09-21 16:19:30 -05:00
Tobias Alexander Franke 9477da799b Jobify view culling (#3983) 
* Jobify culling
* Move JobCompletion to stack

Signed-off-by: Tobias Alexander Franke <tobias.alexander.franke@huawei.com>

Co-authored-by: Tobias Alexander Franke <tobias.alexander.franke@huawei.com>
 2021-09-21 16:05:11 -05:00
jiaweig 61a9223256 ATOM-16079 [RHI][Vulkan] - Linux Swapchain rendering issue on the first frame (#4129) 
* Fix out-of-date swapchain when QT window is not activated.

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

* Removed new code of the previous hack.

Signed-off-by: jiaweig <jiaweig@amazon.com>
 2021-09-21 13:46:22 -07:00
Guthrie Adams d453da4724 Merge branch 'development' into Atom/guthadam/atomtools_support_ly_set_gem_variant_to_load 2021-09-21 14:32:12 -05:00
Guthrie Adams 22e14ea90d added m_drawContextRegistered flag to stop error calling UnregisterDynamicDrawContext in AtomViewportDisplayIconsSystemComponent 
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-09-21 14:29:24 -05:00
Guthrie Adams 037d2f8cad Merge pull request #4232 from aws-lumberyard-dev/Atom/amzn-tommy/ATOM-16504_StandardMultilayerPBR_Displacement_nil 
Modify CalcOverallHeightRange to not return nil
 2021-09-21 13:46:57 -05:00
Chris Galvan ec4e6a6c35 Merge pull request #4243 from aws-lumberyard-dev/cgalvan/FixLCPrefabCrash 
Prevent crash in Landscape Canvas when creating a prefab from an open graph.
 2021-09-21 13:36:51 -05:00
kberg-amzn 13183f8710 Merge pull request #4178 from aws-lumberyard-dev/nvsickle/CryCameraRemoval 
Remove legacy Cry dependencies from the Camera Gem
 2021-09-21 11:35:16 -07:00
jromnoa fa163f49b9 Re-structure Atom test folders in AutomatedTesting. (#4206) 
* 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

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

* re-organize the Atom automated test structure to match the new parallel + batched test structures

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

* fix CMakeLists.txt registrations for test files

Signed-off-by: jromnoa <jromnoa@amazon.com>
 2021-09-21 10:55:48 -07:00
AMZN-tpeng 612ba040a6 [ATOM][RHI][Vulkan] - add different constant alignment values for pla… (#4098) 
* [ATOM][RHI][Vulkan] - add different constant alignment values for platforms.

Signed-off-by: Peng <tonypeng@amazon.com>

* More explanation of the limitation define.

Signed-off-by: Peng <tonypeng@amazon.com>
 2021-09-21 10:54:50 -07:00
Chris Burel 19747cb5c6 Link to xcb as system-provided targets, instead of by direct library path (#4221) 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2021-09-21 12:31:42 -05: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
Chris Galvan 2bba8fe9a3 Clarified behavior in comment. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-09-21 11:57:17 -05: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
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
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