Commit Graph

10340 Commits

Author SHA1 Message Date
Scott Murray d343caa3f2 add optional force_get to get_property_tree
Signed-off-by: Scott Murray <scottmur@amazon.com>
2022-01-04 11:58:17 -08:00
Scott Murray a7d173db3d changes from review and switching to assert model instead of return bool
Signed-off-by: Scott Murray <scottmur@amazon.com>
2022-01-03 16:15:35 -08:00
Scott Murray 291e172f9e fixing some docstrings
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-12-16 21:01:39 -08:00
Scott Murray 9b5dcf82b5 updates extend editor_entity_utils.py functionality
Signed-off-by: Scott Murray <scottmur@amazon.com>
2021-12-16 20:46:12 -08:00
Qing Tao b640f6d691 ATOM-16958 [Image Builder] Alpha data would be removed for source image with alpha content (#6412)
Fixed a regression issue with image builder which it can choose proper preset for images with alpha content.

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
2021-12-15 08:56:28 -08:00
amzn-sean 33bfdc0bd3 corrected implementation of GetRealElapseTime (#6422)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
2021-12-15 16:44:38 +00:00
Jonny Galloway cbba00d473 Atom/16852 (#6316)
* discover build folder, don't assume or require

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* update config_utils, no cyclical imports

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* improved docstrings and some code formatting

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* updates to config.py

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* updates to config_utils.py

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* dccsi bootstrap changes

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* fixed testing for bootstrap externally

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* added note for installing substance automation toolkit for tool dev

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* based on user feedback suppress global debug by default in IDE

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>

* small adjustments

Signed-off-by: Jonny Gallowy <gallowj@amazon.com>
2021-12-15 08:25:23 -08:00
Chris Galvan e2679aad57 Merge pull request #6195 from tjmgd/bug-keyword-22
keyword bug fixed
2021-12-15 10:00:58 -06:00
Chris Galvan 50e06ea8c5 Merge pull request #6328 from tjmgd/bug-lua-debugging-62
Fix: Lua script debugging loading problem
2021-12-15 09:58:11 -06:00
Chris Galvan 0a31483faa Merge pull request #6333 from tjmgd/bug-lua-breakpoint-67
Fix: Lua breakpoint error
2021-12-15 09:57:54 -06:00
rgba16f 50588eb2ad Merge pull request #6401 from aws-lumberyard-dev/Atom/mriegger/stopdx12warnings
Fix for dx12 validation spam
2021-12-14 17:45:58 -06:00
Luis Sempé 3ee7cef09e Merge pull request #6306 from aws-lumberyard-dev/scripting/fix_slot_names
Fixed incorrect condition that led to badly named slots
2021-12-14 11:27:15 -08:00
Guthrie Adams f8ca427954 Fixed several material editor bugs related to file paths and hot reload prompts (#6374)
* draft

Signed-off-by: Guthrie Adams <guthadam@amazon.com>

* Removes automatic generation of relative paths for external references for materials
Updated material editor functions for creating new materials, creating or saving model or lighting presets, to save to the project asset folder instead of the material folder which is not included in the new templates
Changed function for getting saved file names to handle case where Qt save file dialog adds double extensions if the extension contains a dot

Signed-off-by: Guthrie Adams <guthadam@amazon.com>

* Fixed problems with material editor hot reloading after documents or dependencies changed.
Triggering message boxes within the tick function, which is executed from the main application timer, caused the tick function to be called a second time recursively.
Switched from using the tick bus to a timer so that the documents re opening and dialogs are triggered outside of the main tick.

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
2021-12-14 08:52:01 -08:00
Jeremy Ong f3d426e638 Merge pull request #4965 from aws-lumberyard-dev/APTetherLifetimeOnByDefault
Enable lifetime tethering of the AP by default
2021-12-14 09:31:24 -07:00
Chris Galvan 8b7cdd45a3 Merge pull request #6344 from aws-lumberyard-dev/daimini/ReadOnly/TransformResetFix
Disable invalid operations related to procedural prefabs in the Inspector
2021-12-14 09:33:43 -06:00
mrieggeramzn 82e731b1c0 Fix for dx12 validation spam
Signed-off-by: mrieggeramzn <mriegger@amazon.com>
2021-12-13 22:43:41 -08:00
michabr d951e1f652 LyShine cleanup of TODOs (#6138)
* LyShine cleanup pass for Atom conversion

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

* Add GHI numbers to comments

Signed-off-by: abrmich <abrmich@amazon.com>
2021-12-14 00:00:26 +01:00
Steve Pham 04669544cc Remove unused trait AZ_TRAIT_DISABLE_FAILED_MULTIPLAYER_GRIDMATE_TESTS (#6389)
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2021-12-13 14:54:57 -08:00
Qing Tao d9f0a3012d LYN-8837 o3de Material Editor - Texture Settings Editor - Hangs when converting texture (#6359)
Fixed a editor hanging issue when preview texture with astc format (starts multiple job threads inside a job thread)
Fixed an issue of changing texture setting didn't trigger image re-process.
Fixed an issue with image asset which has texture setting may have dependency with wrong preset
Added a EIF_HDR for source image in hdr format.
Fixed astc compression issue which may wrongly compress image to HDR astc format

Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
2021-12-13 14:30:53 -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
amzn-mike 71bb200e0a [LYN-7064] Hot Loading of Procedural Prefabs (#4923)
* Prefab hotloading - load and maintain asset references

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

* Working hotloading

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

* Clean up code, add comments

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

* Add missing includes

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

* Add event for template removal.

Clear ProceduralPrefabSystemComponent lookup when templates are removed.

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

* Add unit test.

Fix missing include, make sure source name is set

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

* Fix missing include

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

* Fix missing include

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

* Update comments to make ebus event behavior more clear

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

* Fix missing include

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

* Fix missing includes

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

* Fix missing include

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

* Fix temp directory usage which doesn't work on linux

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

* Fix temp directory usage which doesn't work on linux

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

* Use AZ::IO::Path for comparison.  Print paths on failure

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

* Fix unit test - register asset with catalog so it can be looked up later

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-12-13 12:44:41 -08:00
amzn-mike 45abb9f88e Proc Prefabs: Remove feature toggle (#6348)
* Disable feature flag - redirect proc prefab check to IsPrefabSystemEnabled.

Procedural Prefabs are now on by default when the prefab system is enabled.

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

* Bump scene builder version to cause all procedural prefabs to rebuild

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

* Switch to lambda for ebus call

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

* Remove unused const

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-12-13 11:52:03 -08:00
dmcdiarmid-ly d5980da3d4 Merge pull request #6377 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-16886
Vulkan validation fixes for RayTracing
2021-12-13 12:46:53 -07:00
dmcdiarmid-ly da8967d570 Minor change to comments
Signed-off-by: dmcdiarmid-ly <63674186+dmcdiarmid-ly@users.noreply.github.com>
2021-12-13 12:03:40 -07:00
rgba16f c444978648 Change Vulkan RHI CommandList::SetStreamBuffers to not do 2 memory allocation per draw by using fixed_vector
This takes the high instance test from 20fps to 44fps in my local testing.

Signed-off-by: rgba16f 82187279+rgba16f@users.noreply.github.com
2021-12-13 12:23:13 -06:00
Danilo Aimini 0dfb8d42c4 Disable the ability to instantiate into closed prefabs, and to move the root prefab in focus mode. (#6320)
* Disable "Move Up" and "Move Down" for focused prefab containers.

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

* Disable the ability to instantiate prefabs inside closed prefab instances.

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

* Minor comment fix.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-12-13 19:10:04 +01:00
John Jones-Steele 586f146a84 Fixed nullptr error (#6386)
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
2021-12-13 17:56:46 +00:00
AMZN-Phil ae3dedfe59 Merge pull request #6172 from aws-lumberyard-dev/Prism/RefactorProjectSettings
Refactor Project Manager Settings
2021-12-13 09:40:48 -08:00
Maxim Ivanov eae66b964b [AudioSystem] Allow audio engines to provide widgets for modifying connection properties. (#6303)
Signed-off-by: Maxim Ivanov <imginimg@gmail.com>
2021-12-13 09:32:24 -08:00
Steve Pham f2c9a217da Revert previous update to ConstantsData::SetConstantArray<bool> and fix unit tests (#6351)
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2021-12-13 08:51:30 -08:00
Luis Sempé 713cd4337c Merge pull request #6263 from aws-lumberyard-dev/scripting/enable_minimap
Enabled the Script Canvas Minimap. It will be tested and any performa…
2021-12-13 07:49:45 -08:00
moraaar f941d03f9e Fix namespace Az for AZ in ProcessWatcher for iOS (#6382)
Signed-off-by: moraaar <moraaar@amazon.com>
2021-12-13 14:03:00 +00:00
dmcdiarmid-ly 4d187b0980 Minor changes to RayTracingScratchBuffer flag.
Signed-off-by: dmcdiarmid-ly <63674186+dmcdiarmid-ly@users.noreply.github.com>
2021-12-12 18:43:12 -07:00
dmcdiarmid-ly 497fe8eccc Fixes for Vulkan validation warnings related to RayTracing and DiffuseGI.
Signed-off-by: dmcdiarmid-ly <63674186+dmcdiarmid-ly@users.noreply.github.com>
2021-12-12 18:02:25 -07:00
rgba16f ab859d1979 Change Vulkan RHI CommandList::SetStreamBuffers to not do 2 memory allocation per draw by using fixed_vector
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-12-10 19:08:18 -06:00
Danilo Aimini c06b697c6b Revert part of the fix as it would break unit tests. Verified the remaining code still achieves the same purpose on the UI side without impacting the backend.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-12-10 15:06:55 -08:00
Steve Pham 4670003aaf Fix failed Atom rpi tests linux (#6319)
- Remove trait AZ_TRAIT_DISABLE_FAILED_ATOM_RPI_TESTS
- Add template specialization for ConstantsData::SetConstant<Color> and ConstantsData::GetConstant<Color>
- Remove trait AZ_TRAIT_DISABLE_FAILED_ATOM_RPI_TESTS from source code
- Fix ConstantsData::SetConstantArray<bool> to pass unit test SetConstant_GetConstant_FalsePackedInGarbage_Bool on Linux, cause by an unwanted optimization (comments describe the situation). This will make this behavior consistent across platforms

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
2021-12-10 14:54:08 -08:00
Danilo Aimini 502578293b Merge branch 'development' of https://github.com/o3de/o3de into daimini/ReadOnly/TransformResetFix 2021-12-10 14:35:25 -08:00
John Jones-Steele 3ae6b601a2 Focus issue in editor settings menu #3921 (#6296)
* Changes to fix DCO

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

* Moved the keyEvent to a helper function for ease of testing

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

* Split definition and declaration of WidgetHandleKeyPressEvent

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>
2021-12-10 22:34:41 +00:00
nggieber 3cf85bb562 Fix project properties test
Signed-off-by: nggieber <52797929+AMZN-nggieber@users.noreply.github.com>
2021-12-10 14:12:14 -08:00
Danilo Aimini f9b31d8bc1 Merge branch 'development' of https://github.com/o3de/o3de into daimini/ReadOnly/TransformResetFix 2021-12-10 14:08:03 -08:00
allisaurus 5fd68cf1c2 Let resource mapping tool save resources without an account ID (#6262)
* Let resource mapping tool save resources without an account ID

Signed-off-by: allisaurus <34254888+allisaurus@users.noreply.github.com>
2021-12-10 13:20:09 -08:00
Danilo Aimini d1533914ab Disable the additional transform context menu items in the inspector. Prevent the user from reparenting entities under procprefabs using the entity picker.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
2021-12-10 13:16:02 -08:00
amzn-phist b7644a2ed5 Fix issues with Bank dependency processing in Wwise Builder (#6048)
* Fix issues with bank dependency processing

- Looking for init.bnk in the .bankdeps files needed to do a
  case-insensitive check.
- Updated many of the failure/warning messages.
- Fixed one place where warning wasn't being output properly.
- Fixed a couple places where the warning was saying it would add
  init.bnk as a dependency (when none was found) but it didn't actually
  do that.

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

* Minor edits to comments and strings

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

* Check empty rather than size

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-12-10 15:14:20 -06:00
rgba16f be0b034c43 Fix editor hang on level load (#6323)
Make View::SortFinalizedDrawLists use child jobs so they don't block the worker thread from doing other work while waiting.
Implement a TaskGraph version of the view draw list sort.
Fix a misc bug where the scene was waiting on a task graph event twice and so hanging.
Enable MeshFeatureProcessor::Simulate to be able to use jobs when no parent job is specified because the parent job is a task.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
2021-12-10 15:03:06 -06: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
Allen Jackson 0ff94f4e6e {lyn2265} adding a Python API for MotionGroup rules (#6215)
* {lyn2265} adding a Python API for MotionGroup rules

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

* updating the license headers
added more proper example code for motion group


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

* updating the actor group to use the common rules module

Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com>
2021-12-10 13:36:47 -06:00
amzn-mike 8f134a82d1 Procedural Prefabs: Stable transform component ID (#6227)
* Set Procedural Prefab Transform ComponentId to the hash of the file path.

Procedural prefabs needs to have a deterministic transform component ID in order for saved patches still work when the prefab is regenerated.

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

* Switch to Cityhash instead of XXHash since prefab system is using that elsewhere

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

* Added unit test

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

* Fix missing include

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
2021-12-10 11:20:31 -08:00
chiyenteng ca49eedc5f Convert prefab to temp spawnable assets (#6179)
* Convert prefab to temp in-memory spawnable assets

Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com>
2021-12-10 10:55:01 -08:00
Andre Mitchell 3a4277395b Remove NOT_USE_CRY_MEMORY_MANAGER (#6273)
Fix for issue o3de/o3de#5888

Signed-off-by: Andre Mitchell <andre.mitchell@bytesofpi.com>
2021-12-10 12:20:48 -06:00