Commit Graph

12122 Commits

Author SHA1 Message Date
Chris Galvan 2f3c4d37df Improved image gradient GetValue(s) performance by using cached image data
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-02-09 12:22:38 -06:00
carlitosan 8cd8638316 initial locale safety for translating to Lua on multiple platforms (#7490)
* initial locale safety for translating to Lua on multiple platforms

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>

* fix android build error

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2022-02-09 10:19:39 -08:00
lsemp3d 08a9f908a2 Disabled tests that are reported failing on nightly builds
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2022-02-09 09:16:21 -08:00
jromnoa fee95f3f5e sandboxing the sponza level from the level test because it causes a hardlock 4%-12% of the time (#7513)
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
2022-02-09 08:10:33 -08:00
Chris Galvan 39777e7afb Merge pull request #7406 from aws-lumberyard-dev/cgalvan/ImageGradientStreamingImageSupport
Updated the image gradient component to use a streaming image asset
2022-02-09 09:40:54 -06:00
moraaar b2206be14d Fixed range-loop-analysis warninig reported as error on mac/ios (#7511)
Signed-off-by: moraaar <moraaar@amazon.com>
2022-02-09 13:37:34 +00:00
Yaakuro 4852cb0d60 Remove redundant ProgramVariant feature because it got deprecated.
Signed-off-by: Yaakuro <y1@codeposer.net>
2022-02-09 13:32:42 +01:00
Danilo Aimini 220eeef386 Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/boxSelectAndManipulatorsHidingTests 2022-02-08 18:39:33 -08:00
Danilo Aimini 8c54513867 Add box selection tests for Editor Focus Mode
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2022-02-08 16:59:25 -08:00
santorac 3f32669883 Merge pull request #7449 from aws-lumberyard-dev/Atom/santorac/RemixableMaterialTypes4_FlatMaterialFiles
Changed the Material File Format to Use a Flat Property List
2022-02-08 16:19:55 -08:00
Jeremy Ong d666b7a1e8 Merge pull request #7437 from aws-lumberyard-dev/Atom/ShaderRefactor
Shader refactor (no functional changes)
2022-02-08 17:05:34 -07:00
Nicholas Van Sickle bc3f957270 Merge pull request #7093 from aws-lumberyard-dev/nvsickle/DomPatch
Add AZ::Dom::Patch, a Generic DOM analog to JSON patch
2022-02-08 18:49:57 -05:00
chiyenteng 90503f2bef Remove error message from InMemorySpawnableAssetContainer (#7499)
* Remove error message from InMemorySpawnableAssetContainer

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

* Fix nits

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
2022-02-08 15:25:35 -08:00
Nicholas Van Sickle 42c2243eaa Fix benchmark non-unity build
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
2022-02-08 14:34:04 -08:00
Sean Sweeney 25016112ca Merge pull request #7446 from AMZN-scspaldi/scspaldi_launcher_sanity_tests
Added server launcher sanity test.
2022-02-08 14:23:50 -08:00
santorac 1894cd60c7 Merge remote-tracking branch 'upstream/development' into Atom/santorac/RemixableMaterialTypes4_FlatMaterialFiles
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-08 14:07:32 -08:00
santorac 2a3c5b38e5 Added a unit test demonstrating that MaterialSourceData can support properties and subgroups together in the same property group.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-08 14:06:53 -08:00
Jeremy Ong 5f914e8e1a Add README to describe upcoming material type changes
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2022-02-08 14:55:50 -07:00
Jeremy Ong faa65bca1b Refactor shader definitions to be more consistent with other shaders
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2022-02-08 14:55:48 -07:00
Jeremy Ong 86d8ececfb Resolve incorrect SHADOWS definitions
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2022-02-08 14:55:46 -07:00
Jeremy Ong 9ed9bcbb2f Fix incorrect include header casing
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2022-02-08 14:55:44 -07:00
Jeremy Ong 4bcc83e7ac Address PR feedback, ensure all ASV tests pass
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2022-02-08 14:55:42 -07:00
Jeremy Ong 7aace39c2f Consolidate alpha retrieval and clip
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2022-02-08 14:55:41 -07:00
Jeremy Ong 61f915366a Shader refactor (no functional changes)
The purpose of this shader refactor is to split various material type
shaders into disparate pieces:

1. The original material type shaders now include an external file with
   the actual shader entry points and structure of the algorithm (e.g.
   depth pass, shadow pass, forward pass) but continue to specify the
   SRGs used
2. Common functionality used across multiple shaders was consolidated
   into routines implemented in the MaterialFunctions folder
   (Materials/Types/MaterialFunctions)
3. The implementation shaders rely on common routines to be
   included/imported prior to inclusion, and by design, make no
   references to any Draw, Object, or Material SRG.

This refactor only includes the Standard and Enhanced material types,
and is, for the most part, a non-functional change. However, the Surface
definition needed to be augmented to include information needed by
lighting later. Modifying the Surface structure enables the lighting
loops to avoid any references to the Material SRG. This completes the
decoupling needed to support future Material canvas work, as well as a
future Material pipeline abstraction (where by the implementation
shaders can be injected by the user, customized per platform, and in
general, are simply decoupled from the materials themselves).

Signed-off-by: Jeremy Ong <jcong@amazon.com>
2022-02-08 14:55:39 -07:00
Nicholas Van Sickle d1bb5a0543 Move DOM delta comparison to its own file, enhance inverting moves
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
2022-02-08 13:44:08 -08:00
Chris Galvan 94644cad1e Merged development, fixed merge conflict
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2022-02-08 15:31:49 -06:00
rgba16f 742ea34d44 Add a function to get the internal data for a disk light from it's feature processor (#7450)
* Add a function to get the internal data for a disk light from it's feature processor

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Address PR comments. Fixed assert message, made function const.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2022-02-08 15:24:37 -06:00
Mike Balfour c46c558038 Switched Gradient Surface benchmarks to use actual surface components. (#7468)
* Switched Gradient Surface benchmarks to use actual surface components.
The gradient unit tests and benchmarks were previously using a mock surface data system, which led to misleading benchmark results. Now, the actual SurfaceData system gets constructed, and the tests use a mock provider, but the benchmarks use actual shape providers for more realistic benchmarking.

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

* Fixed unit tests to have better query ranges.
Half of each previous range was querying outside the surface provider's data.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2022-02-08 15:00:19 -06:00
santorac 8eafb7e057 Merge branch 'Atom/santorac/RemixableMaterialTypes4_FlatMaterialFiles' into Atom/santorac/RemixableMaterialTypes4_Layering
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-08 12:42:15 -08:00
santorac 1af5b28ea3 Fixed a copy-paste mistake, wrong name for a property.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-08 12:41:03 -08:00
Danilo Aimini 48313cd6de Remove const reference to prevent issues in nightly builds. (#7491)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2022-02-08 12:40:10 -08:00
santorac bdeb08f352 Merge remote-tracking branch 'upstream/development' into Atom/santorac/RemixableMaterialTypes4_Layering
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-08 12:12:53 -08:00
santorac 74f6d1ec74 Cleanup up and resolving conflicts after the latest merge.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-08 12:12:40 -08:00
santorac 1a10369adb Merge branch 'development' into Atom/santorac/RemixableMaterialTypes4_Layering
There were conflicts in MaterialDocument.cpp which I had resolve by just taking development. This will not compile. I will make additional fixes in another commit.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-08 11:44:09 -08:00
santorac ddab03d678 Reponse to code review feedback. The main change is making GetPropertyValues return by const ref.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-08 11:18:17 -08:00
Guthrie Adams 45c8e55b62 Merge pull request #7467 from aws-lumberyard-dev/Atom/guthadam/atom_tools_replace_document_settings_with_registry
Atom Tools: replaced document settings with settings registry
2022-02-08 12:51:29 -06:00
Luis Sempé b669878ef6 Merge pull request #7476 from aws-lumberyard-dev/scripting/fix_groups
Fixed group and bookmark display on graph load
2022-02-08 09:06:35 -08:00
SergeyAMZN 44172d532d Merge pull request #7483 from aws-lumberyard-dev/PipelineStateBuildFix
PipelineState build fix for non-unity builds
2022-02-08 17:02:57 +00:00
Nicholas Lawson 3337bdd05d Update Lua to 5.4.4 (#7460)
* Update lua to 5.4.4 (fixes #7267)

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
2022-02-08 08:00:34 -08:00
Allen Jackson 46a435b877 {ghi7403} cleaning up file handles and warnings for PYI files (#7461)
* {ghi7403} cleaning up file handles and warnings for PYI files

Cleaning up file handles and warnings for PYI files while writing how
to the python_symbols folder. The warnings are clogging up the Jenkins
logs making it hard to find real errors.


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

* fixing empty shared pointer failures during tests that do not
set up the logging PYI logging

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
2022-02-08 09:11:25 -06:00
Sergey Pereslavtsev 5dfbddd0cf Build fix
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
2022-02-08 14:48:52 +00:00
Sergey Pereslavtsev 01cac7871b PipelineState build fix for non-unity builds
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
2022-02-08 13:11:27 +00:00
Sergey Pereslavtsev 231c25df89 Merge branch 'development' of https://github.com/o3de/o3de into TerrainMaterialsFix 2022-02-08 12:49:12 +00:00
Sergey Pereslavtsev 701b7a55e6 PR feedback addressing
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
2022-02-08 12:43:40 +00:00
santorac 3a426344dd Updated all of the .material files in AutomatedTesting and Atom/TestData to use the new flat list format. The conversion was done using local changes with a script that opens and re-saves every .material file in a given folder (those WIP changes are on a branch here: Atom/santorac/UpgradeMaterialScript).
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-02-08 00:51:03 -08:00
srikappa-amzn 1db12ca463 Always store LinkIds during prefab instance serialization except when saving to disk (#7444)
* Always store prefab instance linkIds to DOM except for saving to disk

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>

* Added more checks to remove linkIds from templates

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>

* Remove additional check to remove LinkId during template update

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>
2022-02-07 17:59:13 -08:00
lsemp3d 1b52339b6b PR feedback
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
2022-02-07 16:48:23 -08:00
lsemp3d a33529e860 Fixed group and bookmark display on graph load
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>

A
2022-02-07 16:19:24 -08:00
Nicholas Van Sickle 5b8176e99b Address some review feedback
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
2022-02-07 16:01:29 -08:00
Steve Pham 7ddfb5d6a0 Remove AZ_TRAIT_DISABLE_FAILED_PROCESS_LAUNCHER_TESTS and disabled tests from it (#7325)
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2022-02-07 15:58:29 -08:00