Commit Graph

1817 Commits

Author SHA1 Message Date
srikappa-amzn 0cfc7f10a9 Merge pull request #728 from aws-lumberyard-dev/Prefab/CyclicalDependencyCheck
Detect cyclical dependencies in the nested prefabs of the prefab being instantiated
2021-05-14 16:33:13 -07:00
Nicholas Van Sickle 46c0c35c26 Merge pull request #734 from aws-lumberyard-dev/nvsickle/DebugInfoDisplay
Restore debug rendering to the viewport
2021-05-14 15:20:05 -07:00
Alex Peterson 9b9ae22d23 Update Prism Python bindings interface
Add GetProjects, GetProjectTemplates, GetGems, GetProject and GetGem.
CreateProject and UpdateProject and the engine functions are not implemented yet
2021-05-14 14:53:32 -07:00
bosnichd 9ecbbe471b Remove lots of unused things from CrySystem (#765)
Remove lots of unused things from CrySystem
2021-05-14 15:38:59 -06:00
SJ 2a6938bdf5 Remove hardcoded paths to Atom gems in registration.py and clean up gem.json files 2021-05-14 13:54:17 -07:00
Vicky 1c575763c7 ATOM-4661 Improvement with pass templates registration from data (#735)
* ATOM-4661 Improvement with pass templates registration from data
- Update PassLibrary so it can load pass templates from more than one files and report duplicate pass templates.
- Added load templates events to pass system so the handlers from any gems can load their own pass templates.
- Added PassSystemInterface::OnReadyLoadTemplatesEvent::Handler in FeatureCommon gem's CommonSystemeComponet to load the PassTemplates.azasset in featureCommon gem.
- Misc: moved BindlessPrototypeSrg.asli from RPI to ASV project; fixed an assert issue when exit ASV
2021-05-14 13:45:26 -07:00
nvsickle 1426052a5f Address a bit more review feedback
-Use aznumeric_cast for enum <-> int casts
-Short circuit logic a bit more nicely
2021-05-14 13:01:46 -07:00
nvsickle a8b29bf603 Remove memory info from the overlay for now (depended on the now-dead CryMemoryManager) 2021-05-14 12:38:46 -07:00
nvsickle 810c63b80e Streamline AtomLyIntegration/AtomViewportDisplayInfo/gem.json 2021-05-14 12:38:01 -07:00
nvsickle f7a9b28000 Make AtomFont's API use copy semantics for string_view 2021-05-14 12:37:35 -07:00
nvsickle 58759bddf7 Tidy up Script/ScriptTimePoint 2021-05-14 12:36:40 -07:00
srikappa 1a456cc9b9 Marked an our parameter correctly and changed a ref to const ref 2021-05-14 11:48:31 -07:00
amzn-sj f759f471bf Remove unused code 2021-05-14 11:15:52 -07:00
Aaron Ruiz Mora 883786796d [NvCloth] Replace legacy IsDedicated() call with new AZ_CVAR sv_isDedicated 2021-05-14 19:10:58 +01:00
lumberyard-employee-dm 8b8a582f02 External Project Build Path Support using SDK Binaries (#690)
* Updated the DynamicModuleHandle code to search within the
SettingsRegistry for the FilePathKey_ProjectBuildPath setting in order
to determine the binary directory for the Project.

This is used to locate shared libraries and executables built by the
project when running and Engine SDK binary from within the Engine SDK

* Added a generation step within the Projects.cmake file to generate a
.setreg file containing the CMake build directory root.
The file is output to the <project-root>/user/Registry/build_path.setreg
file.
This occurs only on non-host platforms when configuring for
non-Monolithic builds, since the Build Directory is used to located the
project binary directory in order to located the project's generated
${CMAKE_BINARY_DIR}/bin/$<CONFIG>/Registry directory containing the
cmake_dependencies.<project-name>.<application-name>.setreg file
containing the list of gem modules to load for a given application

Updated the SettingsRegistryMergeUtils AddRuntimeFilePaths function to
be read in the new "/Amazon/Project/Settings/Build/project_build_path"
and use that to form an absolute path to the project build directory by
appending it to the FilePathKey_ProjectPath key.
That key is set in the 'FilePathKey_ProjectBuildPath' constant
Next updated the SettingsRegistryMergeUtils
MergeSettingsToRegistry_TargetBuildDependencyRegistry function to look
within the project build directory to locate the
cmake_dependencies.*.setreg file to load

Tweaked the Settings Registry merge order of the ComponentApplication,
GameApplication and Settings Registry builder to merge the command line
after merging the global user registry and after merging the project
user registry.
Moved the call to MergeSettingsToRegistry_TargetBuildDependencyRegistry
to occur after the above calls to make sure the properly overriden
projects' user registry was merged in order for the correct project
build path to be stored in the SettingsRegistry

* Added a ProjectConfigurationBinPath key which contains the path to the <build-dir>/bin/$<CONFIG> directory for a project which is used to load gem dlls and the Registry/cmake_dependencies.*.setreg files when using an pre-built Editor/AssetProcessor on an external project

* Fixed variable reference to fileNamePath variable

* Removing the default Project Build Path from the Settings Registry
Runtime Filepaths.

Any paths would have to be set explicitly via .setreg/.setregpatch file
or the --project-build-path parameter

Updated the setting of the project build path and project binary
directory to perform existance checks on the paths before setting the
keys of /Amazon/AzCore/Runtime/FilePaths/ProjectBuildPath and
/Amazon/AzCore/Runtime/FilePaths/ProjectConfigurationBinPath

Added a backup project binary path of
<project-build-path>/bin/$<PLATFORM>/$<CONFIG> which is used if the path
of <project-build-path>/bin/$<CONFIG> has not been found

Fixed compile error in DynamicModuleHandle_Apple.cpp

* UnixLike Platform Build fix for the DynamicModuleHandle code
2021-05-14 13:01:11 -05:00
amzn-sj 05fec17ebd Remove hardcoded paths to Atom gems in registration.py and clean up gem.json files 2021-05-14 10:35:50 -07:00
nvsickle cc986f563a Merge remote-tracking branch 'upstream/main' into nvsickle/DebugInfoDisplay 2021-05-14 10:27:33 -07:00
Sean Sweeney 711db7e0f7 Merge pull request #754 from aws-lumberyard-dev/ap_race
Reduce AP race conditions and fix minor bugs
2021-05-14 10:19:17 -07:00
srikappa-amzn f6767cec2f Merge pull request #751 from aws-lumberyard-dev/Prefab/DeletePrefab
Fixed bug with delete prefab where the prefabs were not being deleted from the correct instances
2021-05-14 09:52:58 -07:00
moudgils 058688c182 Merge pull request #723 from aws-lumberyard-dev/Atom/moudgils/FixTextureArray
iOS Fixes to get RHI samples running again
2021-05-14 09:23:10 -07:00
Mike Balfour 77278a0329 First version of the slice-to-prefab converter
It converts .slice and .ly files to .prefab files, but doesn't handle nested or complicated slices correctly yet.
2021-05-14 11:18:15 -05:00
lumberyard-employee-dm 5cc0cc9ee7 Fixed the loading of uicanvas assets due to the NetBindable class being (#755)
removed from the SerializeContext.
The TransformComponent and ScriptComponent which used to Serialize a
NetBindable instance didn't have their version numbers bumped in order
to skip the old data when loading a binary ObjectStream
2021-05-14 11:03:31 -05:00
bosnichd a9d986c10f Red code legacy MemoryManager, StreamEngine, ResourceManager, ImageHandler, AsyncPakManager, and more (#758)
Remove from CryCommon and CrySystem:
- MemoryManager and all related classes/files
- StreamEngine, ResourceManager, ImageHandler, and AsyncPakManager
- Various other related interfaces/files/classes etc. that are all now unused
2021-05-14 08:53:56 -06:00
moudgils 169d9e3d57 Added support for EAC_R11 and EACRG11 2021-05-13 19:18:03 -07:00
srikappa b72836fa8f Fixed a typo 2021-05-13 18:03:49 -07:00
srikappa d8865a8f0d Remove links when deleting prefabs 2021-05-13 17:41:45 -07:00
AMZN-mnaumov d0daab4fe0 Merge pull request #710 from aws-lumberyard-dev/Atom/mnaumov/LYN-3529
[LYN-3529] Hiding "Open Material Editor" when material asset is assigned
2021-05-13 17:15:03 -07:00
jackalbe 7d91a4c08e {LYN-3787} Fix for infinite loop in the scene builder's import phase (#747)
* This simple fix pops any node that can not be registered using it name and unique ID
* Any scene file (i.e FBX) with the three or more nodes with the same name and parent will sort of work
* After the 2nd child node with the same name and parent will be dropped on export

Tests: added the new AutomatedTesting/Assets/BadAssets/three_same_named_nodes.fbx to regress test this
2021-05-13 17:50:02 -05:00
AMZN-tpeng c2dc3dad32 Merge pull request #629 from aws-lumberyard-dev/ATOM/tonypeng/ATOM-15266-2
ATOM-15266 [RHI][Vulkan][Android] Use warning on fragment pool error …
2021-05-13 15:38:38 -07:00
Guthrie Adams ab81bd0e7e Merge pull request #726 from aws-lumberyard-dev/Atom/guthadam/ATOM-15223
ATOM-15223 updating material assignment ID to be portable to other models
2021-05-13 17:21:07 -05:00
srikappa 16b2dabde2 Removed additional spacing 2021-05-13 14:51:27 -07:00
srikappa 9328c944b2 Remove an unnecessary check in the if statement 2021-05-13 14:49:06 -07:00
srikappa 7d8180a3bb Fixed a typo 2021-05-13 14:46:30 -07:00
srikappa b92a68f5a4 Improved a comment 2021-05-13 14:45:06 -07:00
sweeneys 9141221843 Reduce AP race conditions and fix minor bugs 2021-05-13 14:43:30 -07:00
srikappa cd4be3a708 Found a better way to find common owning instance 2021-05-13 14:37:22 -07:00
srikappa 76e8a0ef47 Fixed bug with delete prefab where the prefabs were not being deleted from the correct instances 2021-05-13 14:11:47 -07:00
Mike Balfour 0ae123eae6 Fix AssetContainer behavior with immediate load errors
The AssetContainer was getting "stuck" in the case that it tried to load a missing asset that was already registered with the AssetManager as missing. This fixes the bug, as well as adding a unit test for the specific condition.
2021-05-13 16:08:47 -05:00
moudgils 46bdb45d4a Merge branch 'Atom/moudgils/FixTextureArray' of https://github.com/aws-lumberyard-dev/o3de into Atom/moudgils/FixTextureArray 2021-05-13 14:05:23 -07:00
moudgils da8f5849aa Merge branch 'main' into Atom/moudgils/FixTextureArray 2021-05-13 14:03:54 -07:00
moudgils 3a5ca1503a Renamed some variables 2021-05-13 14:00:44 -07:00
mbalfour 7866178f3e Fix AssetContainer behavior with immediate load errors
The AssetContainer was getting "stuck" in the case that it tried to load a missing asset that was already registered with the AssetManager as missing.  This fixes the bug, as well as adding a unit test for the specific condition.
2021-05-13 14:10:45 -05:00
AMZN-nggieber 7ecd1b1761 Rearchitecture Project Manager Screens Workflow and Create Project Settings Ctrl
* Renamed UX screen files and classes to include screen in the name

* Changed screens to emit a screen change request a controller can connect to

* Made ScreensCtrl that owns and manages screens and their changing and history

* Made Project Settings Control managing back and next buttons

* Add Project Setting Model and moved New Project Settings Ui into Screen file

* Goto previous screen always works

* Removed unnecessary QObject namespace from connect calls

* Merged ProjectSettingsModel into ProjectInfo
2021-05-13 10:47:49 -07:00
michabr 67a1e4dc4f Merge pull request #711 from aws-lumberyard-dev/michabr/lyshine_viewport_fixes
UI Editor Viewport fixes
2021-05-13 10:25:44 -07:00
michabr 9cde3d60e9 Merge pull request #712 from aws-lumberyard-dev/michabr/lyshine_merge
LyShine/UI Editor fixes for Atom
2021-05-13 10:21:01 -07:00
bosnichd 3d84902b24 Remove CryCommonTools (moving the three remaining files into Editor/Util which is the only place they're used). (#741)
Remove CryCommonTools (moving the three remaining files into Editor/Util which is the only place they're used).
2021-05-13 11:10:44 -06:00
zsolleci 55ec82be8f Merge pull request #613 from aws-lumberyard-dev/SPEC-6690
Spec 6690
2021-05-13 11:37:25 -05:00
jjjoness 5940f2ebbe Merge pull request #739 from aws-lumberyard-dev/LYN-1099
LYN-1099 DEV TASK - Play Controls
2021-05-13 17:35:17 +01:00
Peng 49d2d92c2d Merge branch 'main' of https://github.com/aws-lumberyard-dev/o3de into ATOM/tonypeng/ATOM-15266-2 2021-05-13 08:39:43 -07:00
Tom Hulton-Harrop 795aa114e6 Improve selection in the viewport (#720)
* improve selection in the viewport

* remove debug code

* updates following review feedback

- update API comments from /// to //! from
- add [[nodiscard]] attribute to member function
- move constructor implementations to .cpp files

* use lambda instead of ternary operator

* fix unit test failure caused by typo
2021-05-13 16:19:53 +01:00