Commit Graph

94 Commits (9fc01ea24decf7129cd099499dab40a6a73b7def)

Author SHA1 Message Date
mnaumov 9fc01ea24d AR fixes 5 years ago
mnaumov 06784a8026 cleanup 5 years ago
mnaumov 44601b7a38 Some refactoring 5 years ago
mnaumov db7afee383 Adding parameters to ACES tone mapping 5 years ago
greerdv 655d71e0dd update compatibility of atom components with NonUniformScaleService 5 years ago
Guthrie Adams ff9d8f7a87
Merge pull request #660 from aws-lumberyard-dev/Atom/guthadam/ATOM-15486
ATOM-15486 Material Editor: Implement layout and user settings
5 years ago
pruiksma 7957d3f8b6 Merge branch 'main' into pruiksma/ATOM-15515 5 years ago
mrieggeramzn d7c72a249c
Merge pull request #395 from aws-lumberyard-dev/Atom/mriegger/PLS
Atom/mriegger/pls
5 years ago
pruiksma e37b3989be ATOM-15515 Fixing nullptr reference in OnShapeChanged() when visibility is turned back on for shapeless punctual light types. 5 years ago
guthadam 1dda6dabe4 Added support for expanding/collapsing material inspector groups by name
Saving/restoring material inspector group expansion state
5 years ago
guthadam 9de3071e21 Merge branch 'main' into Atom/guthadam/ATOM-15486 5 years ago
guthadam e9165ed911 Added save state keys to most of the RPEs in the material editor and component to save expand/collapse state
Saving main window fancy docking state so all of the dock widgets save/restore visibly and positioning

Added window decoration wrapper inside material editor main window for saving/restoring window position, size, state

Added object names to several QT widgets so that their state could be captured and restored
5 years ago
karlberg 1df2fe1d48 Merging latest origin 5 years ago
mrieggeramzn 4d56debe0f
Merge pull request #632 from aws-lumberyard-dev/Atom/mriegger/heatmap
Atom/mriegger/heatmap
5 years ago
dmcdiarmid-ly 8afb35cb10
Merge pull request #633 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15063
[ATOM-15063] Toggling visibility on a reflection probe does not disable rendering
5 years ago
dmcdiar 4cf9af6c06 Released probe handle when deactivating the controller 5 years ago
karlberg c21b4a577d Merge remote-tracking branch 'origin' into MultiplayerComponents 5 years ago
mriegger a2ce67a0e7 remove tabs2 5 years ago
mriegger e3cca11ed3 Fix for heatmap not disabling 5 years ago
karlberg 751d13dd7b Merge remote-tracking branch 'origin' into MultiplayerComponents 5 years ago
greerdv 26ab8c8a25 merging from main 5 years ago
Michael Riegger c58089d35a Merge branch 'main' into Atom/mriegger/PLS 5 years ago
dmcdiarmid-ly 6890cf907d
Merge pull request #537 from aws-lumberyard-dev/Atom/dmcdiar/LYN-3256
[LYN-3256] Atom: Baking Reflection Probe crashes the Editor when Prefabs are enabled
5 years ago
Guthrie Adams 39a356f823
Merge pull request #536 from aws-lumberyard-dev/Atom/guthadam/ATOM-15451
ATOM-15451 always bring material editor into foreground when launching
5 years ago
rgba16f e9a8fdda72
Merge pull request #512 from aws-lumberyard-dev/AtomDebugDisplayFixes
Atom debug display fixes to work in GameMode
5 years ago
guthadam 6b1f0c53a5 Injecting --activateWindow every time new process sends command line
Updated comments
5 years ago
dmcdiar e63aa4f704 Merge branch 'main' into Atom/dmcdiar/LYN-3256 5 years ago
dmcdiar 64f42ba1cb Removed the asset callback from the EditorReflectionProbeComponent, since the component may have been destroyed and recreated between the bake and the asset load.
Replaced with an OnTick handler that polls the ReflectionProbeFeatureProcessor to determine when the asset is ready.
5 years ago
guthadam 80f692118b ATOM-15451 always bring material editor and foreground when launching
Bus, command line option, and handler to activate material editor window
Made sure that material editor action in Ly tools menu is not checked/checkable
Ly editor pushes command line option to use the same RHI

https://jira.agscollab.com/browse/LYN-2610
https://jira.agscollab.com/browse/ATOM-15451
https://jira.agscollab.com/browse/ATOM-13742
5 years ago
karlberg d0a561fa01 merging latest origin 5 years ago
karlberg 822368ef01 Changes to get visibility system working again in-game 5 years ago
Terry Michaels 55f2b24302
Legacy Mesh component removal
* Removed legacy components

* More legacy render component removal

* Starting removal of legacy mesh component dependencies

* Removed old light components that were allowing Atom test to succeed

* Testing increasing the timeout to see if it lets it pass in Jenkins

* put original timeout back

* reordered components to test if it is component specific or not

* Testing disabiling the test to see if we get a green

* Fixed the removal of the test to sandbox

* Removed Legacy Mesh Component and associated tendrils

* Removed some missed references

* Fixed some issues with unity builds and ambiguous naming

* Addressed review feedback
5 years ago
Guthrie Adams eb25e0bd33
Merge pull request #504 from aws-lumberyard-dev/Atom/guthadam/ATOM-15439
ATOM-15439 Implement basic local socket and server for IPC in material editor and other tools
5 years ago
rgba16f 18b94601ed Merge remote-tracking branch 'upstream/main' into AtomDebugDisplayFixes 5 years ago
rgba16f d115c89043 Fixes for using the DebugDisplayRequestBus in game mode 5 years ago
guthadam 9d0f9e9e3a ATOM-14065 fix problems with material editor details group property descriptions
Moved the code that automatically appended a script variable name to a property description out of the dynamic property class and into the material property conversion utility functions.

Added proper descriptions for the material type and parent material placeholder properties

https://jira.agscollab.com/browse/ATOM-14065
5 years ago
guthadam fae33e9235 ATOM-15439 Implement basic local socket and server for IPC in material editor and other tools
This replaces grid hub usage in the material editor. It allows material editor and other tools to intercommunicate on the local host.  This will allow enforcing that there is only one instance of the material editor running.  Opening a second instance will forward command line options to the first instance running a local server.

https://jira.agscollab.com/browse/ATOM-15439
https://jira.agscollab.com/browse/ATOM-13742
5 years ago
dmcdiarmid-ly dd3f032480
Merge pull request #488 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-14933
[ATOM-14933] Reflection probes do not show mesh reflections if the entity's transform is scaled up
5 years ago
dmcdiar 78efa810e0 Fixed debug draw scale 5 years ago
Michael Riegger cff730b4b8 Merge branch 'main' into Atom/mriegger/PLS 5 years ago
Michael Riegger 738883a9b0 Kens feedback 5 years ago
dmcdiar 0e8e33dedf Merge branch 'main' into Atom/dmcdiar/ATOM-14933 5 years ago
mnaumov ce367b4383 Fixing missing asset crashing Editor 5 years ago
dmcdiar ef79dfb359 Added scale handling to the ReflectionProbe 5 years ago
Ken Pruiksma 7f423f16a1
Merge pull request #412 from aws-lumberyard-dev/pruiksma/ATOM-15380
[ATOM-15380] Cherry picking changes from 1.0 - cfdb70978868aa5d0040d3b79994a26e9f82ca39
5 years ago
AMZN-koppersr 5e4094b258
Revamped AzFramework::Scene (#332)
Updated AzFramework::Scene to allow it to serve as the one-stop location for localized singletons. Localized singletons in this case are instance that can only occur once in an environment but multiple times within an application. As an example, this allows settings up a single camera per viewport for instance.

Highlights of changes:

Replaced the original ebuses with interfaces and events for easy of use and performance.
Removed the Entity Context specific code and moved that to new locations within the Entity Context itself.
Allowed basic inheritance. If a subsystem isn't found in a scene the parent can optionally be searched.
Scenes can enter a zombie state and avoid immediately being deleted. This is needed for situations where subsystems can't be destroyed until async calls have been completed.
5 years ago
greerdv f5acd7ad70 Merge branch 'main' into non-uniform-scale-decal 5 years ago
greerdv 64738c0fc1 adding non-uniform scale service as dependency for mesh component controller 5 years ago
greerdv d35adce246 adding support for non-uniform scale for decals 5 years ago
lumberyard-employee-dm 3dec5d3b71
LYN-2537 engine assets (#254)
* LYN-2537 Moved the Engine and Editor folder to be within the EngineAssets folder

* Fixed Documentation in bootstrap.cfg to correct the path to the user project specific registry file

* Adding a newline to the output of AssetCatalog 'Registering asset..., but type is not set' message

* Updating the AssetProcessorPlatformConfig.setreg Scan Folder to detect
the @ENGINEROOT@/EngineAssets/Engine path for engine runtime assets and
@ENGINEROOT@/EngineAssets/Editor path for engine tool assets

* Updating references to Icons and other assets to account for moving the
Engine and Editor folder under a single EngineAssets folder

* Moving the Engine Settings Registry folder from Engine/Registry -> Registry

* Removed the LY_PROJECT_CMAKE_PATH define as it is not portable to other locations. It is hard coded to the project location that was used for the CMake configuration. Furthermore it paths with backslashes within it are treated as escape characters and not a path separator

* Updated the LyTestTools asset_processor.py script to copy the exclude.filetag from the EngineAssets/Engine directory now

* Fixed Atom Shader Preprocessing when running using an External Project

* Updated the TSGenerateAction.cpp to fix the build error with using a renamed variable

* Updated the Install_Common.cmake ly_setup_others function to install the
EngineAssets directory and the each of the Gem's Assets directory while
maintaining the relative directory structure to the Engine Root
Also updated the install step to install the Registry folder at the
engine root

* Fixed the copying of the Registry folder to be in the install root, instead of under a second 'Registry' folder

* Moving the AssetProcessorPlatformConfig.setreg file over to the Registry folder

* Updated the LyTestTools and C++ code to point that the new location of
the AssetProcessorPlatformConfig.setreg file inside of the Registry
folder

* Renamed Test AssetProcessor*Config.ini files to have the .setreg extension

* Converted the AssetProcessor test setreg files from ini format to json
format using the SerializeContextTools convert-ini command

* Updated the AssetProcessor CMakeLists.txt to copy over the test setreg files to the build folder

* Updated the assetprocessor test file list to point at the renamed AsssetProcessor*Config setreg filenames

* Removed the Output Prefix code from the AssetProcessor. The complexity that it brought to the AP code is not needed, as users can replicate the behavior by just moving there assets underneath a another folder, underneath the scan folder

* Adding back support to read the AssetProcessorPlatformConfig.setreg file from the asset root. This is only needed for C++ UnitTests as they run in an environment where the accessing the Engine Settings Registry is not available

* Updating the Install_common.cmake logic to copy any "Assets" folder to
the install layout.
The Script has also been updated to copy over the "Assets" folder in the
Engine Root to the install layout instead of an "EngineAssets" folder

* Updating References to EngineAssets source asset folder in code to be the Assets source folder

* Moved the Engine Source Asset folder of 'EngineAssets' to a new folder name of 'Assets'. This is inline with the naming scheme we use for Gem asset folders

* Adding the EngineFinder.cmake to the AutomatedTesting project to allow it to work in a project centric manner

* Updating the LyTestTools copy_assets_to_project function to be able to copy assets with folders to the temporary project root
Fixed an issue in LyTestTools where the temporary log directory could have shutil.rmtree being called twice on it leading to an exception which fails an automated test

Updated the asset_procesor_gui_tests_2 AddScanFolder test to not use the
output prefix, but instead place the source asset root into a
subdirectory

* Correct the AssetProcessorPlatformConfig Scan Folders for the EngineAssets directory to point at the Assets directory

* Updated the asset procesor batch dependency test scan folder to point at the 'Assets' folder instead of 'EngineAssets'
5 years ago