Commit Graph

12010 Commits (f2378fc8d8afd9e97d2b51b0b09e62c70eb8b39b)
 

Author SHA1 Message Date
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>
4 years ago
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
4 years ago
santorac a6fde12fd3 Merge remote-tracking branch 'upstream/development' into Atom/santorac/RemixableMaterialTypes4_FlatMaterialFiles
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
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>
4 years ago
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>
4 years ago
Chris Galvan 640093fe63 Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/ImageGradientStreamingImageSupport 4 years ago
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>
4 years ago
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>
4 years ago
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>
4 years ago
moraaar 58f8cc666c
Merge pull request #7447 from aws-lumberyard-dev/daimini/Prefabs/fixFocusNightlyIssue
Fix compilation error in converting between InstanceOptionalReference and InstanceOptionalConstReference
4 years ago
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>
4 years ago
Sergey Pereslavtsev 8d30524028 Merge branch 'development' of https://github.com/o3de/o3de into TerrainMaterialsFix 4 years ago
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>
4 years ago
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>
4 years ago
Santi Paprika fe163bc930 Merge remote-tracking branch 'upstream/development' into thin-transmission 4 years ago
greerdv 773336d388 refactor and tidy up
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv 8ca4dbf2da refactor and tidy up
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv a4d5587183 fix scaling manipulator for sphere collider with non-uniform scale
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv bb4c896311 fix scaling issue with collider offset manipulators
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv d37315c2af tidy up bus usage
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv 08eb115e26 fix various issues with collider manipulators and non-uniform scale
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
santorac f1b9ac379d Merge branch 'development' into Atom/santorac/RemixableMaterialTypes4_FlatMaterialFiles
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
Danilo Aimini dc6d8ab2ba Fix conversion issues blocking nightly builds.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
scspaldi c9a84d08a8 Added server launcher sanity test.
Signed-off-by: scspaldi <scspaldi@amazon.com>
4 years ago
Guthrie Adams 36bcf0ca9e Atom Tools: fix gem autoload settings registry files
Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Terry Michaels b1df4c90d5
Merge pull request #7440 from aws-lumberyard-dev/antonmic/quickFixForEditor
removing compute queue flag from SSAO
4 years ago
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>
4 years ago
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>
4 years ago
Sergey Pereslavtsev 13268dea98 Merge branch 'development' of https://github.com/o3de/o3de into TerrainMaterialsFix 4 years ago
AMZN-Phil 4982787043
Merge pull request #7251 from aws-lumberyard-dev/Prism/AdditionalCLIMessages
Catch URLError so that a message can be printed.
4 years ago
santorac b05d4bdf36 Merge remote-tracking branch 'upstream/development' into Atom/santorac/RemixableMaterialTypes4_FlatMaterialFiles
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
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>
4 years ago
Sergey Pereslavtsev 9aece3e84b LYN-8403 Prevent the same Surface Tag from getting reused
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
4 years ago
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>
4 years ago
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.
4 years ago
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>
4 years ago
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>
4 years ago
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
4 years ago
Benjamin Jillich 1a23dc7b93 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.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
4 years ago
Allen Jackson 76b2932cae
{lyn7307} disable saving procedural prefabs in the Editor (#4877)
disable saving procedural prefabs in the Editor since the templates are backed by asset files that will change outside the Editor


Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
4 years ago
Benjamin Jillich 80ac118893 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>
4 years ago
Benjamin Jillich 3e59c10e64 Motion Matching: Enable test builds in CMakeLists.txt
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
4 years ago
Santi Paprika 6e21d63943 Merge remote-tracking branch 'upstream/development' into thin-transmission
Signed-off-by: Santi Paprika <santi.gonzalez.cs@gmail.com>
4 years ago
Santi Paprika 024933d4a1 Improve descriptions and comments (https://github.com/o3de/o3de/pull/6428#discussion_r799207891, https://github.com/o3de/o3de/pull/6428#discussion_r799213620)
Signed-off-by: Santi Paprika <santi.gonzalez.cs@gmail.com>
4 years ago
Guthrie Adams c9c172794e Atom Tools: Document system exposes reflected object data
• This removes a direct dependency on dynamic property groups and data from the document system.
• Added support for names, descriptions, and nesting to dynamic property groups.
• Moved property related functions from base document classes into material editor document classes because dynamic property groups are an implementation detail of the material editor document to support material type flexible data format.
• Change material document to use a table of dynamic property groups instead of a map of properties.
• Added functions to traverse groups and properties.
• This keeps groups and properties organized consistently with the material type file as well as what’s expected in the UI.
• Document data can now be maps directly to the inspector reflective property editors instead of copying one property at a time out of the document and keeping those synchronized.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
4 years ago
Qing Tao 1e11df5d92
ATOM-17264 ASV: StreamingImageTest crashes (#7415)
Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
4 years ago
antonmic 4216e4cfed
Added support for hardware queue class on passes (#7339)
* Added support for hardware queue class on passes. Compute pass data and copy pass data can now specify to run on their appropriate queue.

Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>

* addressed PR feedaback

Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>

* fixing python test failures on AR

Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
4 years ago
Qing Tao 01892914ea
Atom/qingtao/atom 16135 (#7334)
* Changes to AttachmentImage related classes to have better support using render target as texture.
- Updated AttachmentImageAsset to support an unique name which can be used as AttachmentId.
- Functions in ImageSystemInterface to find an AttachmentImage by its unique name.
- Added InsertChild function to ParentPass class so it can insert a child pass at any location.
- Change to ImageAttachmentPreviewPass so it can preview cached pass attachment even the source pass was disabled.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
4 years ago
santorac 4bb93e4c94 Removed unnecessary MaterialSourceData::Property class.
This wrapper used to be needed in order to bind the custom JsonMaterialPropertyValueSerializer back when property values were represented by AZStd::any. Now that property values have a custom MaterialPropertyValue type, the wrapper class is no longer needed.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
Allen Jackson 02bb73c0b0
{lyn9694} removing abstract nodes from scene graph (#7362)
Removed:
	SceneAPI::DataTypes::IAnimationData
	SceneAPI::DataTypes::IBlendShapeAnimationData
	SceneAPI::DataTypes::IBlendShapeData
	SceneAPI::DataTypes::IBoneData
	SceneAPI::DataTypes::IMaterialData
	SceneAPI::DataTypes::IMeshData

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