Commit Graph

1160 Commits

Author SHA1 Message Date
mbalfour 5df82caef6 [LYN-3464] Vegetation unit tests intermittently failed due to an AssetManager bug. Inside the AssetContainer, if the root asset finished loading during the container initialization, the CheckReady() call at the end of initialization would detect the loaded asset, but would skip sending out notifications because the initialized flag wasn't set yet. This would lead to an extra asset reference remaining in the AssetManager itself, would would then cause errors when the asset handler for that asset got removed.
By setting the initialization flag before the CheckReady() call, the notifications get sent correctly, and no extra asset references remain.  This checkin also includes a unit test for the AssetManager that specifically forces this condition to happen and validates that it works correctly.
2021-05-04 09:04:18 -05:00
galibzon 781415755d [SPEC-6220] Mac clean asset fails "No ShaderPlatformInterfaces found"
Added missing runtime and tools target dependencies.
2021-04-30 19:46:47 -05:00
Terry Michaels 3eed53fa27 Crash fixes in LyShine with pRenderer being nullptr now (#496) 2021-04-30 19:41:46 -05:00
AMZN-nggieber 7a2f698bbc Create the Project Manager project (#320)
* Created the Project Manager project with a barebone styled window and rough sketch of first screen

* Renamed to Project Manager, ect.

* Corrected string name for projectmanager and added comments on getting engine path

* Changed output name for Project Manager to lowercase o3de

* Added header guards
2021-04-30 17:11:40 -07:00
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
2021-04-30 16:33:15 -07:00
lumberyard-employee-dm 99c82d141d LYN-3468 Updating the WhiteBox Editor Physics Tests to load the gem module using the updated filename of PhysX.Editor.Gem (#492) 2021-04-30 18:30:51 -05:00
SJ bb6f5239f3 Fix monolithic builds
Merge pull request #494 from aws-lumberyard-dev/monolithic_build_fix
2021-04-30 16:24:58 -07:00
AMZN-mnaumov bdd276d209 Merge pull request #467 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15426
[ATOM-15426] Fixing missing asset crashing Editor
2021-04-30 16:03:33 -07:00
Zaladane a5d4eb5d44 Asset Bundler GUI (#427)
The AssetBundler is a new ToolsApplication that allows users to work through the entire Asset Bundling process without ever touching a command line.

* Integrating github/AssetBundler through commit 1d65018

* Asset Bundler bug fixes: platform initialization and GUI styling (#5)

* fixed enabled platform initialization

* fixed the cached engine root. This fixed some of my Seeds tab data issues. The default Engine Seed List appeared, and was able to display the contents on screen.

* updated my notes of active bugs

* changed some casing in various include lines to hopefully fix my linux build

* another include fix for linux

* AssetBundler GUI is now compiling on Mac

* removed some things off of my todo list because the mac build fix actually fixed the visuals! everything's the right color again

* removed the word Lumberyard from the bundler

* Asset bundler bug fixes - Bundles, Gems, and Tests (#9)

* Fixed the Bundle loading and generation problem. Turned out to be a FileWatcher issue.

* turns out gem loading wasn't broken, there were just no existing SeedListFiles for any of the gems loaded by the AutomatedTesting project. I added a default SeedListFile for the PrimitiveAssets Gem.

* fixed some failing AssetBundler Gem tests

* Misunderstood the need to have default seed lists for asset-only gems. removing the previously created seed list file

* Asset bundler bug fixes: Seeds Tab display issues and _dependencies.xml loading (#10)

* Fixed the Project Source column in the Seeds tab

* The AssetBundler will no longer attempt to copy a template version of the ProjectName_dependencies.xml file into your active project. However, it will throw an error if you do not have one. A follow-up ticket has been cut to address this issue.

* updated the AssetBundler icon. This one matches the current style guides

* PR feedback: pass a const ref instead of a value

* PR feedback: safer conversion from a string_view to a QString

Co-authored-by: alexpete <alexpete@amazon.com>
2021-04-30 15:42:10 -07:00
AMZN-Phil 4e3846e679 Merge pull request #466 from aws-lumberyard-dev/remove-dyad
Remove remaining dyad references and files
2021-04-30 15:26:56 -07:00
Brian Herrera bdd1f8dfe4 Merge pull request #493 from aws-lumberyard-dev/pipeline/fix-readme
Fix repo url
2021-04-30 15:09:22 -07:00
amzn-sj 73d53576ce Fix monolithic builds 2021-04-30 14:55:31 -07:00
Brian Herrera 451d6915ff Fix repo url 2021-04-30 14:54:58 -07:00
AMZN-mnaumov 1ce62ae797 Merge pull request #454 from aws-lumberyard-dev/Atom/mnaumov/ATOM-5281
[ATOM-5281] Adding tone mapping option to Material Editor
2021-04-30 14:29:01 -07:00
mnaumov e7600cef94 PR feedback 2021-04-30 14:24:34 -07:00
Guthrie Adams b7a087948f Merge pull request #413 from aws-lumberyard-dev/Atom/guthadam/ATOM-4849
ATOM-4849 Update default lighting preset values
2021-04-30 16:04:21 -05:00
bosnichd a7c6638064 Remove CryFont and initialization functions related to the legacy renderer. (#485)
- Remove CryFont and initialization functions related to the legacy renderer.
- Remove some references to Code/Tools/RC from mac CMake scripts.
2021-04-30 15:02:11 -06:00
cgalvan 59811cb3a8 Merge pull request #486 from aws-lumberyard-dev/cgalvan/RemoveLensFlareEditor
[LYN-3457] Removed the LensFlareEditor.
2021-04-30 15:42:06 -05:00
dmcdiar 95e9fe4e11 Fixed AR issue 2021-04-30 13:18:00 -07:00
Chris Galvan 3466fdae41 Merge branch 'main' into cgalvan/RemoveLensFlareEditor 2021-04-30 15:06:01 -05:00
Terry Michaels 2fc130d4ab Removed legacy render components (#421)
Removed legacy render components
2021-04-30 15:05:10 -05:00
Chris Galvan bb180e7b7c [LYN-3457] Removed some additional unused methods per PR feedback. 2021-04-30 15:05:04 -05:00
dmcdiar 78efa810e0 Fixed debug draw scale 2021-04-30 12:54:15 -07:00
mnaumov 01bba93f28 PR feedback 2021-04-30 12:52:03 -07:00
garrieta 52bb0788d8 [SPEC-6220] Mac clean asset fails "No ShaderPlatformInterfaces found"
Added missing runtime and tools target dependencies.

Signed-off-by: garrieta <garrieta@amazon.com>
2021-04-30 14:48:25 -05:00
mnaumov 6a0df12de2 PR feedback 2021-04-30 12:24:38 -07:00
Jonny Galloway 636236c6ff Merge pull request #435 from aws-lumberyard-dev/cherrypick_fix_ATOM-15310
Cherrypick fix ATOM-15310, remove non-inclusive terms like 'master' from code
2021-04-30 14:19:53 -05:00
Chris Galvan 2a67584bc9 [LYN-3457] Removed the LensFlareEditor. 2021-04-30 13:27:05 -05:00
Mike Balfour 6f503b5225 Merge pull request #473 from aws-lumberyard-dev/mbalfour/cherrypick-lyn-3411
Cherrypick from 1.0 - [LYN-3411] Editor freezes when saving/reloading slice due to deadlock
2021-04-30 13:19:22 -05:00
Vicky 1681e97a0c ATOM-15369 LYN-3352 Expose sorting paramers to DynamicDrawContext's draw functions (#451) (#463)
* ATOM-15369 Expose sorting paramers to DynamicDrawContext's draw functions
 LYN-3352 LyShine: First element in Hierarchy does not properly draw in UI Editor

Add function to DynamicDrawContext to support set sort key for followed draw calls.
Use different sort key for background draw and top layer draw in UI canvas.
2021-04-30 11:19:13 -07:00
Luis Sempé 759e784e81 Merge pull request #480 from aws-lumberyard-dev/scripting/palette_fix
Removed BC Setters from showing up in the node palette
2021-04-30 11:10:19 -07:00
Esteban Papp b294c88e2a SPEC-5122 Git prune step fails to remove deleted branches in the work… (#442) 2021-04-30 10:43:40 -07:00
dmcdiar 439b781092 Merge branch 'main' into Atom/dmcdiar/ATOM-14933 2021-04-30 10:36:06 -07:00
bosnichd a1319983df Remove the legacy renderer and all associated tools (#476)
Remove the legacy renderer and all associated tools:

- Code/CryEngine/Cry3DEngine/*
- Code/CryEngine/RenderDll/*
- Code/Tools/CryFXC/*
- Code/Tools/HLSLCrossCompiler/*
- Code/Tools/HLSLCrossCompilerMETAL/*
- Code/Tools/RC/*
- Code/Tools/ShaderCacheGen/*
- Tools/CrySCompileServer/*
- Tools/PakGenFromRCList/*
2021-04-30 11:22:33 -06:00
AMZN-puvvadar 24fb48ea8c Merge pull request #271 from aws-lumberyard-dev/mpgem_editor
Adding Multiplayer.Editor which allows specifying a server process for use with Editor on Ctrl+G
2021-04-30 09:54:30 -07:00
cgalvan 4652b4e38a Merge pull request #475 from aws-lumberyard-dev/cgalvan/NewViewportInteractionBusRemoval
[LYN-1731] Removed temporary bus for checking if the new viewport interaction model is enabled.
2021-04-30 11:40:03 -05:00
luissemp ab5ffc7604 Removed BC Setters from showing up in the node palette 2021-04-30 09:35:41 -07:00
Mike Balfour 3f607a1072 Merge pull request #477 from aws-lumberyard-dev/mbalfour/main-spec-6600
[SPEC-6600] Disabling unit tests that intermittently fail AR runs.
2021-04-30 11:30:41 -05:00
Esteban Papp f8633f0ba8 LYN-3112 Add CMakeTestbed to github and setup the Jenkins job to use an installed version (#461) 2021-04-30 09:16:36 -07:00
greerdv 70d53f117f Merge pull request #471 from aws-lumberyard-dev/polygon_prism_genv_crash
Polygon prism genv crash
2021-04-30 16:30:37 +01:00
mbalfour c69a00fd80 [SPEC-6600] Disabling unit tests that intermittently fail AR runs. 2021-04-30 10:25:48 -05:00
Chris Galvan 6ace9ffedb [LYN-1731] Removed temporary bus for checking if the new viewport interaction model is enabled. 2021-04-30 10:24:01 -05:00
Scott Romero cc148743fd [main] replace cpack generator with zip for now
Merge pull request #464 from aws-lumberyard-dev/cpack_installer
2021-04-30 08:13:56 -07:00
cgalvan ca08d78dd6 Merge pull request #441 from aws-lumberyard-dev/cgalvan/OldVIMLogicRemovalSecondPass
[LYN-3419] Removed remaining references to checking if the new viewport interaction model is enabled.
2021-04-30 09:55:08 -05:00
mbalfour 2cfb7d536e [LYN-3411] Editor freezes when saving/reloading slice due to deadlock between main thread which is blocked waiting on a loading asset, and the loading thread, which is blocked on a mutex held by the main thread.
The specific mutex is "m_assetMutex" in the AssetManager.  AssetManager::ReloadAssetFromData was holding this lock while calling AssignAssetData, which goes on to call OnAssetReloaded.  This is dangerous, because any arbitrary logic can be executed during that call, including blocking asset loads, which is what happens in this specific deadlock case.  The fix is to move the call to AssignAssetData outside of the mutex lock.  AssignAssetData itself already grabs the assetMutex to protect the parts of its logic that are necessary, and then specifically releases the lock before calling OnAssetReloaded, so this change shouldn't introduce any dangerous threading conditions.

(cherry picked from commit 1581a28339f12d521955edef890acfb678a0df6f)
2021-04-30 09:13:30 -05:00
greerdv 6eaf27e802 merging from main 2021-04-30 14:40:30 +01:00
bosnichd 1d4c483e73 Red code legacy renderer (#383)
- Remove some references to gEnv->pRenderer/GetIEditor()->GetRenderer() that is now always null.
- Restore the debug console to existence.
- Stop building the following in preparation for their removal:

Code/CryEngine/Cry3DEngine/*
Code/CryEngine/RenderDll/*
Code/Tools/CryFXC/*
Code/Tools/HLSLCrossCompiler/*
Code/Tools/HLSLCrossCompilerMETAL/*
Code/Tools/RC/*
Code/Tools/ShaderCacheGen/*
Tools/CrySCompileServer/*
2021-04-30 07:31:42 -06:00
greerdv d4d47cf492 fixing gEnv dereference crash in polygon prism debug draw 2021-04-30 14:31:07 +01:00
Chris Galvan 9da11f9d3b [LYN-3419] Removed now unused viewportSearch from ViewportTitleDlg and all related code. 2021-04-30 06:58:16 -05:00
dmcdiar 0e8e33dedf Merge branch 'main' into Atom/dmcdiar/ATOM-14933 2021-04-30 00:36:13 -07:00