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

10311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Qing Tao 73f44684e8 Fixed SRG compile issue with metal which leads to multiple gpu crashes inlucde ImGuiPass render crash (#6315) 
Signed-off-by: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
 2021-12-10 09:53:02 -08:00
carlitosan 63f8be12d5 Merge pull request #6322 from aws-lumberyard-dev/carlitosan-sc-bug-fix 
Fix missing asset handler error in AP when loading old SC files
 2021-12-10 09:46:42 -08:00
moudgils 2aecf9557c Fixed SRG updated related crash (#6317) 
Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com>
 2021-12-10 09:26:41 -08:00
Steve Pham 5a4a96348f Remove unused traits that disabled certain failed unit tests 
- Removed trait AZ_TRAIT_DISABLE_FAILED_AP_CONNECTION_TESTS
- Removed trait AZ_TRAIT_DISABLE_FAILED_FRAMEPROFILER_TEST
- Removed trait AZ_TRAIT_DISABLE_FAILED_FRAMEWORK_TESTS
- Removed AZ_TRAIT_DISABLE_FAILED_METRICS_TESTS

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2021-12-10 08:44:18 -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
Artur K 53b88d4752 Preapre codebase for FileRequest compiletime improvements (#6192) 
* Preapre codebase for FileRequest compiletime improvements

This is preparing grounds for the next PR that will contain the 'meat'
of the changes.

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

* Remove spurious newline.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
 2021-12-10 13:08:24 +00:00
Tom Hulton-Harrop 633a9e939a Update modular viewport camera controller interface (#6282) 
* update modular viewport camera controller interface to make follow behaviors easier

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

* updates following PR feedback

Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com>
 2021-12-10 09:49:43 +00:00
dmcdiarmid-ly 2ac049eacd Merge pull request #6275 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-16896 
Diffuse GI Improvements
 2021-12-09 20:34:03 -07:00
carlitosan 21e7d1db67 Fix missing asset handler error on EditorSCComponent load from pre SourceHandle files 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-09 18:58:47 -08:00
Shirang Jia cc242b2239 Fix pipeline name passed to post ar build sns (#6305) 
Signed-off-by: Shirang Jia <shiranj@amazon.com>
 2021-12-09 18:16:19 -08:00
dmcdiarmid-ly 5d0c3c6a2f Re-added AspectFlags to the depth texture in DiffuseProbeGridRender.pass. This was removed in another commit but causes Vulkan to fail to render. 
Signed-off-by: dmcdiarmid-ly <63674186+dmcdiarmid-ly@users.noreply.github.com>
 2021-12-09 19:05:58 -07:00
dmcdiarmid-ly 4e7a45a6c5 Merge branch 'development' into Atom/dmcdiar/ATOM-16896 2021-12-09 17:21:47 -07: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
Sean Sweeney c6e06a64ca Merge pull request #6264 from aws-lumberyard-dev/upload_test_artifacts 
Modified Jenkinsfile to upload test artifacts on failure
 2021-12-09 15:23:13 -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
evanchia 2db4927f73 added clarifying comment 
Signed-off-by: evanchia <evanchia@amazon.com>
 2021-12-09 14:05:30 -08:00
Scott Romero e9379c1746 [development] updated editor event handling with respect to imgui (#6114) 
Fixes #4366

- Added support for sending text events from the Qt event mapper
- Fixed several issues found while running the Profiler gem in debug
- Added ability to track AZ-consumed events in the Qt event mapper
- Minor clean up to input handling in ImGuiManager
- Select ImGui mouse events can now be properly consumed during AZ-input processing in the editor viewport
- Added tests for the Qt event mapper

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2021-12-09 13:58:27 -08:00
carlitosan 3f128c5baa Merge branch 'development' of https://github.com/o3de/o3de into carlitosan-sc-bug-fix 2021-12-09 13:18:45 -08:00
dmcdiarmid-ly d1c184bafd Merge pull request #6235 from aws-lumberyard-dev/Atom/mriegger/fixwarnings 
Fix warnings, add branch notifier
 2021-12-09 13:58:40 -07:00
amzn-mike 5e5bb27219 Procedural Prefabs: Python documentation cleanup (#6136) 
* Auto LOD script setup

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

* Working auto LODs

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

* Correctly selected LODs and added default prefab

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

* Cleanup code

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

* Cleanup code

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

* Add missing legal header, move name cleanup to scene_helpers, add documentation

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

* Add PhysX mesh group support.

Updated example script to show usage

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

* Add a physics collider component

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

* Update DefaultOrValue call

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

* Document remaining methods in scene_data.py

Add enums where appropriate
Add type hints and default values

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

* Remove unused import

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

* Convert docstring to numpy style

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

* Fix return types

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

* Remove empty returns

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

* Add docs on enums

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-12-09 12:53:35 -08:00
amzn-mike c63b4eb905 Removing unused variable and fix typo (#6265) 
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-12-09 12:53:25 -08:00
Chris Galvan e1d36bc445 Merge pull request #6302 from aws-lumberyard-dev/cgalvan/HideViewportManiuplatorsOnReadOnlyEntitiesEdgeCase 
Fixed logic for when to cull entities from having their viewport manipulators regenerated.
 2021-12-09 14:24:39 -06:00