birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,891 Commits 3 Branches 3 Tags
24339e36ab48164cb8a6bb296bba004530efeb9b
Commit Graph

4443 Commits

Author SHA1 Message Date
Chris Burel 24339e36ab Fix non-constexpr RepoPath class to not try to be constexpr 
`RepoPath` is implemented with an `AZ::IO::Path`, which is not `constexpr`.
Consequently, its constructors also cannot be `constexpr`.

This also marks the function definitions in the header as `inline`, to
avoid ODR violations.

Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-02-10 15:36:31 -08:00
Chris Burel 66ba970a3b Fix methods that recurse infinitely 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-02-10 15:36:30 -08:00
Chris Burel 0b133f1154 Fix format string used for size_t (should be %zu), remove unused vararg 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-02-10 15:36:29 -08:00
Chris Burel 07ce8c6e78 Remove unused functions and variables 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-02-10 15:36:27 -08:00
Chris Burel ae7f370fed Fix lambda returning false instead of nullptr 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-02-10 15:36:26 -08:00
Chris Burel d4eb310950 Mark unused variables as unused 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-02-10 15:36:24 -08:00
Chris Burel f59ac65d2c Move platform-specific variable to be inside a platform-specific #ifdef 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-02-10 15:36:20 -08:00
Chris Burel 5cc258d509 Remove unused variable 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-02-10 15:36:19 -08:00
Chris Burel b79d5faa16 Remove unused captures 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-02-10 15:36:17 -08:00
Chris Burel ddb66786dc Remove unused variable 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-02-10 15:36:16 -08:00
Chris Burel 664403c5de Mark benchmark state variables in for loops as unused in benchmarks 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-02-10 15:36:15 -08:00
Chris Burel 36487c1588 Fix alignment of CONTEXT variable 
The previous code had the `alignas()` in the wrong place, it needs to be
left of the typename.

Furthermore, `CONTEXT` has a default alignment of 16, so using `alignas(8)`
underaligns.

Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-02-10 15:34:56 -08:00
Chris Burel 024cbdd2cd Remove unused azSmyType variable 
There's a lot of work done to set the value of this variable, but nothing
read from it.

Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-02-10 15:34:55 -08:00
Chris Burel b44c362af0 Fix comparing an array in a conditional, which is always true 
Instead, check the intent of the original code, if the `szImg` string is
not empty.

Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-02-10 15:34:54 -08:00
Chris Burel cff6fb97af Fix "expression result unused" warning 
This macro was expecting that parenthesis used in the macro would be
removed during macro expansion, when they are not removed. The result was
a function call like this:

```cpp
AZ_Assert(g_SymGetSearchPath != 0, ("Can not load %s function!","SymGetSearchPath"));
```

The parenthesis cause the contents of the parenthsis to be evaluated first,
and the result is an expression using the comma operator. The comma
operator evaluates the left expression, discards the result, then
evaluates the right expression, and returns that. So the above dropping
the message, and just leaving:

```cpp
AZ_Assert(g_SymGetSearchPath != 0, "SymGetSearchPath");
```

Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-02-10 15:34:52 -08:00
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
Steve Pham 45e347315f Remove -Wno-unused-value suppression for GCC (#7387) 
- Remove '-Wno-unused-value' flag from GCC
- Fixes for resulting errors
- Ignore GCC error on FIR-Filter.cpp

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2022-02-07 13:49:25 -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
AMZN-stankowi 07bdba11ca Updating to assimp 5.1.6 (#7435) 
* Updated UV channel name retrieval to match changes to the assimp sdk

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

* Updated FBX automated tests to work with latest changes

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

* Updating to the latest build of assimp: 5.1.6 with our two fixes applied on top

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

* Adding updated linux package info

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

* Added mac package info for 5.1.6 assimp

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

* Updating Linux assimp package hash with latest changes

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

* Updated mac hash to match latest assimp mac package

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

* Updated windows to the latest assimp 5.1.6 package

Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
 2022-02-07 09:09:00 -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
Allen Jackson 02bb73c0b0 {lyn9694} removing abstract nodes from scene graph (#7362) 
Removed:
	SceneAPI::DataTypes::IAnimationData
	SceneAPI::DataTypes::IBlendShapeAnimationData
	SceneAPI::DataTypes::IBlendShapeData
	SceneAPI::DataTypes::IBoneData
	SceneAPI::DataTypes::IMaterialData
	SceneAPI::DataTypes::IMeshData

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
 2022-02-03 16:32:31 -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
SuryanshSangwan 58f4a5259a Lua Editor: Prev Document Tab option from the View menu is misspelled #7345 (#7402) 
Signed-off-by: suryanshsangwan <sangwansuryansh@gmail.com>
 2022-02-03 11:52:23 -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