birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,901 Commits 3 Branches 3 Tags
49ca8d332ed742f2a17ed50dc73277f5e53d15bd
Commit Graph

2839 Commits

Author SHA1 Message Date
SergeyAMZN a715897699 Merge pull request #7439 from aws-lumberyard-dev/TerrainMaterialsFix 
LYN-8403 Prevent the same Surface Tag from getting reused
 2022-02-10 15:59:24 +00:00
amzn-sj 396ec8a247 [Terrain] Optimize bulk queries to the Terrain System to retrieve height, surface weights, and normals (#7357) 2022-02-10 05:53:21 -08:00
moraaar dac3bc4ba6 Added option to disable edit button in asset widgets when there are no asset selected. (#7521) 
Added new attribute "DisableEditButtonWheNoAssetSelected" to PropertyAssetCtrl. By default it's false, keeping the original behavior of leaving the edit button enabled and if it's clicked while there is no asset assigned it'll try to create a new one.

PhysX mesh asset property uses now this new feature.

Signed-off-by: moraaar moraaar@amazon.com
 2022-02-10 12:23:38 +00:00
Sergey Pereslavtsev 469fcc4fb2 Merge branch 'development' of https://github.com/o3de/o3de into TerrainMaterialsFix 2022-02-10 10:40:38 +00:00
Danilo Aimini 1c3a61983a Refactor EditorEntityUiHandlerBaseto be explicitly Outliner-focused. This lays the groundwork for multiple widget-based handlers in the future. (#7443) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2022-02-09 20:50:32 -08:00
Danilo Aimini 220eeef386 Merge branch 'development' of https://github.com/o3de/o3de into daimini/FocusMode/boxSelectAndManipulatorsHidingTests 2022-02-08 18:39:33 -08:00
Danilo Aimini 8c54513867 Add box selection tests for Editor Focus Mode 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2022-02-08 16:59:25 -08:00
Nicholas Van Sickle bc3f957270 Merge pull request #7093 from aws-lumberyard-dev/nvsickle/DomPatch 
Add AZ::Dom::Patch, a Generic DOM analog to JSON patch
 2022-02-08 18:49:57 -05:00
chiyenteng 90503f2bef Remove error message from InMemorySpawnableAssetContainer (#7499) 
* Remove error message from InMemorySpawnableAssetContainer

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>

* Fix nits

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
 2022-02-08 15:25:35 -08:00
Nicholas Van Sickle 42c2243eaa Fix benchmark non-unity build 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2022-02-08 14:34:04 -08:00
Nicholas Van Sickle d1bb5a0543 Move DOM delta comparison to its own file, enhance inverting moves 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2022-02-08 13:44:08 -08:00
Danilo Aimini 48313cd6de Remove const reference to prevent issues in nightly builds. (#7491) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2022-02-08 12:40:10 -08:00
Nicholas Lawson 3337bdd05d Update Lua to 5.4.4 (#7460) 
* Update lua to 5.4.4 (fixes #7267)

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
 2022-02-08 08:00:34 -08:00
Sergey Pereslavtsev 231c25df89 Merge branch 'development' of https://github.com/o3de/o3de into TerrainMaterialsFix 2022-02-08 12:49:12 +00:00
srikappa-amzn 1db12ca463 Always store LinkIds during prefab instance serialization except when saving to disk (#7444) 
* Always store prefab instance linkIds to DOM except for saving to disk

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>

* Added more checks to remove linkIds from templates

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>

* Remove additional check to remove LinkId during template update

Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>
 2022-02-07 17:59:13 -08:00
Nicholas Van Sickle 5b8176e99b Address some review feedback 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2022-02-07 16:01:29 -08:00
Steve Pham 7ddfb5d6a0 Remove AZ_TRAIT_DISABLE_FAILED_PROCESS_LAUNCHER_TESTS and disabled tests from it (#7325) 
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2022-02-07 15:58:29 -08:00
Danilo Aimini e7857120b0 Fix issue with clearing the parent entityId in the transform would result in prefab reparenting. (#7464) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2022-02-07 13:35:48 -08:00
Nicholas Van Sickle dec3def9eb Merge remote-tracking branch 'upstream/development' into nvsickle/DomPatch 2022-02-07 10:51:43 -08:00
Steve Pham 4d4f10beb8 Clang/GCC compiler settings update [SECURITY] (#7358) 
- Add the following compilation flags for clang
  -fpie
  -fstack-protector-all
  -fstack-check (non-release)

- Add the following compilation flags for gcc
  -fpie
  -fstack-protector-all

- Fix -Wunused-result errors from above compilation flag updates

- Add _FORTIFY_SOURCE=2 to GCC DEFINES

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2022-02-07 09:01:07 -08:00
Mike Balfour a6ddf4164f SurfaceTagWeights optimization (#7436) 
* Add comparison operators to SurfaceTagWeight.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Changed AddSurfaceTagWeight to always combine weights.
This simplifies the API a bit and defines the behavior if someone ever tries to add a duplicate tag.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Added benchmarks for measuring the performance-critical APIs.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>

* Changed SurfaceTagWeights to a fixed_vector.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
 2022-02-07 10:57:39 -06:00
Sergey Pereslavtsev 8d30524028 Merge branch 'development' of https://github.com/o3de/o3de into TerrainMaterialsFix 2022-02-07 14:18:34 +00:00
Danilo Aimini dc6d8ab2ba Fix conversion issues blocking nightly builds. 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2022-02-04 17:21:48 -08:00
Steve Pham 69e0090a0b Remove -Wno-return-local-addr warning suppression for GCC 
- Remove '-Wno-return-local-addr' warning suppression flag for GCC
- Fixed discovered error resulting from -Wreturn-local-addr

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Remove extra ws

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2022-02-04 14:20:09 -08:00
Sergey Pereslavtsev 13268dea98 Merge branch 'development' of https://github.com/o3de/o3de into TerrainMaterialsFix 2022-02-04 20:23:36 +00:00
Sergey Pereslavtsev 9aece3e84b LYN-8403 Prevent the same Surface Tag from getting reused 
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com>
 2022-02-04 19:57:29 +00:00
Allen Jackson 76b2932cae {lyn7307} disable saving procedural prefabs in the Editor (#4877) 
disable saving procedural prefabs in the Editor since the templates are backed by asset files that will change outside the Editor


Signed-off-by: jackalbe <23512001+jackalbe@users.noreply.github.com>
 2022-02-04 08:50:14 -06:00
Vincent Liu 74a876ae3b Move multiplayer session interface out of AzFramework library (#7338) 
Signed-off-by: onecent1101 <liug@amazon.com>
 2022-02-03 11:53:00 -08:00
Danilo Aimini 69c8ebd7fb Prefabs UI | Finalize RootAliasPath as a standardized instance handle system, and refactor PrefabFocusHandler to take advantage of it. (#7365) 
* Move the RootAliasPath class definition to the Prefab EOS. Introduce utility functions to enable using the path as an instance handler in UI.

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

* Refactor the PrefabFocusHandler to use the utility functions that were introduced to the Prefab EOS. Remove the m_instanceFocusHierarchy from the Focus Handler, and simplify calls for performance.

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

* Minor adjustments after PR discussion

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

* Silly mistake in function simplification. Turns out == and != are different.

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

* Fixed doxygen comments

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

* Add numeric cast when storing result of AZStd::distance to int.

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

* Restore additional checks in FocusOnparentOfFocusedPrefab that got removed during merge.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2022-02-03 11:13:19 -08:00
carlitosan 50128e7a7c Fix for Lua properties not loading properly in play-in-editor. (#7369) 
* debug information for lua script error

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>

* actual fix for script properties not being loaded in play-in-editor unless modified or editor restarted

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>

* remove debugging artifacts

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2022-02-03 10:31:45 -08:00
Danilo Aimini 65e651388c Add tests for FocusOnParentOfFocusedPrefab. Refactor tests to match, and re-enable disabled tests as the fixture now correctly supports the Prefab EOS. (#7372) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2022-02-03 08:01:30 -08:00
Danilo Aimini daeab4bbb1 Focus Mode | Switch instance referencing in Prefab Focus Handler to use more reliable Instance handles (#7304) 
* Add function to Prefab Instances allowing to get a reference to a nested instance by alias.

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

* Refactor the Prefab Focus Handler to use RootAliasPaths to store the reference to the currently focused prefab instance instead of the previous method (entityId of the prefab container).

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

* Use existing FindNestedInstance method instead of adding new one.

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

* Minor fixes to style and comments

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

* Removing indexing in GetInstanceReferenceFromRootAliasPath, turn variables into constants where possible.

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

* Modified the Prefab Focus test fixture to ensure the entity hierarchy is generated under the Prefab EOS, allowing tests to work with the new implementation of the focus mode handler.

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

* Ensure RootAliasPath is iterated by reference in GetInstanceReferenceFromRootAliasPath

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2022-02-02 09:17:59 -08:00
amzn-mike c1b53f1284 [LYN-4034] Asset Processor: Sqlite inclusivity fix (#7291) 
* Update sqlite package for windows

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

* Add assert to make sure sqlite header and lib version match

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

* Update linux

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

* Update Builting Package / Mac for Sqlite 3.37.2-rev1

Signed-off-by: spham <82231385+spham-amzn@users.noreply.github.com>

* Re-add newline at end of file

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

* Inclusivity: change sqlite_master to sqlite_schema alias

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

Co-authored-by: spham <82231385+spham-amzn@users.noreply.github.com>
 2022-02-02 09:04:27 -08:00
srikappa-amzn fd20b028a6 Deprecate IsPrefabSystemForLevelsEnabled and use IsPrefabSystemEnabled everywhere (#7327) 
Signed-off-by: srikappa-amzn <82230713+srikappa-amzn@users.noreply.github.com>
 2022-02-01 13:37:47 -08:00
Steve Pham 71cc3a2568 Remove -Wno-comment warning suppression 
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2022-02-01 09:04:32 -08:00
Tom Hulton-Harrop dd0f21b460 Fix incorrect icon rendering (#6454) 
* fix incorrect icon rendering

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add redundant parens

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* add tests for icon display fixes

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* update references to EditorVisibleEntityDataCache to EditorVisibleEntityDataCacheInterface

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>

* updates following review feedback and remaining updates for EditorVisibleEntityDataCacheInterface

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2022-02-01 09:36:42 +00:00
Danilo Aimini e1c7dce7a7 Fixes issue with painters being saved and not restored in some cases, which would print numerous warnings in the VS console. (#7296) 
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2022-01-31 15:45:34 -08:00
Ken Pruiksma b455b915a8 Making terrain query resolution a single float instead of a Vector2 (#7186) 
* Making terrain query resolution a single float instead of a Vector2

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

* Keeping the concept of different x/y step sizes in region queries since that may be useful and is separate from query resolution. Also keeping the concept of different x/y step sizes in physics since that's independent of the terrain gem.

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

* Formatting cleanups

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

* A few more minor cleanups

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

* Added support to convert serialized Vector2 query resolution to a single float.

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

* Switch ray intersection check back to using separate values for x and y resolution

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

* Fixing new unit tests added to use float query resolution.

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

* Updating automated test

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
 2022-01-31 16:10:03 -06:00
rgba16f 0a5e61b834 Update default AZStd thread priority on Apple platforms to avoid being prevented from using 100% of a core (#7295) 
PAL-ified default thread priority for pthread platforms.
Fix threads not getting named on Apple platforms by setting the thread name ptr on the thread_info struct.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2022-01-31 14:17:20 -06:00
Michael Pollind d7b3d33711 chore: simplify logic for handling expanding entries in Outliner (#5219) (#5394) 
* chore: simplify logic for handling expanding entries in Outliner

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* bugfix: fix bottom border for collapsed prefabs.

issue: https://github.com/o3de/o3de/issues/5219

Signed-off-by: Michael Pollind <mpollind@gmail.com>

* chore: revert changes for expanding entities

Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2022-01-31 09:57:34 +00:00
amzn-sj 112e310419 [Serialization] Add support for updating the values of existing keys in associative containers (#6832) 
* Add support for updating the values of existing keys in associative containers

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

* Map/Unordered Map serialization updates values corresponding to existing keys by default. Multimaps always add a new entry for existing keys.

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

* Fix unused parameter warning

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

* Update comparison function for test case

Signed-off-by: amzn-sj <srikkant@amazon.com>
 2022-01-28 09:13:24 -08:00
Scott Romero 8ecaaf36c0 [development] updated Profiler interface to allow the forwarding of format string arguments (#7173) 
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2022-01-27 14:43:52 -08:00
Ronald Koppers b695bfa832 Merge pull request #7145 from aws-lumberyard-dev/Prefabs/PlayInEditorMissingAssets 
Fixed missing assets when entering Play-In-Editor.
 2022-01-27 14:41:11 -08:00
Nicholas Van Sickle 155cc5845b Add Path::IsEmpty 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2022-01-27 13:44:35 -08:00
Nicholas Van Sickle 73f166241e Address review feedback 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2022-01-27 13:15:30 -08:00
AMZN-koppersr 3a08a3b325 Removed some unused local variables. 
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
 2022-01-27 12:38:57 -08:00
Scott Romero f7f17c98b4 [development] fixed ambiguous 'byte' type MSVC build error (#7184) 
- fully quality 'byte' type in AZStd::span
- remove unnecessary 'using namespace AZStd;' statement from AssetCatalog tests

Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
 2022-01-27 11:12:15 -08:00
AMZN-koppersr 4471b7008d Merge branch 'development' into Prefabs/PlayInEditorMissingAssets 2022-01-27 09:51:06 -08:00
AMZN-koppersr 94919fe270 Moved Serialize Context retrieval out of a loop and expanded an error message in InMemorySpawnableAssetContainer::LoadReferencedAssets. 
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
 2022-01-27 09:47:12 -08:00
greerdv 61b494a3c7 fix for changes in non-uniform scale component mode not persisting 
Signed-off-by: greerdv <greerdv@amazon.com>
 2022-01-27 13:56:24 +00:00