Commit Graph

12122 Commits

Author SHA1 Message Date
scspaldi d4df57e910 Applied PR feedback.
Signed-off-by: scspaldi <scspaldi@amazon.com>
2022-02-07 15:56:24 -08:00
LesaelR d209bf783c Moving test_CLITool_AssetBuilder_Works to sandbox. (#7438)
Signed-off-by: Rosario Cox <lesaelr@amazon.com>
2022-02-07 14:01:58 -08:00
Steve Pham 45e347315f Remove -Wno-unused-value suppression for GCC (#7387)
- Remove '-Wno-unused-value' flag from GCC
- Fixes for resulting errors
- Ignore GCC error on FIR-Filter.cpp

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2022-02-07 13:49:25 -08:00
Danilo Aimini e7857120b0 Fix issue with clearing the parent entityId in the transform would result in prefab reparenting. (#7464)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2022-02-07 13:35:48 -08:00
Guthrie Adams 0f07f581f8 Atom Tools: replaced document settings with settings registry
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-02-07 15:11:03 -06:00
Guthrie Adams 6ad4dd0adc Merge pull request #7442 from aws-lumberyard-dev/Atom/guthadam/atom_tools_fix_gem_autoload_lists
Atom Tools: fix gem autoload settings registry files
2022-02-07 14:25:47 -06:00
chiyenteng 7c6c01d5a1 Convert automated tests related to content and unused levels (#7416)
* Convert automated tests related to content/WaterSample level/Physics's Base level

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Fix nits

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Add missing .prefab level file

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Fix nits

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Convert Blast tests

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Convert scripting tests

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Remove useless comments

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Revert Collider_AddColliderComponent change until prefab error message bug fixed

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
2022-02-07 12:11:01 -08:00
AMZN-stankowi 38a34d811d Update default bundle size limit to fit slightly larger content. Longer term we'll want to refactor these tests so they don't start failing to seemingly unrelated upstream changes, but for now this buys us time to work on other, more important things. (#7414)
What happened to cause this:
The test_WindowsAndMac_BundlesAndBundleSettings_EquivalentOutput test bundles the same content in two different ways, with the final intention to compare and verify the results are the same.

It's bundling up the level levels\testdependencieslevel\testdependencieslevel.spawnable

Along the way, it verifies the bundles it gets are what it expects. One of the bundle settings it uses is a relatively small maximum bundle size of 5 mib.

Note that when we use a maximum bundle size, it's not a hard limit, it's just when we go to create a new bundle, if the current bundle size + next file would make the bundle too big, it starts a new bundle. This means you can have bundles go over the bundle size in the case where one file is larger than the bundle size limit.

Somehow, one of the files referenced from this bundle ( goegap_4k_skyboxcm.exr.streamingimage ) is now 24 MB, which is larger than the default bundle size originally used, which is why the test fails, it goes to examine the contents of the second pak file of the first bundle, and it's larger than the maximum bundle size. That's why the test is failing.

Changing this to 30 mib causes this test to continue to pass.

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2022-02-07 11:29:13 -08:00
Nicholas Van Sickle dec3def9eb Merge remote-tracking branch 'upstream/development' into nvsickle/DomPatch 2022-02-07 10:51:43 -08:00
Jeremy Ong adb598445f Merge pull request #6428 from santipaprika/thin-transmission
Improve and refactor Atom's light transmission in thin object mode
2022-02-07 11:49:05 -07:00
greerdv ffdd3e85ac merge from development
Signed-off-by: greerdv <greerdv@amazon.com>
2022-02-07 18:48:03 +00:00
greerdv fc01207d14 add test for box component scale manipulators
Signed-off-by: greerdv <greerdv@amazon.com>
2022-02-07 18:47:10 +00:00
Chris Galvan e66d55189e Updated the gradient signal unit tests for the image gradient now using a StreamingImageAsset
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-02-07 12:06:11 -06:00
Guthrie Adams 0802313488 Merge pull request #7452 from aws-lumberyard-dev/Atom/guthadam/atom_tools_move_common_asset_browser_interactions_to_atf
Atom Tools: Move common asset browser interactions to shared class in ATF
2022-02-07 12:04:04 -06:00
santorac a6fde12fd3 Merge remote-tracking branch 'upstream/development' into Atom/santorac/RemixableMaterialTypes4_FlatMaterialFiles
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-07 10:04:02 -08:00
Roman be242f9c71 Fix a problem about rotation and scale manipulator (#7451)
* Load workspace should activate the graph by default.

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

* Fixed the bug with rotation and scale manipulator

Signed-off-by: rhhong <rhhong@amazon.com>
2022-02-07 09:50:31 -08:00
Qing Tao 2d8b4d8285 Fix for github issue https://github.com/o3de/o3de/issues/6380 (#7386)
The texture was treated as in linear space which leads to the color change when renders.
Change to sRGB fixes the issue.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
2022-02-07 09:20:55 -08:00
Chris Galvan 640093fe63 Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/ImageGradientStreamingImageSupport 2022-02-07 11:15:28 -06:00
AMZN-stankowi 07bdba11ca Updating to assimp 5.1.6 (#7435)
* Updated UV channel name retrieval to match changes to the assimp sdk

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated FBX automated tests to work with latest changes

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updating to the latest build of assimp: 5.1.6 with our two fixes applied on top

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Adding updated linux package info

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Added mac package info for 5.1.6 assimp

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updating Linux assimp package hash with latest changes

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated mac hash to match latest assimp mac package

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Updated windows to the latest assimp 5.1.6 package

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2022-02-07 09:09:00 -08:00
Steve Pham 4d4f10beb8 Clang/GCC compiler settings update [SECURITY] (#7358)
- Add the following compilation flags for clang
  -fpie
  -fstack-protector-all
  -fstack-check (non-release)

- Add the following compilation flags for gcc
  -fpie
  -fstack-protector-all

- Fix -Wunused-result errors from above compilation flag updates

- Add _FORTIFY_SOURCE=2 to GCC DEFINES

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2022-02-07 09:01:07 -08:00
Mike Balfour a6ddf4164f SurfaceTagWeights optimization (#7436)
* Add comparison operators to SurfaceTagWeight.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Changed AddSurfaceTagWeight to always combine weights.
This simplifies the API a bit and defines the behavior if someone ever tries to add a duplicate tag.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Added benchmarks for measuring the performance-critical APIs.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Changed SurfaceTagWeights to a fixed_vector.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2022-02-07 10:57:39 -06:00
moraaar 58f8cc666c Merge pull request #7447 from aws-lumberyard-dev/daimini/Prefabs/fixFocusNightlyIssue
Fix compilation error in converting between InstanceOptionalReference and InstanceOptionalConstReference
2022-02-07 15:06:40 +00:00
Benjamin Jillich 96f77f95fb Motion Matching: Debug visualization improvements, enable test builds, updated camera controller for automatic demo #7430
Motion Matching: Debug visualization improvements
* Moved reposibility from the instance to the system component to render debug visualizations. Why? To make sure all motion extraction deltas got applied to the character already and avoid any mismatches between last and current frame (resulting in visual jittering).
* Added frame database stats to the ImGui monitor.
* Switched ImGuiMonitor from internal histogram group to the now shared version in LYImGuiUtils.
* Added a new debug draw bus that the motion matching instance hooks to, so that the system component can control when to render debug visualizations.
* Added class description for the motion matching instance.

Motion Matching: Enable test builds in CMakeLists.txt

Motion Matching: Updated camera controller graph for automatic demo
* Simplified the script canvas graph of the camera controller for the automatic demo.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
2022-02-07 15:58:07 +01:00
Sergey Pereslavtsev 8d30524028 Merge branch 'development' of https://github.com/o3de/o3de into TerrainMaterialsFix 2022-02-07 14:18:34 +00:00
Guthrie Adams 1497250ff5 Atom Tools: Move common asset browser interactions to shared class in ATF
Moved the class for common asset browser interactions for source files, folders, and source control to atom tools framework.
Added a function to register custom actions
Deleted unnecessary document settings class in favor of settings registry

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-02-06 06:00:59 -06:00
greerdv 23788e9297 fix bug with placement of debug draw for mesh geometry in asset colliders with non-uniform scale
Signed-off-by: greerdv <greerdv@amazon.com>
2022-02-05 12:51:28 +00:00
Santi Paprika fe163bc930 Merge remote-tracking branch 'upstream/development' into thin-transmission 2022-02-05 13:30:17 +01:00
greerdv 773336d388 refactor and tidy up
Signed-off-by: greerdv <greerdv@amazon.com>
2022-02-05 10:39:20 +00:00
greerdv 8ca4dbf2da refactor and tidy up
Signed-off-by: greerdv <greerdv@amazon.com>
2022-02-05 10:39:18 +00:00
greerdv a4d5587183 fix scaling manipulator for sphere collider with non-uniform scale
Signed-off-by: greerdv <greerdv@amazon.com>
2022-02-05 10:39:16 +00:00
greerdv bb4c896311 fix scaling issue with collider offset manipulators
Signed-off-by: greerdv <greerdv@amazon.com>
2022-02-05 10:39:15 +00:00
greerdv d37315c2af tidy up bus usage
Signed-off-by: greerdv <greerdv@amazon.com>
2022-02-05 10:39:13 +00:00
greerdv 08eb115e26 fix various issues with collider manipulators and non-uniform scale
Signed-off-by: greerdv <greerdv@amazon.com>
2022-02-05 10:39:11 +00:00
santorac f1b9ac379d Merge branch 'development' into Atom/santorac/RemixableMaterialTypes4_FlatMaterialFiles
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-04 17:32:12 -08:00
Danilo Aimini dc6d8ab2ba Fix conversion issues blocking nightly builds.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2022-02-04 17:21:48 -08:00
scspaldi c9a84d08a8 Added server launcher sanity test.
Signed-off-by: scspaldi <scspaldi@amazon.com>
2022-02-04 17:16:33 -08:00
Guthrie Adams 36bcf0ca9e Atom Tools: fix gem autoload settings registry files
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2022-02-04 17:44:28 -06:00
Terry Michaels b1df4c90d5 Merge pull request #7440 from aws-lumberyard-dev/antonmic/quickFixForEditor
removing compute queue flag from SSAO
2022-02-04 17:18:50 -06:00
Steve Pham 69e0090a0b Remove -Wno-return-local-addr warning suppression for GCC
- Remove '-Wno-return-local-addr' warning suppression flag for GCC
- Fixed discovered error resulting from -Wreturn-local-addr

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

* Remove extra ws

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2022-02-04 14:20:09 -08:00
antonmic 5baf7d5147 removing compute queue flag from SSAO since it's causing crashes for some people
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
2022-02-04 12:46:42 -08:00
Sergey Pereslavtsev 13268dea98 Merge branch 'development' of https://github.com/o3de/o3de into TerrainMaterialsFix 2022-02-04 20:23:36 +00:00
AMZN-Phil 4982787043 Merge pull request #7251 from aws-lumberyard-dev/Prism/AdditionalCLIMessages
Catch URLError so that a message can be printed.
2022-02-04 12:10:38 -08:00
santorac b05d4bdf36 Merge remote-tracking branch 'upstream/development' into Atom/santorac/RemixableMaterialTypes4_FlatMaterialFiles
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-04 12:08:28 -08:00
santorac 1daa9fbbed Changed the .material file format to use a flat list for material property values, instead of a tree structure.
This is needed to support deeply nested material property groups, it just makes the serialization code a lot simpler than trying to support nested groups in the .material file. It also makes the file more readable and easier to search all files for particular properties.
I also updated MaterialSourceData to hide the property values behind a clean API.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-04 12:04:50 -08:00
Sergey Pereslavtsev 9aece3e84b LYN-8403 Prevent the same Surface Tag from getting reused
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
2022-02-04 19:57:29 +00:00
Mike Balfour d9ba0af645 SurfacePoint data structure encapsulations (#7413)
* First pass at encapsulating SurfacePointList.
The biggest challenge in optimizing SurfacePointList(s) usage is the overall memory management associated with it. There are M surface points with N surface mask entries created for every input point, which leads to a lot of container reallocation and memory shuffling when processing multiple input points. By encapsulating the list, it should become easier to preallocate the entries, as well as keep "helper data" around for managing the bookkeeping to associate the input points with the output points.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Small fixes and TODO reminders.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Encapsulate surface point creation and separate EnumeratePoints out from modifications.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Start removing SurfacePoint from the exposed API.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Changed SurfacePointList to split out the surface point storage to allow for span<> usage over time.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Removed entity id

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Removed SurfacePoint from SurfaceData, changed all remaining uses to AzFramework::SurfaceData::SurfacePoint.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Encapsulated SurfaceTagWeightMap and renamed to SurfaceTagWeights.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Fixed make file.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Better commenting and parameter naming.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Renamed methods to be more descriptive.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2022-02-04 11:27:59 -06:00
Ken Pruiksma ff4412db7c Calculating uv transforms for terrain detail materials (#7375)
Calculating uv transforms for terrain detail materials

This adds support for uv transforms in terrain detail materials. To support this work, the code for generating a matrix from material properties was pulled out of the material functor and put into a new MaterialUtils file in Atom Utils.
2022-02-04 11:01:47 -06:00
galibzon d77403f9df Upgrade AZSLc to version 1.7.35 (#7411)
* Upgrade AZSLc to version 1.7.35 for
Windows, Linux & Mac.

Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com>
2022-02-04 10:58:42 -06:00
Santi Paprika c173fd9357 Remove division by constant in distance attenuation for DirectionalLight (https://github.com/o3de/o3de/pull/6428#discussion_r799216516)
Signed-off-by: Santi Paprika <santi.gonzalez.cs@gmail.com>
2022-02-04 17:34:39 +01:00
Guthrie Adams 61c2f77287 Merge pull request #7423 from aws-lumberyard-dev/Atom/guthadam/atom_tools_support_automatic_inspector_population_and_nested_groups
Atom Tools: Document system exposes reflected object data
2022-02-04 10:19:53 -06:00