Commit Graph

7949 Commits (005702b4bd14faa791a470aa2dcfcc0d06e77c59)
 

Author SHA1 Message Date
amzn-phist 005702b4bd
Improve the errors in EngineFinder.cmake (#4713)
* Improve the errors in EngineFinder.cmake

Added additional info on one of the errors to help users resolve the
issue (engine registration).
Improved readability of the errors.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Adds another error message to EngineFinder.cmake

An error message where the user's manifest is present and valid
but no matching engine name was found has been added.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
Guthrie Adams fa3f3e4285
Merge pull request #4618 from aws-lumberyard-dev/Atom/EditorColorGrading
Implement LUT Generation Pass and hook up into Editor
4 years ago
amzn-mike c1335f69c6
Convert resolved wildcard paths to relative path before saving in database (#4574)
* Convert resolved wildcard paths to relative path before saving in database.

Warn if file could not be converted to a relative path.
Fix FindWildcardMatches path handling that could result in pathMatch missing the first character

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Handle abs path wildcard dependencies

Remove dependencies outside of scan folder

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Switch to AZ::IO::PathView for abs path check

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Made code a little more clear

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
4 years ago
jonawals 0031016548
Merge pull request #4785 from aws-lumberyard-dev/pytest_editor_testcase_name_fix
Fix for PyTest editor test case names.
4 years ago
jonawals befb97a80e
Merge pull request #4627 from aws-lumberyard-dev/igarri/Fix-Viewport-camera-locations
Make Go To Location affect the Default Viewport Camera
4 years ago
amzn-sean 82b731b673
Increase the timeout for ForceRegion_LinearDampingForceOnRigidBodies. (#4784)
The Test runs with a wait_for_condition, and the original timeout was right on the edge of how long the test takes to reach that condition.

Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
4 years ago
John ae6005545e Fix for PyTest editor test case names.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
Sean Sweeney 064a72bbac
Merge pull request #4766 from aws-lumberyard-dev/remove_remoteconsole_test
removing remote console smoke test
4 years ago
Nicholas Van Sickle 3485bc08b1
Fix EntityOutlinerTest (#4771)
The test was relying on immediate updates from the prefab system which are now scheduled for a later tick - this reworks the tests to wait for deferred updates before validating state

Signed-off-by: nvsickle <nvsickle@amazon.com>
4 years ago
Esteban Papp 3deaed5733
Enable cmake-install in project-centric / engine-prebuilt (#4767)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Qing Tao c8dc309b32
Fixed dds loader issue with certain dds formats. (#4733)
Signed-off-by: Qing Tao <qingtao@amazon.com>
4 years ago
Junbo Liang 8385d94630
Expose base matchmaking request type to behavior context (#4720)
Signed-off-by: Junbo Liang <junbo@amazon.com>
4 years ago
Nicholas Van Sickle 434641382b
Merge pull request #4749 from aws-lumberyard-dev/nvsickle/OutlinerDuplicateEntryFixes
Fix issues with invalid Outliner entries
4 years ago
evanchia bc479a362f removing remote console smoke test
Signed-off-by: evanchia <evanchia@amazon.com>
4 years ago
hershey5045 85183f5936 Add weights for the remaining color grading operation. Refactor editor hdr color grading property texts. (#266)
Signed-off-by: rbarrand <rbarrand@amazon.com>

Co-authored-by: rbarrand <rbarrand@amazon.com>
Signed-off-by: rbarrand <rbarrand@amazon.com>
4 years ago
Pip Potter d692cde146
LYN-7473: Ensure Requestor background thread is shutdown correctly (#4744)
Signed-off-by: rppotter <rppotter@amazon.com>
4 years ago
Vincent Liu a534fccc9b
Expose matchmaking event polling APIs and add required session notifications (#4636)
* Expose matchmaking event polling APIs and add required session notifications

Signed-off-by: onecent1101 <liug@amazon.com>
4 years ago
Luis Sempé eac14901b0
Merge pull request #4763 from aws-lumberyard-dev/scripting/fixes
Removed outdated and unused ScriptCanvas files
4 years ago
lumberyard-employee-dm 357df2bb4b
Added anchor key parameter to the SettingsRegistry MergeSettings (#4650)
* Added anchor key parameter to the SettingsRegistry MergeSettings

This allows the MergeSettings function to write JSON data anchored
underneath the supplied anchor path.

Upgraded the SignalNotifiers calls in SetObject, MergeSettings and
MergeSettingsFileInternal to query the type of the merge value at the anchor path
and supply that as the type to the notification event.

Also the the above functions now supply the anchor key root as the
path that was modified instead of assuming root ""

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

* Fixed whitespace inconsistencies in SettingsRegistryImpl

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

* Added a queue for storing SignalNotifier calls when a thread is
currently signaling.

The queued calls are invoked by that thread after it has signaled it's
current queue of events

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
lsemp3d bea3ee6dd0 Removed outdated and unused ScriptCanvas files
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
4 years ago
Allen Jackson fbedd8126d
{lyn7251} Add material component example in Python (#4724)
* {lyn7251} Add material component example in Python

adds a AZ::Render::EditorMaterialComponent as an example of how to
override the default material from the scene building pipeline

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* Only set the cube to a gray material
Skip loading the asset, instead just set the outPrefabAssetPath for the Prefab system to load

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>

* stablizing the sub-id of procedural prefab groups

Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
4 years ago
Nicholas Van Sickle 7f10b5d1b9
Merge pull request #4735 from aws-lumberyard-dev/LYN-7317
Fix an incorrect path used when fetching product dependencies for level.pak
4 years ago
lumberyard-employee-dm 643c5c2f82
Removed AZ_ENABLE_TRACING from Archive::GetPakPriority (#4741)
The AZ_ENABLE_TRACING check was preventing the Archive System from using the sys_PakPriority value set from the CVar system

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
AMZN-Phil 6f86f0ea5c
Merge pull request #4736 from aws-lumberyard-dev/CLIDownloadGems
Additional fixes for downloading O3DE objects
4 years ago
Mike Balfour e2105ed5b3
Remove unused header file that caused compile failures. (#4759)
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
4 years ago
AMZN-nggieber 4899309b6a
Connect Adding and Removal of Gem Repo UI to CLI (#4729)
* Connect Adding and Removal of Gem Repo UI to CLI

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

* Addressed PR feedback

Signed-off-by: nggieber <nggieber@amazon.com>
4 years ago
Steve Pham e6464335af
Fix Vulkan issues with VK_ERROR_OUT_OF_DATE caused by the swapchain not being updated on a resize (#4740)
- Updated the RenderViewportWidget::event method to call 'SendWindowResizeEvent' on specific events
- Moved the onResize to one of the events in RenderViewportWidget::event

Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
srikappa-amzn 29988c4104 Bump the version of LevelBuilderComponent after fixing the incorrect level pak path
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
4 years ago
igarri d8b47a1448 More fixes
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
igarri a3c3de4a76 AR fixes
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
igarri f6945f1334 Fixed Viewport Interaction
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
sphrose bcc186f87f
Terrain/sphrose/surface materials component (#4541)
* wip

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* wip

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Terrain Surface Materials List Component.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* fix erroneous commit

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Added some comments.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Review changes.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Surface Materials list unit tests

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Missing shape test

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* review changes.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Compile fix.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

* Fix case issue in include path.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* replaced reverted test.

Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>

Co-authored-by: Ken Pruiksma <pruiksma@amazon.com>
4 years ago
greerdv d0f18eefb3
Merge pull request #4694 from aws-lumberyard-dev/shape-collider-compatibility
mark not yet supported shapes incompatible with shape collider compon…
4 years ago
moraaar 7a450d02cb
Deleted PhysXSamples gem (#4753)
Removing PhysXSamples gem since its assets are outdated generating issues:

- Uses old material file format .mtl
- All FBXs info assets (.fbx.assetinfo) were generated before Assimp and the mesh unification work.
- All script canvas were created before new Physics API, which reflected events differently as AZ::Events.
- It heavily depends on slices (legacy system)

sig/core approved this removal at 15-OCT/2021 meeting: https://github.com/o3de/sig-core/blob/main/meetings/notes/SIG-Core-Notes%20-%202021-OCT-15.md

Signed-off-by: moraaar moraaar@amazon.com
4 years ago
igarri 6050d2e16e merge develop
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
igarri d8a453f826 changed names
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
igarri c93bd87127 Added default camera position to viewport settings
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
igarri 026919c11b Set View in viewport fixed
Signed-off-by: igarri <igarri@amazon.com>
4 years ago
greerdv c0f73faaae remove no longer useful test
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
greerdv d6067f645d merge from development
Signed-off-by: greerdv <greerdv@amazon.com>
4 years ago
jonawals 207ec6e60d
Merge pull request #4667 from aws-lumberyard-dev/LYN-5265_state_tracker_impl
LYN-5302 Double-clicking an entity in a prefab enters Focus Mode.
4 years ago
John 363bc33fed Fix broken function name.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
John cf41ff020a Fix merge conflicts.
Signed-off-by: John <jonawals@amazon.com>
4 years ago
Benjamin Jillich bc29e57bbd
EMotion FX: Keyboard hotkeys can be used while creating a transition in Anim Graph after pressing the RMB which may lead to a crash (#4728)
Resolves #2934

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
4 years ago
nvsickle f0e6841ca8 Fix issues with invalid Outliner entries
The EntityOutlinerListModel was violating the QAbstractItemModel contract in a few cases, as reported by `QAbstractItemModelTester`. The important ones causing issues were:
- Entry order was not guaranteed, leading to model indices pointing at invalid data
- Parent/child relationships could be temporarily invalid due to a change I made in EditorEntityModel::RemoveEntity to try to avoid an unnecessary reparent operation - as it turned out, the parent/child data was being cached even for recreated entities and not clearing child data could cause issues
- `EntityOutlinerListModel::ProcessEntityUpdates` was emitting data changed between two indices that didn't necessarily share a parent, which is [undefined behavior](https://doc.qt.io/qt-5/qabstractitemmodel.html#dataChanged)

The other reported issues (that weren't really causing issues with `QTreeView`) were:
- The root index had flags other than `Qt::ItemIsDropEnabled`
- `rowCount` showed all columns as having children
- `parent` showed indices as being parented to a non-0 column

This change introduces fixes for the above issues, namely:
- Reverts my change to `EditorEntityModel::RemoveEntity` to ensure we don't have invalid parent/child references sitting in the cache
- Ensures `EditorEntityModelEntry` child ordering is guaranteed sorted by EntityId, to prevent the `EntityOutlinerListModel` from having indices pointed at invalid data*.
- Fixes various model sanity issues, such as `rowCount` being 0 for indices with a non-0 column

Two unit tests were added to reproduce the invalid behavior and validate the fix: TestCreateFlatHierarchyUndoAndRedoWorks and TestCreateNestedHierarchyUndoAndRedoWorks
This change focuses on correctness over performance. My subjective in-Editor outliner experience is about the same, but it may be worthwhile to expand the test coverage with a benchmarking suite to look into areas for optimization.

*As a rough illustration of the previous child ordering behavior, consider the following entity hierarchy:
```
Root (EID 9999)
|_ Child1 (EID 2)
|_ Child2 (EID 3)
|_ Child3 (EID 4)
```
With an representations like the following pseudocode:
```
// EditorEntityModel representation
EditorEntityModelEntry root;
root.children[0] = 2;
root.children[1] = 3;
root.children[2] = 4;

// EditorOutlinerListModel representation
// row, column, user data (64 bit uint)
child1 = QModelIndex(0, 0, 2)
child2 = QModelIndex(1, 0, 3)
child3 = QModelIndex(2, 0, 4)
```

When removing a child, the `EditorEntityModel` used to do roughly the following:
```
// Swap and pop the last child
int indexToRemove = 0;
swap(root.children[indexToRemove], root.children[root.children.size() - 1]);
root.children.resize(root.children.size() - 1);
model.notifyRemoved(root, indexToRemove); // model removes the row indicated

// Leading to this EditorEntityModel state
root.children[0] = 4;
root.children[1] = 3;

// And this EntityOutlinerListModel state, note that the row indices are swapped from the indices in the backing storage
child2 = QModelIndex(0, 0, 3)
child3 = QModelIndex(1, 0, 4)
```

A QModelIndex having a row that doesn't match its underlying data is undefined behavior, and was the source of an intermittent crash in our `QSortFilterProxyModel` as subsequent updates to the wrong row led to an invalid proxy state.

Signed-off-by: nvsickle <nvsickle@amazon.com>
4 years ago
AMZN-Phil 08643f8232 Use a more generic project name in download.py dest-path help
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
AMZN-Phil 1d220c3eaa Updates based on feedback, flip return value of a function to return a more expected value whether validation passes
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago
Pratik Patel b58ae15d83
Merge pull request #4595 from yaakuro/yaakuro-development-patch-1
[GNU/Linux] Add basic mouse device implementation and fullscreen handling to GNU/…
4 years ago
Yaakuro 4c733d3f4c Add basic mouse device implementation and fullscreen handling to GNU/Linux.
Signed-off-by: Yaakuro <y1@codeposer.net>
4 years ago
AMZN-Phil 6efeaa405d Additional fixes for downloading O3DE objects, and using the cache folder
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
4 years ago