Commit Graph

7339 Commits (0b718d435c63e5f3f5f16f5d64be7be559b18c55)
 

Author SHA1 Message Date
Mike Chang 0b718d435c
Installer, bootstrapper, and executable signing for Windows (#4406)
* Added a codesigning script to pre and post build steps in the Windows installer CD job

* Changed `windows_installer` job name to `installer_vs2019`

* Added `installer-nightly` tag for `installer_vs2019`

* Updated `build_config.json` to use an envvar for the installer url and bucket

Signed-off-by: Mike Chang <changml@amazon.com>
4 years ago
rgba16f [Amazon] e1c49e436d
convert atom to task graph (#4230)
* Intial attempt to convert the Atom/RHI/FrameScheduler to use the new TaskGraph api

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Avoid enqueuing work on the active task thread if the submitted task
graph is waitable

When submitting a task graph, supplying a wait event implies that
dependent jobs must occur on threads that do not wait on the event (in
the absence of work stealing). This change prevents this by adding a
notion of a task thread enable/disable state, and prohibiting dependent
jobs from being enqueued on waiting threads.

Signed-off-by: Jeremy Ong <jcong@amazon.com>

* Convert RPI/Scene to use TaskGraph pass 1, Culling jobs remain on the old system

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* RemoveTask Graph changes from the FrameScheduler::ExecuteGroups, use old job system instead

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Per review, removing commented out code

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Cleanup debug code, & build fix

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Add a cvar & interface to query whether to use jobs or task graph

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Make TaskGraph assert if you try to wait inside a job

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Fix TaskTest SpawnSubgraph to account for the new TaskGraphEvent assert on wait in a running task

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* 3 minor cleanups. 1) Events always store a ptr to their executor 2) Fix clang compile error 3) remove an early out.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Fix double group end that was causing assert/crash plus misc minor diff's with development

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Fix deallocation failure on deactivation of the TaskGraphSystemComponent. Also make the system component account for multiple creation in Unit Tests.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update with PR feedback
1) Rename UseTaskGraph to IsTaskGraphActive & update related code
2) prefer TaskExecutor::SetInstance
3) add comments and remove commented out code

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Fix incorrect RTTI name for TaskGraphActiveInterface

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Move TaskGraphSystemComponent CRC calculation to a shared variable

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

Co-authored-by: Jeremy Ong <jcong@amazon.com>
4 years ago
mrieggeramzn 60a0d2ba01
Atom/mriegger/decalnormalmaps (#4302)
* Adding normal maps to decals initial commit

Signed-off-by: mrieggeramzn <mriegger@amazon.com>

* Adding checks for normal maps not present

Signed-off-by: mrieggeramzn <mriegger@amazon.com>

* Readding the proper switch statement

Signed-off-by: mrieggeramzn <mriegger@amazon.com>

* Addressing PR feedback, adding brackets

Signed-off-by: mrieggeramzn <mriegger@amazon.com>

* Adding comments

Signed-off-by: mrieggeramzn <mriegger@amazon.com>

* fixing compile issue

Signed-off-by: mrieggeramzn <mriegger@amazon.com>
4 years ago
carlitosan 8a1af282c4
Merge pull request #4419 from aws-lumberyard-dev/carlitosan/bugfix
Fix unused variables in property list, and set ed_useNewAssetBrowserTableView  to false by default
4 years ago
Guthrie Adams e29726ad52
Merge pull request #4398 from aws-lumberyard-dev/Atom/amzn-tommy/ATOM-13339_RemoveModelAssetIdFixupFunction
Remove FixUpModelAsset
4 years ago
chcurran 5fe4d8043d set ed_useNewAssetBrowserTableView to false by default
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Chris Galvan 8581b30260
Merge pull request #4274 from aws-lumberyard-dev/daimini/FocusMode/breadcrumbs
LYN-5303 | Focus Mode - Add breadcrumb of the prefab hierarchy path when entering into the prefab editing mode
4 years ago
Chris Burel aa8594b491
Add a unit test for `XcbInputDeviceKeyboard` (#4393)
* Use XcbUniquePtr to manage xcb resources

Signed-off-by: Chris Burel <burelc@amazon.com>

* Add a unit test for XcbInputDeviceKeyboard

Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
santorac 328cde0516
Updated the naming convention for material property "names" vs "IDs".
Merge pull request #4207 from aws-lumberyard-dev/Atom/santorac/RemixableMaterialTypes

A "property name" is the name of the just the property without regard to the group that it's in. A "group name" is the name of the group. And a "property ID" is the full unique name of a property in the form "groupName.propertyName". This is important preparation for upcoming changes where property sets can contain other property sets, and property IDs can be arbitrarily long like "layer1.baseColor.factor" for example.

The naming changes include variables, some code comments, and the .materialtype file format. All material types have been updated to use "name" instead of "id". If any users have made custom material types, they will need to search and replace "id" with "name" (there probably aren't many of these in the wild, and fixing any that do exist will be a very simple change, not worth the cruft of keeping backward compatibility code around IMO).

Testing:
Opened up materials in the material editor.
Ran AtomSampleViewer in dx12 and vulkan with no new failures.
RPI unit tests.

Signed-off-by: santorac 55155825+santorac@users.noreply.github.com
4 years ago
Danilo Aimini 225d9d3b3c Fixes to unit tests after merge
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini d3bc7d8f12 Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzToolsFramework/Tests/FocusMode/EditorFocusModeTests.cpp
#	Code/Framework/AzToolsFramework/Tests/Prefab/PrefabFocus/PrefabFocusTests.cpp
4 years ago
chcurran 299fc8bc3d Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/bugfix 4 years ago
amzn-tommy 44afede58a Merge remote-tracking branch 'upstream/development' into Atom/amzn-tommy/ATOM-13339_RemoveModelAssetIdFixupFunction
Signed-off-by: amzn-tommy <waltont@amazon.com>
4 years ago
bosnichd 3635e5ed35
Put the ShaderMetrics.json in the @user@ folder, plus an unrelated #include path fix. (#4402)
Signed-off-by: bosnichd <bosnichd@amazon.com>
4 years ago
Danilo Aimini 8d67f184c8
LYN-7008 | Focus Mode - Selection unit tests (#4357)
* Refactor existing tests and fixtures, split them up in more granular tests, and add more comments.

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

* Refactor test fixture for FocusMode to make it more reusable

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

* Fixture rename, draft of selection test

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

* Split SetFocus and ClearFocus tests for Editor Focus Mode

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

* Move BoundsTestComponent to its own file so that it can be reused in Focus Mode Selection tests

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

* Making progress on selection test. Test compiles now, but selection doesn't seem to be working.

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

* Removed commented out code from previous iteration.

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

* Move BoundsTestComponent under the UnitTest namespace

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

* Viewport selection tests + minor fixes.

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

* Minor fixes

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
puvvadar bee4346df8
Merge pull request #4401 from aws-lumberyard-dev/mp_unit_test_pass1
Quick updates to AzNetworking unit tests
4 years ago
santorac c0d8020786 Merge branch 'development' into Atom/santorac/RemixableMaterialTypes 4 years ago
chcurran ff13bf50a0 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/bugfix 4 years ago
lumberyard-employee-dm b1c82fc045
Updated references to Engine.pak to be lowercase engine.pak (#4397)
* Updated references to Engine.pak to be lowercase engine.pak

This makes the engine.pak file consistent with naming scheme of other pak files such as assets.pak.

It will also help avoid issues with mounting the file on Linux.

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

* Engine.pak now loads correctly in release builds. The check for the file existing was failing in release builds because it was only checking inside packs. OpenPack first checks if the file exists, anyways, so it was safe to remove.

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

Co-authored-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
4 years ago
srikappa-amzn ffbc3f1c80
Fix a bug in recursion of prefab links when checking for dirty prefabs (#4392)
* Fix a bug in recursion of prefab links when checking for dirty prefabs

Signed-off-by: srikappa-amzn <srikappa@amazon.com>

* Added a missing EntityId header

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
Danilo Aimini 4d368fe329 Fix to capitalization in include via the UI
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini 7b1d98535d Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs 4 years ago
jonawals fa47b35580
Call sites for activating/deactivating viewport editor modes. (#4265)
* Provisional impl and testing of central state tracker.

Signed-off-by: John <jonawals@amazon.com>

* Add missing namespace comment.

Signed-off-by: John <jonawals@amazon.com>

* ViewportEditorModeState -> ViewportEditorModes

Signed-off-by: John <jonawals@amazon.com>

* ViewportEditorModesTracker -> ViewportEditorModeTracker

Signed-off-by: John <jonawals@amazon.com>

* GetEditorModeState ->GetViewportEditorModes

Signed-off-by: John <jonawals@amazon.com>

* GetNumTrackedViewports -> GetTrackedViewportCount

Signed-off-by: John <jonawals@amazon.com>

* IsViewportStateBeingTracked -> IsViewportModeTracked

Signed-off-by: John <jonawals@amazon.com>

* Fix API comments.

Signed-off-by: John <jonawals@amazon.com>

* Delete hangover file.

Signed-off-by: John <jonawals@amazon.com>

* Delete more hangover files.

Signed-off-by: John <jonawals@amazon.com>

* Minor member name refactor.

Signed-off-by: John <jonawals@amazon.com>

* Refactor nonclemanture.

Signed-off-by: John <jonawals@amazon.com>

* Rename Enter/ExitMode to Register/UnregisterMode.

Signed-off-by: John <jonawals@amazon.com>

* Error and warning msgs now return AZ::Outcomes.

Signed-off-by: John <jonawals@amazon.com>

* Change all nomenclature to Activate/Deactivate for consistency.

Signed-off-by: John <jonawals@amazon.com>

* Change tense of notification bus methods.

Signed-off-by: John <jonawals@amazon.com>

* Fix malformed string format.

Signed-off-by: John <jonawals@amazon.com>

* Fix malformed string format (again).

Signed-off-by: John <jonawals@amazon.com>

* Fix Linux warning.

Signed-off-by: John <jonawals@amazon.com>

* Call sites for editor mode activate/deactivate.

Signed-off-by: John <jonawals@amazon.com>

* Move Component editor mode logic to ComponentModeCollection.

Signed-off-by: John <jonawals@amazon.com>

* Delete non-source data.

Signed-off-by: John <jonawals@amazon.com>

* Remove line breaks and forward declare class.

Signed-off-by: John <jonawals@amazon.com>

* Remove constructors without ViewportEditorModeTrackerInterface ptr.

Signed-off-by: John <jonawals@amazon.com>

* Add integration tests for viewport editor modes.

Signed-off-by: John <jonawals@amazon.com>

* Address PR comments.

Signed-off-by: John <jonawals@amazon.com>
4 years ago
SergeyAMZN 08e020f2b1
Merge pull request #4251 from aws-lumberyard-dev/nvsickle/RevertFrameTimer
Revert "Refresh rate driven rendering tick logic (#3375)"
4 years ago
Guthrie Adams 9f2530ec6f
Merge pull request #4325 from aws-lumberyard-dev/Atom/guthadam/material_component_supports_property_overrides_without_material_overrides
Atom/guthadam/material component supports property overrides without material overrides
4 years ago
amzn-sean 43748c37fd
update joints to use cluster viewport ui. (#4352)
also some joints Component mode cleanup.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
AMZN-Igarri 9eb9a13d99
Flipped CVar to activate the AssetBrowser Search View (#4370)
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
santorac 62e268bec7 Merge branch 'development' into Atom/santorac/RemixableMaterialTypes 4 years ago
hultonha ab0aa4973f
Remove camera LookAtAfterInterpolation (#4391)
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
Benjamin Jillich acea5b7da8
Animation Editor: Creating Motion Sets does not increment them correctly (#4368)
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
4 years ago
Danilo Aimini 742a84f587 Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs 4 years ago
Steve Pham c00a2b5ef4
Merge pull request #4407 from aws-lumberyard-dev/FixNonUnityBuildError
Fix missing include for AZStd::unordered_set in AssetEditorBus.h
4 years ago
Danilo Aimini 27c7e2dcb0 Add correct include in FocusModeInterface to fix non-Unity builds.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini ea3435a9bb Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs 4 years ago
Steve Pham 19bd934a43 Fix missing include for AZStd::unordered_set in AssetEditorBus.h
Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
chcurran f412779273 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/bugfix 4 years ago
chcurran 615b53df50 fix bad unused variable component property check
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
lumberyard-employee-dm 090aa8f053
Removed ununeeded includes from EBus EBus.h and Policies.h (#4256)
* Removed ununeeded includes from EBus EBus.h and Policies.h

Updated the locations which needed those includes

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

* Adding missing include for <memory> to AWsClientAuthBus.h

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

* Remove the while true loop in the EBusQueuePolicy Execute() function

The while true loop in Execute was for allowing additional functions to be queued in the middle of execution of current list of functions.
That functionality was dangerous, because if a queued function added itself during execution unconditionally, then it would result in an infinite loop

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

* Updated the AssetManager::DispatchEvents function to pump the AssetBus event queue until empty

Queued Events on the AssetBus is able to queue additional events on that Bus during execution of those events.

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

* Changed the AssetManager::DispatchEvents function to only execute the
AssetBus queued events once

Changed the AssetJobsFloodTest.AssetWithNoLoadReference_LoadDependencies_BehaviorObeyed test to dispatch events until the OnAssetContainerReady callback is signaled.

This happens after every asset load to make sure that the
expiring AssetContainer instances are removed from `AssetManager::m_ownedAssetContainer` container before retrying to load the same asset.

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

* Added a MaxTimeoutSeconds constant for the maximum amount of the time to run a single DispatchEvents loop

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Guthrie Adams f34e94d2f1 Merge branch 'development' into Atom/guthadam/material_component_supports_property_overrides_without_material_overrides 4 years ago
lumberyard-employee-dm 816a623c97
Added missing EntityId.h include to FocusModeInterface.h (#4396)
* Added missing EntityId.h include to FocusModeInterface.h

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

* Non-unity build fix

Adding missing BehaviorContext.h includes to Multiplayer Gem

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

* Added missing BehaviorContext.h include to NetworkCharacterComponent

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
jiaweig 0f4a9d70b5
Fix 3p path setting to the upper level (#4399)
Signed-off-by: jiaweig <jiaweig@amazon.com>
4 years ago
puvvadar 325294aef8 Remove magic number in AZN unit
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
puvvadar c9ea34d45f Quick updates to AzNetworking unit tests
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
Danilo Aimini a7f6bfbb50 Fix tests to work with new interface APIs using EditorEntityContextId
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
AMZN-Phil 103dc6cfcf
Merge pull request #4351 from aws-lumberyard-dev/Prism/AddRepoDialog
Add Add Gem Repo Dialog
4 years ago
amzn-tommy 96d833fc4e Removing a function that was originally added to convert model asset ids in levels that were created prior to December 2020, which pre-dates anything created for the public O3DE release.
Signed-off-by: amzn-tommy <waltont@amazon.com>
4 years ago
Guthrie Adams 4c9f456ea5 Merge branch 'development' into Atom/guthadam/material_component_supports_property_overrides_without_material_overrides
Signed-off-by: Guthrie Adams <guthadam@amazon.com>

# Conflicts:
#	Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialComponentController.cpp
4 years ago
Tommy Walton b79c2f385d
Adding a temporary Orphan function to the InstanceDatabase (#4297)
* Adding a temporary Orphan function to the InstanceDatabase, which will remove an instance from the database so it will not be found using Find or FindOrCreate. The instance will still persist until its use-count drops to 0, at which point it will be deleted. This is to enable the model asset to remove existing buffer/modellod/model instances and replace them with new instances that have the up to date data. Added unit tests for testing.

Signed-off-by: amzn-tommy <waltont@amazon.com>

* Fix an incorrect ceil and update ParallelInstance test cases for readability

Signed-off-by: amzn-tommy <waltont@amazon.com>
4 years ago
Danilo Aimini 94bd95cee3 Solve merge issue
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
Danilo Aimini 3b9c3f832a Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/breadcrumbs
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

# Conflicts:
#	Code/Editor/ViewportTitleDlg.cpp
4 years ago