1905 Commits

Author SHA1 Message Date
AMZN-stankowi 0c43493e29 FBX to Scene part 3, tangent generation rule FBX -> SourceScene (#1747)
* Tangent space FromFBX -> FromSourceScene

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2021-07-02 07:56:54 -07:00
Anton Michels 9f904e08e7 Merge pull request #1753 from aws-lumberyard-dev/2016/antonmic/diffuse
[ATOM-15864] Added diffuseResponse to lambertian diffuse calculation
2021-07-02 02:44:00 -07:00
lumberyard-employee-dm 2478c60793 Fixed several o3de python package and install layout issues (#1714)
* Updated the CrashLog directory path to save to the project user
directory instead of the engine-root directory

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

* Removing the custom OUTPUT_NAME for the Multiplayer Gem Builder target

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

* Changed the default value for the LY_3RDPARTY_PATH cache variable to be
~/.o3de/3rdParty

This simplifies the first time user experience when running cmake

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

* Fixed Windows only issue where using creating a VS Solution for an O3DE project on a different drive resulted in an unloaded "<drive letter>:" entry appearing in the solution explorer

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

* Refactored install layout logic for External Subdirectories

Instead of performing a regular expression over the Gems/* directory, now the each external subdirectory including the project (external) directory is recursied over and scanned for any folders that aren't excluded.
By default those folders are the [Cc]ache, [Bb]uild and [Uu]ser directories

Afterwards the list files to copy over are then split into a directory list and a file list that is filtered by an include regex
Next the directory list is iterated over and the directories are copied to the install layout
Finally the file list is iterated and the list of files are also copied to the install layout

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

* Fixed the o3de.bat script changing the working directory before running the o3de.py script

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

* Fixed exception in engine-template.py script when the create-gem command
is invoked with the --template-name parameter that does not correspond
to a registered Template

Updated the create-project command to register the project with the
o3de_manifest.json and the engine with the project as the final step

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

* Fixed register.py over-registration of non-engine directories when then
--this-engine parameter is supplied.
All the projects, gems and templates inside of the default o3de_manifest
folder locations were being registered with the engine that was being
registered

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

* Fixed register.py register_project_path() method to return 0 when the
project path is successfully registered.

This issue was that the save_o3de_manifest method "return" value was
being checked and that method doesn't actually return a value

Added question mark to the engine_template.py to correct text around
notifying the user if the project was registered

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

* Added doc comment on the new cmke ly_get_vs_folder_directory function()

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

* Added clarifying comment to the ly_setup_others() command logic to copy over directories and files from any external subdirectories(Gems) that are registered with the engine at the time of install

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

* Fixed infinite recursion when trying to create a template with the
source directory used to seed the template

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-02 00:22:12 -05:00
antonmic 097f99dcc6 [ATOM-15864] Added diffuseResponse to lambertian diffuse calculation 2021-07-01 21:14:04 -07:00
Ken Pruiksma 6a0b8ae6b6 [ATOM-15854] Adjusting alpha on grazing angles so it doesn't affect the diffuse response. (#1708)
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2021-07-01 21:50:01 -05:00
Ken Pruiksma e13b9ca829 [ATOM-15926] Fixing light delegates which were always calculating the attenuation radius automatically for their debug display instead of respecting the user-set attenuation radius. (#1732)
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2021-07-01 21:49:32 -05:00
AMZN-stankowi 73522e90c9 FBX -> Scene, part 2. Code changes, file renames (#1704)
* First pass FBX -> Scene File conversion.
This is the simple pass, minimizing code changes and focused on comments.

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

* Step 1 of part 2 of the FBX -> Scene rename

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

* Renaming FbxSceneBuilder folder to SceneBuilder

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

* Renamed files

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

* More FBX -> Scene

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2021-07-01 15:46:55 -07:00
dmcdiarmid-ly 328a0f09a5 Merge pull request #1711 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15921
[ATOM-15921] ReflectionProbe cubemaps bake with incorrect exposure value
2021-07-01 14:21:24 -07:00
dmcdiarmid-ly e14000e2e2 Merge pull request #1713 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15922
[ATOM-15922] ReflectionProbe does not refresh when changed to use an Authored cubemap
2021-07-01 13:24:31 -07:00
Mike Balfour d34d088191 Miscellaneous prefab/converter bugfixes to support TrackView (#1701)
This has a small bundle of bugfixes and improvements all based around improving prefab TrackView support:

* JsonMerger - improved the error message when patch remove operations fail to make the specific failure more obvious
Instance - swapped the order of destroying entities vs clearing the lookup tables so that lookups still produce valid results during destruction. (This could happen while creating undo caches)
* InstanceEntityIdMapper - in the case where an id isn't found, it now returns an invalid id instead of an "attempted-valid" one that still generally turned out to be not-valid
* PrefabUndo - downgraded a potential crash to an error message if for some reason the patch contains changes to an entity that doesn't currently have an alias. (This case can be caused occasionally by other bugs and error conditions)
* EditorSequenceComponent - downgraded a potential crash to an assert for the times when it tries to remove components, fails, but thinks it succeeded. (This case can currently be caused by using Maestro with Prefabs enabled)
* EditorSequenceAgentComponent - added an undo cache refresh whenever the component deletes itself, so that deleting itself during an EditorSequenceComponent destruction chain of events leaves the undo cache in the correct state.
* SliceConverter - fixed the conversion of entity references in top-level slice instance entities that refer down to nested slice entities. There was a chicken-and-egg problem in terms of which entities need to be created first to make the references and the prefab patching & serialization happy. This was worked around by creating placeholder top-level entities, then the nested slice entities, then replacing the top-level entities with the fully-realized ones.

Specific changes:
* Added more informative error message.

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 672608a6c833c07295996cd9b3449825222b74d0)

* Changed the error condition to produce a "valid" invalid id instead of a deterministic but not-valid id

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 3673950c949de8e067b32ddafaffd07e648a13d8)

* Guard against invalid reference assert/crash

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 268d4ef3447f268a1372d07e028b9e67bac5c64e)

* Downgrade an invalid reference crash to an assert

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 38c9303770845f4e863273dd6fb8fc7e83380425)

* Improved logic for handling entity references across nested slices.

Signed-off-by: mbalfour <mbalfour@amazon.com>
(cherry picked from commit 7e89a016d95fb72cb5f119e1e3768daa60e6bfb4)

* Changed order of entities.clear() call so that instance lookups are still valid during entity destruction.

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

* Add undo cache notification when removing Maestro components.

Signed-off-by: mbalfour <mbalfour@amazon.com>
2021-07-01 13:53:17 -05:00
amzn-hdoke 74de7f785c Fix reading AWSAttribution checkbox state (#1698)
Signed-off-by: dhrudesh <dhrudesh@amazon.com>
2021-07-01 09:51:32 -07:00
AMZN-stankowi 4c4be73bd5 First pass FBX -> Scene File conversion. (#1699)
This is the simple pass, minimizing code changes and focused on comments.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
2021-07-01 08:53:47 -07:00
Guthrie Adams ff9d52d38e Merge pull request #1705 from aws-lumberyard-dev/Atom/guthadam/ATOM-15908
ATOM-15908 Fixed material component exporter to use correct relative paths
2021-07-01 10:32:16 -05:00
greerdv 0069e9aea6 Merge pull request #1719 from aws-lumberyard-dev/raycast-script-fixes
Raycast script fixes
2021-07-01 16:13:49 +01:00
amzn-sean a02ecefab9 short term fix for editor/game mode/launcher tick times consistency (#1720)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-07-01 14:47:51 +01:00
greerdv ef1c6732c8 fix licence on new file
Signed-off-by: greerdv <greerdv@amazon.com>
2021-07-01 14:11:47 +01:00
greerdv 05a2ce4fe1 update based on PR feedback
Signed-off-by: greerdv <greerdv@amazon.com>
2021-07-01 13:35:57 +01:00
greerdv 88615f462c merge from stabilization/2106
Signed-off-by: greerdv <greerdv@amazon.com>
2021-07-01 11:30:16 +01:00
greerdv 899350b5c7 bring across lua raycast improvements from 1.x
Signed-off-by: greerdv <greerdv@amazon.com>
2021-07-01 11:24:10 +01:00
moudgils c6b86e3c40 Remove an assert (#1712)
Signed-off-by: moudgils <moudgils@amazon.com>
Remove this assert as it was firing for swapchain imageview.
2021-06-30 23:23:55 -07:00
dmcdiar 658c974db9 Properly handled reinitializing the cubemap asset when it is changed between Baked and Authored
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
2021-06-30 20:15:30 -07:00
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

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

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
2021-06-30 19:51:55 -07:00
dmcdiar ca606a5e08 Set IBL exposure value to 0.0 while baking ReflectionProbe cubemaps
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
2021-06-30 18:35:25 -07:00
Ken Pruiksma 7b1c37f296 [ATOM-15917] Taa pass will no longer crash if an input attachment is invalid. (#1702)
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
2021-06-30 20:31:26 -05:00
Nicholas Van Sickle e15519603a Merge pull request #1703 from aws-lumberyard-dev/nvsickle/FixCameraSync
Fix duplicated camera entities in the Editor sharing a transform
2021-06-30 16:59:56 -07:00
Danilo Aimini 7030f663f5 LYN-4890 | Change all instances of teal blue to correct O3DE branding palette colors (#1672)
* Replace old teal color with correct palette colors from the O3DE branding.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix hyperlink color in O3DE About Us dialog to improve visibility.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-06-30 15:20:42 -07:00
guthadam 4c28c9d894 ATOM-15908 Fixed material component exporter to use correct relative paths
Signed-off-by: guthadam <guthadam@amazon.com>
2021-06-30 17:14:34 -05:00
nvsickle c546773521 Fix duplicated camera entities in the Editor sharing a transform
Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-06-30 14:44:34 -07:00
Steve Pham 827855f01c Removal last CryTek references
- 'Crytek application' is now 'O3DE application' in ISystem.h
- 'CryTek' is now 'O3DE' in ProjectDefines.h (comment)
- 'Crytek Legacy' is now 'O3DE Legacy' in LocalizedStringManager.cpp
- 'Crytek extended data' references are now 'O3DE extended data'

Signed-off-by: spham <spham@amazon.com>
2021-06-30 12:48:16 -07:00
amzn-hdoke be519bb36a Allow overriding of AWSAttribution settings to skip consent dialog for automated testing (#1650)
Signed-off-by: dhrudesh <dhrudesh@amazon.com>
2021-06-30 12:17:45 -07:00
mrieggeramzn 345be58ca8 Merge pull request #1668 from aws-lumberyard-dev/Atom/mriegger/shadowonoffbug
Fix for shadow aliasing appearing when enabling/disabling lights
2021-06-30 11:53:04 -07:00
dmcdiarmid-ly 89f4872469 Merge pull request #1674 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15902
[ATOM-15902] Reflection probes occasionally fail to hot-reload
2021-06-30 11:36:52 -07:00
Tommy Walton 8d2154af26 Partial fix for LYN-2227 : MeshComponent initialization performance improvement (#1381)
Skip a shader item before creating a shader instance if it's not going to be rendered based on the draw tag. This avoids creating and releasing the shader instance over and over again, which results in a disk write each time during release.
2021-06-30 11:13:54 -07:00
Esteban Papp 473f856d76 SPEC-7563 Change Code/Sandbox/Editor to Code/Editor and Code/Sandbox/Plugins to Code/Editor/Plugins
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-06-30 11:10:39 -07:00
moudgils 9c3ebeba04 Fix metal mip writes within compute pass (#1673)
* Fix mip writes via compute passes by creates subresource views

- Create metal subresource views so that we can write into correct mips for compute passes
- Remove code to set the correct slice/level for gfx passes as the view will be correct now
- Handle cubemap/cubemaparray/3d texture types as the drivers do not allow subresource views.
2021-06-30 10:44:59 -07:00
Esteban Papp 5fa495380c Merge branch 'stabilization/2106' into redcode/SPEC-7563 2021-06-30 09:20:08 -07:00
Jacob Hilliard ed9232563d [ATOM-15862] Fixing CPU profiler to save multiple regions within the same thread (#1636)
Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
2021-06-30 08:51:32 -07:00
Steve Pham 03c8110d02 Replaced remaining CryTek copyright notices
- Replaced 'CryTek' with 'Contributors to the Open 3D Engine Project' in ConsoleHelpGen.cpp (#1667)
- Removed remaining 'Crytek Engine Source File.. Copyright (C), Crytek Studios' in various Editor source files
- Replaced 'modifications by CryTek' and 'modifications by Amazon' with 'Modified from original'
2021-06-30 08:27:43 -07:00
Aaron Ruiz Mora 68f1410956 Using prefabs generated by the conversion tool (#1675)
Signed-off-by: moraaar <moraaar@amazon.com>
2021-06-30 16:18:14 +01:00
pereslav 1100e20e26 Merged ctrl+g fixes from MultiplayerEditorFixes
Signed-off-by: pereslav <pereslav@amazon.com>
2021-06-30 13:20:07 +01:00
dmcdiar 09aba94da7 Fixes for ReflectionProbe hot reloading
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
2021-06-30 00:40:30 -07:00
dmcdiarmid-ly c4a20405e2 Merge pull request #1666 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-14526
[ATOM-14526] DiffuseProbeGrid and ReflectionProbe components alter box shape size
2021-06-29 23:27:38 -07:00
AMZN-mnaumov 48c5854666 Merge pull request #1621 from aws-lumberyard-dev/Atom/mnaumov/LYN-4544cherryPick
[LYN-4544] Fixing thumbnail crashing on bad data
2021-06-29 18:48:41 -07:00
Guthrie Adams ade4199c28 Merge pull request #1662 from aws-lumberyard-dev/Atom/guthadam/ATOM-15892_fixing_material_slot_clear_overrides
ATOM-15892 fixing material component clear overrides button
2021-06-29 20:05:06 -05:00
Riegger 30834a33a4 Fix for shadow aliasing appearing when enabling/disabling lights
Signed-off-by: Riegger <mriegger@amazon.com>
2021-06-29 17:00:30 -07:00
Esteban Papp d6caff7842 Some sandbox references I was missing
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-06-29 16:54:30 -07:00
guthadam 64186b4ec6 ATOM-15892 fixing material component clear overrides button
The clear material override properties button was not sending the notification to update the entity or undo state.

Signed-off-by: guthadam <guthadam@amazon.com>
2021-06-29 18:45:40 -05:00
dmcdiar b65a2da548 Changed the DiffuseProbeGrid and ReflectionProbe components to only override the Box size if it's at the default (unit)
Signed-off-by: dmcdiar <dmcdiar@amazon.com>
2021-06-29 16:10:03 -07:00
Vincent Liu f7c96e44b0 [LYN-4848] Migrate remaining doc links to o3de.org (#1632) 2021-06-29 14:56:09 -07:00
mrieggeramzn ed193c82fa Merge pull request #1652 from aws-lumberyard-dev/Atom/mriegger/tgs
Bumping threadgroup sizes
2021-06-29 14:16:20 -07:00