Commit Graph

3074 Commits

Author SHA1 Message Date
AMZN-koppersr f7cbc1cbba Merge pull request #1152 from aws-lumberyard-dev/SpawnableDespawnAllEntitiesUnitTestFix
Disabled writing UserSettings.xml in Spawnable tests.
2021-06-04 15:03:03 -07:00
Esteban Papp 50d6e36ccd Bug and improvements to Editor/AP debugging settings (#1146) 2021-06-04 14:36:46 -07:00
Guthrie Adams 4a8375748f Merge pull request #1147 from aws-lumberyard-dev/Atom/guthadam/LYN-3871_LYN-3872_material_slot_version_handling
LYN-3871_LYN-3872 Added version handling for removed serialize context fields
2021-06-04 16:05:35 -05:00
AMZN-koppersr 40d90c49a3 Disabled writing UserSettings.xml in Spawnable tests. 2021-06-04 13:44:07 -07:00
jckand-amzn 383fedc973 Merge pull request #1129 from aws-lumberyard-dev/jckand/FoundationAuto
Various Foundation automated test fixes
2021-06-04 15:03:55 -05:00
guthadam b10ed227c0 Added version handling for removed fields 2021-06-04 13:54:45 -05:00
jckand-amzn 43010cf9f3 Merge branch 'main' into jckand/FoundationAuto 2021-06-04 13:47:36 -05:00
Chris Burel 1f48985a0e Update Blast to the latest version, eb169fe (#1076) 2021-06-04 11:09:26 -07:00
Esteban Papp 76a6df341b SPEC-2513 Fixes to enable w4457 2021-06-04 10:51:47 -07:00
Scott Romero aa700fc97f [main] windows installer jenkins scripts + misc. fixes (#1111)
Created new "windows_installer" Jenkins job along with associated scripts
Updated setup script to include required installer tools
Replaced LY_DEFAULT_INSTALL_COMPONENT with built-in CMAKE_INSTALL_DEFAULT_COMPONENT_NAME
Updated stale references to ly_install_target_COMPONENT with a get_prop call
Added some validation to the CMake version included in the installer
Updated installer icon/logo images
Made some small fixes requested from preview review
2021-06-04 10:37:53 -07:00
AMZN-mnaumov 8fa6d5d1b0 Merge pull request #1050 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15631
[ATOM-15631] First pass on exposing Display Mapper properties to Behavior Context
2021-06-04 10:30:04 -07:00
Qing Tao dcdd63966e ATOM-15658 Better option of CreateCommonBuffer requires unique buffer name (#1133)
* ATOM-15658 Better option of CreateCommonBuffer requires unique buffer name
- Change the CreateCommonBuffer function to not require an unique  name by default.
- Remove the code for generating unique buffer names.
- Add buffer name to BufferAsset so it can be used for device object name instead of using asset file name.
- Change RPI::Buffer to use BufferName_AssetUuid as attachment id.
2021-06-04 10:28:56 -07:00
Chris Burel 5d4226df16 Get a mesh's morph targets based on the scene graph hierarchy, instead of mesh name (#1128)
When building a mesh's morph targets, the exporter has to identify the base
mesh in addition to each morph target mesh. Previously this was done by
searching the entire scene graph for nodes
* of type IBlendShapeData
* whose parent's name matches the name of the Atom model

This is problematic for a few reasons. The first is that the Atom model's
name may have been based on the optimized mesh node. When this happens,
the `OptimizedMeshSuffix` that is used in the Scene Graph node's name is
stripped off of the Atom model's name. The result is that the *unoptimized*
mesh is used as the base mesh for the blend shapes, instead of the
optimized blend shape. This of course results in disaster, since the
optimizer reorders the vertices, and the base mesh will not match the
optimized one. The second is that it is not really necessary to do the
search based on the node name at all. All of a mesh's blend shapes are
child nodes of the base IMeshData node. With this change, the base mesh
is located based on the node data pointer, and all of its child
IBlendShapeData nodes are added to the set of blend shapes to process. This
way, the Atom model's name isn't involved in the lookup.
2021-06-04 10:28:43 -07:00
jckand-amzn 973cc3444a Merge branch 'main' into jckand/FoundationAuto 2021-06-04 10:00:56 -05:00
Aaron Ruiz Mora b73de269ee Use '<Default Physics Material>' instead of 'Default' in Material Selection widget. (#1140) 2021-06-04 15:24:22 +01:00
scottr 0d1b217b24 Merge branch 'main' into cpack_installer 2021-06-04 06:45:43 -07:00
Tom Hulton-Harrop 05e20803a8 First pass for getting things ready for grid snap button (#1118)
* first pass of change to simplify snapping for snap-to-grid button and fix snapping bug caused by non-uniform scale
2021-06-04 14:32:06 +01:00
Alex Peterson f20ae8345a Add Open Project folder menu item 2021-06-03 21:58:46 -07:00
lumberyard-employee-dm 4a1d713227 Fix recursive attempts to open the log file in the GameLauncher (#1114)
* Fix recursive attempts to open the log file in the GameLauncher

The AzFramework Application has been updated to default the @user@ and
@log@ aliases to the <engine-root>/user and <engine-root>/user/log
folder respectively if a project isn't set.

Fixed the SystemFile class to support negative offsets if Seek() as per
standard seek function such as fseek

Updated the CrySystem CLog class to use SystemFile instead of FileIOBase
to avoid any asserts that would cause CLog::OpenFile to be recursively
called infinitely

* Removing unused Force Closed variable

* AZ::IO::SystemFile build fixes for Unix platforms. Added a copy constructor for LUAEditorContextInterface.h to fix the LuaEditor build

* Adding missing includes to the WindowsAPI and Android SystemFile headers
2021-06-03 22:36:34 -05:00
Nicholas Van Sickle 30eedc1c55 Avoid more sources of camera update re-entrancy that can lead to stack overflow (#1136) 2021-06-03 20:09:15 -07:00
Nicholas Van Sickle 34449e2fc9 Guard GridComponent against arbitrarily high grid sizes (#1135)
Also do bounds checking at runtime in the controller for safety.
2021-06-03 20:09:04 -07:00
Nicholas Van Sickle f39460e617 Fix rare re-entrancy issue with CCryEditApp::IdleProcessing (#1134)
This issue manifested in a crash in rare circumstances when the Editor lost and gained focus while a modal dialog was active. After investigation, it was discovered that native event processing can lead to IdleProcessing being called again from the main thread while idle processing is still happening. As this is unintentional and generally undesirable, we now guard against this within the IdleProcessing method.
2021-06-03 20:08:51 -07:00
rhongAMZ fe98c34f50 EMFX - Refactor the emfx actor asset loading. (#1101)
Refactor emfx asset loading. The mesh asset, skinMetaAsset and morphTargetMeta asset are part of the dependency.
2021-06-03 19:59:29 -07:00
Scott Romero 64872e024e [main] add 3rd party to engine registration
Merge pull request #1131 from aws-lumberyard-dev/default_3rdparty
2021-06-03 19:32:59 -07:00
scottr 9e7f8e45eb [default_3rdparty] fixed typo 2021-06-03 18:23:54 -07:00
scottr 4405c2275f [default_3rdparty] changed CLI argument type to pathlib.Path and removed optional str type from usage 2021-06-03 18:23:01 -07:00
Esteban Papp 29ac17a090 SPEC-7135 Provide a method to re-trigger compiler detection for changes that require it (#1092)
* SPEC-7135 Provide a method to re-trigger compiler detection for changes that require it

* removing check (is wrong and is not necessary)

* Invert existance check

* add empty lines at the end

* Clean is triggering on each build

* clearing if the variable is false

* test code to understand what is going on...

* yeap, looks good

* handling "false" in linux/mac

* fix for linux/mac

* Fixing typos
2021-06-03 18:05:05 -07:00
dmcdiarmid-ly 8ae800f579 Merge pull request #1106 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-13890
[ATOM-13890] Reflection probe quality levels
2021-06-03 17:00:20 -07:00
scottr 08a2e50ee3 [default_3rdparty] missed updating a call to register 2021-06-03 16:28:15 -07:00
scottr d30fd8b1dd Merge branch 'main' into default_3rdparty 2021-06-03 16:24:55 -07:00
cgalvan deb3c5e74a [LYN-2446] Implemented support for duplicating instances. (#1097)
* [LYN-2446] Implemented support for duplicating instances.

* [LYN-2446] Addressed PR feedback.

* [LYN-2446] Addressed additional PR feedback.
2021-06-03 16:20:59 -07:00
lumberyard-employee-dm 816d05ef2d Updating manifest.py template query functions (#1113)
* Updating manifest.py template query functions
The get_project_templates, get_gem_templates and get_generic_templates
methods have been renamed to indicate that the methods return the
templates that can be used in a create-project, create-gem and
create-from-template command of the engine_template.py

Updated the print_registration.py script to support outputing project
specific gems and templates.
Add a unit test script for the manifest.py script.
Added unit test to validate the new functions:
`get_templates_for_project_creation`
`get_templates_for_gem_creation`
`get_templates_for_generic_creation`

* Implementing the project print registration methods

Added implementations of the project print registration methods and tested them locally
Removed implementations of the download print registration methods, since they have not went through app-sec review.

* Renaming get_restricted_data to get_restricted_json_data

Fixed the get_registered method in manifest.py when looking up projects

* Updated the print_manifest_json_data calls to return the result
2021-06-03 18:16:22 -05:00
scottr 85e6d06c2c [default_3rdparty] add 3rd party to engine registration + specific path registration fixes 2021-06-03 16:09:10 -07:00
mnaumov 856204a5ea merge from main 2021-06-03 16:01:27 -07:00
AMZN-mnaumov c2619decc4 Merge pull request #1096 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15711
[ATOM-15711] Changing thumbnail sphere to polar sphere
2021-06-03 15:39:26 -07:00
jckand-amzn d1f23aff62 SPEC-7008: Excluding more main tests from Debug test runs 2021-06-03 17:38:22 -05:00
carlitosan 96572888a9 Merge pull request #1125 from aws-lumberyard-dev/carlitosan-beta-fixes
Demo support updates and fixes to be integrated into main
2021-06-03 15:24:52 -07:00
Eric Phister 3634277317 Project dll is not loaded by the AP when opened from the launcher (#1123)
* Fixes locating the project dll when using SDK

SDK engine usage has project dll in the project build path, but
searching for module filepaths for loading would have a passing
SystemFile::Exists check but no full filepath was amended to the module.
This causes the module to fail to load.

* Fix locating project module for UnixLike platforms

Fixes the issue with project-centric workflows running GameLauncher, and
it opens AP which can't find the project dynamic module.  From AP's
perspective, the project module is not in the executable directory,
which is in engine bin.  The SystemFile::Exists check is true on the
file because it uses the 'cwd'.  In that situation, an absolute path
must be obtained for the module to be loaded.

* Add missing header to fix UnixLike builds

* Applies a suggested change from PR

Use operator-> on the AZStd::optional

* Add semicolon to a class macro line

Prevent auto formatting indenting the following line.
2021-06-03 16:15:46 -05:00
Danilo Aimini fda28bb7b2 LYN-1818 | [USE CASE] Reparenting between different prefab instances by drag/drop in the Outliner (#1088)
* Add the last known parent to the prefab undo cache to detect changes in the owning instance.
Still WIP.

* Progress in handling reparenting. Still WIP, need a change in CreateLink that will be addressed in a separate branch and then merged back.

* A few fixes, reparenting now works with entities. Still working on instances.

* Fix assert crashing the Editor because of the arguments being in the wrong order.

* Handle moving the patches when removing and recreating links when reparenting nested instances.

* Rearrange some code to prevent including instance removal in instance update undo node, as it would be redundant and cause errors in some edge cases.

* Reorder instance reparenting to account for correct order of operation during undo/redo

* Fix order of operations to support multiple operations in one edit (reparenting to non-container entities while changing instance)

* Add function to refresh patches on links to allow aliases to be restored correctly on reparenting.

* Removed RefreshEntityPatchOnLink function. Introduced a simpler way of handling porting patches.

* Removing unnecessary code that was left after testing.

* Minor fixes to naming and comments.

* Restore previous error, no longer printing the failed patch.

* Remove unused includes.

* Restore include removed by mistake.

* Simplified patches retrieval by using internal function. Renamed some internal functions and variables to be more accurate.
2021-06-03 14:02:40 -07:00
Mike Balfour d90a3d46a7 Support for nested slice conversions (#1121)
This set of changes enables conversions for singly-nested slices. Multiple nesting hierarchies are only partially supported at this point. Conversion is also significantly more deterministic, which makes it easier to convert single slices without needing to reconvert every slice or level that relies on it as well.
Changes:

- Added version of Instance::AddInstance() that takes in an alias to allow for deterministic aliases
- Added a "SliceConverterEditorEntityContextComponent" that's used to specifically disable entity activation on creation. The disabling is done this way vs adding a new public API, because the disable shouldn't be required in any normal case outside of this tool.
- Disabled more AWS gems for the SliceConverter, as they're unneeded and cause issues if they're around in the tool.
- Added a small null check to the Camera Controller.
- Added the actual support for slice instance conversion. This instantiates the entities, applies the data patches, turns them into a prefab instance, and generates a JSON patch out of the changes.
2021-06-03 15:59:45 -05:00
AMZN-mnaumov c155271167 Merge pull request #1095 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15692
[ATOM-15692] Ebus for registering custom feature processors for thumbnail generation
2021-06-03 13:29:37 -07:00
chcurran 46afeef77b Merge branch 'main' into carlitosan-beta-fixes 2021-06-03 13:14:33 -07:00
jckand-amzn dbeee91e7b SPEC-7008: Setting up LargeWorlds main tests to be skipped in Debug builds 2021-06-03 15:14:19 -05:00
chcurran 0a9d6f5f0f Bug fixes and improvements brought over from demo work.
* Generic Multi Function Call ability added to extensible nodes
* Code gen improvements, including allowing for more manually codewritten extension of codegen facilities
* CVAR to disable automatic update of deprecated node
* Fixed variable sorting error that can apply to parser/runtime added variables
* Made Edit/SerializeContext ClassBuilder public, as it was needlessly private
* Fixed dangerous Datum::GetValueAddress(), it now checks for an empty storage AZSTd::any, as does Datum::Empty()
2021-06-03 13:13:22 -07:00
amzn-mgwynn 77d861c124 Merge pull request #1108 from aws-lumberyard-dev/Prism/gem-db
Prism/gem db to main. Adding ability to modify project settings (display name, origin, icon, summary, user tags) through the o3de CLI with edit-project-properties using a project path or registered project name.
2021-06-03 16:10:56 -04:00
lumberyard-employee-dm 1245e0b327 Adding Tools and Builders alias to the DccScriptingInterface gem targets (#1087)
* Adding a Tools and Builders variant to the DccScriptingInterface gem target to allow it to be used as a gem in the AtomTest project

* Adding support to ly_create_alias to be able to specify an alias with no
dependencies
Updated the SettingsRegistry.cmake generation code to support generating
a Gem target entry in the cmake_dependencies.*.setreg file when an
interface library with no dependencies is parsed
2021-06-03 15:02:03 -05:00
Eric Phister 1b8810b963 Remove Project namespace from project template (#1124)
In the enabled_gems.cmake file, can remove the Project:: namespace on
the project module because it's treated the same as a Gem module now.
2021-06-03 14:52:21 -05:00
lumberyard-employee-dm dce87534c7 Removing the Pyside implementation of the project manager python scripts (#1112)
* Removing the Pyside implementation of the project manager python scripts

* Removing reference to the scripts/project_manager directory 

The Install_common.cmake script reference to the project_manager directory has been removed.
2021-06-03 14:37:16 -05:00
mgwynn e99a95d909 Added copyright header for validation 2021-06-03 15:02:18 -04:00
mgwynn 7bba5ed2fc Incorporated suggestion to use setdefault to handle missing tag property rather than explicitly checking for and creating it. 2021-06-03 14:43:13 -04:00