birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,712 Commits 3 Branches 3 Tags
e4c04c1915c05aad3e1305f2b6aeac015de9131e
Commit Graph

992 Commits

Author SHA1 Message Date
Benjamin Jillich afc531d4c3 Fixes VS2022 error C5233: explicit lambda capture 'isSlash' is not used (#6745) 
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2022-01-10 10:22:02 +01:00
Esteban Papp 54e0b8b7b5 Enabling mac tests (#6716) 
* Adds mac test job

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

* Points to sysctl properly to handle zsh

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

* Fixes some macos differences with Linux when reading the CTEST_RUN_FLAGS parameters

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

* adding the test job to the profile pipe

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

* Disables some tests in Mac that are not passing

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

* passes config to cli_test_driver and sets the right trait for the test (pytest instead of lytesttools)

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

* Set proper traits for AtomRHI

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

* Corrected AZ_TRAIT_UNIT_TEST_PERLINE_GRADIANT_GOLDEN_VALUES_7878 values for Mac

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

* Disables EMotionFX tests in Mac

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

* Removes debugging prints

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

* Removes filters that were meant just for Linux

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

* quotes are re-quoted in the test_mac.sh script

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2022-01-06 16:16:48 -08:00
Allen Jackson 6c3d5c434e {lyn8865} Adding DataTypes::ScriptProcessorFallbackLogic (#6396) 
* {lyn8865} Adding DataTypes::ScriptProcessorFallbackLogic

- Give the user an option how to handle fallback logic for script rules

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

* the new code found an error in a Python script... it seems to work!

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

* fixing up the regression test

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

* dump version number

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
 2022-01-05 16:08:58 -06:00
Chris Burel 648a21ab5c [Linux] Correct handling of new dirs added to non-recursive watch roots 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-01-04 16:12:17 -08:00
Chris Burel 2bc1d8620e Rename file to adhere to PAL conventions 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-01-04 16:12:17 -08:00
Chris Burel 484e27c109 Use AZStd::equal to implement path comparison 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-01-04 16:12:17 -08:00
Chris Burel ce0bb1ca2b [AssetProcessor] Refactor the FileWatcher to use only one watch thread 
This change reworks the AssetProcessor's FileWatcher so that it only uses
one thread. This is motivated by getting better support for inotify on
Linux. The previous architecture required calling `inotify_init` once for
each directory that was being watched, and using separate inotify instances
for each watched tree. In addition, having separate threads per watched
tree is not necessary, and just consumes system resources. Each platform
supports watching multiple directories with the same platform-specific
watcher API, so each platform has been updated accordingly.

The interface to the FileWatcher class is greatly simplified. Previously,
it supported client-supplied filtering of the paths that would generate
notifications. This was done by subclassing `FolderWatchBase` and
implementing `OnFileChange`. However, only one filter was ever used, so
that filter is now hard-coded in the FileWatcher class, and the classes
driving the old filtering mechanism are removed. Users of the interface
now have a much easier time, they just call `AddFolderWatch` with the path
to watch, and only have to connect to one set of signals, instead of
separate signals per watched directory.

Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-01-04 16:12:17 -08:00
Chris Burel 7ac5bc3d5c [Linux] Display a warning in AP if inotify fails to initialize 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-01-04 16:12:17 -08:00
Chris Burel 04f4d5e031 [Linux] Avoid recursive inotify when a watch folder is set to recursive=false 
Signed-off-by: Chris Burel <burelc@amazon.com>
 2022-01-04 16:12:17 -08:00
Vincent Liu 2b9d1ca813 Update to use AWSNativeSDK 1.9.50 (#6618) 
* Update to use AWSNativeSDK 1.9.50
* After SDK upgrade, some AWS objects are bound to SDK allocator, init AWS SDK for unit test
 2022-01-04 12:45:51 -08:00
amzn-mike 8ee384f436 Asset Processor: Remove gem loading from AP (#6488) 
* AssetBuilder sends builder registration network message to AP

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

* Add AP activating status message

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

* First builder handles registration.

Fixed deadlock caused by AP and AssetBuilder waiting on each other when registering by moving AP builder start code to a thread

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

* Clean up external builder registration

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

* Add thread description for builder manager idle thread

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

* Remove gem loading

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

* Clean up builder registration and remove unused functions

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

* Remove PostActivate call from batch application since it will be called after builders are registered

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

* Removal external builder dependency scanning since we no longer support builder dlls

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

* Fix missing bus disconnect

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

* Remove unused variable

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

* Moved AP-AssetBuilder specific types into AssetBuilder.Static library.  Also removed some unused/old code

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2022-01-04 12:34:56 -08:00
AMZN-Phil 9f500b1228 Merge pull request #6571 from aws-lumberyard-dev/Prism/RearrangeProjectsAfterRemoval 
Reflow Project Tiles Everytime They Are Updated
 2022-01-04 09:03:42 -08:00
amzn-mike 81453defa0 Load QIcons once for asset tree and share with each Asset Tree Item to avoid file loads for every asset and improve start up time (#6485) 
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2022-01-03 09:56:19 -06:00
amzn-mike a95b303f19 Remove Shader compiler tab from Asset Processor (#6486) 
* Remove Shader compiler tab from Asset Processor

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

* Remove more references to shader compiler

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2022-01-03 09:44:51 -06:00
amzn-mike 346a414aff Change AP unit test project to a DLL like all others, add benchmarks project (#6588) 
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2022-01-03 09:44:34 -06:00
nggieber 451ebf2691 Reflow Project Tiles Everytime They Are Updated 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-27 12:32:24 -08:00
tjmgd f1a1cb3ec0 Fix: Lua directory empty and always loading in editor (#6207) 
* Fix: Lua directory empty and always loading in editor

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>

* fixed naming convention errors

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>

* Tidy up

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>

Co-authored-by: Tobias Alexander Franke <tobias.alexander.franke@huawei.com>
 2021-12-23 12:12:40 -08:00
tjmgd c2373f1f59 Fix: search results not expanded when searching for .lua files (#6211) 
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>

Co-authored-by: Tobias Alexander Franke <tobias.alexander.franke@huawei.com>
 2021-12-23 12:12:27 -08:00
tjmgd 254906cd83 The line number displayed by Breakpoints in Lua Editor is 1 larger than (#6299) 
the actual line number of the code.

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
 2021-12-22 11:32:40 -08:00
tjmgd 7b99b6a1e2 Fix: next and prev tabs incorrectly implemented (#6208) 
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>

Co-authored-by: Tobias Alexander Franke <tobias.alexander.franke@huawei.com>
 2021-12-22 11:31:49 -08:00
tjmgd 38bbf9659e Fix: jumps disordered (Go to Line,Transpose Lines UP,Transpose Lines (#6210) 
Down,Comment Selected Block and UnComment Selected Block)

Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>

Co-authored-by: Tobias Alexander Franke <tobias.alexander.franke@huawei.com>
 2021-12-22 10:54:49 -08:00
Michael Pollind 1a26ea439a bugfix[Linux]: resolve Lua script file not found (#6369) 
* bugfix: resolve Lua script file not found

REF: https://github.com/o3de/o3de/issues/5899

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

* chore: user lowcase version of assetIdLower

Signed-off-by: Michael Pollind <mpollind@gmail.com>
 2021-12-22 09:07:42 -08:00
Jeremy Ong a96387ee35 Fix compile issues blocking adoption of Pix 2108 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2021-12-21 13:52:20 -07:00
Mike Balfour f23798a10a Merge commit '58b6a9c1acfc4e1344e9d0b79b5572ef173c030c' into mbalfour/gitflow_211220_stabilization_2111RTE 2021-12-20 14:43:30 -06:00
Mike Balfour f6faad4adb Merge commit '2fa10d7e6a99c38d578fe5ed969cfd07c5f0df28' into mbalfour/gitflow_211220_stabilization_2111RTE 2021-12-20 14:43:24 -06:00
Mike Balfour 22df3a843e Merge commit '6613030fe691d87c3a870f17c448746616c44787' into mbalfour/gitflow_211220_stabilization_2111RTE 2021-12-20 13:49:19 -06:00
tjmgd f4ae3a5b7d Fix: Find function reports code with a line offset of 1 (#6331) 
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com>
 2021-12-16 15:39:03 +00:00
AMZN-Phil 105524b7c0 Add a missing comma to fix generator 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-12-15 09:29:40 -08:00
AMZN-Phil 98fa18558e Force Project Manager to use VS2019 
Signed-off-by: AMZN-Phil <pconroy@amazon.com>
 2021-12-13 17:40:09 -08:00
Tommy Walton 7188529652 Fix for GHI-4644: mesh optimization breaking skin influences (DCO fix) (#6336) 
* Average incoming skin influences when multiple vertices have been welded. This is one option which will average out the weights even if two welded vertices have differing boneIds, but we probably also need to add the influences earlier in the process and enforce a process where the vertices do not get welded if they have influences with differing boneIds

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Move skin influences from MeshBuilderSkinningInfo to the vertex attribute layers so they are considered when choosing which vertices can be welded and so they are not duplicated when compatible vertices have been welded

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Updating unit tests

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Remove unused functions

Signed-off-by: Tommy Walton <waltont@amazon.com>

* Update based on feedback from burelc

Signed-off-by: Tommy Walton <waltont@amazon.com>
 2021-12-13 13:07:04 -08:00
nggieber e9db0bca6a Fix typo, add missing header, remove unecessary asserts 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-10 11:42:18 -08:00
Alex Peterson 6613030fe6 Fix Visual Studio requirements text and doc link (#6312) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-12-10 10:15:39 -08:00
nggieber 214716dafc Add AZStd string header for linux 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-10 07:48:41 -08:00
nggieber 88b78c0d16 Merge branch 'development' into Prism/RefactorProjectSettings 2021-12-10 06:32:14 -08:00
nggieber af9e75da66 Minor PR feedback changes 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-10 06:19:28 -08:00
nggieber 9f4895aaea Addressed remaining PR feedback 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-09 15:30:32 -08:00
nggieber 5641bcd5f1 Update Update Project Settings UI to show advanced settings and move project preview to right side panel 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-09 14:56:50 -08:00
nggieber c632fadb8f Remove Project ID field from New Project settings 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-09 10:25:04 -08:00
nggieber d7a3d63457 Change ProjectSettings to Singleton interface 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-09 09:24:01 -08:00
Steve Pham 558532f094 Process launcher updates (#6183) 
* Enable process and ap connection tests on linux
* Updated 'OpenProjectManager' to use new the ProcessLauncher argument type
* Add logic to double-escape escaped double quotes in arguments on windows platforms
* Updated argument for LaunchProjectManager to reflect new ProcessLauncher argument type
* Fixed unit test arguments for 'arg=value' condition
* Fix compile errors for BuilderManager and RHI.Edit\Utils.cpp
* PAL'ify the GetCommandLineParametersAsString() to handle windows specific behavior

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

Co-authored-by: byrcolin <byrcolin@amazon.com>
 2021-12-08 09:30:19 -08:00
lumberyard-employee-dm cd65d8a5ac Pass relative path IsFileExcluded so that only paths relative to the root scan folder are matched against the exclude filters (#4504) (#6234) 
* Pass relative path IsFileExcluded so that only paths relative to the root scan folder are matched against the exclude filters.

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

* Revert previous change. Remove the exclude filter for the Install directory.

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

* Pass in relative path to the exclude filter as before. Fix the AssetScanner tests.

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

* Prepend a ./ to the relative path in order to match the exclude patterns

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

* Remove hack to prepend ./. Update the exclude patterns so that the hack is no longer required.

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

* Add missing ? and remove whitespace

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

* 1. IsFileExcluded() now converts the input path to a path that's relative to its corresponding scan folder.
2. Update regex patterns in gems and AutomatedTesting as well.
3. Remove unnecessary escaping for '/'.

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

* Use ConvertToRelativePath() function to compute path relative to a scan folder.

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

* More fixes to regex patterns

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

* Remove test case which tests a hypothetical scenario that cannot occur. Fix another test case by adding scan folder.

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

* Remove assert that's not needed since it's a valid scenario

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

Co-authored-by: amzn-sj <srikkant@amazon.com>
 2021-12-08 11:12:25 -06:00
nggieber c7893e0386 Remove unecessary change to CMakeLists.txt 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-08 05:54:41 -08:00
nggieber 28e5e8b217 Fix Project Built Tests 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-08 05:43:10 -08:00
Esteban Papp cd5306febf Merging from development 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-07 12:35:41 -08:00
nggieber 1348b6e825 Removed q file 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-06 09:52:52 -08:00
nggieber 2c1f0220ec Merge branch 'development' into Prism/RefactorProjectSettings 2021-12-06 09:42:33 -08:00
nggieber 15237af23c Refactored ProjectManagerSettings, added tests, changed project built successful to be tracked by project path, added project ids, changed project settings path to use project id and name 
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
 2021-12-06 09:22:03 -08:00
Esteban Papp 03adf700fe Merge branch 'development' into redcode/driller_removal 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-03 13:35:16 -08:00
Alex Peterson fa385ec842 Fix number argument in notifications (#6121) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-12-03 13:11:23 -08:00
Alex Peterson b3bf2158b4 Right click menu support for project buttons (#6122) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-12-03 13:10:35 -08:00