Commit Graph

8271 Commits

Author SHA1 Message Date
Chris Burel cd65e686ff Use aznew where appropriate for EMotionFX Command subclasses (#4912)
Signed-off-by: Chris Burel <burelc@amazon.com>
2021-10-27 09:53:24 +02:00
Sean Sweeney 56a1d4ff44 Merge pull request #4988 from aws-lumberyard-dev/aztestrunner_smoke
Fix AzTestRunner smoke test on Linux
2021-10-26 16:50:07 -07:00
santorac 34f72730a1 Merge pull request #5025 from aws-lumberyard-dev/Atom/santorac/UnusedVariableDev
Fixed potential unused variable 'originalVersion'
Cherry-picked from https://github.com/o3de/o3de/pull/4980
144af200bf
2021-10-26 16:46:18 -07:00
santorac 8988800a43 Fixed potential unused variable 'originalVersion' with 'maybe_unused' attribute.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-10-26 14:49:46 -07:00
Alex Peterson 7a0246530a Fix notification queue and add gem action (#4985)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
2021-10-26 14:37:47 -07:00
Luis Sempé df8cdff9f1 Merge pull request #5004 from aws-lumberyard-dev/animation/rhhong/RenderUtilOptions
Add wireframe rendering support
2021-10-26 14:30:31 -07:00
jromnoa 8f66b0765e Merge pull request #4933 from aws-lumberyard-dev/Atom/scottmur/test_cleanup
Atom parallel test cleanup and adding AtomComponentProperties
2021-10-26 14:02:18 -07:00
rhhong 43b572e22a CR feedback. Use one color instead of a color array.
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-26 12:28:47 -07:00
puvvadar e68f57c843 Merge pull request #4889 from aws-lumberyard-dev/bitset_serialization_includes
Fix usages of AZStd::bitset not being found by serialize context
2021-10-26 10:16:32 -07:00
amzn-mike ab755c0be8 Fixed Procedural Prefab asset output to set Source field to the corre… (#4921)
* Fixed Procedural Prefab asset output to set Source field to the correct value (Relative path with filename and extension)

Removed unneeded calculation of relative path for the output file since the AP handles that already

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Remove outdated comment

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Try to fix missing include

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-10-26 09:54:41 -07:00
SJ 3bdfe51fca Pass relative path IsFileExcluded so that only paths relative to the root scan folder are matched against the exclude filters (#4504)
* Pass relative path IsFileExcluded so that only paths relative to the root scan folder are matched against the exclude filters.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Revert previous change. Remove the exclude filter for the Install directory.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Pass in relative path to the exclude filter as before. Fix the AssetScanner tests.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Prepend a ./ to the relative path in order to match the exclude patterns

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove hack to prepend ./. Update the exclude patterns so that the hack is no longer required.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Add missing ? and remove whitespace

Signed-off-by: amzn-sj <srikkant@amazon.com>

* 1. IsFileExcluded() now converts the input path to a path that's relative to its corresponding scan folder.
2. Update regex patterns in gems and AutomatedTesting as well.
3. Remove unnecessary escaping for '/'.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Use ConvertToRelativePath() function to compute path relative to a scan folder.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* More fixes to regex patterns

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove test case which tests a hypothetical scenario that cannot occur. Fix another test case by adding scan folder.

Signed-off-by: amzn-sj <srikkant@amazon.com>

* Remove assert that's not needed since it's a valid scenario

Signed-off-by: amzn-sj <srikkant@amazon.com>
2021-10-26 11:43:03 -05:00
amzn-mike ee6ceba5ce Add serialized output version (xml) of debug scene graph (#3437)
* Add serialized output version (xml) of debug scene graph

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix line endings

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix line endings

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Update fbx unit tests to check for dbgsg.xml file

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add dbgsg.xml comparison

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Move dbgsg files to SceneDebug sub folder

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add shaderball.dbgsg.xml and multiple_mesh_multiple_material_override.dbgsg.xml

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add shaderball dbgsg.xml product.

Update code to look in SceneDebug for dbgsg files
Fix extension concatenation

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Remove unnecessary dbgsg.xml file

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-10-26 09:07:22 -07:00
amzn-mike 81acd559d0 [LYN-7529] Create unit tests for ResolveSourceFileDependencyPath (#4790)
* Add unit tests for ResolveSourceFileDependencyPath

Fix crash when file is not in scan folder

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Switch to using vector of AZ strings for better error output

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Switch to using UnorderedElementsAre

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add some comments and fix typo

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-10-26 08:52:33 -07:00
lumberyard-employee-dm b3b646dad9 Moved the Asset Catalog loading from LmbrCentral to the AzFramework::Application (#4568)
* Moved the loading of the AssetCatalog from LmbrCentralSystemComponent to AzFramework Application

Modified the AssetCatalog::InitializeCatalog function to no longer rely on the TickBus to send out the `AssetCatalogEventBus::OnCatalogLoaded` event.
It now queues a function on the AssetCatalogRequestBus to send the OnCatalogLoaded event as soon as the dispatching for the AssetCatalogRequestBus has completed on the current thread.
This is done by updating the AssetCatalogRequestBus to use EBus ThreadDispatchPolicy to add a callback to invoke any queued function has soon a thread has finished dispatching and has released its DispatchMutex

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

* Updated the AssetCatalogRequestBus to add a custom DispatchLockGuard

The AssetCatalogRequestBus uses the custom lock guard to dispatch queued
events after it has unlocked it's context mutex for the current thread.

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

* Removed GetContext call from the
AssetCatalogRequests::PostThreadDispatchInvoker

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

* Updated the definition of FileTagQueryManager::GetDefaultFileTagFilePath
function to return a path

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

* Updated the AZ_CONSOLEFREEFUNC macro to actually use the _NAME

The _NAME parameter was not being used before, resulting in the Console
stringified name of the function being used.

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

* Removed CrySystem dependencies from the BundlingSystemComponent

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

* Moved the loading of the AssetCatalog from LmbrCentralSystemComponent to AzFramework Application

Modified the AssetCatalog::InitializeCatalog function to no longer rely on the TickBus to send out the `AssetCatalogEventBus::OnCatalogLoaded` event.
It now queues a function on the AssetCatalogRequestBus to send the OnCatalogLoaded event as soon as the dispatching for the AssetCatalogRequestBus has completed on the current thread.
This is done by updating the AssetCatalogRequestBus to use EBus ThreadDispatchPolicy to add a callback to invoke any queued function has soon a thread has finished dispatching and has released its DispatchMutex

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

* Updated the AssetCatalogRequestBus to add a custom DispatchLockGuard

The AssetCatalogRequestBus uses the custom lock guard to dispatch queued
events after it has unlocked it's context mutex for the current thread.

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

* Removed GetContext call from the
AssetCatalogRequests::PostThreadDispatchInvoker

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

* Updated the definition of FileTagQueryManager::GetDefaultFileTagFilePath
function to return a path

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

* Updated the AZ_CONSOLEFREEFUNC macro to actually use the _NAME

The _NAME parameter was not being used before, resulting in the Console
stringified name of the function being used.

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

* Removed CrySystem dependencies from the BundlingSystemComponent

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

* Addded missing template parameter to AssetCatalogRequests

The fixes the compile error.

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

* Adding AssetBus::MultiHandler::BusDisconnect call

The BlastSystemComponent was connecting to the Bus, but not
disconnecting from it, causing an assert to fire to it being a
multi-thread bus

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

* Added support for DataDrive lifecycle events to the ComponentApplication

The events are using the SettingsRegistry NotifyEvent to track when
certain keys are modified to signal handlers.

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

* Corrected invalid JSON creation in ModuleManager::DeactivateEntities

Resolved clang warning about used type alias

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

* Fix for dangling reference in lambda registered to the SettingsRegistry
Notifier event

This was causing the EditorPythonBinding tests to crash due to the
following circumstances.

First Python has created an instance of a SettingsRegistryProxy
Second the SettingsRegistry sends an event during the time when the
SettingsRegistryProxy exists.

This issue was exposed due to the ComponentApplication Lifecycle events
using the SettingsRegistry to dispatch during various times of the
application workflow.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-10-26 10:31:31 -05:00
AMZN-stankowi 48fca740a2 Fixed crash if you save a bundle outside the default bundle folder (#4974)
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2021-10-26 08:29:43 -07:00
rhhong 9cd24a7c6d Merge branch 'development' into animation/rhhong/RenderUtilOptions
Signed-off-by: rhhong <rhhong@amazon.com>

# Conflicts:
#	Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.cpp
#	Gems/AtomLyIntegration/EMotionFXAtom/Code/Source/AtomActorDebugDraw.h
2021-10-26 08:19:01 -07:00
rhhong 20f9e80648 wireframe rendering
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-26 08:14:34 -07:00
Michael Pollind 5374860444 Bug Fix: resolve entity ordering for EntityOutliner (#4798) (#4938)
* bugifx: resolve dragging behaviour for EntityOutliner (#4798)

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: cleanup and rework logic

Signed-off-by: Michael Pollind <mpollind@gmail.com>
2021-10-26 10:29:12 +01:00
Roman 77d02ea657 Add some debug rendering options. (#4950)
* [WIP] Adding rendering options

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

* code review feedback. Also add the renderflag as qsettings.

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

* fix broken test

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

* fix linux build

Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-26 10:59:02 +02:00
rhhong 3e686ca9ce fix linux build
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-25 21:17:38 -07:00
rhhong 1edc1ffaf6 fix broken test
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-25 20:04:27 -07:00
Shirang Jia 7ab0871327 Upload AP logs when there is an AP eeror (#4896)
* Updating LFS config to new endpoint (#1624)

Signed-off-by: AMZN-alexpete

* Updates licenses to APACHE-2.0 OR MIT (#1685)

Not to be committed before 7/6/2021

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>

* Updating CONTRIBUTING.md

Signed-off-by: Terry Michaels <miterenc@amazon.com>

* Fixed typo

Signed-off-by: Terry Michaels <miterenc@amazon.com>

* Updated text to be more descriptive

Signed-off-by: Terry Michaels <miterenc@amazon.com>

* Upload AP logs when there is an AP eeror

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

* Add AP log upload step for single step Asset jobs

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

* Address more comments

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

* Only call CreateUploadAPLogsStage() once in try/catch block

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

* Revert acciental update to README.md

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

Co-authored-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
Co-authored-by: Chris Galvan <chgalvan@amazon.com>
Co-authored-by: Nicholas Lawson <70027408+lawsonamzn@users.noreply.github.com>
Co-authored-by: Terry Michaels <miterenc@amazon.com>
2021-10-25 19:16:29 -07:00
rhhong ebf84c49ac code review feedback. Also add the renderflag as qsettings.
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-25 19:11:36 -07:00
sweeneys dd49798596 Fix AzTestRunner with correct lib
Signed-off-by: sweeneys <sweeneys@amazon.com>
2021-10-25 18:54:01 -07:00
sweeneys fa6b1d1d65 Fix AzTestRunner smoke test on Linux
Signed-off-by: sweeneys <sweeneys@amazon.com>
2021-10-25 18:50:34 -07:00
Alex Peterson c00b99f2d5 Disable custom titlebar on Mac, Linux, fix resize (#4973)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
2021-10-25 16:33:32 -07:00
Jonny Galloway d7045f4c31 Scaffold PythonGem template (#4888)
* Renamed ctest_pytest.ini to pytest.ini so it is used by default, added TestSuite_ as collection file (#4822)

* Fixed warnings of unused marks, renamed ctest_pytest.ini to pytest.ini to better consistency on runs

* Fixed some test suites to run propertly

* Fix missing arguments

* Fixed missing cmakelists and renamed missing file

* Temp disable editor_testing_tests as timeout in jenkins

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* scaffold PythonGem template

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* CustomTool was not added to CMakeLists

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* Update Templates/PythonGem/Template/Code/CMakeLists.txt

makes sense thank you for the help

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* Update Templates/PythonGem/Template/Code/CMakeLists.txt

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* Delete  ${NameLower}_tests_files.cmake

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* suggested changes made

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* cleanup not needed files

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* fix up template.json

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* made a correction

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* made a correction

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* fixes

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* fixes

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* more fixes, fixed a file name

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* Added helper method to az_qt_helpers for retrieving the main window instance.

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

* additional fixes

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* Fix for AP trowing errors at boot (can not get mainwindow)

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* Added missing EBus connect/disconnect calls in the EditorSystemComponent


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

* additional fix up

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* adding dialog internals

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

Co-authored-by: AMZN-AlexOteiza <82234181+AMZN-AlexOteiza@users.noreply.github.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Co-authored-by: Chris Galvan <chgalvan@amazon.com>
2021-10-25 18:18:27 -05:00
Alex Peterson 29dbb0b089 Set Project Manager minimum height 700px (#4970)
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com>
2021-10-25 14:57:53 -07:00
Mike Chang 62231aeb4c Add xcb input dev packages (#4962)
Signed-off-by: Mike Chang <changml@amazon.com>
2021-10-25 13:48:17 -07:00
galibzon 4d4deb1211 Added Hydra API to extract all the classes, globals and EBuses exposed (#4953)
* Added Hydra API to extract all the classes, globals and EBuses exposed
to lua:

azlmbr.script.LuaSymbolsReporterBus:
GetListOfClasses
GetListOfGlobalProperties
GetListOfGlobalFunctions
GetListOfEBuses

Also exposed to Hydra the classes that can be used to dump
the symbols
azlmbr.script.LuaPropertySymbol
azlmbr.script.LuaMethodSymbol
azlmbr.script.LuaClassSymbol
azlmbr.script.LuaEBusSender
azlmbr.script.LuaEBusSymbol

The python file Assets/Editor/Scripts/lua_symbols.py
can be used with "pyRunFile <script_name> [output.txt]"
to create Game/output.txt will all the symbols
OR
passing up to three additional arguments "c" or "g" or "e" to dump only
classes, globals or ebuses or a combination of those. Example:
To create an output file with only classes and Ebuses:
"pyRunFile <script_name> [output.txt] c e"

Signed-off-by: garrieta <garrieta@amazon.com>
2021-10-25 13:26:53 -05:00
galibzon da2ce2d7f0 Normalize Shader vs Shaders Folders (#4925)
Normalize Shader vs Shaders Folders (#4925)
Signed-off-by: garrieta <garrieta@amazon.com>
2021-10-25 13:23:43 -05:00
AMZN-stankowi c44d2a351b Fixed some files missed when groundplane_521 was renamed to 512 (#4958)
* Fixed references to 521x521 to reference the correct 512x512 FBX file

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

* Fixed asset hints

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2021-10-25 11:08:49 -07:00
Qing Tao fe8dac7989 ATOM-16489 Add find passes functions for Scene or RenderPipeline in PassSystemInterface (#4739)
* ATOM-16489 Add find passes functions for Scene or RenderPipeline in PassSystemInterface
Introduced new PassSystemInterface::ForEachPass() funtion to replace PassSystemInterface::FindPasses(), PassSystemInterface::GetPassesByTemplateName and ParentPass::FindPassByNameRecursive() functions.
Update all the places which were using those three functions.
The new pass finding filter support any combination of pass name, pass template name, pass class type, pass hirechary, owner scene, owner render pipeline.
Update unit tests.

Signed-off-by: Qing Tao <qingtao@amazon.com>
2021-10-25 10:07:55 -07:00
LesaelR 079e684b77 Adding Shaderball test and asset files. (#4743)
Signed-off-by: Rosario Cox <lesaelr@amazon.com>
2021-10-25 10:05:07 -07:00
Mike Balfour 91ca986e2a Terrain Macro Material component improvements (#4930)
* First pass of non-working changes to Terrain Macro Material Component.

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

* Reworked Terrain Macro Material to use properties instead of a material.

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

* Fixed comments.

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

* PR feedback - disable attributes when no normal map selected

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

* Fix linux compile error - unused variables.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
2021-10-25 11:37:32 -05:00
AMZN-Igarri e970247fc5 Asset Browser Search View fixes (#4814)
* Fixed RowCount method.

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

* Fixed Signals

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

* Fixed Delegate case

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

* Fixed issue when displaying branch icons

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

* Fixed AssetBrowser Delegate

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

* Removed optimize flags

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

* AssetBrowsertableModel cleanup

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

* Fixed Typos

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

* Fixed Comment

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

* Added check for rowCount == 0

Signed-off-by: igarri <igarri@amazon.com>
2021-10-25 10:35:50 +01:00
rhhong c76cb8ef74 Merge branch 'development' into animation/rhhong/RenderUtilOptions
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-25 01:40:58 -07:00
rhhong 8595805c47 [WIP] Adding rendering options
Signed-off-by: rhhong <rhhong@amazon.com>
2021-10-25 01:32:12 -07:00
santorac 9438fbe3b7 Made material property auto-rename procedure apply to Material Component
Merge pull request #4905 from aws-lumberyard-dev/Atom/santorac/MaterialPropertyRenameInMaterialComponent

This ensures that an material property overrides and any gameplay scripts that work with property overrides can get the benefit of the material type version update procedure.

I added an ApplyPropertyRenames function to MaterialTypeAsset very similar to the one in MaterialTypeSourceData.
Updated the MaterialAssignment class to apply any property renames when it discovers the old name doesn't work. This will be written to disk when the level or prefab is saved.
2021-10-23 14:14:19 -07:00
santorac a892181432 Minor updates in response to code review feedback.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-10-23 00:02:31 -07:00
AMZN-Phil 0d5482495f Merge pull request #4932 from aws-lumberyard-dev/Prism/ShowRepoGems
Show Undownloaded Gems from Repos in Gem Catalog
2021-10-22 19:39:39 -07:00
AMZN-Phil 657106d66a Merge pull request #4931 from aws-lumberyard-dev/FixInstallerDesktopShortcut
Fix desktop shortcuts created by Windows installer
2021-10-22 18:11:29 -07:00
Junbo Liang 71d23cc602 Read engine version from setting registry (#4926)
* Read engine version from setting registry

Signed-off-by: Junbo Liang <junbo@amazon.com>
2021-10-22 18:00:43 -07:00
nggieber 182a7b98b7 Always convert gem_path to pathlib.Path and check it isFile() in case it is a str
Signed-off-by: nggieber <nggieber@amazon.com>
2021-10-22 17:33:30 -07:00
nggieber 06f893edf1 Merge branch 'development' into Prism/ShowRepoGems 2021-10-22 17:28:28 -07:00
AMZN-Phil e8a7743aec Merge pull request #4911 from aws-lumberyard-dev/Prism/RefreshGemRepos
Gem Repos can be Refreshed through Project Manager
2021-10-22 17:23:35 -07:00
nggieber 88f7f66b04 Removed fullPathGiven and instead check if path is a file when getting gem json data
Signed-off-by: nggieber <nggieber@amazon.com>
2021-10-22 17:19:54 -07:00
AMZN-Phil f8990ac577 Merge remote-tracking branch 'upstream/development' into FixInstallerDesktopShortcut 2021-10-22 17:08:13 -07:00
santorac cef1e200f6 Merge remote-tracking branch 'upstream/development' into Atom/santorac/MaterialPropertyRenameInMaterialComponent 2021-10-22 16:42:09 -07:00
santorac 3c331e00ff Moved the Material Component property override renaming to EditorMaterialComponent via ApplyAutomaticPropertyUpdates.
MaterialAssignment::ApplyProperties() still reports warnings but does not update the m_propertyOverrides.
MaterialAssignment::ApplyProperties() will now skip the old name'd overrides if overrides are present for the new names. I'm not sure if this will ever happen, but it did happen while I had some intermediate changes, so I imagine it could happen again.
I had to update the Material::FindPropertyIndex function to expose information about renames when they occur. This should make it easier for other systems to get (somewhat) automatic benefit from the version update feature.
I also found that there was an issue with material inspector where it wouldn't be initialized the the right override values when renames were present. Now it applies the renames to whatever override data it gets from the Material Component.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2021-10-22 16:41:44 -07:00