Commit Graph

3915 Commits

Author SHA1 Message Date
amzn-sean b882eddca8 fix dev break. AZStd::fixed_vector cannot be constexp error (#5995)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-11-29 14:05:03 +00:00
lumberyard-employee-dm 97106f9e60 Adding missing C++20 std::erase implementations (#5735)
There were already implementations for std::erase_if.
This adds the counterpart AZStd::erase versions

resolves #5734

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-11-26 11:31:13 -06:00
John 7fa80ee501 Merge commit '99d0c39273fed3742acffa0fafd07038e5ef4b25' into jonawals/gitflow_211125_o3de 2021-11-25 10:22:55 +00:00
Tom Hulton-Harrop b0c522be51 Rename QtEventToAzInputManager.h/cpp to QtEventToAzInputMapper.h/cpp (#5905)
* rename QtEventToAzInputManager.h/cpp to QtEventToAzInputMapper.h/cpp to match type name

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

* update #includes to refer to QtEventToAzInputMapper.h

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-25 09:43:57 +00:00
Artur K eca2e36687 Fix clang 13 compilation problems (#5791)
* Fix clang 13 compilation problems

Re-instated ShowPlayedSequencesDebug logic by introducing no-op lambda
which replaces missing `Draw2dLabel` functionality ( added TODO marker
there )

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* apply review suggestions

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix type in assert message

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
2021-11-25 09:24:39 +00:00
Gene Walters 5426df41ea Merge branch 'LYN-8025_PipeEditorServerLogsToEditor' into LYN-8514_AutomatedReviewServerLogChecks 2021-11-24 17:52:27 -08:00
Gene Walters 77e3dd786d Instead of AZCoreLogSink pulling a cvar, we'll check if we're running an editor-server on SystemInit
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-11-24 16:05:53 -08:00
John d75b6f9d64 Add call to ViewportEditorModeNotifications::Reflect
Signed-off-by: John <jonawals@amazon.com>
2021-11-24 10:41:48 +00:00
John 7b9038e750 Fix warning as error.
Signed-off-by: John <jonawals@amazon.com>
2021-11-24 10:40:53 +00:00
John Jones-Steele 2259cb3dc0 Moved TerrainDataRquestBus to AzFrameworkTestShared (#5835)
* Moved TerrainDataRquestBus to AzFrameworkTestShared

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Changes from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
2021-11-24 09:29:40 +00:00
Michael Pollind 1649d86568 chore: update static const declerations in AzQtComponent (#5826)
* chore: update static const declerations in AzQtComponent

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

* chore: update static const

Signed-off-by: Michael Pollind <mpollind@gmail.com>
2021-11-24 09:17:54 +00:00
Tom Hulton-Harrop 5bd751531d Update return type for viewport screen functions (#5803)
* update return type for viewport screen functions

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

* add tests for AZ::Matrix3x4::CreateFromMatrix4x4 and add TransformPoint to Matrix3x4

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

* update NDC -> Ndc

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

* updates following review feedback

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

* updates and improvements following PR feedback

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

* add forward declaration of Matrix3x4 type

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

* update where forward declarations are defined for Matrix3x4

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-24 09:17:43 +00:00
chcurran 30bcddc694 fixed unit testing code
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-23 23:57:03 -08:00
Gene Walters 97b27513e9 Editor is now listening to editor-server stdout so adding newlines to lines we care about. (Editor is separating out the log lines based on newline)
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-11-23 19:27:16 -08:00
Gene Walters d357d1ed1f Merge branch 'upstream/development' into LYN-8514_AutomatedReviewServerLogChecks 2021-11-23 19:15:53 -08:00
Gene Walters 4b9aae5a1a merging latest dev
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-11-23 19:11:02 -08:00
lumberyard-employee-dm 99d0c39273 O3DE.exe Project-Centric "Open Editor" fix (#5852)
* The O3DE.exe Open Editor button now attempts to open the Editor in the
build directory of the project being opened.

If their is no Editor within the build directory of the Project, it uses
the Editor.exe in the current O3DE.exe executable directory if it exists

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

* Engine .gitignore now ignores the build directory if placed in the
AutomatedTesting project

Previously it was just ignoring a `[Bb]uild` directory if it was
directly within the engine root.
This change matches the behavior of the project templates.

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

* Renamed the ProjectUtils GetEditorDirectory function to
GetEditorExecutablePath

Added a platform specific implementation for retrieving the path to the
Editor executable in the GetEditorExectuablePath function.

It first attempts to locate the Editor via checking the project build
directory for an Editor executable before falling back to checking the
binary directory of the currently running O3DE executable.

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

* Correct the MacOS GetEditorExecutablePath to return the Editor path

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-11-23 18:25:00 -06:00
Gene Walters 97f7e5afd6 merging latest dev
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-11-23 16:16:55 -08:00
Ronald Koppers 7975629a7a Merge pull request #5872 from aws-lumberyard-dev/FixedVectorOptimization
Performance improvement for fixed_vector.
2021-11-23 15:43:24 -08:00
Junbo Liang abb37c0b4a Merge commit '4ac8b5dc429b6c87b3bd9e743839c47f7a02c0ce' into junbo/gitflow_211123_o3de 2021-11-23 13:29:30 -08:00
Junbo Liang 2bdee5c9e6 Merge commit 'bf3a5118069d287c013febd94a977966e4d1f944' into junbo/gitflow_211123_o3de 2021-11-23 13:29:23 -08:00
Junbo Liang 7086aa1a75 Merge commit 'dbc5d7a8bc5404b80fbc38b6b004aaa1f9e06df9' into junbo/gitflow_211123_o3de 2021-11-23 13:28:04 -08:00
Junbo Liang e2649512b2 Merge commit '4be1e68bad1b627668a4517b00526bba6cc7acea' into junbo/gitflow_211123_o3de 2021-11-23 13:16:55 -08:00
Junbo Liang 6a40d21b66 Merge commit '4ee2f341dc0dc709aedb446b57d5cca61b86160d' into junbo/gitflow_211123_o3de 2021-11-23 13:14:59 -08:00
Junbo Liang 3b39be7fd0 Merge commit '4ad35f424e01356a4745e5f50631dc050b328c98' into junbo/gitflow_211123_o3de 2021-11-23 13:14:57 -08:00
Danilo Aimini 4ac8b5dc42 Display version number correctly in installer builds from branches that properly set the name on Jenkins. (#5856)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-11-23 13:13:21 -08:00
Gene Walters 33e44a4813 revert rawoutput function. we'll update any of the logs we care about to include newlines
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-11-23 09:27:50 -08:00
AMZN-koppersr 389f29f0e7 Performance improvement for fixed_vector
AZStd::fixed_vector had all its functions marked with constexpr, but this requires all member variables to be fully initialized. This meant that the internal array used to store elements always has to be fully initialized. This was done for trivial classes but not for non-trivial classes. As a result trivial classes always did a memset (or more optimized versions for smaller buffers) while the non-trivial version couldn't actually be stored in a constexpr variable. Since AZStd::fixed_vector is meant to be dynamic the choice was made to remove the constexpr from all non-static member functions in favor of avoiding the overhead of memset, which profiling showed was a considerable overhead depending on the reserved size. If a truly constexpr array is needed than AZStd::array is a better choice as that's designed to not by dynamic.

Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com>
2021-11-23 09:26:37 -08:00
Tom Hulton-Harrop ea0afae502 Fix for how viewport icons highlight (accent) when sticky select is disabled (#5833)
* fix for how viewport icons highlight when sticky select is disabled

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

* naming - update highlight to accent

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
2021-11-23 12:28:38 +00:00
chcurran 205b2c27ee SC Editor serialization update in JSON
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-11-22 16:04:49 -08:00
Steve Pham ba32937867 Cherry pick release unused warning error into Stabilization/2110 (#5845)
* Fixed unused variable warning in Release configuration in Linux. (#5830)

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

* Fix unused variable errors (#5843)

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

Co-authored-by: moraaar <moraaar@amazon.com>
2021-11-22 15:32:54 -08:00
Nicholas Lawson 1a0d466443 Adds simple stats tracking to AssetProcessor (#5573)
* Adds simple stats tracking to AssetProcessor

The system captures cumulative and individual processing times.
It avoids touching any part of the app which affects decision
making or flow, or altering any structures such as JobEntry which
are involved in processing, in order to keep it as simple and
small as possible.

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
2021-11-22 11:18:19 -08:00
AMZN-Phil bf3a511806 Merge pull request #5817 from aws-lumberyard-dev/Prism/CMakePATH
Fix Project Manager not finding CMake on Windows
2021-11-22 11:04:27 -08:00
AMZN-Phil d958502f2c Check return value of qputenv
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-22 09:26:34 -08:00
amzn-phist 5c71a7481d Modify resource limit function to warn (#5807)
The function that modifies resource limits will return true always and warn instead
of giving an error.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-11-22 10:53:59 -06:00
AMZN-Phil c2145a6387 Use QStringList to avoid false matches against a partial path
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-22 08:31:12 -08:00
moraaar ab1b6d057d Fixed unused variable warning in Release configuration in Linux. (#5830)
Signed-off-by: moraaar <moraaar@amazon.com>
2021-11-22 13:25:29 +00:00
Gene Walters 0bd86cf0a4 small edit: removing pragma optimize offs
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-11-20 14:58:09 -08:00
Gene Walters 02590a1766 AzCoreLogSink will check if it's running in an editor-server and will allow stdouts
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-11-20 14:48:48 -08:00
AMZN-Phil def5b3a65d Fix additional left over references to QProcessEnvironment
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-20 10:37:55 -08:00
AMZN-Phil 74e1ee1862 Fix non-Windows platforms
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-20 10:23:50 -08:00
Gene Walters 6005a4e08b Merging last dev
Signed-off-by: Gene Walters <genewalt@amazon.com>
2021-11-19 23:12:59 -08:00
AMZN-Phil e1b6054ff8 Fix Project Manager not finding CMake on Windows
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
2021-11-19 19:13:19 -08:00
puvvadar 6eec6c8f8e Merge pull request #5752 from aws-lumberyard-dev/puvvadar/gitflow_211118_o3de
Merge stabilization/2110
2021-11-19 15:46:16 -08:00
Chris Galvan 1937e1ea51 Fixed asset completer model for source handle picker.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-11-19 16:20:54 -06:00
Esteban Papp dbc5d7a8bc Cherry-pick of Linux deb package to stabilization (#5778)
* Cherry-pick 49e8f35858

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Merging differences from development of other changes that need to be there for deb packaging

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Picks a needed change for the installer

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fixes warning in mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Takes version from environment if defined

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Do not pick up version if it is empty string since that will also break version comparison

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* creating temp directories if they dont exist

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removing a dependency to itself (Multiplayer.Builders is an alias of Multiplayer.Editor)

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Filters which runtime dependencies are passed from private build dependencies to only those that are actual targets.
This avoids something like a "d3d12" private build dependency from being passed to the runtime dependencies

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-11-19 14:07:25 -08:00
Chris Galvan 6e14713ea6 Added property handler for SourceHandle type.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-11-19 14:52:45 -06:00
Chris Galvan 06e3fa4bef Made PropertyAssetCtrl more extensible.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-11-19 14:51:41 -06:00
Chris Galvan 27fbbded4a Added logic to AssetPickerDialog to pre-select by file paths.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-11-19 14:49:56 -06:00
Chris Galvan d91d5a079f Added method to AssetCompleterModel for specifying a filter directly.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-11-19 14:48:56 -06:00