Commit Graph

11142 Commits

Author SHA1 Message Date
santorac c3363fc22e Updating StandardPbr.materialtype to follow the new file format. In this commit all I did was combine the "groups" metadata together with the property lists. The groups will now show up in the wrong order in the Material Editor, because that was based on the "groups" list that no longer exists. I wanted to keep the giant list of properties in the same order for an easier diff review. In the next commit, I'll move the property groups around to be in the same order as before.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-28 09:36:09 -08:00
Tom Hulton-Harrop ea55c6d5e5 Initial fix for geometry being intersected when not visible (#6473)
* initial fix for geometry being intersected when not visible

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add tests for shape intersection with helpers enabled/disabled

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update moved cmake file after merge

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates following PR feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2022-01-25 16:56:58 +00:00
dependabot[bot] ad8b142230 Bump urllib3 in /scripts/build/build_node/Platform/Common (#7118)
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.2 to 1.26.5.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](https://github.com/urllib3/urllib3/compare/1.26.2...1.26.5)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-25 08:31:18 -08:00
Allen Jackson c8cf613cf6 {lyn9135} Adding a default prefab during scene processing (#6851)
* {lyn8865} Adding DataTypes::ScriptProcessorFallbackLogic

- Give the user an option how to handle fallback logic for script rules

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* the new code found an error in a Python script... it seems to work!

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* fixing up the regression test

Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>

* dump version number

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* Adding first pass of logic plus test file

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* Applying scene graph transform to entity transform
Excluding other mesh names in the mesh groups


Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* test: parent top stack


Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* cleaned up the code and parent tops FBX file

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* adding tests for the proc prefab constructor logic

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* Linux/Clang fixes

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* assigning matrix data to pass the tests in Linux (and others...)

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* Addressed some concerns based on PR feedback

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* encapsulating the logic into readable sections

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* added comment to watch folder to asset path info

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
2022-01-25 10:02:56 -06:00
Scott Romero f3e6e57cc4 [development] Android trace support (#7021)
- Abstracted the platform specific low level profiler API
- Added support for ATrace markers on Android
- Stubbed iOS, Linux, and macOS with unimplemented versions of the low level platform profiler API

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2022-01-25 07:59:53 -08:00
Mike Balfour 95c0186d1b Add GetHeights() and GetSurfaceWeightsFromList() APIs. (#7121)
These perform bulk queries of the underlying gradients which is much faster than performing a lot of individual queries.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2022-01-25 09:52:00 -06:00
Chris Galvan a2db9806a8 Merge pull request #7123 from aws-lumberyard-dev/cgalvan/gitflow_220124_o3de_development
Merged `stabilization/2111RTE` to `development`
2022-01-25 08:19:34 -06:00
John Jones-Steele 601858978f The default android platform settings refer to lumberyard #3881 (#7073)
* WIP

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Commit before merging

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Added new pngs

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Changes from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Fixed CRC errors

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
2022-01-25 11:49:05 +00:00
John Jones-Steele d346d45848 File menu open level and save level as dialogs not properly recognized as modals #6605 (#7072)
* WIP

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Fixes to ModalWindowDismisser

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Redisables Import test as fails on Jenkins

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Redisables Import test and Edit Platform as fails on Jenkins

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Replace skip in TestSuite_Main.py

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
2022-01-25 10:43:20 +00:00
lumberyard-employee-dm e1cb40fa33 Adding missing dependency on LyShine to the VirtualGamepad (#7087)
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2022-01-24 17:24:43 -06:00
lumberyard-employee-dm f3e9e41f4f Adding partial implementation of C++20 concepts and range functions for AZStd::span (#7102)
* Adding partial implementation of C++20 concepts and range functions for AZStd::span

The new concepts to discovered existing issues with the PathIterator and deque::iterator classes
PathIterator wasn't properly an input_iterator and therefore the Path classes weren't a range due to an incorrect const_iterator alias
The deque::iterator classes was missing the operator+ friend function that accepted a (ptrdiff_t, deque::iterator) to fulfill the random_access_iterator concepts

The AZStd implementations of (uninitialized_)copy(_n), (uninitialized_)move(_n) and (uninitialized_)file(_n) have been optimized to use memcpy and memset based on fulfilling the contiguous_iterator concept

Fixed invalid AZStd::vector inserts in FrameGraphExecuter.cpp and SliceditorEntityOwnershipService.cpp
The code was trying to copy the underlying addresses for vector<unique_ptr> to a vector<raw pointer> using insert, which it was doing by using memcpy.

relates to #6749

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

* Fixed the `fixed_vector` emplace function to not move initialized
elements using uninitialized_move.

This was causing initialized elements of the fixed_vector to be
overwritten with the element at the emplace position.

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

* Fixed clang warnings about variables that are set, but never read

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

* Updated the `az_has_builtin_is_constant_evaluated` define to not have
"()" as is not a macro.

This helps prevent users from using `az_has_builtin_is_constant_evaluated`
define in a situation where they want to know if the function is being
evaluated in a compile time context.
In that case they need to use the `az_builtin_is_constant_evaluated()`
macro (which of course looks quite similiar) but does not have the word
"has" in it..

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

* Updated the AZStd span class to be C++20 compliant.

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

* Changed phrase "DoesNotCompiles" to be more grammatically correct.

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

* Added more unit test for AZStd span

Fixed an the the return type of the subspan template overload to account
for the source span having a dynamic extent.

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

* Removed unused variable from span unit test.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2022-01-24 17:09:08 -06:00
dependabot[bot] a3fbcae81f Bump urllib3 in /scripts/build/build_node/Platform/Linux (#7119)
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.4 to 1.26.5.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](https://github.com/urllib3/urllib3/compare/1.26.4...1.26.5)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-01-24 14:47:38 -08:00
Junbo Liang 075f5ce693 Reimplement the GCC fix for the AWS jobs using forward declare (#7088)
* Revert the recent AWSApiRequestJob and ServiceRequestJob and use forward declaring to fix the GCC issue

Signed-off-by: Junbo Liang <68558268+junbo75@users.noreply.github.com>
2022-01-24 14:20:33 -08:00
Chris Galvan a2d925c311 Merge pull request #6719 from tjmgd/bug-model-crash-92
Model drag causes crash
2022-01-24 16:03:07 -06:00
Chris Galvan 049b33d2df Merging stabilization/2111RTE -> development, resolved conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-01-24 15:55:31 -06:00
santorac f89977abe3 Merge pull request #7054 from aws-lumberyard-dev/Atom/santorac/RemixableMaterialTypes2_FIX2
Made MaterialPropertyId Be More Generic
2022-01-24 13:18:11 -08:00
Danilo Aimini d1143770e0 Prefab Focus Mode | Fixes to viewport top toolbar (#7094)
* Fixes to the viewport top toolbar.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Additional checks to prevent issues if widgets aren't set up correctly.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Add asserts to catch UI changes that would break this class.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2022-01-24 13:17:16 -08:00
Chris Galvan 630c10faf8 Merge pull request #7117 from aws-lumberyard-dev/cgalvan/FixAudioWwiseCompileIssue
Fixed missing include compile issue
2022-01-24 15:15:49 -06:00
Allen Jackson 640fe70c56 Combining the original scene manifest with the new manifest (#7083)
* Combining the original scene manifest with the new manifest to allow the
OnPrepareForExport to execute

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>

* fixing comment

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
2022-01-24 15:09:15 -06:00
bosnichd f34d3a822e Add a ray cast API to the terrain system, implement it, and use it so entities can be placed on top of terrain. (#6895)
* Add a ray cast API to the terrain system, implement it, and use it so entities can be placed on top of terrain.

Still to do:
- Unit tests
- Profiling/benchmarks
- Optimization (if needed, may not be now after updating to use the iterative approach, but one option could be to use SIMD to ray cast against both triangles at once)

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

* Fix typos.

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

* Added a FindNearestIntersectionIterative to use in place of the first-pass FindnearestIntersectionRecursive attempt.

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

* Remove some functions that are no longer being used.

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

* Remove a unicode character from a comment to fix the validation build.

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

* Remove another unicode character from a comment to fix the validation build.

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

* Update to bail out as soon as t > 1.0f

Signed-off-by: bosnichd <bosnichd@amazon.com>
2022-01-24 13:47:44 -07:00
Chris Galvan f8ac3071a3 Merge pull request #6671 from tjmgd/bug-anim-lod-91
Fix: LOD stops animation
2022-01-24 13:26:03 -06:00
Danilo Aimini b1caed0f8e Introduce shortcut labeling in "Find in Viewport" context menu item in the Outliner (#7095)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2022-01-24 11:22:50 -08:00
Junbo Liang 1cf7d57b3f Update deployment scripts to support AWSI automation tests on Linux (#7038)
* Update deployment scripts to support AWSI automation tests on Linux

Signed-off-by: Junbo Liang <68558268+junbo75@users.noreply.github.com>
2022-01-24 11:20:15 -08:00
Guthrie Adams 160508d2d6 Merge pull request #7104 from aws-lumberyard-dev/Atom/guthadam/atom_tools_change_preset_browser_to_generic_asset_grid_dialog
Atom Tools: Changed ME preset browser dialog into generic asset grid dialog in ATF
2022-01-24 13:15:32 -06:00
Guthrie Adams b5ac9cb66b Merge pull request #7107 from aws-lumberyard-dev/Atom/guthadam/atom_tools_combined_me_viewport_renderer_and_widget
Atom Tools: Combined ME viewport widget and renderer classes
2022-01-24 13:11:27 -06:00
Guthrie Adams 56edae53b9 Merge pull request #7105 from aws-lumberyard-dev/Atom/guthadam/atom_tools_replace_custom_help_dialog_with_message_box
Atom Tools: Replaced custom help dialog with generic message box
2022-01-24 13:10:49 -06:00
santorac fec2b889a3 Merge remote-tracking branch 'upstream/development' into Atom/santorac/RemixableMaterialTypes2_FIX2
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-24 10:54:03 -08:00
Chris Galvan 2b7b975a88 Fixed missing include compile issue
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-01-24 12:38:29 -06:00
Chris Galvan 8d0dce2613 Merge pull request #7101 from siretty/fix_build_linux_clang_13
Fix Build on Linux with Clang 13 with Debug, Profile and Release Configuration
2022-01-24 12:24:33 -06:00
SWMasterson 7bf7b03dd2 Added base level for tests, updated automation to use prefabs, and restored sandboxed tests (#6993)
Signed-off-by: Sean Masterson <semaster@amazon.com>
2022-01-24 11:50:37 -06:00
Scott Romero 0d2204917e [development] enabled mouse wheel scrolling in the Profiler gem visualizer (#6930)
Resolves #6698

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
2022-01-24 09:49:13 -08:00
Gene Walters 04e515ee85 Merge pull request #7099 from aws-lumberyard-dev/LYN-8726_NetAutoComponentScriptNodeFrontEndFix
Fix Network Test Script Nodes Front End
2022-01-24 09:45:47 -08:00
Chris Galvan 71640c1c82 Merge pull request #6376 from nemerle/compiletime_filerequest_code2
Compile time reduction - FileRequest & related changes
2022-01-24 11:43:27 -06:00
Chris Galvan 3fd7e79891 Merge pull request #5155 from pollend/feat/add-cursor-wrap-mode-viewport
feat: add cursor wrapped mode
2022-01-24 11:43:18 -06:00
mrieggeramzn c7d1c4603f Removing lux core (whats left of it) (#7089)
* Removing lux core (whats left of it)

Signed-off-by: mrieggeramzn <mriegger@amazon.com>

* Removing files recommended by NLawson and EPapp

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
2022-01-24 11:24:20 -06:00
Gene Walters 7b3631444d Merge pull request #7058 from aws-lumberyard-dev/editor_log_fix
Temporary fix for editor log stomping during python tests
2022-01-24 08:08:28 -08:00
moraaar 37c0b661f9 Added blast asset, whose fbx works with Atom, to help testing Blast Gem (#7110)
Signed-off-by: moraaar <moraaar@amazon.com>
2022-01-24 15:49:33 +00:00
Michael Pollind 7b649656bc chore: use numeric cast for QtEventTOAzInputMapperTest
Signed-off-by: Michael Pollind <mpollind@gmail.com>
2022-01-24 07:30:39 -08:00
greerdv be877373f1 Merge pull request #7041 from aws-lumberyard-dev/quad-collider-2
Support for quad shape in PhysX shape collider component
2022-01-24 14:26:02 +00:00
greerdv 8d7500f9c3 merge from development
Signed-off-by: greerdv <greerdv@amazon.com>
2022-01-24 12:39:08 +00:00
greerdv d412f3cc50 update with feedback from PR
Signed-off-by: greerdv <greerdv@amazon.com>
2022-01-24 12:38:15 +00:00
Tom Hulton-Harrop 5940982244 Ensure render geometry is refreshed when the mesh component controller is moved (#6452)
* ensure render geometry is refreshed when the mesh component controller is moved

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* cache bus pointer and send update notification when mesh changes

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add integration test to detect MeshComponentController notification to IntersectionNotificationBus

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* remove optimize off

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update build visibility for AtomLyIntegration editor static lib

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* move runtime dependencies to gem module

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2022-01-24 10:41:32 +00:00
SergeyAMZN a623e52331 Merge pull request #7040 from aws-lumberyard-dev/TerrainMaterialsFix
LYN-7640 Terrain Physics Materials hooked up all the way down to PhysX
2022-01-24 10:25:51 +00:00
Steve Pham 3113b8be03 Fix for 'Cannot Find PThread' when using GCC (#7097)
* Fix for 'Cannot Find PThread' when using GCC

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Fix error when COMPILATION_C and COMPILATION_CXX handling in ly_append_configurations_options

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Add missing 'PARENT_SCOPE' when appending to the CMAKE_C_FLAGS and CMAKE_CXX_FLAGS

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Fix appending of CMAKE_C_FLAGS and CMAKE_CXX_FLAGS

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Workaround for  C/C++ compilation flag settings for gcc. COMPILATION_C/COMPILATION_CXX is wiping out COMPILATION, so define each one separately with no sharing

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Remove unnecessary gcc ignore warnings for C files

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2022-01-24 01:17:25 -06:00
Michael Pollind 1643c68fa7 chore: fix compiling errors
Signed-off-by: Michael Pollind <mpollind@gmail.com>
2022-01-23 18:27:17 -08:00
Guthrie Adams aabde7916f Atom Tools: Combined ME viewport widget and renderer classes
Was looking into options for making any part of this more generic or reusable but 60% of the code is just setup and teardown of processors, handles, entities, and components for the material editor viewport content. The rest is about handling material editors specific setting changes. Most of the general-purpose code has already been moved into atom tools framework render viewport widget. The best reduction or generalization from this point would be using prefabs or some other mechanism to data drive setting up camera, viewport model, IBL, lighting, sky box.

Also discussing options for replacing the material editor viewport camera controller and states with a generic one used in the main editor and animation editor.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-01-23 18:20:52 -06:00
Daniel Edwards 0a5f472f43 Clang 13: Fix build errors ...
... due to local variables only being written to (but never read).

Signed-off-by: Daniel Edwards <dev@danieledwards.de>
2022-01-23 22:29:03 +01:00
Guthrie Adams d6cf8e24f3 Atom Tools: Replaced custom help dialog with generic message box
The help dialog just displayed some HTML text. The message box class provided by Qt can display the same information and styling without additional code. We don’t want to carry around the extra class to new applications based off of this one or port to ATF.
A simple about box was also added and can be fleshed out in the future.
Both dialogs will eventually need to be updated with additional information.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-01-23 15:18:49 -06:00
Guthrie Adams f20bf38f88 Atom Tools: Changed ME preset browser dialog into generic asset grid dialog in ATF
Moving more potentially shared code out of the material editor into atom tools framework.
This change consolidates the lighting preset browser, model preset browser, and the base dialogue that they shared into a single, grid based, asset selection dialog.
AssetGridDialog should appear as a move and rename of PresetBrowserDialog but there are probably too many differences with new variable renames and SelectableAsset struct.
Along the way I found examples showing that event bus broadcast accepted generic functions and lambdas. Used this to do a minor cleanup of the viewport settings inspector where the preset dialogs were initialized and other places that did several back to back bus calls.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-01-23 11:22:48 -06:00
Gene Walters c4addbc0e0 Moved AutomatedTesting specific script translation assets from gems/canvas into AutomatedTesting
Signed-off-by: Gene Walters <genewalt@amazon.com>
2022-01-21 22:08:31 -08:00