diff --git a/AutomatedTesting/Gem/PythonCoverage/preview.png b/AutomatedTesting/Gem/PythonCoverage/preview.png
index 2f1ed47754..2979dbb6a4 100644
--- a/AutomatedTesting/Gem/PythonCoverage/preview.png
+++ b/AutomatedTesting/Gem/PythonCoverage/preview.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6d6204c6730e5675791765ca194e9b1cbec282208e280507de830afc2805e5fa
-size 41127
+oid sha256:de0e6e480ece5b423222f4feacf56553d73713fe9afea8bbc9a2660a3cd54ec7
+size 1232
diff --git a/AutomatedTesting/Gem/PythonTests/Multiplayer/tests/Multiplayer_AutoComponent_RPC.py b/AutomatedTesting/Gem/PythonTests/Multiplayer/tests/Multiplayer_AutoComponent_RPC.py
index 827826cbcc..62ec410d3b 100644
--- a/AutomatedTesting/Gem/PythonTests/Multiplayer/tests/Multiplayer_AutoComponent_RPC.py
+++ b/AutomatedTesting/Gem/PythonTests/Multiplayer/tests/Multiplayer_AutoComponent_RPC.py
@@ -62,15 +62,16 @@ def Multiplayer_AutoComponent_RPC():
Report.critical_result(TestSuccessFailTuples.find_network_player, player_id.IsValid())
# 4) Check the editor logs for expected and unexpected log output
+ # Authority->Autonomous RPC
PLAYERID_RPC_WAIT_TIME_SECONDS = 1.0 # The player id is sent from the server as soon as the player script is spawned. 1 second should be more than enough time to send/receive that RPC.
helper.succeed_if_log_line_found('EditorServer', 'Script: AutoComponent_RPC: Sending client PlayerNumber 1', section_tracer.prints, PLAYERID_RPC_WAIT_TIME_SECONDS)
helper.succeed_if_log_line_found('Script', "AutoComponent_RPC: I'm Player #1", section_tracer.prints, PLAYERID_RPC_WAIT_TIME_SECONDS)
- # Uncomment once editor game-play mode supports level entities with net-binding
- #PLAYFX_RPC_WAIT_TIME_SECONDS = 1.1 # The server will send an RPC to play an fx on the client every second.
- #helper.succeed_if_log_line_found('EditorServer', "Script: AutoComponent_RPC_NetLevelEntity Activated on entity: NetLevelEntity", section_tracer.prints, PLAYFX_RPC_WAIT_TIME_SECONDS)
- #helper.succeed_if_log_line_found('EditorServer', "Script: AutoComponent_RPC_NetLevelEntity: Authority sending RPC to play some fx.", section_tracer.prints, PLAYFX_RPC_WAIT_TIME_SECONDS)
- #helper.succeed_if_log_line_found('Script', "AutoComponent_RPC_NetLevelEntity: I'm a client playing some superficial fx.", section_tracer.prints, PLAYFX_RPC_WAIT_TIME_SECONDS)
+ # Authority->Client RPC
+ PLAYFX_RPC_WAIT_TIME_SECONDS = 1.1 # The server will send an RPC to play an fx on the client every second.
+ helper.succeed_if_log_line_found('EditorServer', "Script: AutoComponent_RPC_NetLevelEntity Activated on entity: NetLevelEntity", section_tracer.prints, PLAYFX_RPC_WAIT_TIME_SECONDS)
+ helper.succeed_if_log_line_found('EditorServer', "Script: AutoComponent_RPC_NetLevelEntity: Authority sending RPC to play some fx.", section_tracer.prints, PLAYFX_RPC_WAIT_TIME_SECONDS)
+ helper.succeed_if_log_line_found('Script', "AutoComponent_RPC_NetLevelEntity: I'm a client playing some fx.", section_tracer.prints, PLAYFX_RPC_WAIT_TIME_SECONDS)
# Exit game mode
diff --git a/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_World_ConfigurationWorks.py b/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_World_ConfigurationWorks.py
index bb5dcb3bea..41dc6b92af 100644
--- a/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_World_ConfigurationWorks.py
+++ b/AutomatedTesting/Gem/PythonTests/Terrain/EditorScripts/Terrain_World_ConfigurationWorks.py
@@ -93,7 +93,7 @@ def Terrain_World_ConfigurationWorks():
# 5) Set the base Terrain World values
world_bounds_max = azmath.Vector3(1100.0, 1100.0, 1100.0)
world_bounds_min = azmath.Vector3(10.0, 10.0, 10.0)
- height_query_resolution = azmath.Vector2(1.0, 1.0)
+ height_query_resolution = 1.0
hydra.set_component_property_value(terrain_world_component, "Configuration|World Bounds (Max)", world_bounds_max)
hydra.set_component_property_value(terrain_world_component, "Configuration|World Bounds (Min)", world_bounds_min)
hydra.set_component_property_value(terrain_world_component, "Configuration|Height Query Resolution (m)", height_query_resolution)
@@ -148,7 +148,7 @@ def Terrain_World_ConfigurationWorks():
# 13) Check height value is the expected one when query resolution is changed
testpoint = terrain.TerrainDataRequestBus(bus.Broadcast, 'GetHeightFromFloats', 10.5, 10.5, CLAMP)
- height_query_resolution = azmath.Vector2(0.5, 0.5)
+ height_query_resolution = 0.5
hydra.set_component_property_value(terrain_world_component, "Configuration|Height Query Resolution (m)", height_query_resolution)
general.idle_wait_frames(1)
testpoint2 = terrain.TerrainDataRequestBus(bus.Broadcast, 'GetHeightFromFloats', 10.5, 10.5, CLAMP)
@@ -165,4 +165,3 @@ if __name__ == "__main__":
from editor_python_test_tools.utils import Report
Report.start_test(Terrain_World_ConfigurationWorks)
-
diff --git a/AutomatedTesting/Gem/Sponza/preview.png b/AutomatedTesting/Gem/Sponza/preview.png
new file mode 100644
index 0000000000..2979dbb6a4
--- /dev/null
+++ b/AutomatedTesting/Gem/Sponza/preview.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de0e6e480ece5b423222f4feacf56553d73713fe9afea8bbc9a2660a3cd54ec7
+size 1232
diff --git a/AutomatedTesting/Gem/preview.png b/AutomatedTesting/Gem/preview.png
index 2f1ed47754..2979dbb6a4 100644
--- a/AutomatedTesting/Gem/preview.png
+++ b/AutomatedTesting/Gem/preview.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6d6204c6730e5675791765ca194e9b1cbec282208e280507de830afc2805e5fa
-size 41127
+oid sha256:de0e6e480ece5b423222f4feacf56553d73713fe9afea8bbc9a2660a3cd54ec7
+size 1232
diff --git a/AutomatedTesting/Levels/Multiplayer/AutoComponent_RPC/AutoComponent_RPC.prefab b/AutomatedTesting/Levels/Multiplayer/AutoComponent_RPC/AutoComponent_RPC.prefab
index 758cb4fca8..35d5ef9527 100644
--- a/AutomatedTesting/Levels/Multiplayer/AutoComponent_RPC/AutoComponent_RPC.prefab
+++ b/AutomatedTesting/Levels/Multiplayer/AutoComponent_RPC/AutoComponent_RPC.prefab
@@ -568,22 +568,10 @@
"$type": "EditorScriptCanvasComponent",
"Id": 14750978061505735417,
"m_name": "GlobalGameData",
- "m_assetHolder": {
- "m_asset": {
- "assetId": {
- "guid": "{B16589A0-EA01-56BC-8141-91A3967FB95F}"
- },
- "assetHint": "levels/multiplayer/autocomponent_rpc/globalgamedata.scriptcanvas"
- }
- },
"runtimeDataIsValid": true,
- "runtimeDataOverrides": {
- "source": {
- "assetId": {
- "guid": "{B16589A0-EA01-56BC-8141-91A3967FB95F}"
- },
- "assetHint": "levels/multiplayer/autocomponent_rpc/globalgamedata.scriptcanvas"
- }
+ "sourceHandle": {
+ "id": "{B16589A0-EA01-56BC-8141-91A3967FB95F}",
+ "path": "levels/multiplayer/autocomponent_rpc/globalgamedata.scriptcanvas"
}
},
"Component_[16436925042043744033]": {
@@ -636,6 +624,13 @@
"$type": "SelectionComponent",
"Id": 12302672911455629152
},
+ "Component_[12517591696100736853]": {
+ "$type": "GenericComponentWrapper",
+ "Id": 12517591696100736853,
+ "m_template": {
+ "$type": "AutomatedTesting::NetworkTestLevelEntityComponent"
+ }
+ },
"Component_[14169903623243423134]": {
"$type": "EditorVisibilityComponent",
"Id": 14169903623243423134
@@ -644,13 +639,6 @@
"$type": "EditorInspectorComponent",
"Id": 14607413934411389854
},
- "Component_[15396284312416541768]": {
- "$type": "GenericComponentWrapper",
- "Id": 15396284312416541768,
- "m_template": {
- "$type": "Multiplayer::LocalPredictionPlayerInputComponent"
- }
- },
"Component_[15494977028055234270]": {
"$type": "EditorDisabledCompositionComponent",
"Id": 15494977028055234270
@@ -682,22 +670,10 @@
"$type": "EditorScriptCanvasComponent",
"Id": 7256163899440301540,
"m_name": "AutoComponent_RPC_NetLevelEntity",
- "m_assetHolder": {
- "m_asset": {
- "assetId": {
- "guid": "{1D517006-AC01-5ECA-AE66-0E007871F0CD}"
- },
- "assetHint": "levels/multiplayer/autocomponent_rpc/autocomponent_rpc_netlevelentity.scriptcanvas"
- }
- },
"runtimeDataIsValid": true,
- "runtimeDataOverrides": {
- "source": {
- "assetId": {
- "guid": "{1D517006-AC01-5ECA-AE66-0E007871F0CD}"
- },
- "assetHint": "levels/multiplayer/autocomponent_rpc/autocomponent_rpc_netlevelentity.scriptcanvas"
- }
+ "sourceHandle": {
+ "id": "{1D517006-AC01-5ECA-AE66-0E007871F0CD}",
+ "path": "levels/multiplayer/autocomponent_rpc/autocomponent_rpc_netlevelentity.scriptcanvas"
}
},
"Component_[731336627222243355]": {
@@ -730,13 +706,6 @@
"$type": "NetBindComponent"
}
},
- "Component_[9816897251206708579]": {
- "$type": "GenericComponentWrapper",
- "Id": 9816897251206708579,
- "m_template": {
- "$type": "AutomatedTesting::NetworkTestPlayerComponent"
- }
- },
"Component_[9880860858035405475]": {
"$type": "EditorOnlyEntityComponent",
"Id": 9880860858035405475
diff --git a/AutomatedTesting/Levels/Multiplayer/AutoComponent_RPC/AutoComponent_RPC.scriptcanvas b/AutomatedTesting/Levels/Multiplayer/AutoComponent_RPC/AutoComponent_RPC.scriptcanvas
index c1c77b14fe..7f3f8181ae 100644
--- a/AutomatedTesting/Levels/Multiplayer/AutoComponent_RPC/AutoComponent_RPC.scriptcanvas
+++ b/AutomatedTesting/Levels/Multiplayer/AutoComponent_RPC/AutoComponent_RPC.scriptcanvas
@@ -5,7 +5,7 @@
"ClassData": {
"m_scriptCanvas": {
"Id": {
- "id": 2816238339133127497
+ "id": 8397436129732444837
},
"Name": "AutoComponent_RPC",
"Components": {
@@ -37,7 +37,7 @@
}
},
"Component_[9755768666831861951]": {
- "$type": "{4D755CA9-AB92-462C-B24F-0B3376F19967} Graph",
+ "$type": "EditorGraph",
"Id": 9755768666831861951,
"m_graphData": {
"m_nodes": [
@@ -1734,6 +1734,1542 @@
{
"m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
},
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
{
"m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
}
@@ -3272,6 +4808,1542 @@
{
"m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
},
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
+ {
+ "m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
+ },
{
"m_id": "{82D3E2FD-ADFA-47F7-A889-D1172BF2EC49}"
}
@@ -4723,7 +7795,7 @@
"{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
"$type": "GeometrySaveData",
"Position": [
- 380.0,
+ 360.0,
620.0
]
},
@@ -4953,15 +8025,16 @@
},
{
"Key": {
- "id": 2816238339133127497
+ "id": 8397436129732444837
},
"Value": {
"ComponentData": {
"{5F84B500-8C45-40D1-8EFC-A5306B241444}": {
"$type": "SceneComponentSaveData",
"ViewParams": {
- "AnchorX": 260.0,
- "AnchorY": 479.0
+ "Scale": 0.8049999999999999,
+ "AnchorX": -166.45962524414063,
+ "AnchorY": -216.14906311035156
}
}
}
diff --git a/AutomatedTesting/Levels/Multiplayer/AutoComponent_RPC/AutoComponent_RPC_NetLevelEntity.scriptcanvas b/AutomatedTesting/Levels/Multiplayer/AutoComponent_RPC/AutoComponent_RPC_NetLevelEntity.scriptcanvas
index 5d61fea3e7..70730a4496 100644
--- a/AutomatedTesting/Levels/Multiplayer/AutoComponent_RPC/AutoComponent_RPC_NetLevelEntity.scriptcanvas
+++ b/AutomatedTesting/Levels/Multiplayer/AutoComponent_RPC/AutoComponent_RPC_NetLevelEntity.scriptcanvas
@@ -5,7 +5,7 @@
"ClassData": {
"m_scriptCanvas": {
"Id": {
- "id": 7369225496155711251
+ "id": 7558387155527535988
},
"Name": "AutoComponent_RPC_NetLevelEntity",
"Components": {
@@ -93,7 +93,6 @@
],
"Datums": [
{
- "isOverloadedStorage": false,
"scriptCanvasType": {
"m_type": 1
},
@@ -108,6 +107,9 @@
"methodType": 2,
"methodName": "GetAuthorityToClientNoParams_PlayFxEventByEntityId",
"className": "NetworkTestLevelEntityComponent",
+ "resultSlotIDs": [
+ {}
+ ],
"inputSlots": [
{
"m_id": "{AE2A0AA3-99DD-4DE4-AFEA-7560F078943C}"
@@ -688,6 +690,199 @@
}
}
},
+ {
+ "Id": {
+ "id": 11750998249450
+ },
+ "Name": "SC-Node(IsNetEntityRoleAuthority)",
+ "Components": {
+ "Component_[17217487756380135718]": {
+ "$type": "{E42861BD-1956-45AE-8DD7-CCFC1E3E5ACF} Method",
+ "Id": 17217487756380135718,
+ "Slots": [
+ {
+ "id": {
+ "m_id": "{C58EF254-1A51-443B-B35E-B26831323D27}"
+ },
+ "contracts": [
+ {
+ "$type": "SlotTypeContract"
+ }
+ ],
+ "slotName": "EntityId: 0",
+ "Descriptor": {
+ "ConnectionType": 1,
+ "SlotType": 2
+ },
+ "DataType": 1
+ },
+ {
+ "id": {
+ "m_id": "{98927A53-663A-452D-ABAF-01D31F7D5D53}"
+ },
+ "contracts": [
+ {
+ "$type": "SlotTypeContract"
+ }
+ ],
+ "slotName": "In",
+ "Descriptor": {
+ "ConnectionType": 1,
+ "SlotType": 1
+ }
+ },
+ {
+ "id": {
+ "m_id": "{89F646CA-FBC6-45D2-916B-0B47474EE693}"
+ },
+ "contracts": [
+ {
+ "$type": "SlotTypeContract"
+ }
+ ],
+ "slotName": "Out",
+ "Descriptor": {
+ "ConnectionType": 2,
+ "SlotType": 1
+ }
+ },
+ {
+ "id": {
+ "m_id": "{3FFC81A6-5C31-4CBA-8253-5DF361F10610}"
+ },
+ "contracts": [
+ {
+ "$type": "SlotTypeContract"
+ }
+ ],
+ "slotName": "Is Role Authority",
+ "DisplayDataType": {
+ "m_type": 0
+ },
+ "Descriptor": {
+ "ConnectionType": 2,
+ "SlotType": 2
+ },
+ "DataType": 1
+ }
+ ],
+ "Datums": [
+ {
+ "isOverloadedStorage": false,
+ "scriptCanvasType": {
+ "m_type": 1
+ },
+ "isNullPointer": false,
+ "$type": "EntityId",
+ "value": {
+ "id": 2901262558
+ },
+ "label": "Entity Id"
+ }
+ ],
+ "methodType": 2,
+ "methodName": "IsNetEntityRoleAuthority",
+ "className": "NetBindComponent",
+ "inputSlots": [
+ {
+ "m_id": "{C58EF254-1A51-443B-B35E-B26831323D27}"
+ }
+ ],
+ "prettyClassName": "NetBindComponent"
+ }
+ }
+ },
+ {
+ "Id": {
+ "id": 13206992162794
+ },
+ "Name": "SC-Node(Gate)",
+ "Components": {
+ "Component_[18126119383071583133]": {
+ "$type": "Gate",
+ "Id": 18126119383071583133,
+ "Slots": [
+ {
+ "id": {
+ "m_id": "{3896AA13-516C-410F-AB9C-2CAA5E71AEF6}"
+ },
+ "contracts": [
+ {
+ "$type": "SlotTypeContract"
+ }
+ ],
+ "slotName": "Condition",
+ "toolTip": "If true the node will signal the Output and proceed execution",
+ "Descriptor": {
+ "ConnectionType": 1,
+ "SlotType": 2
+ },
+ "DataType": 1
+ },
+ {
+ "id": {
+ "m_id": "{F651B19A-FD1A-44EB-9C16-0CDB44CD85AA}"
+ },
+ "contracts": [
+ {
+ "$type": "SlotTypeContract"
+ }
+ ],
+ "slotName": "In",
+ "toolTip": "Input signal",
+ "Descriptor": {
+ "ConnectionType": 1,
+ "SlotType": 1
+ }
+ },
+ {
+ "id": {
+ "m_id": "{78807DC9-82B7-4893-ADA4-53E51C2AD3D1}"
+ },
+ "contracts": [
+ {
+ "$type": "SlotTypeContract"
+ }
+ ],
+ "slotName": "True",
+ "toolTip": "Signaled if the condition provided evaluates to true.",
+ "Descriptor": {
+ "ConnectionType": 2,
+ "SlotType": 1
+ }
+ },
+ {
+ "id": {
+ "m_id": "{3B353484-F14C-4D93-AD1D-6F3EDAE4B71C}"
+ },
+ "contracts": [
+ {
+ "$type": "SlotTypeContract"
+ }
+ ],
+ "slotName": "False",
+ "toolTip": "Signaled if the condition provided evaluates to false.",
+ "Descriptor": {
+ "ConnectionType": 2,
+ "SlotType": 1
+ }
+ }
+ ],
+ "Datums": [
+ {
+ "isOverloadedStorage": false,
+ "scriptCanvasType": {
+ "m_type": 0
+ },
+ "isNullPointer": false,
+ "$type": "bool",
+ "value": false,
+ "label": "Condition"
+ }
+ ]
+ }
+ }
+ },
{
"Id": {
"id": 57025381737912
@@ -882,7 +1077,6 @@
],
"Datums": [
{
- "isOverloadedStorage": false,
"scriptCanvasType": {
"m_type": 1
},
@@ -897,6 +1091,9 @@
"methodType": 2,
"methodName": "AuthorityToClientNoParams_PlayFxByEntityId",
"className": "NetworkTestLevelEntityComponent",
+ "resultSlotIDs": [
+ {}
+ ],
"inputSlots": [
{
"m_id": "{029728DF-0939-4D64-A9A1-3DB4B8AF127E}"
@@ -1036,7 +1233,6 @@
],
"Datums": [
{
- "isOverloadedStorage": false,
"scriptCanvasType": {
"m_type": 4,
"m_azType": "{F429F985-AF00-529B-8449-16E56694E5F9}"
@@ -1223,34 +1419,6 @@
}
}
},
- {
- "Id": {
- "id": 57055446508984
- },
- "Name": "srcEndpoint=(TimeDelay: Done), destEndpoint=(Repeater: Start)",
- "Components": {
- "Component_[6292481678297438578]": {
- "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection",
- "Id": 6292481678297438578,
- "sourceEndpoint": {
- "nodeId": {
- "id": 57012496836024
- },
- "slotId": {
- "m_id": "{158B30BE-BD39-40AE-A8A8-F0E5694F0180}"
- }
- },
- "targetEndpoint": {
- "nodeId": {
- "id": 56986727032248
- },
- "slotId": {
- "m_id": "{07267CBA-B377-4B57-8A04-E322F8BFC07F}"
- }
- }
- }
- }
- },
{
"Id": {
"id": 10269167405311
@@ -1530,6 +1698,118 @@
}
}
}
+ },
+ {
+ "Id": {
+ "id": 13030898503658
+ },
+ "Name": "srcEndpoint=(TimeDelay: Done), destEndpoint=(IsNetEntityRoleAuthority: In)",
+ "Components": {
+ "Component_[14235185264262332827]": {
+ "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection",
+ "Id": 14235185264262332827,
+ "sourceEndpoint": {
+ "nodeId": {
+ "id": 57012496836024
+ },
+ "slotId": {
+ "m_id": "{158B30BE-BD39-40AE-A8A8-F0E5694F0180}"
+ }
+ },
+ "targetEndpoint": {
+ "nodeId": {
+ "id": 11750998249450
+ },
+ "slotId": {
+ "m_id": "{98927A53-663A-452D-ABAF-01D31F7D5D53}"
+ }
+ }
+ }
+ }
+ },
+ {
+ "Id": {
+ "id": 14005856079850
+ },
+ "Name": "srcEndpoint=(IsNetEntityRoleAuthority: Out), destEndpoint=(If: In)",
+ "Components": {
+ "Component_[16302238484508620286]": {
+ "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection",
+ "Id": 16302238484508620286,
+ "sourceEndpoint": {
+ "nodeId": {
+ "id": 11750998249450
+ },
+ "slotId": {
+ "m_id": "{89F646CA-FBC6-45D2-916B-0B47474EE693}"
+ }
+ },
+ "targetEndpoint": {
+ "nodeId": {
+ "id": 13206992162794
+ },
+ "slotId": {
+ "m_id": "{F651B19A-FD1A-44EB-9C16-0CDB44CD85AA}"
+ }
+ }
+ }
+ }
+ },
+ {
+ "Id": {
+ "id": 14302208823274
+ },
+ "Name": "srcEndpoint=(IsNetEntityRoleAuthority: Is Role Authority), destEndpoint=(If: Condition)",
+ "Components": {
+ "Component_[3887593885874168259]": {
+ "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection",
+ "Id": 3887593885874168259,
+ "sourceEndpoint": {
+ "nodeId": {
+ "id": 11750998249450
+ },
+ "slotId": {
+ "m_id": "{3FFC81A6-5C31-4CBA-8253-5DF361F10610}"
+ }
+ },
+ "targetEndpoint": {
+ "nodeId": {
+ "id": 13206992162794
+ },
+ "slotId": {
+ "m_id": "{3896AA13-516C-410F-AB9C-2CAA5E71AEF6}"
+ }
+ }
+ }
+ }
+ },
+ {
+ "Id": {
+ "id": 14637216272362
+ },
+ "Name": "srcEndpoint=(If: True), destEndpoint=(Repeater: Start)",
+ "Components": {
+ "Component_[8721834474263401249]": {
+ "$type": "{64CA5016-E803-4AC4-9A36-BDA2C890C6EB} Connection",
+ "Id": 8721834474263401249,
+ "sourceEndpoint": {
+ "nodeId": {
+ "id": 13206992162794
+ },
+ "slotId": {
+ "m_id": "{78807DC9-82B7-4893-ADA4-53E51C2AD3D1}"
+ }
+ },
+ "targetEndpoint": {
+ "nodeId": {
+ "id": 56986727032248
+ },
+ "slotId": {
+ "m_id": "{07267CBA-B377-4B57-8A04-E322F8BFC07F}"
+ }
+ }
+ }
+ }
}
]
},
@@ -1571,6 +1851,37 @@
}
}
},
+ {
+ "Key": {
+ "id": 11750998249450
+ },
+ "Value": {
+ "ComponentData": {
+ "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": {
+ "$type": "NodeSaveData"
+ },
+ "{328FF15C-C302-458F-A43D-E1794DE0904E}": {
+ "$type": "GeneralNodeTitleComponentSaveData",
+ "PaletteOverride": "MethodNodeTitlePalette"
+ },
+ "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
+ "$type": "GeometrySaveData",
+ "Position": [
+ 100.0,
+ 60.0
+ ]
+ },
+ "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
+ "$type": "StylingComponentSaveData",
+ "SubStyle": ".method"
+ },
+ "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": {
+ "$type": "PersistentIdComponentSaveData",
+ "PersistentId": "{73B270BC-9743-41C1-9E48-0CAB5A63AC97}"
+ }
+ }
+ }
+ },
{
"Key": {
"id": 11993350262154
@@ -1587,8 +1898,8 @@
"{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
"$type": "GeometrySaveData",
"Position": [
- -120.0,
- 340.0
+ 60.0,
+ 480.0
]
},
"{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
@@ -1618,8 +1929,8 @@
"{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
"$type": "GeometrySaveData",
"Position": [
- 340.0,
- 360.0
+ 520.0,
+ 500.0
]
},
"{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
@@ -1633,6 +1944,36 @@
}
}
},
+ {
+ "Key": {
+ "id": 13206992162794
+ },
+ "Value": {
+ "ComponentData": {
+ "{24CB38BB-1705-4EC5-8F63-B574571B4DCD}": {
+ "$type": "NodeSaveData"
+ },
+ "{328FF15C-C302-458F-A43D-E1794DE0904E}": {
+ "$type": "GeneralNodeTitleComponentSaveData",
+ "PaletteOverride": "LogicNodeTitlePalette"
+ },
+ "{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
+ "$type": "GeometrySaveData",
+ "Position": [
+ 540.0,
+ 60.0
+ ]
+ },
+ "{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
+ "$type": "StylingComponentSaveData"
+ },
+ "{B1F49A35-8408-40DA-B79E-F1E3B64322CE}": {
+ "$type": "PersistentIdComponentSaveData",
+ "PersistentId": "{3F73BD0E-D02D-4A48-9E25-F9FD4A0F1B89}"
+ }
+ }
+ }
+ },
{
"Key": {
"id": 16962627423626
@@ -1649,8 +1990,8 @@
"{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
"$type": "GeometrySaveData",
"Position": [
- 440.0,
- -40.0
+ 1240.0,
+ 0.0
]
},
"{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
@@ -1680,8 +2021,8 @@
"{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
"$type": "GeometrySaveData",
"Position": [
- 80.0,
- -60.0
+ 860.0,
+ 0.0
]
},
"{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
@@ -1740,8 +2081,8 @@
"{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
"$type": "GeometrySaveData",
"Position": [
- 800.0,
- 260.0
+ 980.0,
+ 400.0
]
},
"{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
@@ -1770,8 +2111,8 @@
"{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
"$type": "GeometrySaveData",
"Position": [
- 420.0,
- 100.0
+ 1220.0,
+ 140.0
]
},
"{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
@@ -1800,8 +2141,8 @@
"{7CC444B1-F9B3-41B5-841B-0C4F2179F111}": {
"$type": "GeometrySaveData",
"Position": [
- 800.0,
- 460.0
+ 980.0,
+ 600.0
]
},
"{B0B99C8A-03AF-4CF6-A926-F65C874C3D97}": {
@@ -1877,16 +2218,16 @@
},
{
"Key": {
- "id": 7369225496155711251
+ "id": 7558387155527535988
},
"Value": {
"ComponentData": {
"{5F84B500-8C45-40D1-8EFC-A5306B241444}": {
"$type": "SceneComponentSaveData",
"ViewParams": {
- "Scale": 0.7585823890144868,
- "AnchorX": -205.64674377441406,
- "AnchorY": -467.9781799316406
+ "Scale": 0.9585879578077288,
+ "AnchorX": 488.2181091308594,
+ "AnchorY": -175.25778198242188
}
}
}
@@ -1915,6 +2256,14 @@
"Key": 6462358712820489356,
"Value": 1
},
+ {
+ "Key": 8065262779685207188,
+ "Value": 1
+ },
+ {
+ "Key": 8452971738487658154,
+ "Value": 1
+ },
{
"Key": 10684225535275896474,
"Value": 3
diff --git a/AutomatedTesting/Passes/MainPipeline.pass b/AutomatedTesting/Passes/MainPipeline.pass
index c34c556983..39b992a11d 100644
--- a/AutomatedTesting/Passes/MainPipeline.pass
+++ b/AutomatedTesting/Passes/MainPipeline.pass
@@ -42,6 +42,16 @@
"RayTracingAccelerationStructurePass"
]
},
+ {
+ "Name": "TerrainDetailTextureComputePass",
+ "TemplateName": "TerrainDetailTextureComputePassTemplate",
+ "Enabled": false
+ },
+ {
+ "Name": "TerrainMacroTextureComputePass",
+ "TemplateName": "TerrainMacroTextureComputePassTemplate",
+ "Enabled": false
+ },
{
"Name": "DepthPrePass",
"TemplateName": "DepthMSAAParentTemplate",
@@ -215,7 +225,7 @@
// Note: The following two lines represent the choice of rendering pipeline for the hair.
// You can either choose to use PPLL or ShortCut and accordingly change the flag
// 'm_usePPLLRenderTechnique' in the class 'HairFeatureProcessor.cpp'
-// "TemplateName": "HairParentPassTemplate",
+ // "TemplateName": "HairParentPassTemplate",
"TemplateName": "HairParentShortCutPassTemplate",
"Enabled": true,
"Connections": [
diff --git a/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui b/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui
index 2cc7c57ccd..e07a5cda95 100644
--- a/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui
+++ b/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.ui
@@ -78,10 +78,7 @@
Qt::ClickFocus
-
-
-
- 3
+ Collapse All
diff --git a/Code/Editor/Controls/BitmapToolTip.cpp b/Code/Editor/Controls/BitmapToolTip.cpp
deleted file mode 100644
index d639ac0677..0000000000
--- a/Code/Editor/Controls/BitmapToolTip.cpp
+++ /dev/null
@@ -1,369 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Tooltip that displays bitmap.
-
-
-#include "EditorDefs.h"
-
-#include "BitmapToolTip.h"
-
-// Qt
-#include
-
-// Editor
-#include "Util/Image.h"
-#include "Util/ImageUtil.h"
-
-
-static const int STATIC_TEXT_C_HEIGHT = 42;
-static const int HISTOGRAM_C_HEIGHT = 130;
-
-/////////////////////////////////////////////////////////////////////////////
-// CBitmapToolTip
-CBitmapToolTip::CBitmapToolTip(QWidget* parent)
- : QWidget(parent, Qt::ToolTip)
- , m_staticBitmap(new QLabel(this))
- , m_staticText(new QLabel(this))
- , m_rgbaHistogram(new CImageHistogramCtrl(this))
- , m_alphaChannelHistogram(new CImageHistogramCtrl(this))
-{
- m_nTimer = 0;
- m_hToolWnd = nullptr;
- m_bShowHistogram = true;
- m_bShowFullsize = false;
- m_eShowMode = ESHOW_RGB;
-
- connect(&m_timer, &QTimer::timeout, this, &CBitmapToolTip::OnTimer);
-
- auto* layout = new QVBoxLayout(this);
- layout->setSizeConstraint(QLayout::SetFixedSize);
-
- layout->addWidget(m_staticBitmap);
- layout->addWidget(m_staticText);
-
- auto* histogramLayout = new QHBoxLayout();
- histogramLayout->addWidget(m_rgbaHistogram);
- histogramLayout->addWidget(m_alphaChannelHistogram);
- m_alphaChannelHistogram->setVisible(false);
-
- layout->addLayout(histogramLayout);
-
- setLayout(layout);
-}
-
-CBitmapToolTip::~CBitmapToolTip()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBitmapToolTip::GetShowMode(EShowMode& eShowMode, bool& bShowInOriginalSize) const
-{
- bShowInOriginalSize = CheckVirtualKey(Qt::Key_Space);
- eShowMode = ESHOW_RGB;
-
- if (m_bHasAlpha)
- {
- if (CheckVirtualKey(Qt::Key_Control))
- {
- eShowMode = ESHOW_RGB_ALPHA;
- }
- else if (CheckVirtualKey(Qt::Key_Alt))
- {
- eShowMode = ESHOW_ALPHA;
- }
- else if (CheckVirtualKey(Qt::Key_Shift))
- {
- eShowMode = ESHOW_RGBA;
- }
- }
- else if (m_bIsLimitedHDR)
- {
- if (CheckVirtualKey(Qt::Key_Shift))
- {
- eShowMode = ESHOW_RGBE;
- }
- }
-}
-
-const char* CBitmapToolTip::GetShowModeDescription(EShowMode eShowMode, [[maybe_unused]] bool bShowInOriginalSize) const
-{
- switch (eShowMode)
- {
- case ESHOW_RGB:
- return "RGB";
- case ESHOW_RGB_ALPHA:
- return "RGB+A";
- case ESHOW_ALPHA:
- return "Alpha";
- case ESHOW_RGBA:
- return "RGBA";
- case ESHOW_RGBE:
- return "RGBExp";
- }
-
- return "";
-}
-
-void CBitmapToolTip::RefreshViewmode()
-{
- LoadImage(m_filename);
-
- if (m_eShowMode == ESHOW_RGB_ALPHA || m_eShowMode == ESHOW_RGBA)
- {
- m_rgbaHistogram->setVisible(true);
- m_alphaChannelHistogram->setVisible(true);
- }
- else if (m_eShowMode == ESHOW_ALPHA)
- {
- m_rgbaHistogram->setVisible(false);
- m_alphaChannelHistogram->setVisible(true);
- }
- else
- {
- m_rgbaHistogram->setVisible(true);
- m_alphaChannelHistogram->setVisible(false);
- }
-}
-
-bool CBitmapToolTip::LoadImage(const QString& imageFilename)
-{
- EShowMode eShowMode = ESHOW_RGB;
- const char* pShowModeDescription = "RGB";
- bool bShowInOriginalSize = false;
-
- GetShowMode(eShowMode, bShowInOriginalSize);
- pShowModeDescription = GetShowModeDescription(eShowMode, bShowInOriginalSize);
-
- QString convertedFileName = Path::GamePathToFullPath(Path::ReplaceExtension(imageFilename, ".dds"));
-
- // We need to check against both the image filename and the converted filename as it is possible that the
- // converted file existed but failed to load previously and we reverted to loading the source asset.
- bool alreadyLoadedImage = ((m_filename == convertedFileName) || (m_filename == imageFilename));
- if (alreadyLoadedImage && (m_eShowMode == eShowMode) && (m_bShowFullsize == bShowInOriginalSize))
- {
- return true;
- }
-
- CCryFile fileCheck;
- if (!fileCheck.Open(convertedFileName.toUtf8().data(), "rb"))
- {
- // if we didn't find it, then default back to just using what we can find (if any)
- convertedFileName = imageFilename;
- }
- else
- {
- fileCheck.Close();
- }
-
- m_eShowMode = eShowMode;
- m_bShowFullsize = bShowInOriginalSize;
-
- CImageEx image;
- image.SetHistogramEqualization(CheckVirtualKey(Qt::Key_Shift));
- bool loadedRequestedAsset = true;
- if (!CImageUtil::LoadImage(convertedFileName, image))
- {
- //Failed to load the requested asset, let's try loading the source asset if available.
- loadedRequestedAsset = false;
- if (!CImageUtil::LoadImage(imageFilename, image))
- {
- m_staticBitmap->clear();
- return false;
- }
- }
-
- QString imginfo;
-
- m_filename = loadedRequestedAsset ? convertedFileName : imageFilename;
- m_bHasAlpha = image.HasAlphaChannel();
- m_bIsLimitedHDR = image.IsLimitedHDR();
-
- GetShowMode(eShowMode, bShowInOriginalSize);
- pShowModeDescription = GetShowModeDescription(eShowMode, bShowInOriginalSize);
-
- if (m_bHasAlpha)
- {
- imginfo = tr("%1x%2 %3\nShowing %4 (ALT=Alpha, SHIFT=RGBA, CTRL=RGB+A, SPACE=see in original size)");
- }
- else if (m_bIsLimitedHDR)
- {
- imginfo = tr("%1x%2 %3\nShowing %4 (SHIFT=see hist.-equalized, SPACE=see in original size)");
- }
- else
- {
- imginfo = tr("%1x%2 %3\nShowing %4 (SPACE=see in original size)");
- }
-
- imginfo = imginfo.arg(image.GetWidth()).arg(image.GetHeight()).arg(image.GetFormatDescription()).arg(pShowModeDescription);
-
- m_staticText->setText(imginfo);
-
- int w = image.GetWidth();
- int h = image.GetHeight();
- int multiplier = (m_eShowMode == ESHOW_RGB_ALPHA ? 2 : 1);
- int originalW = w * multiplier;
- int originalH = h;
-
- if (!bShowInOriginalSize || (w == 0))
- {
- w = 256;
- }
- if (!bShowInOriginalSize || (h == 0))
- {
- h = 256;
- }
-
- w *= multiplier;
-
- resize(w + 4, h + 4 + STATIC_TEXT_C_HEIGHT + HISTOGRAM_C_HEIGHT);
- setVisible(true);
-
- CImageEx scaledImage;
-
- if (bShowInOriginalSize && (originalW < w))
- {
- w = originalW;
- }
- if (bShowInOriginalSize && (originalH < h))
- {
- h = originalH;
- }
-
- scaledImage.Allocate(w, h);
-
- if (m_eShowMode == ESHOW_RGB_ALPHA)
- {
- CImageUtil::ScaleToDoubleFit(image, scaledImage);
- }
- else
- {
- CImageUtil::ScaleToFit(image, scaledImage);
- }
-
- if (m_eShowMode == ESHOW_RGB || m_eShowMode == ESHOW_RGBE)
- {
- scaledImage.SwapRedAndBlue();
- scaledImage.FillAlpha();
- }
- else if (m_eShowMode == ESHOW_ALPHA)
- {
- for (int hh = 0; hh < scaledImage.GetHeight(); hh++)
- {
- for (int ww = 0; ww < scaledImage.GetWidth(); ww++)
- {
- int a = scaledImage.ValueAt(ww, hh) >> 24;
- scaledImage.ValueAt(ww, hh) = RGB(a, a, a);
- }
- }
- }
- else if (m_eShowMode == ESHOW_RGB_ALPHA)
- {
- int halfWidth = scaledImage.GetWidth() / 2;
- for (int hh = 0; hh < scaledImage.GetHeight(); hh++)
- {
- for (int ww = 0; ww < halfWidth; ww++)
- {
- int r = GetRValue(scaledImage.ValueAt(ww, hh));
- int g = GetGValue(scaledImage.ValueAt(ww, hh));
- int b = GetBValue(scaledImage.ValueAt(ww, hh));
- int a = scaledImage.ValueAt(ww, hh) >> 24;
- scaledImage.ValueAt(ww, hh) = RGB(b, g, r);
- scaledImage.ValueAt(ww + halfWidth, hh) = RGB(a, a, a);
- }
- }
- }
- else //if (m_showMode == ESHOW_RGBA)
- {
- scaledImage.SwapRedAndBlue();
- }
-
- QImage qImage(scaledImage.GetWidth(), scaledImage.GetHeight(), QImage::Format_RGB32);
- memcpy(qImage.bits(), scaledImage.GetData(), qImage.sizeInBytes());
- m_staticBitmap->setPixmap(QPixmap::fromImage(qImage));
-
- if (m_bShowHistogram && scaledImage.GetData())
- {
- m_rgbaHistogram->ComputeHistogram(image, CImageHistogram::eImageFormat_32BPP_BGRA);
- m_rgbaHistogram->setDrawMode(EHistogramDrawMode::OverlappedRGB);
-
- m_alphaChannelHistogram->histogramDisplay()->CopyComputedDataFrom(m_rgbaHistogram->histogramDisplay());
- m_alphaChannelHistogram->setDrawMode(EHistogramDrawMode::AlphaChannel);
- }
-
- return true;
-}
-
-void CBitmapToolTip::OnTimer()
-{
- /*
- if (IsWindowVisible())
- {
- if (m_bHaveAnythingToRender)
- Invalidate();
- }
- */
- if (m_hToolWnd)
- {
- QRect toolRc(m_toolRect);
- QRect rc = geometry();
- QPoint cursorPos = QCursor::pos();
- toolRc.moveTopLeft(m_hToolWnd->mapToGlobal(toolRc.topLeft()));
- if (!toolRc.contains(cursorPos) && !rc.contains(cursorPos))
- {
- setVisible(false);
- }
- else
- {
- RefreshViewmode();
- }
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBitmapToolTip::showEvent([[maybe_unused]] QShowEvent* event)
-{
- QPoint cursorPos = QCursor::pos();
- move(cursorPos);
- m_timer.start(500);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBitmapToolTip::hideEvent([[maybe_unused]] QHideEvent* event)
-{
- m_timer.stop();
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-void CBitmapToolTip::keyPressEvent(QKeyEvent* event)
-{
- if (event->key() == Qt::Key_Control || event->key() == Qt::Key_Alt || event->key() == Qt::Key_Shift)
- {
- RefreshViewmode();
- }
-}
-
-void CBitmapToolTip::keyReleaseEvent(QKeyEvent* event)
-{
- if (event->key() == Qt::Key_Control || event->key() == Qt::Key_Alt || event->key() == Qt::Key_Shift)
- {
- RefreshViewmode();
- }
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CBitmapToolTip::SetTool(QWidget* pWnd, const QRect& rect)
-{
- assert(pWnd);
- m_hToolWnd = pWnd;
- m_toolRect = rect;
-}
-
-#include
diff --git a/Code/Editor/Controls/BitmapToolTip.h b/Code/Editor/Controls/BitmapToolTip.h
deleted file mode 100644
index 5b7c56cbf3..0000000000
--- a/Code/Editor/Controls/BitmapToolTip.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-// Description : Tooltip that displays bitmap.
-
-
-#ifndef CRYINCLUDE_EDITOR_CONTROLS_BITMAPTOOLTIP_H
-#define CRYINCLUDE_EDITOR_CONTROLS_BITMAPTOOLTIP_H
-#pragma once
-
-
-#if !defined(Q_MOC_RUN)
-#include "Controls/ImageHistogramCtrl.h"
-
-#include
-#include
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-class CBitmapToolTip
- : public QWidget
-{
- Q_OBJECT
- // Construction
-public:
-
- enum EShowMode
- {
- ESHOW_RGB = 0,
- ESHOW_ALPHA,
- ESHOW_RGBA,
- ESHOW_RGB_ALPHA,
- ESHOW_RGBE
- };
-
- CBitmapToolTip(QWidget* parent = nullptr);
- virtual ~CBitmapToolTip();
-
- bool Create(const RECT& rect);
-
- // Attributes
-public:
-
- // Operations
-public:
- void RefreshViewmode();
-
- bool LoadImage(const QString& imageFilename);
- void SetTool(QWidget* pWnd, const QRect& rect);
-
- // Generated message map functions
-protected:
- void OnTimer();
-
- void keyPressEvent(QKeyEvent* event) override;
- void keyReleaseEvent(QKeyEvent* event) override;
-
- void showEvent(QShowEvent* event) override;
- void hideEvent(QHideEvent* event) override;
-
-private:
- void GetShowMode(EShowMode& showMode, bool& showInOriginalSize) const;
- const char* GetShowModeDescription(EShowMode showMode, bool showInOriginalSize) const;
-
- QLabel* m_staticBitmap;
- QLabel* m_staticText;
- QString m_filename;
- bool m_bShowHistogram;
- EShowMode m_eShowMode;
- bool m_bShowFullsize;
- bool m_bHasAlpha;
- bool m_bIsLimitedHDR;
- CImageHistogramCtrl* m_rgbaHistogram;
- CImageHistogramCtrl* m_alphaChannelHistogram;
- int m_nTimer;
- QWidget* m_hToolWnd;
- QRect m_toolRect;
- QTimer m_timer;
-};
-
-
-#endif // CRYINCLUDE_EDITOR_CONTROLS_BITMAPTOOLTIP_H
diff --git a/Code/Editor/Controls/QBitmapPreviewDialog.cpp b/Code/Editor/Controls/QBitmapPreviewDialog.cpp
deleted file mode 100644
index 912db3708c..0000000000
--- a/Code/Editor/Controls/QBitmapPreviewDialog.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "QBitmapPreviewDialog.h"
-#include
-
-#include
-#include
-#include
-#include
-
-void QBitmapPreviewDialog::ImageData::setRgba8888(const void* buffer, const int& w, const int& h)
-{
- const unsigned long bytes = w * h * 4;
- m_buffer.resize(bytes);
- memcpy(m_buffer.data(), buffer, bytes);
- m_image = QImage((uchar*)m_buffer.constData(), w, h, QImage::Format::Format_RGBA8888);
-}
-
-static void fillChecker(int w, int h, unsigned int* dst)
-{
- for (int y = 0; y < h; y++)
- {
- for (int x = 0; x < w; x++)
- {
- dst[y * w + x] = 0xFF000000 | (((x >> 2) + (y >> 2)) % 2 == 0 ? 0x007F7F7F : 0x00000000);
- }
- }
-}
-
-QBitmapPreviewDialog::QBitmapPreviewDialog(QWidget* parent)
- : QWidget(parent)
- , ui(new Ui::QBitmapTooltip)
-{
- ui->setupUi(this);
- setAttribute(Qt::WA_TranslucentBackground);
- setAttribute(Qt::WA_ShowWithoutActivating);
-
- // Clear label text
- ui->m_placeholderBitmap->setText("");
- ui->m_placeholderHistogram->setText("");
-
- ui->m_bitmapSize->setProperty("tableRow", "Odd");
- ui->m_Mips->setProperty("tableRow", "Even");
- ui->m_Mean->setProperty("tableRow", "Odd");
- ui->m_StdDev->setProperty("tableRow", "Even");
- ui->m_Median->setProperty("tableRow", "Odd");
- ui->m_labelForBitmapSize->setProperty("tooltipLabel", "content");
- ui->m_labelForMean->setProperty("tooltipLabel", "content");
- ui->m_labelForMedian->setProperty("tooltipLabel", "content");
- ui->m_labelForMips->setProperty("tooltipLabel", "content");
- ui->m_labelForStdDev->setProperty("tooltipLabel", "content");
- ui->m_vBitmapSize->setProperty("tooltipLabel", "content");
- ui->m_vMean->setProperty("tooltipLabel", "content");
- ui->m_vMedian->setProperty("tooltipLabel", "content");
- ui->m_vMips->setProperty("tooltipLabel", "content");
- ui->m_vStdDev->setProperty("tooltipLabel", "content");
-
- // Initialize placeholder images
- const int w = 64;
- const int h = 64;
- QByteArray buffer;
- buffer.resize(w * h * 4);
- unsigned int* dst = (unsigned int*)buffer.data();
- fillChecker(w, h, dst);
- m_checker.setRgba8888(buffer.constData(), w, h);
-
- m_initialSize = window()->window()->geometry().size();
-}
-
-QBitmapPreviewDialog::~QBitmapPreviewDialog()
-{
- delete ui;
-}
-
-void QBitmapPreviewDialog::setImageRgba8888(const void* buffer, const int& w, const int& h, [[maybe_unused]] const QString& info)
-{
- m_imageMain.setRgba8888(buffer, w, h);
-}
-
-
-QRect QBitmapPreviewDialog::getHistogramArea()
-{
- return QRect(ui->m_placeholderHistogram->pos(), ui->m_placeholderHistogram->size());
-}
-
-void QBitmapPreviewDialog::setFullSize(const bool& fullSize)
-{
- if (fullSize)
- {
- QSize desktop = QApplication::screenAt(ui->m_placeholderBitmap->pos())->availableGeometry().size();
- QSize image = m_imageMain.m_image.size();
- QPoint location = mapToGlobal(ui->m_placeholderBitmap->pos());
- QSize finalSize;
- finalSize.setWidth((image.width() < (desktop.width() - location.x())) ? image.width() : (desktop.width() - location.x()));
- finalSize.setHeight((image.height() < (desktop.height() - location.y())) ? image.height() : (desktop.height() - location.y()));
- float scale = (finalSize.width() < finalSize.height()) ? finalSize.width() / float(m_imageMain.m_image.width()) : finalSize.height() / float(m_imageMain.m_image.height());
- ui->m_placeholderBitmap->setFixedSize(scale * m_imageMain.m_image.size());
- }
- else
- {
- ui->m_placeholderBitmap->setFixedSize(256, 256);
- }
-
- adjustSize();
-
- update();
-}
-
-void QBitmapPreviewDialog::paintEvent(QPaintEvent* e)
-{
- QWidget::paintEvent(e);
- QRect rect(ui->m_placeholderBitmap->pos(), ui->m_placeholderBitmap->size());
- drawImageData(rect, m_imageMain);
-}
-
-void QBitmapPreviewDialog::drawImageData(const QRect& rect, const ImageData& imgData)
-{
- // Draw the
- QPainter p(this);
- p.drawImage(rect.topLeft(), m_checker.m_image.scaled(rect.size()));
- p.drawImage(rect.topLeft(), imgData.m_image.scaled(rect.size()));
-
- // Draw border
- QPen pen;
- pen.setColor(QColor(0, 0, 0));
- p.drawRect(rect.top(), rect.left(), rect.width() - 1, rect.height());
-}
-
-void QBitmapPreviewDialog::setSize(QString _value)
-{
- ui->m_vBitmapSize->setText(_value);
-}
-
-void QBitmapPreviewDialog::setMips(QString _value)
-{
- ui->m_vMips->setText(_value);
-}
-
-void QBitmapPreviewDialog::setMean(QString _value)
-{
- ui->m_vMean->setText(_value);
-}
-
-void QBitmapPreviewDialog::setMedian(QString _value)
-{
- ui->m_vMedian->setText(_value);
-}
-
-void QBitmapPreviewDialog::setStdDev(QString _value)
-{
- ui->m_vStdDev->setText(_value);
-}
-
-QSize QBitmapPreviewDialog::GetCurrentBitmapSize()
-{
- return ui->m_placeholderBitmap->size();
-}
-
-QSize QBitmapPreviewDialog::GetOriginalImageSize()
-{
- return m_imageMain.m_image.size();
-}
-
-
-#include
diff --git a/Code/Editor/Controls/QBitmapPreviewDialog.h b/Code/Editor/Controls/QBitmapPreviewDialog.h
deleted file mode 100644
index a5429bc8f0..0000000000
--- a/Code/Editor/Controls/QBitmapPreviewDialog.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef QBITMAPPREVIEWDIALOG_H
-#define QBITMAPPREVIEWDIALOG_H
-
-#if !defined(Q_MOC_RUN)
-#include
-#include
-#include
-#endif
-
-class QLabel;
-
-namespace Ui {
- class QBitmapTooltip;
-}
-
-class QBitmapPreviewDialog
- : public QWidget
-{
- Q_OBJECT
-
- struct ImageData
- {
- QByteArray m_buffer;
- QImage m_image;
-
- void setRgba8888(const void* buffer, const int& w, const int& h);
- };
-
-public:
- explicit QBitmapPreviewDialog(QWidget* parent = 0);
- virtual ~QBitmapPreviewDialog();
- QSize GetCurrentBitmapSize();
- QSize GetOriginalImageSize();
-
-protected:
- void setImageRgba8888(const void* buffer, const int& w, const int& h, const QString& info);
- void setSize(QString _value);
- void setMips(QString _value);
- void setMean(QString _value);
- void setMedian(QString _value);
- void setStdDev(QString _value);
- QRect getHistogramArea();
- void setFullSize(const bool& fullSize);
-
- void paintEvent(QPaintEvent* e) override;
-
-private:
- void drawImageData(const QRect& rect, const ImageData& imgData);
-
-protected:
- Ui::QBitmapTooltip* ui;
- QSize m_initialSize;
- ImageData m_checker;
- ImageData m_imageMain;
-};
-
-#endif // QBITMAPPREVIEWDIALOG_H
diff --git a/Code/Editor/Controls/QBitmapPreviewDialog.ui b/Code/Editor/Controls/QBitmapPreviewDialog.ui
deleted file mode 100644
index 87b3a310ef..0000000000
--- a/Code/Editor/Controls/QBitmapPreviewDialog.ui
+++ /dev/null
@@ -1,390 +0,0 @@
-
-
- QBitmapTooltip
-
-
-
- 0
- 0
- 256
- 510
-
-
-
-
- 256
- 0
-
-
-
-
- 16777215
- 16777215
-
-
-
- Form
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 256
-
-
-
-
- 16777215
- 16777215
-
-
-
- false
-
-
- QFrame::NoFrame
-
-
- QFrame::Sunken
-
-
- Bitmap Area
-
-
- Qt::AlignCenter
-
-
- false
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 128
-
-
-
- QFrame::NoFrame
-
-
- QFrame::Sunken
-
-
- Histogram Area
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
-
- 0
- 24
-
-
-
-
- 16777215
- 24
-
-
-
-
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- Size:
-
-
-
- -
-
-
- Qt::RightToLeft
-
-
- Size Value
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
-
-
- -
-
-
-
- 0
- 24
-
-
-
-
- 16777215
- 24
-
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- DXT5 Mips:
-
-
-
- -
-
-
- Qt::RightToLeft
-
-
- Size Value
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
-
-
- -
-
-
-
- 0
- 24
-
-
-
-
- 16777215
- 24
-
-
-
-
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- Mean:
-
-
-
- -
-
-
- Qt::RightToLeft
-
-
- Size Value
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
-
-
- -
-
-
-
- 0
- 24
-
-
-
-
- 16777215
- 24
-
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- StdDev:
-
-
-
- -
-
-
- Qt::RightToLeft
-
-
- Size Value
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
-
-
- -
-
-
-
- 0
- 24
-
-
-
-
- 16777215
- 24
-
-
-
-
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- Median:
-
-
-
- -
-
-
- Qt::RightToLeft
-
-
- Size Value
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Code/Editor/Controls/QBitmapPreviewDialogImp.cpp b/Code/Editor/Controls/QBitmapPreviewDialogImp.cpp
deleted file mode 100644
index b47a535d2a..0000000000
--- a/Code/Editor/Controls/QBitmapPreviewDialogImp.cpp
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include "QBitmapPreviewDialogImp.h"
-
-// Cry
-#include
-
-// EditorCore
-#include
-#include
-
-// QT
-AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 4251: class '...' needs to have dll-interface to be used by clients of class '...'
-#include
-#include
-#include
-#include
-#include
-AZ_POP_DISABLE_WARNING
-
-#include
-
-static const int kDefaultWidth = 256;
-static const int kDefaultHeight = 256;
-
-QBitmapPreviewDialogImp::QBitmapPreviewDialogImp(QWidget* parent)
- : QBitmapPreviewDialog(parent)
- , m_image(new CImageEx())
- , m_showOriginalSize(false)
- , m_showMode(ESHOW_RGB)
- , m_histrogramMode(eHistogramMode_OverlappedRGB)
-{
- setMouseTracking(true);
- setImage("");
- ui->m_placeholderBitmap->setStyleSheet("background-color: rgba(0, 0, 0, 0);");
- ui->m_placeholderHistogram->setStyleSheet("background-color: rgba(0, 0, 0, 0);");
-
- ui->m_labelForBitmapSize->setProperty("tooltipLabel", "Content");
- ui->m_labelForMean->setProperty("tooltipLabel", "Content");
- ui->m_labelForMedian->setProperty("tooltipLabel", "Content");
- ui->m_labelForMips->setProperty("tooltipLabel", "Content");
- ui->m_labelForStdDev->setProperty("tooltipLabel", "Content");
-
- ui->m_vBitmapSize->setProperty("tooltipLabel", "Content");
- ui->m_vMean->setProperty("tooltipLabel", "Content");
- ui->m_vMedian->setProperty("tooltipLabel", "Content");
- ui->m_vMips->setProperty("tooltipLabel", "Content");
- ui->m_vStdDev->setProperty("tooltipLabel", "Content");
-
- setUIStyleMode(EUISTYLE_IMAGE_ONLY);
-}
-
-QBitmapPreviewDialogImp::~QBitmapPreviewDialogImp()
-{
- SAFE_DELETE(m_image);
-}
-
-void QBitmapPreviewDialogImp::setImage(const QString path)
-{
- if (path.isEmpty()
- || m_path == path
- || !GetIEditor()->GetImageUtil()->LoadImage(path.toUtf8().data(), *m_image))
- {
- return;
- }
-
- m_showOriginalSize = isSizeSmallerThanDefault();
- m_path = path;
- refreshData();
-}
-
-void QBitmapPreviewDialogImp::setShowMode(EShowMode mode)
-{
- if (mode == ESHOW_NumModes)
- {
- return;
- }
-
- m_showMode = mode;
- refreshData();
- update();
-}
-
-void QBitmapPreviewDialogImp::toggleShowMode()
-{
- m_showMode = (EShowMode)(((int)m_showMode + 1) % ESHOW_NumModes);
- refreshData();
- update();
-}
-
-void QBitmapPreviewDialogImp::setUIStyleMode(EUIStyle mode)
-{
- if (mode >= EUISTYLE_NumModes)
- {
- return;
- }
-
- m_uiStyle = mode;
- if (m_uiStyle == EUISTYLE_IMAGE_ONLY)
- {
- ui->m_placeholderHistogram->hide();
-
- ui->m_labelForBitmapSize->hide();
- ui->m_labelForMean->hide();
- ui->m_labelForMedian->hide();
- ui->m_labelForMips->hide();
- ui->m_labelForStdDev->hide();
-
- ui->m_vBitmapSize->hide();
- ui->m_vMean->hide();
- ui->m_vMedian->hide();
- ui->m_vMips->hide();
- ui->m_vStdDev->hide();
- }
- else
- {
- ui->m_placeholderHistogram->show();
-
- ui->m_labelForBitmapSize->show();
- ui->m_labelForMean->show();
- ui->m_labelForMedian->show();
- ui->m_labelForMips->show();
- ui->m_labelForStdDev->show();
-
- ui->m_vBitmapSize->show();
- ui->m_vMean->show();
- ui->m_vMedian->show();
- ui->m_vMips->show();
- ui->m_vStdDev->show();
- }
-}
-
-const QBitmapPreviewDialogImp::EShowMode& QBitmapPreviewDialogImp::getShowMode() const
-{
- return m_showMode;
-}
-
-void QBitmapPreviewDialogImp::setHistogramMode(EHistogramMode mode)
-{
- if (mode == eHistogramMode_NumModes)
- {
- return;
- }
-
- m_histrogramMode = mode;
-}
-
-void QBitmapPreviewDialogImp::toggleHistrogramMode()
-{
- m_histrogramMode = (EHistogramMode)(((int)m_histrogramMode + 1) % eHistogramMode_NumModes);
- update();
-}
-
-const QBitmapPreviewDialogImp::EHistogramMode& QBitmapPreviewDialogImp::getHistogramMode() const
-{
- return m_histrogramMode;
-}
-
-void QBitmapPreviewDialogImp::toggleOriginalSize()
-{
- m_showOriginalSize = !m_showOriginalSize;
-
- refreshData();
- update();
-}
-
-bool QBitmapPreviewDialogImp::isSizeSmallerThanDefault()
-{
- return m_image->GetWidth() < kDefaultWidth && m_image->GetHeight() < kDefaultHeight;
-}
-
-void QBitmapPreviewDialogImp::setOriginalSize(bool value)
-{
- m_showOriginalSize = value;
-
- refreshData();
- update();
-}
-
-
-const char* QBitmapPreviewDialogImp::GetShowModeDescription(EShowMode eShowMode, [[maybe_unused]] bool bShowInOriginalSize) const
-{
- switch (eShowMode)
- {
- case ESHOW_RGB:
- return "RGB";
- case ESHOW_RGB_ALPHA:
- return "RGB+A";
- case ESHOW_ALPHA:
- return "Alpha";
- case ESHOW_RGBA:
- return "RGBA";
- case ESHOW_RGBE:
- return "RGBExp";
- }
-
- return "";
-}
-
-const char* getHistrogramModeStr(QBitmapPreviewDialogImp::EHistogramMode mode, bool shortName)
-{
- switch (mode)
- {
- case QBitmapPreviewDialogImp::eHistogramMode_Luminosity:
- return shortName ? "Lum" : "Luminosity";
- case QBitmapPreviewDialogImp::eHistogramMode_OverlappedRGB:
- return shortName ? "Overlap" : "Overlapped RGBA";
- case QBitmapPreviewDialogImp::eHistogramMode_SplitRGB:
- return shortName ? "R|G|B" : "Split RGB";
- case QBitmapPreviewDialogImp::eHistogramMode_RedChannel:
- return shortName ? "Red" : "Red Channel";
- case QBitmapPreviewDialogImp::eHistogramMode_GreenChannel:
- return shortName ? "Green" : "Green Channel";
- case QBitmapPreviewDialogImp::eHistogramMode_BlueChannel:
- return shortName ? "Blue" : "Blue Channel";
- case QBitmapPreviewDialogImp::eHistogramMode_AlphaChannel:
- return shortName ? "Alpha" : "Alpha Channel";
- default:
- break;
- }
-
- return "";
-}
-
-void QBitmapPreviewDialogImp::refreshData()
-{
- // Check if we have some usefull data loaded
- if (m_image->GetWidth() * m_image->GetHeight() == 0)
- {
- return;
- }
-
- int w = m_image->GetWidth();
- int h = m_image->GetHeight();
-
- int multiplier = (m_showMode == ESHOW_RGB_ALPHA ? 2 : 1);
- int originalW = w * multiplier;
- int originalH = h;
-
- if (!m_showOriginalSize || (w == 0))
- {
- w = kDefaultWidth;
- }
- if (!m_showOriginalSize || (h == 0))
- {
- h = kDefaultHeight;
- }
-
- w *= multiplier;
-
- CImageEx scaledImage;
-
- if (m_showOriginalSize && (originalW < w))
- {
- w = originalW;
- }
- if (m_showOriginalSize && (originalH < h))
- {
- h = originalH;
- }
-
- scaledImage.Allocate(w, h);
-
- if (m_showMode == ESHOW_RGB_ALPHA)
- {
- GetIEditor()->GetImageUtil()->ScaleToDoubleFit(*m_image, scaledImage);
- }
- else
- {
- GetIEditor()->GetImageUtil()->ScaleToFit(*m_image, scaledImage);
- }
-
- if (m_showMode == ESHOW_RGB || m_showMode == ESHOW_RGBE)
- {
- scaledImage.FillAlpha();
- }
- else if (m_showMode == ESHOW_ALPHA)
- {
- for (int h2 = 0; h2 < scaledImage.GetHeight(); h2++)
- {
- for (int w2 = 0; w2 < scaledImage.GetWidth(); w2++)
- {
- int a = scaledImage.ValueAt(w2, h2) >> 24;
- scaledImage.ValueAt(w2, h2) = RGB(a, a, a) | (a << 24);
- }
- }
- }
- else if (m_showMode == ESHOW_RGB_ALPHA)
- {
- int halfWidth = scaledImage.GetWidth() / 2;
- for (int h2 = 0; h2 < scaledImage.GetHeight(); h2++)
- {
- for (int w2 = 0; w2 < halfWidth; w2++)
- {
- int r = GetRValue(scaledImage.ValueAt(w2, h2));
- int g = GetGValue(scaledImage.ValueAt(w2, h2));
- int b = GetBValue(scaledImage.ValueAt(w2, h2));
- int a = scaledImage.ValueAt(w2, h2) >> 24;
- scaledImage.ValueAt(w2, h2) = RGB(r, g, b) | (a << 24);
- scaledImage.ValueAt(w2 + halfWidth, h2) = RGB(a, a, a) | (a << 24);
- }
- }
- }
-
-
- setImageRgba8888(scaledImage.GetData(), w, h, "");
- setSize(QString().asprintf("%d x %d", m_image->GetWidth(), m_image->GetHeight()));
- setMips(QString().asprintf("%d", m_image->GetNumberOfMipMaps()));
-
- setFullSize(m_showOriginalSize);
-
- // Compute histogram
- m_histogram.ComputeHistogram((BYTE*)scaledImage.GetData(), w, h, CImageHistogram::eImageFormat_32BPP_RGBA);
-}
-
-void QBitmapPreviewDialogImp::paintEvent(QPaintEvent* e)
-{
- QBitmapPreviewDialog::paintEvent(e);
-
- //if showing original size hide other information so it's easier to see
- if (m_showOriginalSize)
- {
- return;
- }
- if (m_uiStyle == EUISTYLE_IMAGE_ONLY)
- {
- return;
- }
-
- QPainter p(this);
- QPen pen;
- QPainterPath path[4];
-
- // Fill background color
- QRect histogramRect = getHistogramArea();
- p.fillRect(histogramRect, QColor(255, 255, 255));
-
- // Draw borders
- pen.setColor(QColor(0, 0, 0));
- p.setPen(pen);
- p.drawRect(histogramRect);
-
- // Draw histogram
-
- QVector drawChannels;
-
- switch (m_histrogramMode)
- {
- case eHistogramMode_Luminosity:
- drawChannels.push_back(3);
- break;
- case eHistogramMode_SplitRGB:
- drawChannels.push_back(0);
- drawChannels.push_back(1);
- drawChannels.push_back(2);
- break;
- case eHistogramMode_OverlappedRGB:
- drawChannels.push_back(0);
- drawChannels.push_back(1);
- drawChannels.push_back(2);
- break;
- case eHistogramMode_RedChannel:
- drawChannels.push_back(0);
- break;
- case eHistogramMode_GreenChannel:
- drawChannels.push_back(1);
- break;
- case eHistogramMode_BlueChannel:
- drawChannels.push_back(2);
- break;
- case eHistogramMode_AlphaChannel:
- drawChannels.push_back(3);
- break;
- }
-
- int graphWidth = qMax(histogramRect.width(), 1);
- int graphHeight = qMax(histogramRect.height() - 2, 0);
- int graphBottom = histogramRect.bottom() + 1;
- int currX[4] = {0, 0, 0, 0};
- int prevX[4] = {0, 0, 0, 0};
- float scale = 0.0f;
- static const int numSubGraphs = 3;
- const int subGraph = qCeil(graphWidth / numSubGraphs);
-
- // Fill background for Split RGB histogram
- if (m_histrogramMode == eHistogramMode_SplitRGB)
- {
- const static QColor backgroundColor[numSubGraphs] =
- {
- QColor(255, 220, 220),
- QColor(220, 255, 220),
- QColor(220, 220, 255)
- };
-
- for (int i = 0; i < numSubGraphs; i++)
- {
- p.fillRect(histogramRect.left() + subGraph * i,
- histogramRect.top(),
- subGraph + (i == numSubGraphs - 1 ? 1 : 0),
- histogramRect.height(), backgroundColor[i]);
- }
- }
-
- int lastHeight[CImageHistogram::kNumChannels] = { INT_MAX, INT_MAX, INT_MAX, INT_MAX };
-
- for (int x = 0; x < graphWidth; ++x)
- {
- for (int j = 0; j < drawChannels.size(); j++)
- {
- const int c = drawChannels[j];
- int& curr_x = currX[c];
- int& prev_x = prevX[c];
- int& last_height = lastHeight[c];
- QPainterPath& curr_path = path[c];
-
-
- curr_x = histogramRect.left() + x + 1;
- int i = static_cast(((float)x / (graphWidth - 1)) * (CImageHistogram::kNumColorLevels - 1));
- if (m_histrogramMode == eHistogramMode_SplitRGB)
- {
- // Filter out to area which we are interested
- const int k = x / subGraph;
- if (k != c)
- {
- continue;
- }
-
- i = qCeil((i - (subGraph * c)) * numSubGraphs);
- i = qMin(i, CImageHistogram::kNumColorLevels - 1);
- i = qMax(i, 0);
- }
-
- if (m_histrogramMode == eHistogramMode_Luminosity)
- {
- scale = (float)m_histogram.m_lumCount[i] / m_histogram.m_maxLumCount;
- }
- else if (m_histogram.m_maxCount[c])
- {
- scale = (float)m_histogram.m_count[c][i] / m_histogram.m_maxCount[c];
- }
-
- int height = static_cast(graphBottom - graphHeight * scale);
- if (last_height == INT_MAX)
- {
- last_height = height;
- }
-
- curr_path.moveTo(prev_x, last_height);
- curr_path.lineTo(curr_x, height);
- last_height = height;
-
- if (prev_x == INT_MAX)
- {
- prev_x = curr_x;
- }
-
- prev_x = curr_x;
- }
- }
-
- static const QColor kChannelColor[4] =
- {
- QColor(255, 0, 0),
- QColor(0, 255, 0),
- QColor(0, 0, 255),
- QColor(120, 120, 120)
- };
-
- for (int i = 0; i < drawChannels.size(); i++)
- {
- const int c = drawChannels[i];
- pen.setColor(kChannelColor[c]);
- p.setPen(pen);
- p.drawPath(path[c]);
- }
-
- // Update histogram info
- {
- float mean = 0, stdDev = 0, median = 0;
-
- switch (m_histrogramMode)
- {
- case eHistogramMode_Luminosity:
- case eHistogramMode_SplitRGB:
- case eHistogramMode_OverlappedRGB:
- mean = m_histogram.m_meanAvg;
- stdDev = m_histogram.m_stdDevAvg;
- median = m_histogram.m_medianAvg;
- break;
- case eHistogramMode_RedChannel:
- mean = m_histogram.m_mean[0];
- stdDev = m_histogram.m_stdDev[0];
- median = m_histogram.m_median[0];
- break;
- case eHistogramMode_GreenChannel:
- mean = m_histogram.m_mean[1];
- stdDev = m_histogram.m_stdDev[1];
- median = m_histogram.m_median[1];
- break;
- case eHistogramMode_BlueChannel:
- mean = m_histogram.m_mean[2];
- stdDev = m_histogram.m_stdDev[2];
- median = m_histogram.m_median[2];
- break;
- case eHistogramMode_AlphaChannel:
- mean = m_histogram.m_mean[3];
- stdDev = m_histogram.m_stdDev[3];
- median = m_histogram.m_median[3];
- break;
- }
- QString val;
- val.setNum(mean);
- setMean(val);
- val.setNum(stdDev);
- setStdDev(val);
- val.setNum(median);
- setMedian(val);
- }
-}
-
-#include
diff --git a/Code/Editor/Controls/QBitmapPreviewDialogImp.h b/Code/Editor/Controls/QBitmapPreviewDialogImp.h
deleted file mode 100644
index 63de867e6c..0000000000
--- a/Code/Editor/Controls/QBitmapPreviewDialogImp.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef QBITMAPPREVIEWDIALOG_IMP_H
-#define QBITMAPPREVIEWDIALOG_IMP_H
-
-#if !defined(Q_MOC_RUN)
-#include "QBitmapPreviewDialog.h"
-#include
-#endif
-
-class CImageEx;
-
-class QBitmapPreviewDialogImp
- : public QBitmapPreviewDialog
-{
- Q_OBJECT;
-public:
-
- enum EUIStyle
- {
- EUISTYLE_IMAGE_ONLY,
- EUISTYLE_IMAGE_HISTOGRAM,
- EUISTYLE_NumModes
- };
-
- enum EShowMode
- {
- ESHOW_RGB = 0,
- ESHOW_ALPHA,
- ESHOW_RGBA,
- ESHOW_RGB_ALPHA,
- ESHOW_RGBE,
- ESHOW_NumModes,
- };
-
- enum EHistogramMode
- {
- eHistogramMode_Luminosity,
- eHistogramMode_OverlappedRGB,
- eHistogramMode_SplitRGB,
- eHistogramMode_RedChannel,
- eHistogramMode_GreenChannel,
- eHistogramMode_BlueChannel,
- eHistogramMode_AlphaChannel,
- eHistogramMode_NumModes,
- };
-
- explicit QBitmapPreviewDialogImp(QWidget* parent = 0);
- virtual ~QBitmapPreviewDialogImp();
-
- void setImage(const QString path);
-
- void setShowMode(EShowMode mode);
- void toggleShowMode();
- void setUIStyleMode(EUIStyle mode);
- const EShowMode& getShowMode() const;
-
- void setHistogramMode(EHistogramMode mode);
- void toggleHistrogramMode();
- const EHistogramMode& getHistogramMode() const;
-
- void setOriginalSize(bool value);
- void toggleOriginalSize();
-
- bool isSizeSmallerThanDefault();
- void paintEvent(QPaintEvent* e) override;
-
-protected:
- void refreshData();
-
-private:
- const char* GetShowModeDescription(EShowMode eShowMode, bool bShowInOriginalSize) const;
-
-private:
- CImageEx* m_image;
- QString m_path;
- CImageHistogram m_histogram;
- bool m_showOriginalSize;
- EShowMode m_showMode;
- EHistogramMode m_histrogramMode;
- EUIStyle m_uiStyle;
-};
-
-#endif // QBITMAPPREVIEWDIALOG_IMP_H
diff --git a/Code/Editor/Controls/QToolTipWidget.cpp b/Code/Editor/Controls/QToolTipWidget.cpp
deleted file mode 100644
index 12a66a5d67..0000000000
--- a/Code/Editor/Controls/QToolTipWidget.cpp
+++ /dev/null
@@ -1,642 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#include "EditorDefs.h"
-
-#include
-
-#include "QBitmapPreviewDialogImp.h"
-#include "qcoreapplication.h"
-#include "qguiapplication.h"
-#include "qapplication.h"
-#include
-#include
-#include
-#include
-
-void QToolTipWidget::RebuildLayout()
-{
- if (m_title != nullptr)
- {
- m_title->hide();
- }
- if (m_content != nullptr)
- {
- m_content->hide();
- }
- if (m_specialContent != nullptr)
- {
- m_specialContent->hide();
- }
-
- //empty layout
- while (m_layout->count() > 0)
- {
- m_layout->takeAt(0);
- }
- qDeleteAll(m_currentShortcuts);
- m_currentShortcuts.clear();
- if (m_includeTextureShortcuts)
- {
- m_currentShortcuts.append(new QLabel(tr("Alt - Alpha"), this));
- m_currentShortcuts.back()->setProperty("tooltipLabel", "Shortcut");
- m_currentShortcuts.append(new QLabel(tr("Shift - RGBA"), this));
- m_currentShortcuts.back()->setProperty("tooltipLabel", "Shortcut");
- }
-
- if (m_title != nullptr && !m_title->text().isEmpty())
- {
- m_layout->addWidget(m_title);
- m_title->show();
- }
-
- for (QLabel* var : m_currentShortcuts)
- {
- if (var != nullptr)
- {
- m_layout->addWidget(var);
- var->show();
- }
- }
- if (m_specialContent != nullptr)
- {
- m_layout->addWidget(m_specialContent);
- m_specialContent->show();
- }
- if (m_content != nullptr && !m_content->text().isEmpty())
- {
- m_layout->addWidget(m_content);
- m_content->show();
- }
- m_background->adjustSize();
- adjustSize();
-}
-
-void QToolTipWidget::Hide()
-{
- m_currentShortcuts.clear();
- hide();
-}
-
-void QToolTipWidget::Show(QPoint pos, ArrowDirection dir)
-{
- if (!IsValid())
- {
- return;
- }
- m_arrow->m_direction = dir;
- pos = AdjustTipPosByArrowSize(pos, dir);
- m_normalPos = pos;
- move(pos);
- RebuildLayout();
- show();
- m_arrow->show();
-}
-
-void QToolTipWidget::Display(QRect targetRect, ArrowDirection preferredArrowDir)
-{
- if (!IsValid())
- {
- return;
- }
-
- KeepTipOnScreen(targetRect, preferredArrowDir);
-
- RebuildLayout();
- show();
- m_arrow->show();
-}
-
-void QToolTipWidget::TryDisplay(QPoint mousePos, const QRect& rect, [[maybe_unused]] ArrowDirection preferredArrowDir)
-{
- if (rect.contains(mousePos))
- {
- Display(rect, QToolTipWidget::ArrowDirection::ARROW_RIGHT);
- }
- else
- {
- hide();
- }
- }
-
-void QToolTipWidget::TryDisplay(QPoint mousePos, const QWidget* widget, ArrowDirection preferredArrowDir)
-{
- const QRect rect(widget->mapToGlobal(QPoint(0,0)), widget->size());
- TryDisplay(mousePos, rect, preferredArrowDir);
-}
-
-void QToolTipWidget::SetTitle(QString title)
-{
- if (!title.isEmpty())
- {
- m_title->setText(title);
- }
- m_title->setProperty("tooltipLabel", "Title");
-
- setWindowTitle("ToolTip - " + title);
-}
-
-void QToolTipWidget::SetContent(QString content)
-{
- m_content->setWordWrap(true);
-
- m_content->setProperty("tooltipLabel", "Content");
- //line-height is not supported via stylesheet so we use the html rich-text subset in QT for it.
- m_content->setText(QString("%1").arg(content));
-}
-
-void QToolTipWidget::AppendContent(QString content)
-{
- m_content->setText(m_content->text() + "\n\n" + content);
- update();
- RebuildLayout();
- m_content->update();
- m_content->repaint();
-}
-
-QToolTipWidget::QToolTipWidget(QWidget* parent)
- : QWidget(parent)
-{
- m_background = new QWidget(this);
- m_background->setProperty("tooltip", "Background");
- m_background->stackUnder(this);
- m_title = new QLabel(this);
- m_currentShortcuts = QVector();
- m_content = new QLabel(this);
- m_specialContent = nullptr;
- setWindowTitle("ToolTip");
- setObjectName("ToolTip");
- m_layout = new QVBoxLayout(this);
- m_normalPos = QPoint(0, 0);
- m_arrow = new QArrow(m_background);
- setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint);
- m_arrow->setWindowFlags(Qt::ToolTip | Qt::FramelessWindowHint);
- m_arrow->setAttribute(Qt::WA_TranslucentBackground, true);
- m_background->setLayout(m_layout);
- m_arrow->setObjectName("ToolTipArrow");
- m_background->setObjectName("ToolTipBackground");
-
- //we need a drop shadow for the background
- QGraphicsDropShadowEffect* dropShadow = new QGraphicsDropShadowEffect(this);
- dropShadow->setBlurRadius(m_shadowRadius);
- dropShadow->setColor(Qt::black);
- dropShadow->setOffset(0);
- dropShadow->setEnabled(true);
- m_background->setGraphicsEffect(dropShadow);
- //we need a second drop shadow effect for the arrow
- dropShadow = new QGraphicsDropShadowEffect(m_arrow);
- dropShadow->setBlurRadius(m_shadowRadius);
- dropShadow->setColor(Qt::black);
- dropShadow->setOffset(0);
- dropShadow->setEnabled(true);
- m_arrow->setGraphicsEffect(dropShadow);
-}
-
-QToolTipWidget::~QToolTipWidget()
-{
-}
-
-void QToolTipWidget::AddSpecialContent(QString type, QString dataStream)
-{
- if (type.isEmpty())
- {
- m_includeTextureShortcuts = false;
- if (m_specialContent != nullptr)
- {
- delete m_specialContent;
- m_specialContent = nullptr;
- }
- return;
- }
- if (type == "TEXTURE")
- {
- if (m_specialContent == nullptr)
- {
- QCoreApplication::instance()->installEventFilter(this); //grab the event filter while displaying the advanced texture tooltip
- m_specialContent = new QBitmapPreviewDialogImp(this);
- }
- QString path(dataStream);
- qobject_cast(m_specialContent)->setImage(path);
- // set default showmode to RGB
- qobject_cast(m_specialContent)->setShowMode(QBitmapPreviewDialogImp::EShowMode::ESHOW_RGB);
- QString dir = (path.split("/").count() > path.split("\\").count()) ? path.split("/").back() : path.split("\\").back();
- SetTitle(dir);
- //always use default size but not image size
- qobject_cast(m_specialContent)->setOriginalSize(false);
- m_includeTextureShortcuts = true;
- }
- else if (type == "ADD TO CONTENT")
- {
- AppendContent(dataStream);
-
- m_includeTextureShortcuts = false;
- if (m_specialContent != nullptr)
- {
- delete m_specialContent;
- m_specialContent = nullptr;
- }
- }
- else if (type == "REPLACE TITLE")
- {
- SetTitle(dataStream);
- m_includeTextureShortcuts = false;
- if (m_specialContent != nullptr)
- {
- delete m_specialContent;
- m_specialContent = nullptr;
- }
- }
- else if (type == "REPLACE CONTENT")
- {
- SetContent(dataStream);
- m_includeTextureShortcuts = false;
- if (m_specialContent != nullptr)
- {
- delete m_specialContent;
- m_specialContent = nullptr;
- }
- }
- else
- {
- m_includeTextureShortcuts = false;
- if (m_specialContent != nullptr)
- {
- delete m_specialContent;
- m_specialContent = nullptr;
- }
- return;
- }
-
- m_special = type;
-}
-
-
-bool QToolTipWidget::eventFilter(QObject* obj, QEvent* event)
-{
- if (event->type() == QEvent::KeyPress)
- {
- if (m_special == "TEXTURE" && m_specialContent != nullptr)
- {
- const QKeyEvent* ke = static_cast(event);
- Qt::KeyboardModifiers mods = ke->modifiers();
- if (mods & Qt::KeyboardModifier::AltModifier)
- {
- ((QBitmapPreviewDialogImp*)m_specialContent)->setShowMode(QBitmapPreviewDialogImp::ESHOW_ALPHA);
- }
- else if (mods & Qt::KeyboardModifier::ShiftModifier && !(mods & Qt::KeyboardModifier::ControlModifier))
- {
- ((QBitmapPreviewDialogImp*)m_specialContent)->setShowMode(QBitmapPreviewDialogImp::ESHOW_RGBA);
- }
- }
- }
- if (event->type() == QEvent::KeyRelease)
- {
- if (m_special == "TEXTURE" && m_specialContent != nullptr)
- {
- const QKeyEvent* ke = static_cast(event);
- Qt::KeyboardModifiers mods = ke->modifiers();
- if (!(mods& Qt::KeyboardModifier::AltModifier) && !(mods & Qt::KeyboardModifier::ShiftModifier))
- {
- ((QBitmapPreviewDialogImp*)m_specialContent)->setShowMode(QBitmapPreviewDialogImp::ESHOW_RGB);
- }
- }
- }
- return QWidget::eventFilter(obj, event);
-}
-
-void QToolTipWidget::hideEvent(QHideEvent* event)
-{
- QWidget::hideEvent(event);
- m_arrow->hide();
-}
-
-void QToolTipWidget::UpdateOptionalData(QString optionalData)
-{
- AddSpecialContent(m_special, optionalData);
-}
-
-
-
-QPoint QToolTipWidget::AdjustTipPosByArrowSize(QPoint pos, ArrowDirection dir)
-{
- switch (dir)
- {
- case QToolTipWidget::ArrowDirection::ARROW_UP:
- {
- m_arrow->move(pos);
- pos.setY(pos.y() + 10);
- m_arrow->setFixedSize(20, 10);
- pos -= QPoint(m_shadowRadius, m_shadowRadius);
- break;
- }
- case QToolTipWidget::ArrowDirection::ARROW_LEFT:
- {
- m_arrow->move(pos);
- pos.setX(pos.x() + 10);
- m_arrow->setFixedSize(10, 20);
- pos -= QPoint(m_shadowRadius, m_shadowRadius);
- break;
- }
- case QToolTipWidget::ArrowDirection::ARROW_RIGHT:
- {
- pos.setX(pos.x() - 10);
- m_arrow->move(QPoint(pos.x() + width(), pos.y()));
- m_arrow->setFixedSize(10, 20);
- pos -= QPoint(-m_shadowRadius, m_shadowRadius);
- break;
- }
- case QToolTipWidget::ArrowDirection::ARROW_DOWN:
- {
- pos.setY(pos.y() - 10);
- m_arrow->move(QPoint(pos.x(), pos.y() + height()));
- m_arrow->setFixedSize(20, 10);
- pos -= QPoint(m_shadowRadius, -m_shadowRadius);
- break;
- }
- default:
- m_arrow->move(-10, -10);
- break;
- }
- return pos;
-}
-
-bool QToolTipWidget::IsValid()
-{
- if (m_title->text().isEmpty() ||
- (m_content->text().isEmpty() && m_specialContent == nullptr))
- {
- return false;
- }
- return true;
-}
-
-void QToolTipWidget::KeepTipOnScreen(QRect targetRect, ArrowDirection preferredArrowDir)
-{
- QRect desktop = QApplication::desktop()->availableGeometry(this);
-
- if (this->isHidden())
- {
- setAttribute(Qt::WA_DontShowOnScreen, true);
- Show(QPoint(0, 0), preferredArrowDir);
- hide();
- setAttribute(Qt::WA_DontShowOnScreen, false);
- }
- //else assume the size is right
-
- //calculate initial rect
- QRect tipRect = QRect(0, 0, 0, 0);
- switch (preferredArrowDir)
- {
- case QToolTipWidget::ArrowDirection::ARROW_UP:
- {
- //tip is below the widget with a left alignment
- tipRect.setTopLeft(AdjustTipPosByArrowSize(targetRect.bottomLeft(), preferredArrowDir));
- break;
- }
- case QToolTipWidget::ArrowDirection::ARROW_LEFT:
- {
- //tip is on the right with the top being even
- tipRect.setTopLeft(AdjustTipPosByArrowSize(targetRect.topRight(), preferredArrowDir));
- break;
- }
- case QToolTipWidget::ArrowDirection::ARROW_RIGHT:
- {
- //tip is on the left with the top being even
- tipRect.setY(targetRect.top());
- tipRect.setX(targetRect.left() - width());
- tipRect.setTopLeft(AdjustTipPosByArrowSize(tipRect.topLeft(), preferredArrowDir));
- break;
- }
- case QToolTipWidget::ArrowDirection::ARROW_DOWN:
- {
- //tip is above the widget with a left alignment
- tipRect.setX(targetRect.left());
- tipRect.setY(targetRect.top() - height());
- tipRect.setTopLeft(AdjustTipPosByArrowSize(tipRect.topLeft(), preferredArrowDir));
- break;
- }
- default:
- {
- //tip is on the right with the top being even
- preferredArrowDir = QToolTipWidget::ArrowDirection::ARROW_LEFT;
- tipRect.setTopLeft(AdjustTipPosByArrowSize(targetRect.topRight(), QToolTipWidget::ArrowDirection::ARROW_LEFT));
- break;
- }
- }
- tipRect.setSize(size());
-
- //FixPositioning
- if (preferredArrowDir == ArrowDirection::ARROW_LEFT || preferredArrowDir == ArrowDirection::ARROW_RIGHT)
- {
- if (tipRect.left() <= desktop.left())
- {
- m_arrow->m_direction = ArrowDirection::ARROW_LEFT;
- tipRect.setTopLeft(AdjustTipPosByArrowSize(targetRect.topRight(), m_arrow->m_direction));
- }
- else if (tipRect.right() >= desktop.right())
- {
- m_arrow->m_direction = ArrowDirection::ARROW_RIGHT;
- tipRect.setLeft(targetRect.left() - width());
- tipRect.setTopLeft(AdjustTipPosByArrowSize(tipRect.topLeft(), m_arrow->m_direction));
- }
- }
- else if (preferredArrowDir == ArrowDirection::ARROW_UP || preferredArrowDir == ArrowDirection::ARROW_DOWN)
- {
- if (tipRect.top() <= desktop.top())
- {
- m_arrow->m_direction = ArrowDirection::ARROW_UP;
- tipRect.setTopLeft(AdjustTipPosByArrowSize(targetRect.bottomLeft(), m_arrow->m_direction));
- }
- else if (tipRect.bottom() >= desktop.bottom())
- {
- m_arrow->m_direction = ArrowDirection::ARROW_DOWN;
- tipRect.setY(targetRect.top() - height());
- tipRect.setTopLeft(AdjustTipPosByArrowSize(tipRect.topLeft(), m_arrow->m_direction));
- }
- }
-
- //Nudge tip without arrow
- if (preferredArrowDir == ArrowDirection::ARROW_UP || preferredArrowDir == ArrowDirection::ARROW_DOWN)
- {
- if (tipRect.left() <= desktop.left())
- {
- tipRect.setLeft(desktop.left());
- }
- else if (tipRect.right() >= desktop.right())
- {
- tipRect.setLeft(desktop.right() - width());
- }
- }
- else if (preferredArrowDir == ArrowDirection::ARROW_RIGHT || preferredArrowDir == ArrowDirection::ARROW_LEFT)
- {
- if (tipRect.top() <= desktop.top())
- {
- tipRect.setTop(desktop.top());
- }
- else if (tipRect.bottom() >= desktop.bottom())
- {
- tipRect.setTop(desktop.bottom() - height());
- }
- }
-
-
- m_normalPos = tipRect.topLeft();
- move(m_normalPos);
-}
-
-QPolygonF QToolTipWidget::QArrow::CreateArrow()
-{
- QVector vertex;
- //3 points in triangle
- vertex.reserve(3);
- //all magic number below are given in order to draw smooth transitions between tooltip and arrow
- if (m_direction == ArrowDirection::ARROW_UP)
- {
- vertex.push_back(QPointF(10, 1));
- vertex.push_back(QPointF(19, 10));
- vertex.push_back(QPointF(0, 10));
- }
- else if (m_direction == ArrowDirection::ARROW_RIGHT)
- {
- vertex.push_back(QPointF(9, 10));
- vertex.push_back(QPointF(0, 19));
- vertex.push_back(QPointF(0, 1));
- }
- else if (m_direction == ArrowDirection::ARROW_LEFT)
- {
- vertex.push_back(QPointF(1, 10));
- vertex.push_back(QPointF(10, 19));
- vertex.push_back(QPointF(10, 0));
- }
- else //ArrowDirection::ARROW_DOWN
- {
- vertex.push_back(QPointF(10, 10));
- vertex.push_back(QPointF(19, 0));
- vertex.push_back(QPointF(0, 0));
- }
- return QPolygonF(vertex);
-}
-
-void QToolTipWidget::QArrow::paintEvent([[maybe_unused]] QPaintEvent* event)
-{
- QColor color(255, 255, 255, 255);
- QPainter painter(this);
- painter.fillRect(rect(), Qt::transparent); //force transparency
- painter.setRenderHint(QPainter::Antialiasing, false);
- painter.setBrush(color);
- painter.setPen(Qt::NoPen);
- painter.drawPolygon(CreateArrow());
- //painter.setRenderHint(QPainter::Antialiasing, false);
-}
-
-QToolTipWrapper::QToolTipWrapper(QWidget* parent)
- : QObject(parent)
-{
-}
-
-void QToolTipWrapper::SetTitle(QString title)
-{
- m_title = title;
-}
-
-void QToolTipWrapper::SetContent(QString content)
-{
- AddSpecialContent("REPLACE CONTENT", content);
-}
-
-void QToolTipWrapper::AppendContent(QString content)
-{
- AddSpecialContent("ADD TO CONTENT", content);
-}
-
-void QToolTipWrapper::AddSpecialContent(QString type, QString dataStream)
-{
- if (type == "REPLACE CONTENT")
- {
- m_contentOperations.clear();
- }
- m_contentOperations.push_back({type, dataStream});
-}
-
-void QToolTipWrapper::UpdateOptionalData(QString optionalData)
-{
- m_contentOperations.push_back({"UPDATE OPTIONAL", optionalData});
-}
-
-void QToolTipWrapper::Display(QRect targetRect, QToolTipWidget::ArrowDirection preferredArrowDir)
-{
- GetOrCreateToolTip()->Display(targetRect, preferredArrowDir);
-}
-
-void QToolTipWrapper::TryDisplay(QPoint mousePos, const QWidget * widget, QToolTipWidget::ArrowDirection preferredArrowDir)
-{
- GetOrCreateToolTip()->TryDisplay(mousePos, widget, preferredArrowDir);
-}
-
-void QToolTipWrapper::TryDisplay(QPoint mousePos, const QRect & widget, QToolTipWidget::ArrowDirection preferredArrowDir)
-{
- GetOrCreateToolTip()->TryDisplay(mousePos, widget, preferredArrowDir);
-}
-
-void QToolTipWrapper::hide()
-{
- DestroyToolTip();
-}
-
-void QToolTipWrapper::show()
-{
- GetOrCreateToolTip()->show();
-}
-
-bool QToolTipWrapper::isVisible() const
-{
- return m_actualTooltip && m_actualTooltip->isVisible();
-}
-
-void QToolTipWrapper::update()
-{
- if (m_actualTooltip)
- {
- m_actualTooltip->update();
- }
-}
-
-void QToolTipWrapper::ReplayContentOperations(QToolTipWidget* tooltipWidget)
-{
- tooltipWidget->SetTitle(m_title);
- for (const auto& operation : m_contentOperations)
- {
- if (operation.first == "UPDATE OPTIONAL")
- {
- tooltipWidget->UpdateOptionalData(operation.second);
- }
- else
- {
- tooltipWidget->AddSpecialContent(operation.first, operation.second);
- }
- }
-}
-
-QToolTipWidget * QToolTipWrapper::GetOrCreateToolTip()
-{
- if (!m_actualTooltip)
- {
- QToolTipWidget* tooltipWidget = new QToolTipWidget(static_cast(parent()));
- tooltipWidget->setAttribute(Qt::WA_DeleteOnClose);
- ReplayContentOperations(tooltipWidget);
- m_actualTooltip = tooltipWidget;
- }
- return m_actualTooltip.data();
-}
-
-void QToolTipWrapper::DestroyToolTip()
-{
- if (m_actualTooltip)
- {
- m_actualTooltip->deleteLater();
- }
-}
diff --git a/Code/Editor/Controls/QToolTipWidget.h b/Code/Editor/Controls/QToolTipWidget.h
deleted file mode 100644
index 813f2a75fb..0000000000
--- a/Code/Editor/Controls/QToolTipWidget.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-#ifndef QToolTipWidget_h__
-#define QToolTipWidget_h__
-
-#include "EditorCoreAPI.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-
-class IQToolTip
-{
-public:
- virtual void SetTitle(QString title) = 0;
- virtual void SetContent(QString content) = 0;
- virtual void AppendContent(QString content) = 0;
- virtual void AddSpecialContent(QString type, QString dataStream) = 0;
- virtual void UpdateOptionalData(QString optionalData) = 0;
-};
-
-class EDITOR_CORE_API QToolTipWidget
- : public QWidget
- , public IQToolTip
-{
-public:
- enum class ArrowDirection
- {
- ARROW_UP,
- ARROW_LEFT,
- ARROW_RIGHT,
- ARROW_DOWN
- };
- class QArrow
- : public QWidget
- {
- public:
- ArrowDirection m_direction;
- QPoint m_pos;
- QArrow(QWidget* parent)
- : QWidget(parent){ setWindowFlags(Qt::ToolTip); }
- virtual ~QArrow(){}
-
- QPolygonF CreateArrow();
- virtual void paintEvent(QPaintEvent*) override;
- };
- QToolTipWidget(QWidget* parent);
- ~QToolTipWidget();
- void SetTitle(QString title) override;
- void SetContent(QString content) override;
- void AppendContent(QString content) override;
- void AddSpecialContent(QString type, QString dataStream) override;
- void UpdateOptionalData(QString optionalData) override;
- void Display(QRect targetRect, ArrowDirection preferredArrowDir);
-
- //! Displays the tooltip on the given widget, only if the mouse is over it.
- void TryDisplay(QPoint mousePos, const QWidget* widget, ArrowDirection preferredArrowDir);
-
- //! Displays the tooltip on the given rect, only if the mouse is over it.
- void TryDisplay(QPoint mousePos, const QRect& widget, ArrowDirection preferredArrowDir);
-
- void Hide();
-
-protected:
- void Show(QPoint pos, ArrowDirection dir);
- bool IsValid();
- void KeepTipOnScreen(QRect targetRect, ArrowDirection preferredArrowDir);
- QPoint AdjustTipPosByArrowSize(QPoint pos, ArrowDirection dir);
- virtual bool eventFilter(QObject* obj, QEvent* event) override;
- void RebuildLayout();
- virtual void hideEvent(QHideEvent*) override;
-
- QLabel* m_title;
- AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
- QVector m_currentShortcuts;
- AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
- //can be anything from QLabel to QBitMapPreviewDialog
- //must allow movement, and show/hide calls
- QLabel* m_content;
- QWidget* m_specialContent;
- QWidget* m_background;
- QVBoxLayout* m_layout;
- QString m_special;
- QPoint m_normalPos;
- QArrow* m_arrow;
- const int m_shadowRadius = 5;
- bool m_includeTextureShortcuts; //added since Qt does not support modifier only shortcuts
-};
-
-// HACK: The EditorUI_QT classes all were keeping persistent references to QToolTipWidgets around
-// This led to many, many top-level widget creations, which led to many platform-side window allocations
-// which led to crashes in Qt5.15. As this is legacy code, this is a drop-in replacement that only
-// allocates the actual QToolTipWidget (and thus platform window) while the tooltip is visible
-class EDITOR_CORE_API QToolTipWrapper
- : public QObject
- , public IQToolTip
-{
-public:
- QToolTipWrapper(QWidget* parent);
-
- void SetTitle(QString title) override;
- void SetContent(QString content) override;
- void AppendContent(QString content) override;
- void AddSpecialContent(QString type, QString dataStream) override;
- void UpdateOptionalData(QString optionalData) override;
-
- void Display(QRect targetRect, QToolTipWidget::ArrowDirection preferredArrowDir);
- void TryDisplay(QPoint mousePos, const QWidget* widget, QToolTipWidget::ArrowDirection preferredArrowDir);
- void TryDisplay(QPoint mousePos, const QRect& widget, QToolTipWidget::ArrowDirection preferredArrowDir);
- void hide();
- void show();
- bool isVisible() const;
- void update();
- void repaint(){update();} //Things really shouldn't be calling repaint on these...
-
- void Hide(){hide();}
- void close(){hide();}
-
-private:
- void ReplayContentOperations(QToolTipWidget* tooltipWidget);
-
- QToolTipWidget* GetOrCreateToolTip();
- void DestroyToolTip();
-
- AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // conditional expression is constant, needs to have dll-interface to be used by clients of class 'AzQtComponents::FilteredSearchWidget'
- QPointer m_actualTooltip;
- AZ_POP_DISABLE_WARNING
-
- QString m_title;
- AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // conditional expression is constant, needs to have dll-interface to be used by clients of class 'AzQtComponents::FilteredSearchWidget'
- QVector> m_contentOperations;
- AZ_POP_DISABLE_WARNING
-};
-
-
-#endif // QToolTipWidget_h__
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp
index 68c4acb95e..50d053ab9e 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp
+++ b/Code/Editor/Controls/ReflectedPropertyControl/PropertyCtrl.cpp
@@ -10,7 +10,6 @@
// Editor
#include "PropertyCtrl.h"
-#include "PropertyResourceCtrl.h"
#include "PropertyGenericCtrl.h"
#include "PropertyMiscCtrl.h"
#include "PropertyMotionCtrl.h"
@@ -21,7 +20,6 @@ void RegisterReflectedVarHandlers()
if (!registered)
{
registered = true;
- EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew FileResourceSelectorWidgetHandler());
EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew SequencePropertyHandler());
EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew SequenceIdPropertyHandler());
EBUS_EVENT(AzToolsFramework::PropertyTypeRegistrationMessages::Bus, RegisterPropertyType, aznew LocalStringPropertyHandler());
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp
deleted file mode 100644
index d26e978ae8..0000000000
--- a/Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include "EditorDefs.h"
-
-#include "PropertyResourceCtrl.h"
-
-// Qt
-#include
-#include
-
-// AzToolsFramework
-#include
-#include
-#include
-
-// Editor
-#include "Controls/QToolTipWidget.h"
-#include "Controls/BitmapToolTip.h"
-
-
-BrowseButton::BrowseButton(PropertyType type, QWidget* parent /*= nullptr*/)
- : QToolButton(parent)
- , m_propertyType(type)
-{
- setAutoRaise(true);
- setIcon(QIcon(QStringLiteral(":/stylesheet/img/UI20/browse-edit.svg")));
- connect(this, &QAbstractButton::clicked, this, &BrowseButton::OnClicked);
-}
-
-void BrowseButton::SetPathAndEmit(const QString& path)
-{
- //only emit if path changes. Old property control
- if (path != m_path)
- {
- m_path = path;
- emit PathChanged(m_path);
- }
-}
-
-class FileBrowseButton
- : public BrowseButton
-{
-public:
- AZ_CLASS_ALLOCATOR(FileBrowseButton, AZ::SystemAllocator, 0);
- FileBrowseButton(PropertyType type, QWidget* pParent = nullptr)
- : BrowseButton(type, pParent)
- {
- setToolTip("Browse...");
- }
-
-private:
- void OnClicked() override
- {
- QString tempValue("");
- if (!m_path.isEmpty() && !Path::GetExt(m_path).isEmpty())
- {
- tempValue = m_path;
- }
-
- AssetSelectionModel selection;
-
- if (m_propertyType == ePropertyTexture)
- {
- // Filters for texture.
- selection = AssetSelectionModel::AssetGroupSelection("Texture");
- }
- else
- {
- return;
- }
-
- AzToolsFramework::EditorRequests::Bus::Broadcast(&AzToolsFramework::EditorRequests::BrowseForAssets, selection);
- if (selection.IsValid())
- {
- QString newPath = Path::FullPathToGamePath(selection.GetResult()->GetFullPath().c_str()).c_str();
-
- switch (m_propertyType)
- {
- case ePropertyTexture:
- newPath.replace("\\\\", "/");
- if (newPath.size() > MAX_PATH)
- {
- newPath.resize(MAX_PATH);
- }
- }
-
- SetPathAndEmit(newPath);
- }
- }
-};
-
-class AudioControlSelectorButton
- : public BrowseButton
-{
-public:
- AZ_CLASS_ALLOCATOR(AudioControlSelectorButton, AZ::SystemAllocator, 0);
-
- AudioControlSelectorButton(PropertyType type, QWidget* pParent = nullptr)
- : BrowseButton(type, pParent)
- {
- setToolTip(tr("Select Audio Control"));
- }
-
-private:
- void OnClicked() override
- {
- AZStd::string resourceResult;
- auto ConvertLegacyAudioPropertyType = [](const PropertyType type) -> AzToolsFramework::AudioPropertyType
- {
- switch (type)
- {
- case ePropertyAudioTrigger:
- return AzToolsFramework::AudioPropertyType::Trigger;
- case ePropertyAudioRTPC:
- return AzToolsFramework::AudioPropertyType::Rtpc;
- case ePropertyAudioSwitch:
- return AzToolsFramework::AudioPropertyType::Switch;
- case ePropertyAudioSwitchState:
- return AzToolsFramework::AudioPropertyType::SwitchState;
- case ePropertyAudioEnvironment:
- return AzToolsFramework::AudioPropertyType::Environment;
- case ePropertyAudioPreloadRequest:
- return AzToolsFramework::AudioPropertyType::Preload;
- default:
- return AzToolsFramework::AudioPropertyType::NumTypes;
- }
- };
-
- auto propType = ConvertLegacyAudioPropertyType(m_propertyType);
- if (propType != AzToolsFramework::AudioPropertyType::NumTypes)
- {
- AzToolsFramework::AudioControlSelectorRequestBus::EventResult(
- resourceResult, propType, &AzToolsFramework::AudioControlSelectorRequestBus::Events::SelectResource,
- AZStd::string_view{ m_path.toUtf8().constData() });
- SetPathAndEmit(QString{ resourceResult.c_str() });
- }
- }
-};
-
-class TextureEditButton
- : public BrowseButton
-{
-public:
- AZ_CLASS_ALLOCATOR(TextureEditButton, AZ::SystemAllocator, 0);
- TextureEditButton(QWidget* pParent = nullptr)
- : BrowseButton(ePropertyTexture, pParent)
- {
- setIcon(QIcon(QStringLiteral(":/stylesheet/img/UI20/open-in-internal-app.svg")));
- setToolTip(tr("Launch default editor"));
- }
-
-private:
- void OnClicked() override
- {
- CFileUtil::EditTextureFile(m_path.toUtf8().data(), true);
- }
-};
-
-FileResourceSelectorWidget::FileResourceSelectorWidget(QWidget* pParent /*= nullptr*/)
- : QWidget(pParent)
- , m_propertyType(ePropertyInvalid)
- , m_tooltip(nullptr)
-{
- m_pathEdit = new QLineEdit;
- m_mainLayout = new QHBoxLayout(this);
- m_mainLayout->addWidget(m_pathEdit, 1);
-
- m_mainLayout->setContentsMargins(0, 0, 0, 0);
-
-// KDAB just ported the MFC texture preview tooltip, but looks like Amazon added their own. Not sure which to use.
-// To switch to Amazon QToolTipWidget, remove FileResourceSelectorWidget::event and m_previewTooltip
-#ifdef USE_QTOOLTIPWIDGET
- m_tooltip = new QToolTipWidget(this);
-
- installEventFilter(this);
-#endif
- connect(m_pathEdit, &QLineEdit::editingFinished, this, [this]() { OnPathChanged(m_pathEdit->text()); });
-}
-
-bool FileResourceSelectorWidget::eventFilter([[maybe_unused]] QObject* obj, QEvent* event)
-{
- if (m_propertyType == ePropertyTexture)
- {
- if (event->type() == QEvent::ToolTip)
- {
- QHelpEvent* e = (QHelpEvent*)event;
-
- m_tooltip->AddSpecialContent("TEXTURE", m_path);
- m_tooltip->TryDisplay(e->globalPos(), m_pathEdit, QToolTipWidget::ArrowDirection::ARROW_RIGHT);
-
- return true;
- }
-
- if (event->type() == QEvent::Leave)
- {
- m_tooltip->hide();
- }
- }
-
- return false;
-}
-
-void FileResourceSelectorWidget::SetPropertyType(PropertyType type)
-{
- if (m_propertyType == type)
- {
- return;
- }
-
- //if the property type changed for some reason, delete all the existing widgets
- if (!m_buttons.isEmpty())
- {
- qDeleteAll(m_buttons.begin(), m_buttons.end());
- m_buttons.clear();
- }
-
- m_previewToolTip.reset();
- m_propertyType = type;
-
- switch (type)
- {
- case ePropertyTexture:
- AddButton(new FileBrowseButton(type));
- AddButton(new TextureEditButton);
- m_previewToolTip.reset(new CBitmapToolTip);
- break;
- case ePropertyAudioTrigger:
- case ePropertyAudioSwitch:
- case ePropertyAudioSwitchState:
- case ePropertyAudioRTPC:
- case ePropertyAudioEnvironment:
- case ePropertyAudioPreloadRequest:
- AddButton(new AudioControlSelectorButton(type));
- break;
- default:
- break;
- }
-
- m_mainLayout->invalidate();
-}
-
-void FileResourceSelectorWidget::AddButton(BrowseButton* button)
-{
- m_mainLayout->addWidget(button);
- m_buttons.push_back(button);
- connect(button, &BrowseButton::PathChanged, this, &FileResourceSelectorWidget::OnPathChanged);
-}
-
-void FileResourceSelectorWidget::OnPathChanged(const QString& path)
-{
- bool changed = SetPath(path);
- if (changed)
- {
- emit PathChanged(m_path);
- }
-}
-
-bool FileResourceSelectorWidget::SetPath(const QString& path)
-{
- bool changed = false;
-
- const QString newPath = path.toLower();
- if (m_path != newPath)
- {
- m_path = newPath;
- UpdateWidgets();
-
- changed = true;
- }
-
- return changed;
-}
-
-
-void FileResourceSelectorWidget::UpdateWidgets()
-{
- m_pathEdit->setText(m_path);
-
- foreach(BrowseButton * button, m_buttons)
- {
- button->SetPath(m_path);
- }
-
- if (m_previewToolTip)
- {
- m_previewToolTip->SetTool(this, rect());
- }
-}
-
-QString FileResourceSelectorWidget::GetPath() const
-{
- return m_path;
-}
-
-
-
-QWidget* FileResourceSelectorWidget::GetLastInTabOrder()
-{
- return m_buttons.empty() ? nullptr : m_buttons.last();
-}
-
-QWidget* FileResourceSelectorWidget::GetFirstInTabOrder()
-{
- return m_buttons.empty() ? nullptr : m_buttons.first();
-}
-
-void FileResourceSelectorWidget::UpdateTabOrder()
-{
- if (m_buttons.count() >= 2)
- {
- for (int i = 0; i < m_buttons.count() - 1; ++i)
- {
- setTabOrder(m_buttons[i], m_buttons[i + 1]);
- }
- }
-}
-
-bool FileResourceSelectorWidget::event(QEvent* event)
-{
- if (event->type() == QEvent::ToolTip && m_previewToolTip && !m_previewToolTip->isVisible())
- {
- if (!m_path.isEmpty())
- {
- m_previewToolTip->LoadImage(m_path);
- m_previewToolTip->setVisible(true);
- }
- event->accept();
- return true;
- }
-
- if (event->type() == QEvent::Resize && m_previewToolTip)
- {
- m_previewToolTip->SetTool(this, rect());
- }
-
- return QWidget::event(event);
-}
-
-QWidget* FileResourceSelectorWidgetHandler::CreateGUI(QWidget* pParent)
-{
- FileResourceSelectorWidget* newCtrl = aznew FileResourceSelectorWidget(pParent);
- connect(newCtrl, &FileResourceSelectorWidget::PathChanged, newCtrl, [newCtrl]()
- {
- EBUS_EVENT(AzToolsFramework::PropertyEditorGUIMessages::Bus, RequestWrite, newCtrl);
- });
- return newCtrl;
-}
-
-void FileResourceSelectorWidgetHandler::ConsumeAttribute(FileResourceSelectorWidget* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName)
-{
- Q_UNUSED(GUI);
- Q_UNUSED(attrib);
- Q_UNUSED(attrValue);
- Q_UNUSED(debugName);
-}
-
-void FileResourceSelectorWidgetHandler::WriteGUIValuesIntoProperty(size_t index, FileResourceSelectorWidget* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node)
-{
- Q_UNUSED(index);
- Q_UNUSED(node);
- CReflectedVarResource val = instance;
- val.m_propertyType = GUI->GetPropertyType();
- val.m_path = GUI->GetPath().toUtf8().data();
- instance = static_cast(val);
-}
-
-bool FileResourceSelectorWidgetHandler::ReadValuesIntoGUI(size_t index, FileResourceSelectorWidget* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)
-{
- Q_UNUSED(index);
- Q_UNUSED(node);
- CReflectedVarResource val = instance;
- GUI->SetPropertyType(val.m_propertyType);
- GUI->SetPath(val.m_path.c_str());
- return false;
-}
-
-#include
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.h b/Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.h
deleted file mode 100644
index 087ee9f1db..0000000000
--- a/Code/Editor/Controls/ReflectedPropertyControl/PropertyResourceCtrl.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#ifndef CRYINCLUDE_EDITOR_UTILS_PROPERTYRESOURCECTRL_H
-#define CRYINCLUDE_EDITOR_UTILS_PROPERTYRESOURCECTRL_H
-#pragma once
-
-#if !defined(Q_MOC_RUN)
-#include
-#include
-#include
-#include "ReflectedVar.h"
-#include "Util/VariablePropertyType.h"
-#include
-#include
-#include
-#endif
-
-class QLineEdit;
-class QHBoxLayout;
-class CBitmapToolTip;
-class QToolTipWidget;
-
-class BrowseButton
- : public QToolButton
-{
- Q_OBJECT
-public:
- AZ_CLASS_ALLOCATOR(BrowseButton, AZ::SystemAllocator, 0);
-
- BrowseButton(PropertyType type, QWidget* parent = nullptr);
-
- void SetPath(const QString& path) { m_path = path; }
- QString GetPath() const { return m_path; }
-
- PropertyType GetPropertyType() const {return m_propertyType; }
-
-signals:
- void PathChanged(const QString& path);
-
-protected:
- void SetPathAndEmit(const QString& path);
- virtual void OnClicked() = 0;
-
- PropertyType m_propertyType;
- QString m_path;
-};
-
-class FileResourceSelectorWidget
- : public QWidget
-{
- Q_OBJECT
-public:
- AZ_CLASS_ALLOCATOR(FileResourceSelectorWidget, AZ::SystemAllocator, 0);
- FileResourceSelectorWidget(QWidget* pParent = nullptr);
-
- bool SetPath(const QString& path);
- QString GetPath() const;
- void SetPropertyType(PropertyType type);
- PropertyType GetPropertyType() const { return m_propertyType; }
-
- QWidget* GetFirstInTabOrder();
- QWidget* GetLastInTabOrder();
- void UpdateTabOrder();
-
- bool eventFilter(QObject* obj, QEvent* event) override;
-
-signals:
- void PathChanged(const QString& path);
-
-protected:
- bool event(QEvent* event) override;
-
-private:
- void OnAssignClicked();
- void OnMaterialClicked();
-
- void UpdateWidgets();
- void AddButton(BrowseButton* button);
- void OnPathChanged(const QString& path);
-
-private:
- QLineEdit* m_pathEdit;
- PropertyType m_propertyType;
- QString m_path;
-
- QHBoxLayout* m_mainLayout;
- QVector m_buttons;
- QScopedPointer m_previewToolTip;
- QToolTipWidget* m_tooltip;
-};
-
-class FileResourceSelectorWidgetHandler
- : QObject
- , public AzToolsFramework::PropertyHandler < CReflectedVarResource, FileResourceSelectorWidget >
-{
- Q_OBJECT
-public:
- AZ_CLASS_ALLOCATOR(FileResourceSelectorWidgetHandler, AZ::SystemAllocator, 0);
-
- virtual AZ::u32 GetHandlerName(void) const override { return AZ_CRC("Resource", 0xbc91f416); }
- virtual bool IsDefaultHandler() const override { return true; }
- virtual QWidget* GetFirstInTabOrder(FileResourceSelectorWidget* widget) override { return widget->GetFirstInTabOrder(); }
- virtual QWidget* GetLastInTabOrder(FileResourceSelectorWidget* widget) override { return widget->GetLastInTabOrder(); }
- virtual void UpdateWidgetInternalTabbing(FileResourceSelectorWidget* widget) override { widget->UpdateTabOrder(); }
-
- virtual QWidget* CreateGUI(QWidget* pParent) override;
- virtual void ConsumeAttribute(FileResourceSelectorWidget* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
- virtual void WriteGUIValuesIntoProperty(size_t index, FileResourceSelectorWidget* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
- virtual bool ReadValuesIntoGUI(size_t index, FileResourceSelectorWidget* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
-};
-
-#endif // CRYINCLUDE_EDITOR_UTILS_PROPERTYRESOURCECTRL_H
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp
index 263c17a8bb..268faaa335 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp
@@ -70,12 +70,6 @@ void ReflectedVarInit::setupReflection(AZ::SerializeContext* serializeContext)
AZ::EditContext* ec = serializeContext->GetEditContext();
if (ec)
{
- ec->Class< CReflectedVarResource >("VarResource", "Resource")
- ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
- ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarResource::varName)
- ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarResource::description)
- ;
-
ec->Class< CReflectedVarUser >("VarUser", "")
->ClassElement(AZ::Edit::ClassElements::EditorData, "")
->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarUser::varName)
diff --git a/Code/Editor/Core/LevelEditorMenuHandler.cpp b/Code/Editor/Core/LevelEditorMenuHandler.cpp
index 05f06c87aa..d359d9ef5d 100644
--- a/Code/Editor/Core/LevelEditorMenuHandler.cpp
+++ b/Code/Editor/Core/LevelEditorMenuHandler.cpp
@@ -588,7 +588,7 @@ QMenu* LevelEditorMenuHandler::CreateGameMenu()
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
if (!usePrefabSystemForLevels)
{
// Export to Engine
diff --git a/Code/Editor/Core/QtEditorApplication.h b/Code/Editor/Core/QtEditorApplication.h
index 0d702bf647..28ee8ac14b 100644
--- a/Code/Editor/Core/QtEditorApplication.h
+++ b/Code/Editor/Core/QtEditorApplication.h
@@ -13,7 +13,6 @@
#include
#include
#include
-#include "IEventLoopHook.h"
#include
#include
diff --git a/Code/Editor/CryEdit.cpp b/Code/Editor/CryEdit.cpp
index 982f8ba411..f3c38fdef7 100644
--- a/Code/Editor/CryEdit.cpp
+++ b/Code/Editor/CryEdit.cpp
@@ -706,7 +706,7 @@ void CCryEditApp::OnFileSave()
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
if (!usePrefabSystemForLevels)
{
@@ -1828,34 +1828,6 @@ bool CCryEditApp::InitInstance()
return true;
}
-void CCryEditApp::RegisterEventLoopHook(IEventLoopHook* pHook)
-{
- pHook->pNextHook = m_pEventLoopHook;
- m_pEventLoopHook = pHook;
-}
-
-void CCryEditApp::UnregisterEventLoopHook(IEventLoopHook* pHookToRemove)
-{
- IEventLoopHook* pPrevious = nullptr;
- for (IEventLoopHook* pHook = m_pEventLoopHook; pHook != nullptr; pHook = pHook->pNextHook)
- {
- if (pHook == pHookToRemove)
- {
- if (pPrevious)
- {
- pPrevious->pNextHook = pHookToRemove->pNextHook;
- }
- else
- {
- m_pEventLoopHook = pHookToRemove->pNextHook;
- }
-
- pHookToRemove->pNextHook = nullptr;
- return;
- }
- }
-}
-
//////////////////////////////////////////////////////////////////////////
void CCryEditApp::LoadFile(QString fileName)
{
@@ -2392,7 +2364,7 @@ void CCryEditApp::ExportLevel(bool bExportToGame, bool bExportTexture, bool bAut
{
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
if (usePrefabSystemForLevels)
{
AZ_Assert(false, "Prefab system doesn't require level exports.");
@@ -2433,7 +2405,7 @@ bool CCryEditApp::UserExportToGame(bool bNoMsgBox)
{
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
if (usePrefabSystemForLevels)
{
AZ_Assert(false, "Export Level should no longer exist.");
@@ -2481,7 +2453,7 @@ void CCryEditApp::ExportToGame(bool bNoMsgBox)
{
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
if (usePrefabSystemForLevels)
{
AZ_Assert(false, "Prefab system no longer exports levels.");
@@ -2989,7 +2961,7 @@ CCryEditApp::ECreateLevelResult CCryEditApp::CreateLevel(const QString& levelNam
{
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
// If we are creating a new level and we're in simulate mode, then switch it off before we do anything else
if (GetIEditor()->GetGameEngine() && GetIEditor()->GetGameEngine()->GetSimulationMode())
@@ -3135,7 +3107,7 @@ bool CCryEditApp::CreateLevel(bool& wasCreateLevelOperationCancelled)
{
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
if (!usePrefabSystemForLevels)
{
QString str = QObject::tr("Level %1 has been changed. Save Level?").arg(GetIEditor()->GetGameEngine()->GetLevelName());
@@ -3349,7 +3321,7 @@ CCryEditDoc* CCryEditApp::OpenDocumentFile(const char* filename, bool addToMostR
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
// If we are loading and we're in simulate mode, then switch it off before we do anything else
if (GetIEditor()->GetGameEngine() && GetIEditor()->GetGameEngine()->GetSimulationMode())
diff --git a/Code/Editor/CryEdit.h b/Code/Editor/CryEdit.h
index 48f362003c..f472639dcd 100644
--- a/Code/Editor/CryEdit.h
+++ b/Code/Editor/CryEdit.h
@@ -30,7 +30,6 @@ class CConsoleDialog;
struct mg_connection;
struct mg_request_info;
struct mg_context;
-struct IEventLoopHook;
class QAction;
class MainWindow;
class QSharedMemory;
@@ -153,8 +152,6 @@ public:
int IdleProcessing(bool bBackground);
bool IsWindowInForeground();
void RunInitPythonScript(CEditCommandLineInfo& cmdInfo);
- void RegisterEventLoopHook(IEventLoopHook* pHook);
- void UnregisterEventLoopHook(IEventLoopHook* pHook);
void DisableIdleProcessing() override;
void EnableIdleProcessing() override;
@@ -344,7 +341,6 @@ private:
QString m_lastOpenLevelPath;
CQuickAccessBar* m_pQuickAccessBar = nullptr;
- IEventLoopHook* m_pEventLoopHook = nullptr;
QString m_rootEnginePath;
int m_disableIdleProcessingCounter = 0; //!< Counts requests to disable idle processing. When non-zero, idle processing will be disabled.
diff --git a/Code/Editor/CryEditDoc.cpp b/Code/Editor/CryEditDoc.cpp
index c7d719184d..cabb82db89 100644
--- a/Code/Editor/CryEditDoc.cpp
+++ b/Code/Editor/CryEditDoc.cpp
@@ -371,7 +371,7 @@ void CCryEditDoc::Load(TDocMultiArchive& arrXmlAr, const QString& szFilename)
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
if (!usePrefabSystemForLevels)
{
@@ -636,7 +636,7 @@ bool CCryEditDoc::SaveModified()
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
if (!usePrefabSystemForLevels)
{
QMessageBox saveModifiedMessageBox(AzToolsFramework::GetActiveWindow());
@@ -699,7 +699,7 @@ void CCryEditDoc::OnFileSaveAs()
CCryEditApp::instance()->AddToRecentFileList(levelFileDialog.GetFileName());
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
if (usePrefabSystemForLevels)
{
AzToolsFramework::Prefab::TemplateId rootPrefabTemplateId =
@@ -728,7 +728,7 @@ bool CCryEditDoc::BeforeOpenDocument(const QString& lpszPathName, TOpenDocContex
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
if (!usePrefabSystemForLevels)
{
diff --git a/Code/Editor/EditorPreferencesPageAWS.cpp b/Code/Editor/EditorPreferencesPageAWS.cpp
index 968969245d..bb57802e47 100644
--- a/Code/Editor/EditorPreferencesPageAWS.cpp
+++ b/Code/Editor/EditorPreferencesPageAWS.cpp
@@ -101,7 +101,7 @@ void CEditorPreferencesPage_AWS::SaveSettingsRegistryFile()
return;
}
- [[maybe_unused]] bool saved{};
+ [[maybe_unused]] bool saved = false;
constexpr auto configurationMode =
AZ::IO::SystemFile::SF_OPEN_CREATE | AZ::IO::SystemFile::SF_OPEN_CREATE_PATH | AZ::IO::SystemFile::SF_OPEN_WRITE_ONLY;
if (AZ::IO::SystemFile outputFile; outputFile.Open(resolvedPath.data(), configurationMode))
diff --git a/Code/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp
index 9a9e9f5ad3..7314908580 100644
--- a/Code/Editor/EditorViewportWidget.cpp
+++ b/Code/Editor/EditorViewportWidget.cpp
@@ -586,6 +586,7 @@ void EditorViewportWidget::OnEditorNotifyEvent(EEditorNotifyEvent event)
break;
case eNotify_OnEndLoad:
+ case eNotify_OnEndCreate:
UpdateScene();
SetDefaultCamera();
break;
diff --git a/Code/Editor/GameEngine.cpp b/Code/Editor/GameEngine.cpp
index 8aab168b6d..200c48ab81 100644
--- a/Code/Editor/GameEngine.cpp
+++ b/Code/Editor/GameEngine.cpp
@@ -489,7 +489,7 @@ bool CGameEngine::LoadLevel(
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
if (!usePrefabSystemForLevels)
{
diff --git a/Code/Editor/GameExporter.cpp b/Code/Editor/GameExporter.cpp
index a768861b90..32429f7f0b 100644
--- a/Code/Editor/GameExporter.cpp
+++ b/Code/Editor/GameExporter.cpp
@@ -100,7 +100,7 @@ bool CGameExporter::Export(unsigned int flags, [[maybe_unused]] EEndian eExportE
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
if (usePrefabSystemForLevels)
{
@@ -317,8 +317,8 @@ void CGameExporter::ExportLevelInfo(const QString& path)
root->setAttr("Name", levelName.toUtf8().data());
auto terrain = AzFramework::Terrain::TerrainDataRequestBus::FindFirstHandler();
const AZ::Aabb terrainAabb = terrain ? terrain->GetTerrainAabb() : AZ::Aabb::CreateFromPoint(AZ::Vector3::CreateZero());
- const AZ::Vector2 terrainGridResolution = terrain ? terrain->GetTerrainHeightQueryResolution() : AZ::Vector2::CreateOne();
- const int compiledHeightmapSize = static_cast(terrainAabb.GetXExtent() / terrainGridResolution.GetX());
+ const float terrainGridResolution = terrain ? terrain->GetTerrainHeightQueryResolution() : 1.0f;
+ const int compiledHeightmapSize = static_cast(terrainAabb.GetXExtent() / terrainGridResolution);
root->setAttr("HeightmapSize", compiledHeightmapSize);
//////////////////////////////////////////////////////////////////////////
diff --git a/Code/Editor/GameExporter.h b/Code/Editor/GameExporter.h
index ee4e8df3d9..1ecd2403f2 100644
--- a/Code/Editor/GameExporter.h
+++ b/Code/Editor/GameExporter.h
@@ -70,7 +70,7 @@ private:
{
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
if (usePrefabSystemForLevels)
{
AZ_Assert(false, "Level.pak should no longer be used when prefabs are used for levels.");
diff --git a/Code/Editor/IEditor.h b/Code/Editor/IEditor.h
index da29b00f2d..0de08445b4 100644
--- a/Code/Editor/IEditor.h
+++ b/Code/Editor/IEditor.h
@@ -66,7 +66,6 @@ class IAWSResourceManager;
struct ISystem;
struct IRenderer;
struct AABB;
-struct IEventLoopHook;
struct IErrorReport; // Vladimir@conffx
struct IFileUtil; // Vladimir@conffx
struct IEditorLog; // Vladimir@conffx
@@ -509,11 +508,6 @@ struct IEditor
virtual void SetActiveView(CViewport* viewport) = 0;
virtual struct IEditorFileMonitor* GetFileMonitor() = 0;
- // These are needed for Qt integration:
- virtual void RegisterEventLoopHook(IEventLoopHook* pHook) = 0;
- virtual void UnregisterEventLoopHook(IEventLoopHook* pHook) = 0;
- // ^^^
-
//! QMimeData is used by the Qt clipboard.
//! IMPORTANT: Any QMimeData allocated for the clipboard will be deleted
//! when the editor exists. If a QMimeData is allocated by a different
diff --git a/Code/Editor/IEditorImpl.cpp b/Code/Editor/IEditorImpl.cpp
index 05b74f3b05..b6a4209948 100644
--- a/Code/Editor/IEditorImpl.cpp
+++ b/Code/Editor/IEditorImpl.cpp
@@ -789,16 +789,6 @@ IEditorFileMonitor* CEditorImpl::GetFileMonitor()
return m_pEditorFileMonitor.get();
}
-void CEditorImpl::RegisterEventLoopHook(IEventLoopHook* pHook)
-{
- CCryEditApp::instance()->RegisterEventLoopHook(pHook);
-}
-
-void CEditorImpl::UnregisterEventLoopHook(IEventLoopHook* pHook)
-{
- CCryEditApp::instance()->UnregisterEventLoopHook(pHook);
-}
-
float CEditorImpl::GetTerrainElevation(float x, float y)
{
float terrainElevation = AzFramework::Terrain::TerrainDataRequests::GetDefaultTerrainHeight();
diff --git a/Code/Editor/IEditorImpl.h b/Code/Editor/IEditorImpl.h
index 5e47a76802..73fcec917d 100644
--- a/Code/Editor/IEditorImpl.h
+++ b/Code/Editor/IEditorImpl.h
@@ -155,8 +155,6 @@ public:
CMusicManager* GetMusicManager() override { return m_pMusicManager; };
IEditorFileMonitor* GetFileMonitor() override;
- void RegisterEventLoopHook(IEventLoopHook* pHook) override;
- void UnregisterEventLoopHook(IEventLoopHook* pHook) override;
IIconManager* GetIconManager() override;
float GetTerrainElevation(float x, float y) override;
Editor::EditorQtApplication* GetEditorQtApplication() override { return m_QtApplication; }
diff --git a/Code/Editor/Include/IEventLoopHook.h b/Code/Editor/Include/IEventLoopHook.h
deleted file mode 100644
index eaf7bf2d62..0000000000
--- a/Code/Editor/Include/IEventLoopHook.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#ifndef CRYINCLUDE_EDITOR_INCLUDE_IEVENTLOOPHOOK_H
-#define CRYINCLUDE_EDITOR_INCLUDE_IEVENTLOOPHOOK_H
-#pragma once
-
-struct IEventLoopHook
-{
- IEventLoopHook* pNextHook;
-
- IEventLoopHook()
- : pNextHook(0) {}
-
- virtual bool PrePumpMessage() { return false; }
-};
-
-#endif // CRYINCLUDE_EDITOR_INCLUDE_IEVENTLOOPHOOK_H
diff --git a/Code/Editor/Lib/Tests/IEditorMock.h b/Code/Editor/Lib/Tests/IEditorMock.h
index 99c05c7f4d..780362cb30 100644
--- a/Code/Editor/Lib/Tests/IEditorMock.h
+++ b/Code/Editor/Lib/Tests/IEditorMock.h
@@ -97,8 +97,6 @@ public:
MOCK_METHOD0(GetActiveView, class CViewport* ());
MOCK_METHOD1(SetActiveView, void(CViewport*));
MOCK_METHOD0(GetFileMonitor, struct IEditorFileMonitor* ());
- MOCK_METHOD1(RegisterEventLoopHook, void(IEventLoopHook* ));
- MOCK_METHOD1(UnregisterEventLoopHook, void(IEventLoopHook* ));
MOCK_CONST_METHOD0(CreateQMimeData, QMimeData* ());
MOCK_CONST_METHOD1(DestroyQMimeData, void(QMimeData*));
MOCK_METHOD0(GetLevelIndependentFileMan, class CLevelIndependentFileMan* ());
diff --git a/Code/Editor/MainWindow.cpp b/Code/Editor/MainWindow.cpp
index 3a52bb85a1..a1f054b57f 100644
--- a/Code/Editor/MainWindow.cpp
+++ b/Code/Editor/MainWindow.cpp
@@ -659,7 +659,7 @@ void MainWindow::InitActions()
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
if (!usePrefabSystemForLevels)
{
am->AddAction(ID_FILE_EXPORTTOGAMENOSURFACETEXTURE, tr("&Export to Engine"))
diff --git a/Code/Editor/Objects/EntityObject.cpp b/Code/Editor/Objects/EntityObject.cpp
index 450a15766c..0d70d47d7d 100644
--- a/Code/Editor/Objects/EntityObject.cpp
+++ b/Code/Editor/Objects/EntityObject.cpp
@@ -499,14 +499,12 @@ void CEntityObject::AdjustLightProperties(CVarBlockPtr& properties, const char*
pAreaLight->SetHumanName("PlanarLight");
}
- bool bCastShadowLegacy = false; // Backward compatibility for existing shadow casting lights
if (IVariable* pCastShadowVarLegacy = FindVariableInSubBlock(properties, pSubBlockVar, "bCastShadow"))
{
pCastShadowVarLegacy->SetFlags(pCastShadowVarLegacy->GetFlags() | IVariable::UI_INVISIBLE);
const QString zeroPrefix("0");
if (!pCastShadowVarLegacy->GetDisplayValue().startsWith(zeroPrefix))
{
- bCastShadowLegacy = true;
pCastShadowVarLegacy->SetDisplayValue(zeroPrefix);
}
}
diff --git a/Code/Editor/Settings.cpp b/Code/Editor/Settings.cpp
index 9efe846b9e..a3f08a24b2 100644
--- a/Code/Editor/Settings.cpp
+++ b/Code/Editor/Settings.cpp
@@ -1084,7 +1084,7 @@ void SEditorSettings::SaveSettingsRegistryFile()
return;
}
- [[maybe_unused]] bool saved{};
+ [[maybe_unused]] bool saved = false;
constexpr auto configurationMode = AZ::IO::SystemFile::SF_OPEN_CREATE
| AZ::IO::SystemFile::SF_OPEN_CREATE_PATH
| AZ::IO::SystemFile::SF_OPEN_WRITE_ONLY;
diff --git a/Code/Editor/editor_core_files.cmake b/Code/Editor/editor_core_files.cmake
index 4cf092e774..447d763a63 100644
--- a/Code/Editor/editor_core_files.cmake
+++ b/Code/Editor/editor_core_files.cmake
@@ -22,13 +22,6 @@ set(FILES
Controls/ReflectedPropertyControl/ReflectedVar.h
Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
Controls/ReflectedPropertyControl/ReflectedVarWrapper.h
- Controls/QBitmapPreviewDialog.cpp
- Controls/QBitmapPreviewDialog.h
- Controls/QBitmapPreviewDialog.ui
- Controls/QBitmapPreviewDialogImp.cpp
- Controls/QBitmapPreviewDialogImp.h
- Controls/QToolTipWidget.h
- Controls/QToolTipWidget.cpp
UsedResources.cpp
LyViewPaneNames.h
QtViewPaneManager.cpp
diff --git a/Code/Editor/editor_lib_files.cmake b/Code/Editor/editor_lib_files.cmake
index 75962fe3b3..53cfe243b1 100644
--- a/Code/Editor/editor_lib_files.cmake
+++ b/Code/Editor/editor_lib_files.cmake
@@ -270,7 +270,6 @@ set(FILES
Include/ICommandManager.h
Include/IDisplayViewport.h
Include/IEditorClassFactory.h
- Include/IEventLoopHook.h
Include/IExportManager.h
Include/IGizmoManager.h
Include/IIconManager.h
@@ -314,8 +313,6 @@ set(FILES
AssetEditor/AssetEditorWindow.ui
Commands/CommandManager.cpp
Commands/CommandManager.h
- Controls/BitmapToolTip.cpp
- Controls/BitmapToolTip.h
Controls/ConsoleSCB.cpp
Controls/ConsoleSCB.h
Controls/ConsoleSCB.ui
@@ -337,8 +334,6 @@ set(FILES
Controls/ReflectedPropertyControl/PropertyMiscCtrl.h
Controls/ReflectedPropertyControl/PropertyMotionCtrl.cpp
Controls/ReflectedPropertyControl/PropertyMotionCtrl.h
- Controls/ReflectedPropertyControl/PropertyResourceCtrl.cpp
- Controls/ReflectedPropertyControl/PropertyResourceCtrl.h
Controls/ReflectedPropertyControl/PropertyCtrl.cpp
Controls/ReflectedPropertyControl/PropertyCtrl.h
MainStatusBar.cpp
diff --git a/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/thread_Android.cpp b/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/thread_Android.cpp
index 612296ebba..865d84516f 100644
--- a/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/thread_Android.cpp
+++ b/Code/Framework/AzCore/Platform/Android/AzCore/std/parallel/internal/thread_Android.cpp
@@ -36,5 +36,12 @@ namespace AZStd
{
pthread_setname_np(tId, name);
}
+
+ uint8_t GetDefaultThreadPriority()
+ {
+ // pthread priority is an integer between >=1 and <=99 (although only range 1<=>32 is guaranteed)
+ // Don't use a scheduling policy value (e.g. SCHED_OTHER or SCHED_FIFO) here.
+ return 1;
+ }
}
}
diff --git a/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/internal/thread_Apple.cpp b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/internal/thread_Apple.cpp
index bc89545faa..c39447b2f2 100644
--- a/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/internal/thread_Apple.cpp
+++ b/Code/Framework/AzCore/Platform/Common/Apple/AzCore/std/parallel/internal/thread_Apple.cpp
@@ -35,7 +35,7 @@ namespace AZStd
void SetThreadPriority(int priority, pthread_attr_t& attr)
{
- if (priority == -1)
+ if (priority <= -1)
{
pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED);
}
@@ -59,5 +59,18 @@ namespace AZStd
thread_policy_set(mach_thread, THREAD_AFFINITY_POLICY, (thread_policy_t)& policyData, 1);
}
}
+
+ //////////////////////////////////////////////////////////////////////////////////
+ // Apple pthread -> NSThread quality of service level map
+ // QOS class name | min pthread priority | max pthread priority | comment
+ // QOS_CLASS_USER_INTERACTIVE | 38 | 47 | Per-frame work
+ // QOS_CLASS_USER_INITIATED | 32 | 37 | Asynchronous / Cross frame work
+ // QOS_CLASS_DEFAULT | 21 | 31 | Streaming / Multiple frames deadline
+ // QOS_CLASS_UTILITY | 5 | 20 | Background asset download
+ // QOS_CLASS_BACKGROUN | 0 | 4 | Will be prevented from using whole core.
+ uint8_t GetDefaultThreadPriority()
+ {
+ return 10;
+ }
}
}
diff --git a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/thread_UnixLike.cpp b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/thread_UnixLike.cpp
index da5d95b9a4..5ff3b82b3f 100644
--- a/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/thread_UnixLike.cpp
+++ b/Code/Framework/AzCore/Platform/Common/UnixLike/AzCore/std/parallel/internal/thread_UnixLike.cpp
@@ -21,6 +21,7 @@ namespace AZStd
void PreCreateSetThreadAffinity(int cpuId, pthread_attr_t& attr);
void SetThreadPriority(int priority, pthread_attr_t& attr);
void PostCreateThread(pthread_t tId, const char * name, int cpuId);
+ uint8_t GetDefaultThreadPriority();
}
namespace Internal
@@ -60,12 +61,13 @@ namespace AZStd
}
else
{
- priority = SCHED_OTHER;
+ priority = Platform::GetDefaultThreadPriority();
}
if (desc->m_name)
{
name = desc->m_name;
}
+ ti->m_name = name;
cpuId = desc->m_cpuId;
pthread_attr_setdetachstate(&attr, desc->m_isJoinable ? PTHREAD_CREATE_JOINABLE : PTHREAD_CREATE_DETACHED);
diff --git a/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/thread_Linux.cpp b/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/thread_Linux.cpp
index 619658057b..10121cc2ed 100644
--- a/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/thread_Linux.cpp
+++ b/Code/Framework/AzCore/Platform/Linux/AzCore/std/parallel/internal/thread_Linux.cpp
@@ -55,5 +55,12 @@ namespace AZStd
{
pthread_setname_np(tId, name);
}
+
+ uint8_t GetDefaultThreadPriority()
+ {
+ // pthread priority is an integer between >=1 and <=99 (although only range 1<=>32 is guaranteed)
+ // Don't use a scheduling policy value (e.g. SCHED_OTHER or SCHED_FIFO) here.
+ return 1;
+ }
}
}
diff --git a/Code/Framework/AzCore/Tests/TaskTests.cpp b/Code/Framework/AzCore/Tests/TaskTests.cpp
index 4f53772d51..53fa89900e 100644
--- a/Code/Framework/AzCore/Tests/TaskTests.cpp
+++ b/Code/Framework/AzCore/Tests/TaskTests.cpp
@@ -447,13 +447,13 @@ namespace UnitTest
{
x -= 1;
});
-
- // a <-- Root
- // / \
- // b c
- // \ /
- // d
-
+ /*
+ a <-- Root
+ / \
+ b c
+ \ /
+ d
+ */
a.Precedes(b, c);
d.Follows(b, c);
@@ -522,20 +522,20 @@ namespace UnitTest
{
x -= 1;
});
-
- // NOTE: The ideal way to express this topology is without the wait on the subgraph
- // at task g, but this is more an illustrative test. Better is to express the entire
- // graph in a single larger graph.
- // a <-- Root
- // / \
- // b c - f
- // \ \ \
- // \ e - g
- // \ /
- // \ /
- // \ /
- // d
-
+ /*
+ NOTE: The ideal way to express this topology is without the wait on the subgraph
+ at task g, but this is more an illustrative test. Better is to express the entire
+ graph in a single larger graph.
+ a <-- Root
+ / \
+ b c - f
+ \ \ \
+ \ e - g
+ \ /
+ \ /
+ \ /
+ d
+ */
a.Precedes(b);
a.Precedes(c);
b.Precedes(d);
@@ -593,17 +593,17 @@ namespace UnitTest
{
x += 0b1000;
});
-
- // a <-- Root
- // / \
- // b c - f
- // \ \ \
- // \ e - g
- // \ /
- // \ /
- // \ /
- // d
-
+ /*
+ a <-- Root
+ / \
+ b c - f
+ \ \ \
+ \ e - g
+ \ /
+ \ /
+ \ /
+ d
+ */
a.Precedes(b, c);
b.Precedes(d);
c.Precedes(e, f);
diff --git a/Code/Framework/AzFramework/AzFramework/API/ApplicationAPI.h b/Code/Framework/AzFramework/AzFramework/API/ApplicationAPI.h
index e536082d61..c7a9256c9c 100644
--- a/Code/Framework/AzFramework/AzFramework/API/ApplicationAPI.h
+++ b/Code/Framework/AzFramework/AzFramework/API/ApplicationAPI.h
@@ -112,6 +112,7 @@ namespace AzFramework
virtual void SetPrefabSystemEnabled([[maybe_unused]] bool enable) {}
/// Returns true if Prefab System is enabled for use with levels, false if legacy level system is enabled (level.pak)
+ /// @deprecated Use 'IsPrefabSystemEnabled' instead
virtual bool IsPrefabSystemForLevelsEnabled() const { return false; }
/// Returns true if code should assert when the Legacy Slice System is used
diff --git a/Code/Framework/AzFramework/AzFramework/Application/Application.cpp b/Code/Framework/AzFramework/AzFramework/Application/Application.cpp
index b3521a877f..b3fed38715 100644
--- a/Code/Framework/AzFramework/AzFramework/Application/Application.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Application/Application.cpp
@@ -765,6 +765,7 @@ namespace AzFramework
bool Application::IsPrefabSystemForLevelsEnabled() const
{
+ AZ_Warning("Application", false, "'IsPrefabSystemForLevelsEnabled' is deprecated, please use 'IsPrefabSystemEnabled' instead.");
return IsPrefabSystemEnabled();
}
diff --git a/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp b/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
index c2fba5c5a3..6f0f3e6d13 100644
--- a/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Archive/Archive.cpp
@@ -1208,7 +1208,7 @@ namespace AZ::IO
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
if (usePrefabSystemForLevels)
{
@@ -1274,7 +1274,7 @@ namespace AZ::IO
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
AZStd::unique_lock lock(m_csZips);
for (auto it = m_arrZips.begin(); it != m_arrZips.end();)
diff --git a/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.cpp b/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.cpp
index db8004d83a..bc38fe78fd 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.cpp
@@ -378,7 +378,7 @@ namespace Physics
m_cachedNativeHeightfield = cachedNativeHeightfield;
}
- AZ::Vector2 HeightfieldShapeConfiguration::GetGridResolution() const
+ const AZ::Vector2& HeightfieldShapeConfiguration::GetGridResolution() const
{
return m_gridResolution;
}
diff --git a/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.h b/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.h
index bd9d6a6aa7..26af746128 100644
--- a/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.h
+++ b/Code/Framework/AzFramework/AzFramework/Physics/ShapeConfiguration.h
@@ -221,7 +221,7 @@ namespace Physics
const void* GetCachedNativeHeightfield() const;
void* GetCachedNativeHeightfield();
void SetCachedNativeHeightfield(void* cachedNativeHeightfield);
- AZ::Vector2 GetGridResolution() const;
+ const AZ::Vector2& GetGridResolution() const;
void SetGridResolution(const AZ::Vector2& gridSpacing);
int32_t GetNumColumns() const;
void SetNumColumns(int32_t numColumns);
@@ -235,7 +235,7 @@ namespace Physics
void SetMaxHeightBounds(float maxBounds);
private:
- //! The number of meters between each heightfield sample.
+ //! The number of meters between each heightfield sample in x and y.
AZ::Vector2 m_gridResolution{ 1.0f };
//! The number of columns in the heightfield sample grid.
int32_t m_numColumns{ 0 };
diff --git a/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h
index f9ef264ab1..7909a7ec83 100644
--- a/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h
+++ b/Code/Framework/AzFramework/AzFramework/Terrain/TerrainDataRequestBus.h
@@ -50,8 +50,8 @@ namespace AzFramework
static AZ::Vector3 GetDefaultTerrainNormal() { return AZ::Vector3::CreateAxisZ(); }
// System-level queries to understand world size and resolution
- virtual AZ::Vector2 GetTerrainHeightQueryResolution() const = 0;
- virtual void SetTerrainHeightQueryResolution(AZ::Vector2 queryResolution) = 0;
+ virtual float GetTerrainHeightQueryResolution() const = 0;
+ virtual void SetTerrainHeightQueryResolution(float queryResolution) = 0;
virtual AZ::Aabb GetTerrainAabb() const = 0;
virtual void SetTerrainAabb(const AZ::Aabb& worldBounds) = 0;
diff --git a/Code/Framework/AzFramework/Tests/Mocks/Terrain/MockTerrainDataRequestBus.h b/Code/Framework/AzFramework/Tests/Mocks/Terrain/MockTerrainDataRequestBus.h
index f5af0ff486..4b9658eebb 100644
--- a/Code/Framework/AzFramework/Tests/Mocks/Terrain/MockTerrainDataRequestBus.h
+++ b/Code/Framework/AzFramework/Tests/Mocks/Terrain/MockTerrainDataRequestBus.h
@@ -49,8 +49,8 @@ namespace UnitTest
AzFramework::Terrain::TerrainDataRequestBus::Handler::BusDisconnect();
}
- MOCK_CONST_METHOD0(GetTerrainHeightQueryResolution, AZ::Vector2());
- MOCK_METHOD1(SetTerrainHeightQueryResolution, void(AZ::Vector2));
+ MOCK_CONST_METHOD0(GetTerrainHeightQueryResolution, float());
+ MOCK_METHOD1(SetTerrainHeightQueryResolution, void(float));
MOCK_CONST_METHOD0(GetTerrainAabb, AZ::Aabb());
MOCK_METHOD1(SetTerrainAabb, void(const AZ::Aabb&));
MOCK_CONST_METHOD3(GetHeight, float(const AZ::Vector3&, Sampler, bool*));
diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFramework.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFramework.h
index 865a571d3b..b5251d6e97 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFramework.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/AzManipulatorTestFramework.h
@@ -47,8 +47,6 @@ namespace AzManipulatorTestFramework
virtual void UpdateVisibility() = 0;
//! Sets if sticky select is enabled or not.
virtual void SetStickySelect(bool enabled) = 0;
- //! Gets default Editor Camera Position.
- virtual AZ::Vector3 DefaultEditorCameraPosition() const = 0;
//! Sets if icons are visible in the viewport.
virtual void SetIconsVisible(bool visible) = 0;
//! Sets if helpers are visible in the viewport.
diff --git a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h
index f29245bb34..3de54e9e6d 100644
--- a/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h
+++ b/Code/Framework/AzManipulatorTestFramework/Include/AzManipulatorTestFramework/ViewportInteraction.h
@@ -10,6 +10,7 @@
#include
#include
+#include
namespace AzFramework
{
@@ -22,7 +23,7 @@ namespace AzManipulatorTestFramework
class ViewportInteraction
: public ViewportInteractionInterface
, public AzToolsFramework::ViewportInteraction::ViewportInteractionRequestBus::Handler
- , public AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Handler
+ , public UnitTest::ViewportSettingsTestImpl
, private AzToolsFramework::ViewportInteraction::EditorEntityViewportInteractionRequestBus::Handler
{
public:
@@ -50,19 +51,6 @@ namespace AzManipulatorTestFramework
const AzFramework::ScreenPoint& screenPosition) override;
float DeviceScalingFactor() override;
- // ViewportSettingsRequestBus overrides ...
- bool GridSnappingEnabled() const override;
- float GridSize() const override;
- bool ShowGrid() const override;
- bool AngleSnappingEnabled() const override;
- float AngleStep() const override;
- float ManipulatorLineBoundWidth() const override;
- float ManipulatorCircleBoundWidth() const override;
- bool StickySelectEnabled() const override;
- AZ::Vector3 DefaultEditorCameraPosition() const override;
- bool IconsVisible() const override;
- bool HelpersVisible() const override;
-
// EditorEntityViewportInteractionRequestBus overrides ...
void FindVisibleEntities(AZStd::vector& visibleEntities) override;
@@ -72,12 +60,5 @@ namespace AzManipulatorTestFramework
AzFramework::EntityVisibilityQuery m_entityVisibilityQuery;
AZStd::shared_ptr m_debugDisplayRequests;
AzFramework::CameraState m_cameraState;
- float m_gridSize = 1.0f;
- float m_angularStep = 0.0f;
- bool m_gridSnapping = false;
- bool m_angularSnapping = false;
- bool m_stickySelect = true;
- bool m_iconsVisible = true;
- bool m_helpersVisible = true;
};
} // namespace AzManipulatorTestFramework
diff --git a/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp b/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp
index b7fd5e2b73..0eac957a0a 100644
--- a/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp
+++ b/Code/Framework/AzManipulatorTestFramework/Source/ViewportInteraction.cpp
@@ -37,46 +37,6 @@ namespace AzManipulatorTestFramework
return m_cameraState;
}
- bool ViewportInteraction::GridSnappingEnabled() const
- {
- return m_gridSnapping;
- }
-
- float ViewportInteraction::GridSize() const
- {
- return m_gridSize;
- }
-
- bool ViewportInteraction::ShowGrid() const
- {
- return false;
- }
-
- bool ViewportInteraction::AngleSnappingEnabled() const
- {
- return m_angularSnapping;
- }
-
- float ViewportInteraction::AngleStep() const
- {
- return m_angularStep;
- }
-
- float ViewportInteraction::ManipulatorLineBoundWidth() const
- {
- return 0.1f;
- }
-
- float ViewportInteraction::ManipulatorCircleBoundWidth() const
- {
- return 0.1f;
- }
-
- bool ViewportInteraction::StickySelectEnabled() const
- {
- return m_stickySelect;
- }
-
void ViewportInteraction::FindVisibleEntities(AZStd::vector& visibleEntitiesOut)
{
visibleEntitiesOut.assign(m_entityVisibilityQuery.Begin(), m_entityVisibilityQuery.End());
@@ -127,11 +87,6 @@ namespace AzManipulatorTestFramework
m_helpersVisible = visible;
}
- AZ::Vector3 ViewportInteraction::DefaultEditorCameraPosition() const
- {
- return {};
- }
-
void ViewportInteraction::SetGridSize(float size)
{
m_gridSize = size;
@@ -162,14 +117,4 @@ namespace AzManipulatorTestFramework
{
return 1.0f;
}
-
- bool ViewportInteraction::IconsVisible() const
- {
- return m_iconsVisible;
- }
-
- bool ViewportInteraction::HelpersVisible() const
- {
- return m_helpersVisible;
- }
} // namespace AzManipulatorTestFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.cpp
index 6647f48c31..9b3a6379af 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBundle/AssetBundleComponent.cpp
@@ -295,7 +295,7 @@ namespace AzToolsFramework
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
for (const AzToolsFramework::AssetFileInfo& assetFileInfo : assetFileInfoList.m_fileInfoList)
{
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp
index 93e4ffd3da..45363f4bb5 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp
@@ -80,7 +80,6 @@ namespace AzToolsFramework
EntityOutlinerListModel::EntityOutlinerListModel(QObject* parent)
: QAbstractItemModel(parent)
, m_entitySelectQueue()
- , m_entityExpandQueue()
, m_entityChangeQueue()
, m_entityChangeQueued(false)
, m_entityLayoutQueued(false)
@@ -1275,7 +1274,6 @@ namespace AzToolsFramework
void EntityOutlinerListModel::QueueEntityToExpand(AZ::EntityId entityId, bool expand)
{
m_entityExpansionState[entityId] = expand;
- m_entityExpandQueue.insert(entityId);
QueueEntityUpdate(entityId);
}
@@ -1300,16 +1298,7 @@ namespace AzToolsFramework
{
return;
}
-
- {
- AZ_PROFILE_SCOPE(Editor, "EntityOutlinerListModel::ProcessEntityUpdates:ExpandQueue");
- for (auto entityId : m_entityExpandQueue)
- {
- emit ExpandEntity(entityId, IsExpanded(entityId));
- };
- m_entityExpandQueue.clear();
- }
-
+
{
AZ_PROFILE_SCOPE(Editor, "EntityOutlinerListModel::ProcessEntityUpdates:SelectQueue");
for (auto entityId : m_entitySelectQueue)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx
index f099ed504a..51d047e81a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.hxx
@@ -156,7 +156,6 @@ namespace AzToolsFramework
void ProcessEntityUpdates();
Q_SIGNALS:
- void ExpandEntity(const AZ::EntityId& entityId, bool expand);
void SelectEntity(const AZ::EntityId& entityId, bool select);
void EnableSelectionUpdates(bool enable);
void ResetFilter();
@@ -190,7 +189,6 @@ namespace AzToolsFramework
void QueueEntityToExpand(AZ::EntityId entityId, bool expand);
void ProcessEntityInfoResetEnd();
AZStd::unordered_set m_entitySelectQueue;
- AZStd::unordered_set m_entityExpandQueue;
AZStd::unordered_set m_entityChangeQueue;
bool m_entityChangeQueued;
bool m_entityLayoutQueued;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.cpp
index 857fdb5f80..c2bbebb72e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.cpp
@@ -81,6 +81,61 @@ namespace AzToolsFramework
update();
}
+ void EntityOutlinerTreeView::dataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector& roles)
+ {
+ AzQtComponents::StyledTreeView::dataChanged(topLeft, bottomRight, roles);
+
+ if (topLeft.isValid() && topLeft.parent() == bottomRight.parent() && topLeft.row() <= bottomRight.row() &&
+ topLeft.column() <= bottomRight.column())
+ {
+ for (int i = topLeft.row(); i <= bottomRight.row(); i++)
+ {
+ auto modelRow = topLeft.sibling(i, EntityOutlinerListModel::ColumnName);
+ if (modelRow.isValid())
+ {
+ checkExpandedState(modelRow);
+ }
+ }
+ }
+ }
+
+ void EntityOutlinerTreeView::rowsInserted(const QModelIndex& parent, int start, int end)
+ {
+ if (parent.isValid())
+ {
+ for (int i = start; i <= end; i++)
+ {
+ auto modelRow = model()->index(i, EntityOutlinerListModel::ColumnName, parent);
+ if (modelRow.isValid())
+ {
+ checkExpandedState(modelRow);
+ recursiveCheckExpandedStates(modelRow);
+ }
+ }
+ }
+ AzQtComponents::StyledTreeView::rowsInserted(parent, start, end);
+ }
+
+ void EntityOutlinerTreeView::recursiveCheckExpandedStates(const QModelIndex& current)
+ {
+ const int rowCount = model()->rowCount(current);
+ for (int i = 0; i < rowCount; i++)
+ {
+ auto modelRow = model()->index(i, EntityOutlinerListModel::ColumnName, current);
+ if (modelRow.isValid())
+ {
+ checkExpandedState(modelRow);
+ recursiveCheckExpandedStates(modelRow);
+ }
+ }
+ }
+
+ void EntityOutlinerTreeView::checkExpandedState(const QModelIndex& current)
+ {
+ const bool expandState = current.data(EntityOutlinerListModel::ExpandedRole).template value();
+ setExpanded(current, expandState);
+ }
+
void EntityOutlinerTreeView::mousePressEvent(QMouseEvent* event)
{
//postponing normal mouse pressed logic until mouse is released or dragged
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.hxx
index 9262da9a73..014bb7bd48 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerTreeView.hxx
@@ -51,6 +51,10 @@ namespace AzToolsFramework
Q_SIGNALS:
void ItemDropped();
+ protected Q_SLOTS:
+ void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles = QVector()) override;
+ void rowsInserted(const QModelIndex &parent, int start, int end) override;
+
protected:
// Qt overrides
void mousePressEvent(QMouseEvent* event) override;
@@ -75,6 +79,8 @@ namespace AzToolsFramework
void ClearQueuedMouseEvent();
void processQueuedMousePressedEvent(QMouseEvent* event);
+ void recursiveCheckExpandedStates(const QModelIndex& parent);
+ void checkExpandedState(const QModelIndex& current);
void StartCustomDrag(const QModelIndexList& indexList, Qt::DropActions supportedActions) override;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp
index 31bb067603..52b688543a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.cpp
@@ -224,7 +224,6 @@ namespace AzToolsFramework
connect(m_gui->m_objectTree, &QTreeView::expanded, this, &EntityOutlinerWidget::OnTreeItemExpanded);
connect(m_gui->m_objectTree, &QTreeView::collapsed, this, &EntityOutlinerWidget::OnTreeItemCollapsed);
connect(m_gui->m_objectTree, &EntityOutlinerTreeView::ItemDropped, this, &EntityOutlinerWidget::OnDropEvent);
- connect(m_listModel, &EntityOutlinerListModel::ExpandEntity, this, &EntityOutlinerWidget::OnExpandEntity);
connect(m_listModel, &EntityOutlinerListModel::SelectEntity, this, &EntityOutlinerWidget::OnSelectEntity);
connect(m_listModel, &EntityOutlinerListModel::EnableSelectionUpdates, this, &EntityOutlinerWidget::OnEnableSelectionUpdates);
connect(m_listModel, &EntityOutlinerListModel::ResetFilter, this, &EntityOutlinerWidget::ClearFilter);
@@ -972,10 +971,6 @@ namespace AzToolsFramework
m_listModel->OnEntityCollapsed(entityId);
}
- void EntityOutlinerWidget::OnExpandEntity(const AZ::EntityId& entityId, bool expand)
- {
- m_gui->m_objectTree->setExpanded(GetIndexFromEntityId(entityId), expand);
- }
void EntityOutlinerWidget::OnSelectEntity(const AZ::EntityId& entityId, bool selected)
{
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx
index e6c42fa64e..38d2e16199 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerWidget.hxx
@@ -155,7 +155,6 @@ namespace AzToolsFramework
void OnTreeItemDoubleClicked(const QModelIndex& index);
void OnTreeItemExpanded(const QModelIndex& index);
void OnTreeItemCollapsed(const QModelIndex& index);
- void OnExpandEntity(const AZ::EntityId& entityId, bool expand);
void OnSelectEntity(const AZ::EntityId& entityId, bool selected);
void OnEnableSelectionUpdates(bool enable);
void OnDropEvent();
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.cpp
index cc0018753e..69d6ae82ca 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabUiHandler.cpp
@@ -306,41 +306,37 @@ namespace AzToolsFramework
{
// Only show the close icon if the prefab is expanded.
// This allows the prefab container to be opened if it was collapsed during propagation.
- if (!isExpanded)
+ if (isExpanded)
{
- return;
- }
+ // Use the same color as the background.
+ QColor backgroundColor = m_backgroundColor;
+ if (isSelected)
+ {
+ backgroundColor = m_backgroundSelectedColor;
+ }
+ else if (isHovered)
+ {
+ backgroundColor = m_backgroundHoverColor;
+ }
- // Use the same color as the background.
- QColor backgroundColor = m_backgroundColor;
- if (isSelected)
- {
- backgroundColor = m_backgroundSelectedColor;
- }
- else if (isHovered)
- {
- backgroundColor = m_backgroundHoverColor;
- }
+ // Paint a rect to cover up the expander.
+ QRect rect = QRect(0, 0, 16, 16);
+ rect.translate(option.rect.topLeft() + offset);
+ painter->fillRect(rect, backgroundColor);
- // Paint a rect to cover up the expander.
- QRect rect = QRect(0, 0, 16, 16);
- rect.translate(option.rect.topLeft() + offset);
- painter->fillRect(rect, backgroundColor);
-
- // Paint the icon.
- QIcon closeIcon = QIcon(m_prefabEditCloseIconPath);
- painter->drawPixmap(option.rect.topLeft() + offset, closeIcon.pixmap(iconSize));
+ // Paint the icon.
+ QIcon closeIcon = QIcon(m_prefabEditCloseIconPath);
+ painter->drawPixmap(option.rect.topLeft() + offset, closeIcon.pixmap(iconSize));
+ }
}
else
{
// Only show the edit icon on hover.
- if (!isHovered)
+ if (isHovered)
{
- return;
+ QIcon openIcon = QIcon(m_prefabEditOpenIconPath);
+ painter->drawPixmap(option.rect.topLeft() + offset, openIcon.pixmap(iconSize));
}
-
- QIcon openIcon = QIcon(m_prefabEditOpenIconPath);
- painter->drawPixmap(option.rect.topLeft() + offset, openIcon.pixmap(iconSize));
}
painter->restore();
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.cpp
index 7a9a5a4d7a..6d32145742 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.cpp
@@ -122,7 +122,7 @@ namespace AzToolsFramework
EditorInteractionSystemViewportSelectionRequestBus::Event(
GetEntityContextId(), &EditorInteractionSystemViewportSelection::SetHandler,
- [](const EditorVisibleEntityDataCache* entityDataCache, ViewportEditorModeTrackerInterface* viewportEditorModeTracker)
+ [](const EditorVisibleEntityDataCacheInterface* entityDataCache, ViewportEditorModeTrackerInterface* viewportEditorModeTracker)
{
return AZStd::make_unique(entityDataCache, viewportEditorModeTracker);
});
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.cpp
index 7f877facb6..dca1da64d8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.cpp
@@ -90,6 +90,61 @@ namespace UnitTest
return AZStd::string(keyText.toUtf8().data());
}
+ bool ViewportSettingsTestImpl::GridSnappingEnabled() const
+ {
+ return m_gridSnapping;
+ }
+
+ float ViewportSettingsTestImpl::GridSize() const
+ {
+ return m_gridSize;
+ }
+
+ bool ViewportSettingsTestImpl::ShowGrid() const
+ {
+ return false;
+ }
+
+ bool ViewportSettingsTestImpl::AngleSnappingEnabled() const
+ {
+ return m_angularSnapping;
+ }
+
+ float ViewportSettingsTestImpl::AngleStep() const
+ {
+ return m_angularStep;
+ }
+
+ float ViewportSettingsTestImpl::ManipulatorLineBoundWidth() const
+ {
+ return 0.1f;
+ }
+
+ float ViewportSettingsTestImpl::ManipulatorCircleBoundWidth() const
+ {
+ return 0.1f;
+ }
+
+ bool ViewportSettingsTestImpl::StickySelectEnabled() const
+ {
+ return m_stickySelect;
+ }
+
+ bool ViewportSettingsTestImpl::IconsVisible() const
+ {
+ return m_iconsVisible;
+ }
+
+ bool ViewportSettingsTestImpl::HelpersVisible() const
+ {
+ return m_helpersVisible;
+ }
+
+ AZ::Vector3 ViewportSettingsTestImpl::DefaultEditorCameraPosition() const
+ {
+ return {};
+ }
+
bool TestWidget::eventFilter(QObject* watched, QEvent* event)
{
AZ_UNUSED(watched);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h
index 2c60ca914c..e5a655cfee 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/AzToolsFrameworkTestHelpers.h
@@ -91,6 +91,43 @@ namespace UnitTest
/// @param modifiers Optional keyboard modifiers to include during the wheel events, defaults to Qt::NoModifier
AZStd::string QtKeyToAzString(Qt::Key key, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
+ //! Test implementation of the ViewportSettingsRequestBus.
+ //! @note Can be used to customize viewport settings during test execution.
+ class ViewportSettingsTestImpl : public AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Handler
+ {
+ public:
+ void Connect(const AzFramework::ViewportId viewportId)
+ {
+ AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Handler::BusConnect(viewportId);
+ }
+
+ void Disconnect()
+ {
+ AzToolsFramework::ViewportInteraction::ViewportSettingsRequestBus::Handler::BusDisconnect();
+ }
+
+ // ViewportSettingsRequestBus overrides ...
+ bool GridSnappingEnabled() const override;
+ float GridSize() const override;
+ bool ShowGrid() const override;
+ bool AngleSnappingEnabled() const override;
+ float AngleStep() const override;
+ float ManipulatorLineBoundWidth() const override;
+ float ManipulatorCircleBoundWidth() const override;
+ bool StickySelectEnabled() const override;
+ AZ::Vector3 DefaultEditorCameraPosition() const override;
+ bool IconsVisible() const override;
+ bool HelpersVisible() const override;
+
+ float m_gridSize = 1.0f;
+ float m_angularStep = 0.0f;
+ bool m_gridSnapping = false;
+ bool m_angularSnapping = false;
+ bool m_stickySelect = true;
+ bool m_iconsVisible = true;
+ bool m_helpersVisible = true;
+ };
+
/// Test widget to store QActions generated by EditorTransformComponentSelection.
class TestWidget : public QWidget
{
@@ -207,7 +244,7 @@ namespace UnitTest
m_editorActions.Connect();
const auto viewportHandlerBuilder =
- [this](const AzToolsFramework::EditorVisibleEntityDataCache* entityDataCache,
+ [this](const AzToolsFramework::EditorVisibleEntityDataCacheInterface* entityDataCache,
[[maybe_unused]] AzToolsFramework::ViewportEditorModeTrackerInterface* viewportEditorModeTracker)
{
// create the default viewport (handles ComponentMode)
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/Mocks/MockEditorViewportIconDisplayInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/Mocks/MockEditorViewportIconDisplayInterface.h
new file mode 100644
index 0000000000..be29837b59
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/Mocks/MockEditorViewportIconDisplayInterface.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include
+
+#include
+
+namespace UnitTest
+{
+ class MockEditorViewportIconDisplayInterface : public AZ::Interface::Registrar
+ {
+ public:
+ virtual ~MockEditorViewportIconDisplayInterface() = default;
+
+ //! AzToolsFramework::EditorViewportIconDisplayInterface overrides ...
+ MOCK_METHOD1(DrawIcon, void(const DrawParameters&));
+ MOCK_METHOD1(GetOrLoadIconForPath, IconId(AZStd::string_view path));
+ MOCK_METHOD1(GetIconLoadStatus, IconLoadStatus(IconId icon));
+ };
+} // namespace UnitTest
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/Mocks/MockEditorVisibleEntityDataCacheInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/Mocks/MockEditorVisibleEntityDataCacheInterface.h
new file mode 100644
index 0000000000..4fc35fa9aa
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/Mocks/MockEditorVisibleEntityDataCacheInterface.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include
+
+#include
+
+namespace UnitTest
+{
+ class MockEditorVisibleEntityDataCacheInterface : public AzToolsFramework::EditorVisibleEntityDataCacheInterface
+ {
+ using ComponentEntityAccentType = AzToolsFramework::Components::EditorSelectionAccentSystemComponent::ComponentEntityAccentType;
+
+ public:
+ virtual ~MockEditorVisibleEntityDataCacheInterface() = default;
+
+ // AzToolsFramework::EditorVisibleEntityDataCacheInterface overrides ...
+ MOCK_CONST_METHOD0(VisibleEntityDataCount, size_t());
+ MOCK_CONST_METHOD1(GetVisibleEntityPosition, AZ::Vector3(size_t));
+ MOCK_CONST_METHOD1(GetVisibleEntityTransform, const AZ::Transform&(size_t));
+ MOCK_CONST_METHOD1(GetVisibleEntityId, AZ::EntityId(size_t));
+ MOCK_CONST_METHOD1(GetVisibleEntityAccent, ComponentEntityAccentType(size_t));
+ MOCK_CONST_METHOD1(IsVisibleEntityLocked, bool(size_t));
+ MOCK_CONST_METHOD1(IsVisibleEntityVisible, bool(size_t));
+ MOCK_CONST_METHOD1(IsVisibleEntitySelected, bool(size_t));
+ MOCK_CONST_METHOD1(IsVisibleEntityIconHidden, bool(size_t));
+ MOCK_CONST_METHOD1(IsVisibleEntityIndividuallySelectableInViewport, bool(size_t));
+ MOCK_CONST_METHOD1(GetVisibleEntityIndexFromId, AZStd::optional(AZ::EntityId entityId));
+ };
+} // namespace UnitTest
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/Mocks/MockFocusModeInterface.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/Mocks/MockFocusModeInterface.h
new file mode 100644
index 0000000000..7bb5db14c5
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UnitTest/Mocks/MockFocusModeInterface.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include
+
+#include
+
+namespace UnitTest
+{
+ class MockFocusModeInterface : public AZ::Interface::Registrar
+ {
+ public:
+ virtual ~MockFocusModeInterface() = default;
+
+ // AzToolsFramework::FocusModeInterface overrides ...
+ MOCK_METHOD1(SetFocusRoot, void(AZ::EntityId entityId));
+ MOCK_METHOD1(ClearFocusRoot, void(AzFramework::EntityContextId entityContextId));
+ MOCK_METHOD1(GetFocusRoot, AZ::EntityId(AzFramework::EntityContextId entityContextId));
+ MOCK_METHOD1(GetFocusedEntities, AzToolsFramework::EntityIdList(AzFramework::EntityContextId entityContextId));
+ MOCK_CONST_METHOD1(IsInFocusSubTree, bool(AZ::EntityId entityId));
+ };
+} // namespace UnitTest
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.cpp
index 1541d4678e..4ae22ca899 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.cpp
@@ -21,9 +21,8 @@ namespace AzToolsFramework
AZ_CLASS_ALLOCATOR_IMPL(EditorDefaultSelection, AZ::SystemAllocator, 0)
EditorDefaultSelection::EditorDefaultSelection(
- const EditorVisibleEntityDataCache* entityDataCache, ViewportEditorModeTrackerInterface* viewportEditorModeTracker)
+ const EditorVisibleEntityDataCacheInterface* entityDataCache, ViewportEditorModeTrackerInterface* viewportEditorModeTracker)
: m_phantomWidget(nullptr)
- , m_entityDataCache(entityDataCache)
, m_viewportEditorModeTracker(viewportEditorModeTracker)
, m_componentModeCollection(viewportEditorModeTracker)
{
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.h
index f44de0d6eb..f940a3e6b2 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorDefaultSelection.h
@@ -27,7 +27,8 @@ namespace AzToolsFramework
AZ_CLASS_ALLOCATOR_DECL
//! @cond
- EditorDefaultSelection(const EditorVisibleEntityDataCache* entityDataCache, ViewportEditorModeTrackerInterface* viewportEditorModeTracker);
+ EditorDefaultSelection(
+ const EditorVisibleEntityDataCacheInterface* entityDataCache, ViewportEditorModeTrackerInterface* viewportEditorModeTracker);
EditorDefaultSelection(const EditorDefaultSelection&) = delete;
EditorDefaultSelection& operator=(const EditorDefaultSelection&) = delete;
virtual ~EditorDefaultSelection();
@@ -85,10 +86,8 @@ namespace AzToolsFramework
QWidget m_phantomWidget; //!< The phantom widget responsible for holding QActions while in ComponentMode.
QWidget* m_phantomOverrideWidget = nullptr; //!< It's possible to override the phantom widget in special circumstances (eg testing).
ComponentModeFramework::ComponentModeCollection m_componentModeCollection; //!< Handles all active ComponentMode types.
- AZStd::unique_ptr m_transformComponentSelection =
- nullptr; //!< Viewport selection (responsible for
- //!< manipulators and transform modifications).
- const EditorVisibleEntityDataCache* m_entityDataCache = nullptr; //!< Reference to cached visible EntityData.
+ //! Viewport selection (responsible for manipulators and transform modifications).
+ AZStd::unique_ptr m_transformComponentSelection = nullptr;
//! Mapping between passed ActionOverride (AddActionOverride) and allocated QAction.
struct ActionOverrideMapping
@@ -112,7 +111,7 @@ namespace AzToolsFramework
AZStd::shared_ptr m_manipulatorManager; //!< The default manipulator manager.
ViewportInteraction::MouseInteraction m_currentInteraction; //!< Current mouse interaction to be used for drawing manipulators.
- ViewportEditorModeTrackerInterface* m_viewportEditorModeTracker = nullptr; //!< Tracker for activating/deactivating viewport editor modes.
-
+ //! Tracker for activating/deactivating viewport editor modes.
+ ViewportEditorModeTrackerInterface* m_viewportEditorModeTracker = nullptr;
};
} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp
index ace2156d85..9b82129582 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.cpp
@@ -159,7 +159,7 @@ namespace AzToolsFramework
return false;
}
- EditorHelpers::EditorHelpers(const EditorVisibleEntityDataCache* entityDataCache)
+ EditorHelpers::EditorHelpers(const EditorVisibleEntityDataCacheInterface* entityDataCache)
: m_entityDataCache(entityDataCache)
{
m_focusModeInterface = AZ::Interface::Get();
@@ -344,9 +344,19 @@ namespace AzToolsFramework
continue;
}
- int iconTextureId = 0;
- EditorEntityIconComponentRequestBus::EventResult(
- iconTextureId, entityId, &EditorEntityIconComponentRequests::GetEntityIconTextureId);
+ const AZ::Vector3& entityPosition = m_entityDataCache->GetVisibleEntityPosition(entityCacheIndex);
+ const AZ::Vector3 entityCameraVector = entityPosition - cameraState.m_position;
+
+ if (const float directionFromCamera = entityCameraVector.Dot(cameraState.m_forward); directionFromCamera < 0.0f)
+ {
+ continue;
+ }
+
+ const float distanceFromCamera = entityCameraVector.GetLength();
+ if (distanceFromCamera < cameraState.m_nearClip)
+ {
+ continue;
+ }
using ComponentEntityAccentType = Components::EditorSelectionAccentSystemComponent::ComponentEntityAccentType;
const AZ::Color iconHighlight = [this, entityCacheIndex]()
@@ -364,13 +374,13 @@ namespace AzToolsFramework
return AZ::Color(1.0f, 1.0f, 1.0f, 1.0f);
}();
- const AZ::Vector3& entityPosition = m_entityDataCache->GetVisibleEntityPosition(entityCacheIndex);
- const float distanceFromCamera = cameraState.m_position.GetDistance(entityPosition);
- const float iconSize = GetIconSize(distanceFromCamera);
+ int iconTextureId = 0;
+ EditorEntityIconComponentRequestBus::EventResult(
+ iconTextureId, entityId, &EditorEntityIconComponentRequestBus::Events::GetEntityIconTextureId);
- editorViewportIconDisplay->DrawIcon({ viewportInfo.m_viewportId, iconTextureId, iconHighlight, entityPosition,
- EditorViewportIconDisplayInterface::CoordinateSpace::WorldSpace,
- AZ::Vector2{ iconSize, iconSize } });
+ editorViewportIconDisplay->DrawIcon(EditorViewportIconDisplayInterface::DrawParameters{
+ viewportInfo.m_viewportId, iconTextureId, iconHighlight, entityPosition,
+ EditorViewportIconDisplayInterface::CoordinateSpace::WorldSpace, AZ::Vector2(GetIconSize(distanceFromCamera)) });
}
}
}
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h
index 358e6d9117..b21e0b6737 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorHelpers.h
@@ -24,7 +24,7 @@ namespace AzFramework
namespace AzToolsFramework
{
- class EditorVisibleEntityDataCache;
+ class EditorVisibleEntityDataCacheInterface;
class FocusModeInterface;
namespace ViewportInteraction
@@ -64,7 +64,7 @@ namespace AzToolsFramework
//! An EditorVisibleEntityDataCache must be passed to EditorHelpers to allow it to
//! efficiently read entity data without resorting to EBus calls.
- explicit EditorHelpers(const EditorVisibleEntityDataCache* entityDataCache);
+ explicit EditorHelpers(const EditorVisibleEntityDataCacheInterface* entityDataCache);
EditorHelpers(const EditorHelpers&) = delete;
EditorHelpers& operator=(const EditorHelpers&) = delete;
~EditorHelpers() = default;
@@ -103,7 +103,7 @@ namespace AzToolsFramework
AZStd::unique_ptr m_invalidClicks; //!< Display for invalid click behavior.
- const EditorVisibleEntityDataCache* m_entityDataCache = nullptr; //!< Entity Data queried by the EditorHelpers.
+ const EditorVisibleEntityDataCacheInterface* m_entityDataCache = nullptr; //!< Entity Data queried by the EditorHelpers.
const FocusModeInterface* m_focusModeInterface = nullptr; //!< API to interact with focus mode functionality.
};
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.cpp
index 5d03231aab..17ffa2fdc1 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.cpp
@@ -84,7 +84,7 @@ namespace AzToolsFramework
void EditorInteractionSystemComponent::SetDefaultHandler()
{
SetHandler(
- [](const EditorVisibleEntityDataCache* entityDataCache, ViewportEditorModeTrackerInterface* viewportEditorModeTracker)
+ [](const EditorVisibleEntityDataCacheInterface* entityDataCache, ViewportEditorModeTrackerInterface* viewportEditorModeTracker)
{
return AZStd::make_unique(entityDataCache, viewportEditorModeTracker);
});
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h
index 3579460ca0..78fd8d3429 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemViewportSelectionRequestBus.h
@@ -16,7 +16,7 @@
namespace AzToolsFramework
{
- class EditorVisibleEntityDataCache;
+ class EditorVisibleEntityDataCacheInterface;
class ViewportEditorModeTrackerInterface;
//! Bus to handle all mouse events originating from the viewport.
@@ -34,7 +34,7 @@ namespace AzToolsFramework
//! Alias for factory function to create a new type implementing the ViewportSelectionRequests interface.
using ViewportSelectionRequestsBuilderFn = AZStd::function(
- const EditorVisibleEntityDataCache*, ViewportEditorModeTrackerInterface*)>;
+ const EditorVisibleEntityDataCacheInterface*, ViewportEditorModeTrackerInterface*)>;
//! Interface for system component implementing the ViewportSelectionRequests interface.
//! This interface also includes a setter to set a custom handler also implementing
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.cpp
index 059b265f51..a853a9182d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.cpp
@@ -17,7 +17,7 @@ namespace AzToolsFramework
AZ_CLASS_ALLOCATOR_IMPL(EditorPickEntitySelection, AZ::SystemAllocator, 0)
EditorPickEntitySelection::EditorPickEntitySelection(
- const EditorVisibleEntityDataCache* entityDataCache, ViewportEditorModeTrackerInterface* viewportEditorModeTracker)
+ const EditorVisibleEntityDataCacheInterface* entityDataCache, ViewportEditorModeTrackerInterface* viewportEditorModeTracker)
: m_editorHelpers(AZStd::make_unique(entityDataCache))
, m_viewportEditorModeTracker(viewportEditorModeTracker)
{
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.h
index 62fa4161b7..f941108ef8 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorPickEntitySelection.h
@@ -13,6 +13,7 @@
namespace AzToolsFramework
{
+ class EditorVisibleEntityDataCacheInterface;
class ViewportEditorModeTrackerInterface;
//! Viewport interaction that will handle assigning an entity in the viewport to
@@ -23,7 +24,7 @@ namespace AzToolsFramework
AZ_CLASS_ALLOCATOR_DECL
EditorPickEntitySelection(
- const EditorVisibleEntityDataCache* entityDataCache, ViewportEditorModeTrackerInterface* viewportEditorModeTracker);
+ const EditorVisibleEntityDataCacheInterface* entityDataCache, ViewportEditorModeTrackerInterface* viewportEditorModeTracker);
~EditorPickEntitySelection();
private:
@@ -35,6 +36,7 @@ namespace AzToolsFramework
AZStd::unique_ptr m_editorHelpers; //!< Editor visualization of entities (icons, shapes, debug visuals etc).
AZ::EntityId m_hoveredEntityId; //!< What EntityId is the mouse currently hovering over (if any).
AZ::EntityId m_cachedEntityIdUnderCursor; //!< Store the EntityId on each mouse move for use in Display.
- ViewportEditorModeTrackerInterface* m_viewportEditorModeTracker = nullptr; //!< Tracker for activating/deactivating viewport editor modes.
+ //! Tracker for activating/deactivating viewport editor modes.
+ ViewportEditorModeTrackerInterface* m_viewportEditorModeTracker = nullptr;
};
} // namespace AzToolsFramework
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
index b14f58fafa..5c5cdcb4b4 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.cpp
@@ -381,7 +381,7 @@ namespace AzToolsFramework
EntityIdContainer& selectedEntityIdsBeforeBoxSelect,
EntityIdContainer& potentialSelectedEntityIds,
EntityIdContainer& potentialDeselectedEntityIds,
- const EditorVisibleEntityDataCache& entityDataCache,
+ const EditorVisibleEntityDataCacheInterface& entityDataCache,
const int viewportId,
const ViewportInteraction::KeyboardModifiers currentKeyboardModifiers,
const ViewportInteraction::KeyboardModifiers& previousKeyboardModifiers)
@@ -958,7 +958,7 @@ namespace AzToolsFramework
// (useful in the context of drawing when we only care about entities we can see)
// note: return the index if it is selectable, nullopt otherwise
static AZStd::optional SelectableInVisibleViewportCache(
- const EditorVisibleEntityDataCache& entityDataCache, const AZ::EntityId entityId)
+ const EditorVisibleEntityDataCacheInterface& entityDataCache, const AZ::EntityId entityId)
{
if (auto entityIndex = entityDataCache.GetVisibleEntityIndexFromId(entityId))
{
@@ -1002,7 +1002,7 @@ namespace AzToolsFramework
}
}
- EditorTransformComponentSelection::EditorTransformComponentSelection(const EditorVisibleEntityDataCache* entityDataCache)
+ EditorTransformComponentSelection::EditorTransformComponentSelection(const EditorVisibleEntityDataCacheInterface* entityDataCache)
: m_entityDataCache(entityDataCache)
{
const AzFramework::EntityContextId entityContextId = GetEntityContextId();
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h
index 7b3ba08894..0465a7920f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorTransformComponentSelection.h
@@ -34,7 +34,7 @@
namespace AzToolsFramework
{
- class EditorVisibleEntityDataCache;
+ class EditorVisibleEntityDataCacheInterface;
using EntityIdSet = AZStd::unordered_set; //!< Alias for unordered_set of EntityIds.
@@ -167,7 +167,7 @@ namespace AzToolsFramework
AZ_CLASS_ALLOCATOR_DECL
EditorTransformComponentSelection() = default;
- explicit EditorTransformComponentSelection(const EditorVisibleEntityDataCache* entityDataCache);
+ explicit EditorTransformComponentSelection(const EditorVisibleEntityDataCacheInterface* entityDataCache);
EditorTransformComponentSelection(const EditorTransformComponentSelection&) = delete;
EditorTransformComponentSelection& operator=(const EditorTransformComponentSelection&) = delete;
virtual ~EditorTransformComponentSelection();
@@ -325,10 +325,8 @@ namespace AzToolsFramework
AZ::EntityId m_currentEntityIdUnderCursor; //!< Store the EntityId on each mouse move for use in Display.
AZ::EntityId m_editorCameraComponentEntityId; //!< The EditorCameraComponent EntityId if it is set.
EntityIdSet m_selectedEntityIds; //!< Represents the current entities in the selection.
-
- const EditorVisibleEntityDataCache* m_entityDataCache = nullptr; //!< A cache of packed EntityData that can be
- //!< iterated over efficiently without the need
- //!< to make individual EBus calls.
+ //! A cache of packed EntityData that can be iterated over efficiently without the need to make individual EBus calls.
+ const EditorVisibleEntityDataCacheInterface* m_entityDataCache = nullptr;
AZStd::unique_ptr m_editorHelpers; //!< Editor visualization of entities (icons, shapes, debug visuals etc).
EntityIdManipulators m_entityIdManipulators; //!< Mapping from a Manipulator to potentially many EntityIds.
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h
index 4262d334df..44dc570d5a 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorVisibleEntityDataCache.h
@@ -20,10 +20,36 @@
namespace AzToolsFramework
{
+ //! Read-only interface for EditorVisibleEntityDataCache to be used by systems that want to efficiently
+ //! query the state of visible entities in the viewport.
+ class EditorVisibleEntityDataCacheInterface
+ {
+ using ComponentEntityAccentType = Components::EditorSelectionAccentSystemComponent::ComponentEntityAccentType;
+
+ public:
+ virtual ~EditorVisibleEntityDataCacheInterface() = default;
+
+ virtual size_t VisibleEntityDataCount() const = 0;
+ virtual AZ::Vector3 GetVisibleEntityPosition(size_t index) const = 0;
+ virtual const AZ::Transform& GetVisibleEntityTransform(size_t index) const = 0;
+ virtual AZ::EntityId GetVisibleEntityId(size_t index) const = 0;
+ virtual ComponentEntityAccentType GetVisibleEntityAccent(size_t index) const = 0;
+ virtual bool IsVisibleEntityLocked(size_t index) const = 0;
+ virtual bool IsVisibleEntityVisible(size_t index) const = 0;
+ virtual bool IsVisibleEntitySelected(size_t index) const = 0;
+ virtual bool IsVisibleEntityIconHidden(size_t index) const = 0;
+ //! Returns true if the entity is individually selectable (none of its ancestors are a closed container entity).
+ //! @note It may still be desirable to be able to 'click' an entity that is a descendant of a closed container
+ //! to select the container itself, not the individual entity.
+ virtual bool IsVisibleEntityIndividuallySelectableInViewport(size_t index) const = 0;
+ virtual AZStd::optional GetVisibleEntityIndexFromId(AZ::EntityId entityId) const = 0;
+ };
+
//! A cache of packed EntityData that can be iterated over efficiently without
//! the need to make individual EBus calls
class EditorVisibleEntityDataCache
- : private EditorEntityVisibilityNotificationBus::Router
+ : public EditorVisibleEntityDataCacheInterface
+ , private EditorEntityVisibilityNotificationBus::Router
, private EditorEntityLockComponentNotificationBus::Router
, private AZ::TransformNotificationBus::Router
, private EditorComponentSelectionNotificationsBus::Router
@@ -45,22 +71,18 @@ namespace AzToolsFramework
void CalculateVisibleEntityDatas(const AzFramework::ViewportInfo& viewportInfo);
- //! EditorVisibleEntityDataCache interface
- size_t VisibleEntityDataCount() const;
- AZ::Vector3 GetVisibleEntityPosition(size_t index) const;
- const AZ::Transform& GetVisibleEntityTransform(size_t index) const;
- AZ::EntityId GetVisibleEntityId(size_t index) const;
- ComponentEntityAccentType GetVisibleEntityAccent(size_t index) const;
- bool IsVisibleEntityLocked(size_t index) const;
- bool IsVisibleEntityVisible(size_t index) const;
- bool IsVisibleEntitySelected(size_t index) const;
- bool IsVisibleEntityIconHidden(size_t index) const;
- //! Returns true if the entity is individually selectable (none of its ancestors are a closed container entity).
- //! @note It may still be desirable to be able to 'click' an entity that is a descendant of a closed container
- //! to select the container itself, not the individual entity.
- bool IsVisibleEntityIndividuallySelectableInViewport(size_t index) const;
-
- AZStd::optional GetVisibleEntityIndexFromId(AZ::EntityId entityId) const;
+ //! EditorVisibleEntityDataCacheInterface overrides ...
+ size_t VisibleEntityDataCount() const override;
+ AZ::Vector3 GetVisibleEntityPosition(size_t index) const override;
+ const AZ::Transform& GetVisibleEntityTransform(size_t index) const override;
+ AZ::EntityId GetVisibleEntityId(size_t index) const override;
+ ComponentEntityAccentType GetVisibleEntityAccent(size_t index) const override;
+ bool IsVisibleEntityLocked(size_t index) const override;
+ bool IsVisibleEntityVisible(size_t index) const override;
+ bool IsVisibleEntitySelected(size_t index) const override;
+ bool IsVisibleEntityIconHidden(size_t index) const override;
+ bool IsVisibleEntityIndividuallySelectableInViewport(size_t index) const override;
+ AZStd::optional GetVisibleEntityIndexFromId(AZ::EntityId entityId) const override;
void AddEntityIds(const EntityIdList& entityIds);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframeworktestcommon_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframeworktestcommon_files.cmake
index b70407ac68..4259a6ee9c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframeworktestcommon_files.cmake
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframeworktestcommon_files.cmake
@@ -9,6 +9,9 @@
set(FILES
UnitTest/AzToolsFrameworkTestHelpers.cpp
UnitTest/AzToolsFrameworkTestHelpers.h
+ UnitTest/Mocks/MockFocusModeInterface.h
+ UnitTest/Mocks/MockEditorVisibleEntityDataCacheInterface.h
+ UnitTest/Mocks/MockEditorViewportIconDisplayInterface.h
UnitTest/ToolsTestApplication.cpp
UnitTest/ToolsTestApplication.h
)
diff --git a/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp
index dc9e1180b7..29d72a8270 100644
--- a/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/EditorTransformComponentSelectionTests.cpp
@@ -265,7 +265,7 @@ namespace UnitTest
using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
EditorInteractionSystemViewportSelectionRequestBus::Event(
AzToolsFramework::GetEntityContextId(), &EditorInteractionSystemViewportSelectionRequestBus::Events::SetHandler,
- [](const AzToolsFramework::EditorVisibleEntityDataCache* entityDataCache,
+ [](const AzToolsFramework::EditorVisibleEntityDataCacheInterface* entityDataCache,
[[maybe_unused]] AzToolsFramework::ViewportEditorModeTrackerInterface* viewportEditorModeTracker)
{
return AZStd::make_unique(entityDataCache, viewportEditorModeTracker);
diff --git a/Code/Framework/AzToolsFramework/Tests/EditorViewportIconTests.cpp b/Code/Framework/AzToolsFramework/Tests/EditorViewportIconTests.cpp
new file mode 100644
index 0000000000..46ce9804e6
--- /dev/null
+++ b/Code/Framework/AzToolsFramework/Tests/EditorViewportIconTests.cpp
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+namespace UnitTest
+{
+ class EditorViewportIconFixture : public AllocatorsTestFixture
+ {
+ public:
+ inline static constexpr AzFramework::ViewportId TestViewportId = 2468;
+
+ void SetUp() override
+ {
+ AllocatorsTestFixture::SetUp();
+
+ m_focusModeMock = AZStd::make_unique<::testing::NiceMock>();
+ m_editorViewportIconDisplayMock = AZStd::make_unique<::testing::NiceMock>();
+ m_entityVisibleEntityDataCacheMock = AZStd::make_unique<::testing::NiceMock>();
+ m_editorHelpers = AZStd::make_unique(m_entityVisibleEntityDataCacheMock.get());
+ m_viewportSettings = AZStd::make_unique();
+
+ m_viewportSettings->Connect(TestViewportId);
+ m_viewportSettings->m_helpersVisible = false;
+ m_viewportSettings->m_iconsVisible = true;
+
+ m_cameraState = AzFramework::CreateDefaultCamera(AZ::Transform::CreateIdentity(), AZ::Vector2(1024.0f, 768.0f));
+
+ using ::testing::_;
+ using ::testing::Return;
+ ON_CALL(*m_entityVisibleEntityDataCacheMock, VisibleEntityDataCount()).WillByDefault(Return(1));
+ ON_CALL(*m_entityVisibleEntityDataCacheMock, GetVisibleEntityId(_)).WillByDefault(Return(AZ::EntityId()));
+ ON_CALL(*m_entityVisibleEntityDataCacheMock, IsVisibleEntityIconHidden(_)).WillByDefault(Return(false));
+ ON_CALL(*m_entityVisibleEntityDataCacheMock, IsVisibleEntityVisible(_)).WillByDefault(Return(true));
+ ON_CALL(*m_focusModeMock, IsInFocusSubTree(_)).WillByDefault(Return(true));
+ }
+
+ void TearDown() override
+ {
+ m_viewportSettings->Disconnect();
+ m_viewportSettings.reset();
+ m_editorHelpers.reset();
+ m_entityVisibleEntityDataCacheMock.reset();
+ m_editorViewportIconDisplayMock.reset();
+ m_focusModeMock.reset();
+
+ AllocatorsTestFixture::TearDown();
+ }
+
+ AZStd::unique_ptr m_viewportSettings;
+ AZStd::unique_ptr m_editorHelpers;
+ AZStd::unique_ptr<::testing::NiceMock> m_focusModeMock;
+ AZStd::unique_ptr<::testing::NiceMock> m_entityVisibleEntityDataCacheMock;
+ AZStd::unique_ptr<::testing::NiceMock> m_editorViewportIconDisplayMock;
+ AzFramework::CameraState m_cameraState;
+ };
+
+ TEST_F(EditorViewportIconFixture, ViewportIconsAreNotDisplayedWhenInBetweenCameraAndNearClipPlane)
+ {
+ NullDebugDisplayRequests nullDebugDisplayRequests;
+
+ const auto insideNearClip = m_cameraState.m_nearClip * 0.5f;
+
+ using ::testing::_;
+ using ::testing::Return;
+ // given
+ // entity position (where icon will be drawn) is in between near clip plane and camera position
+ ON_CALL(*m_entityVisibleEntityDataCacheMock, GetVisibleEntityPosition(_))
+ .WillByDefault(Return(AZ::Vector3(0.0f, insideNearClip, 0.0f)));
+
+ EXPECT_CALL(*m_editorViewportIconDisplayMock, DrawIcon(_)).Times(0);
+
+ // when
+ m_editorHelpers->DisplayHelpers(
+ AzFramework::ViewportInfo{ TestViewportId }, m_cameraState, nullDebugDisplayRequests,
+ [](AZ::EntityId)
+ {
+ return true;
+ });
+ }
+
+ TEST_F(EditorViewportIconFixture, ViewportIconsAreNotDisplayedWhenBehindCamera)
+ {
+ NullDebugDisplayRequests nullDebugDisplayRequests;
+
+ using ::testing::_;
+ using ::testing::Return;
+ // given
+ // entity position (where icon will be drawn) behind the camera position
+ ON_CALL(*m_entityVisibleEntityDataCacheMock, GetVisibleEntityPosition(_)).WillByDefault(Return(AZ::Vector3(0.0f, -1.0f, 0.0f)));
+
+ EXPECT_CALL(*m_editorViewportIconDisplayMock, DrawIcon(_)).Times(0);
+
+ // when
+ m_editorHelpers->DisplayHelpers(
+ AzFramework::ViewportInfo{ TestViewportId }, m_cameraState, nullDebugDisplayRequests,
+ [](AZ::EntityId)
+ {
+ return true;
+ });
+ }
+} // namespace UnitTest
diff --git a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportEditorModeTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportEditorModeTests.cpp
index 85b65f3edf..96e56d0c6a 100644
--- a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportEditorModeTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportEditorModeTests.cpp
@@ -573,7 +573,7 @@ namespace UnitTest
using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
EditorInteractionSystemViewportSelectionRequestBus::Event(
AzToolsFramework::GetEntityContextId(), &EditorInteractionSystemViewportSelectionRequestBus::Events::SetHandler,
- [](const AzToolsFramework::EditorVisibleEntityDataCache* entityDataCache,
+ [](const AzToolsFramework::EditorVisibleEntityDataCacheInterface* entityDataCache,
[[maybe_unused]] AzToolsFramework::ViewportEditorModeTrackerInterface* viewportEditorModeTracker)
{
return AZStd::make_unique(entityDataCache, viewportEditorModeTracker);
@@ -591,7 +591,7 @@ namespace UnitTest
using AzToolsFramework::EditorInteractionSystemViewportSelectionRequestBus;
EditorInteractionSystemViewportSelectionRequestBus::Event(
AzToolsFramework::GetEntityContextId(), &EditorInteractionSystemViewportSelectionRequestBus::Events::SetHandler,
- [](const AzToolsFramework::EditorVisibleEntityDataCache* entityDataCache,
+ [](const AzToolsFramework::EditorVisibleEntityDataCacheInterface* entityDataCache,
[[maybe_unused]] AzToolsFramework::ViewportEditorModeTrackerInterface* viewportEditorModeTracker)
{
return AZStd::make_unique(entityDataCache, viewportEditorModeTracker);
@@ -599,7 +599,7 @@ namespace UnitTest
EditorInteractionSystemViewportSelectionRequestBus::Event(
AzToolsFramework::GetEntityContextId(), &EditorInteractionSystemViewportSelectionRequestBus::Events::SetHandler,
- [](const AzToolsFramework::EditorVisibleEntityDataCache* entityDataCache,
+ [](const AzToolsFramework::EditorVisibleEntityDataCacheInterface* entityDataCache,
[[maybe_unused]] AzToolsFramework::ViewportEditorModeTrackerInterface* viewportEditorModeTracker)
{
return AZStd::make_unique(entityDataCache, viewportEditorModeTracker);
diff --git a/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake b/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake
index 2631a84325..b23713f891 100644
--- a/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake
+++ b/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake
@@ -24,6 +24,7 @@ set(FILES
ComponentModeTests.cpp
EditorTransformComponentSelectionTests.cpp
EditorVertexSelectionTests.cpp
+ EditorViewportIconTests.cpp
Entity/EditorEntityContextComponentTests.cpp
Entity/EditorEntityHelpersTests.cpp
Entity/EditorEntitySearchComponentTests.cpp
diff --git a/Code/Framework/GridMate/GridMate/Carrier/SecureSocketDriver.h b/Code/Framework/GridMate/GridMate/Carrier/SecureSocketDriver.h
index 76b7958085..30a9f99436 100644
--- a/Code/Framework/GridMate/GridMate/Carrier/SecureSocketDriver.h
+++ b/Code/Framework/GridMate/GridMate/Carrier/SecureSocketDriver.h
@@ -19,13 +19,15 @@
#define AZ_DebugSecureSocket(...)
#define AZ_DebugSecureSocketConnection(window, fmt, ...)
-//#define AZ_DebugUseSocketDebugLog
-//#define AZ_DebugSecureSocket AZ_TracePrintf
-//#define AZ_DebugSecureSocketConnection(window, fmt, ...) \
-//{\
-// AZStd::string line = AZStd::string::format(fmt, __VA_ARGS__);\
-// this->m_dbgLog += line;\
-//}
+/*
+ #define AZ_DebugUseSocketDebugLog
+ #define AZ_DebugSecureSocket AZ_TracePrintf
+ #define AZ_DebugSecureSocketConnection(window, fmt, ...) \
+ {\
+ AZStd::string line = AZStd::string::format(fmt, __VA_ARGS__);\
+ this->m_dbgLog += line;\
+ }
+*/
#if AZ_TRAIT_GRIDMATE_SECURE_SOCKET_DRIVER_HOOK_ENABLED
struct ssl_st;
diff --git a/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp b/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp
index 0b90e73bc0..bd788fdd73 100644
--- a/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp
+++ b/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp
@@ -41,7 +41,7 @@ bool CLevelInfo::OpenLevelPak()
{
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
// The prefab system doesn't use level.pak
if (usePrefabSystemForLevels)
@@ -62,7 +62,7 @@ void CLevelInfo::CloseLevelPak()
{
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
// The prefab system doesn't use level.pak
if (usePrefabSystemForLevels)
@@ -82,7 +82,7 @@ bool CLevelInfo::ReadInfo()
{
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
// Set up a default game type for legacy code.
m_defaultGameTypeName = "mission0";
diff --git a/Code/Legacy/CrySystem/SystemInit.cpp b/Code/Legacy/CrySystem/SystemInit.cpp
index 600a799bc1..cad914e29d 100644
--- a/Code/Legacy/CrySystem/SystemInit.cpp
+++ b/Code/Legacy/CrySystem/SystemInit.cpp
@@ -1046,7 +1046,7 @@ AZ_POP_DISABLE_WARNING
// LEVEL SYSTEM
bool usePrefabSystemForLevels = false;
AzFramework::ApplicationRequests::Bus::BroadcastResult(
- usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemForLevelsEnabled);
+ usePrefabSystemForLevels, &AzFramework::ApplicationRequests::IsPrefabSystemEnabled);
if (usePrefabSystemForLevels)
{
diff --git a/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake b/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake
index 20ab4b706d..bc7b16cc79 100644
--- a/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake
+++ b/Code/Tools/AssetProcessor/assetprocessor_test_files.cmake
@@ -30,6 +30,8 @@ set(FILES
native/tests/assetBuilderSDK/SerializationDependenciesTests.cpp
native/tests/assetmanager/AssetProcessorManagerTest.cpp
native/tests/assetmanager/AssetProcessorManagerTest.h
+ native/tests/assetmanager/ModtimeScanningTests.cpp
+ native/tests/assetmanager/ModtimeScanningTests.h
native/tests/utilities/assetUtilsTest.cpp
native/tests/platformconfiguration/platformconfigurationtests.cpp
native/tests/platformconfiguration/platformconfigurationtests.h
diff --git a/Code/Tools/AssetProcessor/native/tests/PathDependencyManagerTests.cpp b/Code/Tools/AssetProcessor/native/tests/PathDependencyManagerTests.cpp
index 1d6e92e47e..5103643833 100644
--- a/Code/Tools/AssetProcessor/native/tests/PathDependencyManagerTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/PathDependencyManagerTests.cpp
@@ -49,7 +49,7 @@ namespace UnitTests
}
struct PathDependencyBase
- : UnitTest::TraceBusRedirector
+ : ::UnitTest::TraceBusRedirector
{
void Init();
void Destroy();
@@ -65,7 +65,7 @@ namespace UnitTests
};
struct PathDependencyDeletionTest
- : UnitTest::ScopedAllocatorSetupFixture
+ : ::UnitTest::ScopedAllocatorSetupFixture
, PathDependencyBase
{
void SetUp() override
@@ -357,7 +357,7 @@ namespace UnitTests
}
struct PathDependencyBenchmarks
- : UnitTest::ScopedAllocatorFixture
+ : ::UnitTest::ScopedAllocatorFixture
, PathDependencyBase
{
static inline constexpr int NumTestDependencies = 4; // Must be a multiple of 4
@@ -530,7 +530,7 @@ namespace UnitTests
BENCHMARK_F(PathDependencyBenchmarksWrapperClass, BM_DeferredWildcardDependencyResolution)(benchmark::State& state)
{
- for (auto _ : state)
+ for ([[maybe_unused]] auto unused : state)
{
m_benchmarks->m_stateData->SetProductDependencies(m_benchmarks->m_dependencies);
diff --git a/Code/Tools/AssetProcessor/native/tests/SourceFileRelocatorTests.cpp b/Code/Tools/AssetProcessor/native/tests/SourceFileRelocatorTests.cpp
index 8d52ba23bd..bd2ef8b3cd 100644
--- a/Code/Tools/AssetProcessor/native/tests/SourceFileRelocatorTests.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/SourceFileRelocatorTests.cpp
@@ -191,7 +191,7 @@ namespace UnitTests
m_data->m_perforceComponent = AZStd::make_unique();
m_data->m_perforceComponent->Activate();
- m_data->m_perforceComponent->SetConnection(new UnitTest::MockPerforceConnection(m_command));
+ m_data->m_perforceComponent->SetConnection(new ::UnitTest::MockPerforceConnection(m_command));
}
void TearDown() override
@@ -876,7 +876,7 @@ namespace UnitTests
QDir tempPath(m_tempDir.path());
auto filePath = QDir(tempPath.absoluteFilePath(m_data->m_scanFolder1.m_scanFolder.c_str())).absoluteFilePath("duplicate/file1.tif");
-
+
ASSERT_TRUE(AZ::IO::FileIOBase::GetInstance()->Exists(filePath.toUtf8().constData()));
auto result = m_data->m_reporter->Delete(filePath.toUtf8().constData(), false);
diff --git a/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp b/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
index 0908d0fdb9..347d2a6842 100644
--- a/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
+++ b/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp
@@ -22,108 +22,6 @@
using namespace AssetProcessor;
-class AssetProcessorManager_Test
- : public AssetProcessorManager
-{
-public:
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, AssetProcessedImpl_DifferentProductDependenciesPerProduct_SavesCorrectlyToDatabase);
-
- friend class GTEST_TEST_CLASS_NAME_(MultiplatformPathDependencyTest, AssetProcessed_Impl_MultiplatformDependencies);
- friend class GTEST_TEST_CLASS_NAME_(MultiplatformPathDependencyTest, AssetProcessed_Impl_MultiplatformDependencies_DeferredResolution);
- friend class GTEST_TEST_CLASS_NAME_(MultiplatformPathDependencyTest, SameFilenameForAllPlatforms);
-
- friend class GTEST_TEST_CLASS_NAME_(MultiplatformPathDependencyTest, AssetProcessed_Impl_MultiplatformDependencies_SourcePath);
-
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, DeleteFolder_SignalsDeleteOfContainedFiles);
-
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, QueryAbsolutePathDependenciesRecursive_BasicTest);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, QueryAbsolutePathDependenciesRecursive_WithDifferentTypes_BasicTest);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, QueryAbsolutePathDependenciesRecursive_Reverse_BasicTest);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, QueryAbsolutePathDependenciesRecursive_MissingFiles_ReturnsNoPathWithPlaceholders);
-
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_BeforeComputingDirtiness_AllDirty);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_EmptyDatabase_AllDirty);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_SameAsLastTime_NoneDirty);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_MoreThanLastTime_NewOneIsDirty);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_FewerThanLastTime_Dirty);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_ChangedPattern_CountsAsNew);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_ChangedPatternType_CountsAsNew);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_NewPattern_CountsAsNewBuilder);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_NewVersionNumber_IsNotANewBuilder);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_NewAnalysisFingerprint_IsNotANewBuilder);
-
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_BasicTest);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_UpdateTest);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_MissingFiles_ByUuid);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_MissingFiles_ByName);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_MissingFiles_ByUuid_UpdatesWhenTheyAppear);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_MissingFiles_ByName_UpdatesWhenTheyAppear);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_WildcardMissingFiles_ByName_UpdatesWhenTheyAppear);
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, JobDependencyOrderOnce_MultipleJobs_EmitOK);
-
- friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, SourceFileProcessFailure_ClearsFingerprint);
-
- friend class GTEST_TEST_CLASS_NAME_(AbsolutePathProductDependencyTest, UnresolvedProductPathDependency_AssetProcessedTwice_DoesNotDuplicateDependency);
- friend class GTEST_TEST_CLASS_NAME_(AbsolutePathProductDependencyTest, AbsolutePathProductDependency_RetryDeferredDependenciesWithMatchingSource_DependencyResolves);
- friend class GTEST_TEST_CLASS_NAME_(AbsolutePathProductDependencyTest, UnresolvedProductPathDependency_AssetProcessedTwice_ValidatePathDependenciesMap);
- friend class GTEST_TEST_CLASS_NAME_(AbsolutePathProductDependencyTest, UnresolvedSourceFileTypeProductPathDependency_DependencyHasNoProductOutput_ValidatePathDependenciesMap);
-
- friend class GTEST_TEST_CLASS_NAME_(ModtimeScanningTest, ModtimeSkipping_FileUnchanged_WithoutModtimeSkipping);
-
- friend class GTEST_TEST_CLASS_NAME_(ModtimeScanningTest, ModtimeSkipping_FileUnchanged);
-
- friend class GTEST_TEST_CLASS_NAME_(ModtimeScanningTest, ModtimeSkipping_EnablePlatform_ShouldProcessFilesForPlatform);
-
- friend class GTEST_TEST_CLASS_NAME_(ModtimeScanningTest, ModtimeSkipping_ModifyFile);
- friend class GTEST_TEST_CLASS_NAME_(ModtimeScanningTest, ModtimeSkipping_ModifyFile_AndThenRevert_ProcessesAgain);
- friend class GTEST_TEST_CLASS_NAME_(ModtimeScanningTest, ModtimeSkipping_ModifyFilesSameHash_BothProcess);
- friend class GTEST_TEST_CLASS_NAME_(ModtimeScanningTest, ModtimeSkipping_ModifyTimestamp);
- friend class GTEST_TEST_CLASS_NAME_(ModtimeScanningTest, ModtimeSkipping_ModifyTimestampNoHashing_ProcessesFile);
- friend class GTEST_TEST_CLASS_NAME_(ModtimeScanningTest, ModtimeSkipping_ModifyMetadataFile);
- friend class GTEST_TEST_CLASS_NAME_(ModtimeScanningTest, ModtimeSkipping_DeleteFile);
- friend class GTEST_TEST_CLASS_NAME_(DeleteTest, DeleteFolderSharedAcrossTwoScanFolders_CorrectFileAndFolderAreDeletedFromCache);
- friend class GTEST_TEST_CLASS_NAME_(MetadataFileTest, MetadataFile_SourceFileExtensionDifferentCase);
-
- friend class AssetProcessorManagerTest;
- friend struct ModtimeScanningTest;
- friend struct JobDependencyTest;
- friend struct ChainJobDependencyTest;
- friend struct DeleteTest;
- friend struct PathDependencyTest;
- friend struct DuplicateProductsTest;
- friend struct DuplicateProcessTest;
- friend struct AbsolutePathProductDependencyTest;
- friend struct WildcardSourceDependencyTest;
-
- explicit AssetProcessorManager_Test(PlatformConfiguration* config, QObject* parent = nullptr);
- ~AssetProcessorManager_Test() override;
-
- bool CheckJobKeyToJobRunKeyMap(AZStd::string jobKey);
-
- int CountDirtyBuilders() const
- {
- int numDirty = 0;
- for (const auto& element : m_builderDataCache)
- {
- if (element.second.m_isDirty)
- {
- ++numDirty;
- }
- }
- return numDirty;
- }
-
- bool IsBuilderDirty(const AZ::Uuid& builderBusId) const
- {
- auto finder = m_builderDataCache.find(builderBusId);
- if (finder == m_builderDataCache.end())
- {
- return true;
- }
- return finder->second.m_isDirty;
- }
-};
-
AssetProcessorManager_Test::AssetProcessorManager_Test(AssetProcessor::PlatformConfiguration* config, QObject* parent /*= 0*/)
:AssetProcessorManager(config, parent)
{
@@ -3839,632 +3737,6 @@ TEST_F(AssetProcessorManagerTest, SourceFileProcessFailure_ClearsFingerprint)
ASSERT_EQ(source.m_analysisFingerprint, "");
}
-void ModtimeScanningTest::SetUp()
-{
- AssetProcessorManagerTest::SetUp();
-
- m_data = AZStd::make_unique();
-
- // We don't want the mock application manager to provide builder descriptors, mockBuilderInfoHandler will provide our own
- m_mockApplicationManager->BusDisconnect();
-
- m_data->m_mockBuilderInfoHandler.m_builderDesc = m_data->m_mockBuilderInfoHandler.CreateBuilderDesc("test builder", "{DF09DDC0-FD22-43B6-9E22-22C8574A6E1E}", { AssetBuilderSDK::AssetBuilderPattern("*.txt", AssetBuilderSDK::AssetBuilderPattern::Wildcard) });
- m_data->m_mockBuilderInfoHandler.BusConnect();
-
- ASSERT_TRUE(m_mockApplicationManager->GetBuilderByID("txt files", m_data->m_builderTxtBuilder));
-
- // Run this twice so the test builder doesn't get counted as a "new" builder and bypass the modtime skipping
- m_assetProcessorManager->ComputeBuilderDirty();
- m_assetProcessorManager->ComputeBuilderDirty();
-
- auto assetConnection = QObject::connect(m_assetProcessorManager.get(), &AssetProcessorManager::AssetToProcess, [this](JobDetails details)
- {
- m_data->m_processResults.push_back(AZStd::move(details));
- });
-
- auto deletedConnection = QObject::connect(m_assetProcessorManager.get(), &AssetProcessorManager::SourceDeleted, [this](QString file)
- {
- m_data->m_deletedSources.push_back(file);
- });
-
- // Create the test file
- const auto& scanFolder = m_config->GetScanFolderAt(0);
- m_data->m_relativePathFromWatchFolder[0] = "modtimeTestFile.txt";
- m_data->m_absolutePath.push_back(QDir(scanFolder.ScanPath()).absoluteFilePath(m_data->m_relativePathFromWatchFolder[0]));
-
- m_data->m_relativePathFromWatchFolder[1] = "modtimeTestDependency.txt";
- m_data->m_absolutePath.push_back(QDir(scanFolder.ScanPath()).absoluteFilePath(m_data->m_relativePathFromWatchFolder[1]));
-
- m_data->m_relativePathFromWatchFolder[2] = "modtimeTestDependency.txt.assetinfo";
- m_data->m_absolutePath.push_back(QDir(scanFolder.ScanPath()).absoluteFilePath(m_data->m_relativePathFromWatchFolder[2]));
-
- for (const auto& path : m_data->m_absolutePath)
- {
- ASSERT_TRUE(UnitTestUtils::CreateDummyFile(path, ""));
- }
-
- m_data->m_mockBuilderInfoHandler.m_dependencyFilePath = m_data->m_absolutePath[1].toUtf8().data();
-
- // Add file to database with no modtime
- {
- AssetDatabaseConnection connection;
- ASSERT_TRUE(connection.OpenDatabase());
- AzToolsFramework::AssetDatabase::FileDatabaseEntry fileEntry;
- fileEntry.m_fileName = m_data->m_relativePathFromWatchFolder[0].toUtf8().data();
- fileEntry.m_modTime = 0;
- fileEntry.m_isFolder = false;
- fileEntry.m_scanFolderPK = scanFolder.ScanFolderID();
-
- bool entryAlreadyExists;
- ASSERT_TRUE(connection.InsertFile(fileEntry, entryAlreadyExists));
- ASSERT_FALSE(entryAlreadyExists);
-
- fileEntry.m_fileID = AzToolsFramework::AssetDatabase::InvalidEntryId; // Reset the id so we make a new entry
- fileEntry.m_fileName = m_data->m_relativePathFromWatchFolder[1].toUtf8().data();
- ASSERT_TRUE(connection.InsertFile(fileEntry, entryAlreadyExists));
- ASSERT_FALSE(entryAlreadyExists);
-
- fileEntry.m_fileID = AzToolsFramework::AssetDatabase::InvalidEntryId; // Reset the id so we make a new entry
- fileEntry.m_fileName = m_data->m_relativePathFromWatchFolder[2].toUtf8().data();
- ASSERT_TRUE(connection.InsertFile(fileEntry, entryAlreadyExists));
- ASSERT_FALSE(entryAlreadyExists);
- }
-
- QSet filePaths = BuildFileSet();
- SimulateAssetScanner(filePaths);
-
- ASSERT_TRUE(BlockUntilIdle(5000));
- ASSERT_EQ(m_data->m_mockBuilderInfoHandler.m_createJobsCount, 2);
- ASSERT_EQ(m_data->m_processResults.size(), 2);
- ASSERT_EQ(m_data->m_deletedSources.size(), 0);
-
- ProcessAssetJobs();
-
- m_data->m_processResults.clear();
- m_data->m_mockBuilderInfoHandler.m_createJobsCount = 0;
-
- m_isIdling = false;
-}
-
-void ModtimeScanningTest::TearDown()
-{
- m_data = nullptr;
-
- AssetProcessorManagerTest::TearDown();
-}
-
-void ModtimeScanningTest::ProcessAssetJobs()
-{
- m_data->m_productPaths.clear();
-
- for (const auto& processResult : m_data->m_processResults)
- {
- auto file = QDir(processResult.m_destinationPath).absoluteFilePath(processResult.m_jobEntry.m_databaseSourceName.toLower() + ".arc1");
- m_data->m_productPaths.emplace(
- QDir(processResult.m_jobEntry.m_watchFolderPath)
- .absoluteFilePath(processResult.m_jobEntry.m_databaseSourceName)
- .toUtf8()
- .constData(),
- file);
-
- // Create the file on disk
- ASSERT_TRUE(UnitTestUtils::CreateDummyFile(file, "products."));
-
- AssetBuilderSDK::ProcessJobResponse response;
- response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
- response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(file.toUtf8().constData(), AZ::Uuid::CreateNull(), 1));
-
- QMetaObject::invokeMethod(m_assetProcessorManager.get(), "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResult.m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
- }
-
- ASSERT_TRUE(BlockUntilIdle(5000));
-
- m_isIdling = false;
-}
-
-void ModtimeScanningTest::SimulateAssetScanner(QSet filePaths)
-{
- QMetaObject::invokeMethod(m_assetProcessorManager.get(), "OnAssetScannerStatusChange", Qt::QueuedConnection, Q_ARG(AssetProcessor::AssetScanningStatus, AssetProcessor::AssetScanningStatus::Started));
- QMetaObject::invokeMethod(m_assetProcessorManager.get(), "AssessFilesFromScanner", Qt::QueuedConnection, Q_ARG(QSet, filePaths));
- QMetaObject::invokeMethod(m_assetProcessorManager.get(), "OnAssetScannerStatusChange", Qt::QueuedConnection, Q_ARG(AssetProcessor::AssetScanningStatus, AssetProcessor::AssetScanningStatus::Completed));
-}
-
-QSet ModtimeScanningTest::BuildFileSet()
-{
- QSet filePaths;
-
- for (const auto& path : m_data->m_absolutePath)
- {
- QFileInfo fileInfo(path);
- auto modtime = fileInfo.lastModified();
- AZ::u64 fileSize = fileInfo.size();
- filePaths.insert(AssetFileInfo(path, modtime, fileSize, m_config->GetScanFolderForFile(path), false));
- }
-
- return filePaths;
-}
-
-void ModtimeScanningTest::ExpectWork(int createJobs, int processJobs)
-{
- ASSERT_TRUE(BlockUntilIdle(5000));
-
- EXPECT_EQ(m_data->m_mockBuilderInfoHandler.m_createJobsCount, createJobs);
- EXPECT_EQ(m_data->m_processResults.size(), processJobs);
- EXPECT_FALSE(m_data->m_processResults[0].m_autoFail);
- EXPECT_FALSE(m_data->m_processResults[1].m_autoFail);
- EXPECT_EQ(m_data->m_deletedSources.size(), 0);
-
- m_isIdling = false;
-}
-
-void ModtimeScanningTest::ExpectNoWork()
-{
- // Since there's no work to do, the idle event isn't going to trigger, just process events a couple times
- for (int i = 0; i < 10; ++i)
- {
- QCoreApplication::processEvents(QEventLoop::AllEvents, 10);
- }
-
- ASSERT_EQ(m_data->m_mockBuilderInfoHandler.m_createJobsCount, 0);
- ASSERT_EQ(m_data->m_processResults.size(), 0);
- ASSERT_EQ(m_data->m_deletedSources.size(), 0);
-
- m_isIdling = false;
-}
-
-void ModtimeScanningTest::SetFileContents(QString filePath, QString contents)
-{
- QFile file(filePath);
- file.open(QIODevice::WriteOnly | QIODevice::Truncate);
- file.write(contents.toUtf8().constData());
- file.close();
-}
-
-TEST_F(ModtimeScanningTest, ModtimeSkipping_FileUnchanged_WithoutModtimeSkipping)
-{
- using namespace AzToolsFramework::AssetSystem;
-
- // Make sure modtime skipping is disabled
- // We're just going to do 1 quick sanity test to make sure the files are still processed when modtime skipping is turned off
- m_assetProcessorManager->m_allowModtimeSkippingFeature = false;
-
- QSet filePaths = BuildFileSet();
- SimulateAssetScanner(filePaths);
-
- // 2 create jobs but 0 process jobs because the file has already been processed before in SetUp
- ExpectWork(2, 0);
-}
-
-TEST_F(ModtimeScanningTest, ModtimeSkipping_FileUnchanged)
-{
- using namespace AzToolsFramework::AssetSystem;
-
- // Enable the features we're testing
- m_assetProcessorManager->m_allowModtimeSkippingFeature = true;
- AssetUtilities::SetUseFileHashOverride(true, true);
-
- QSet filePaths = BuildFileSet();
- SimulateAssetScanner(filePaths);
-
- ExpectNoWork();
-}
-
-TEST_F(ModtimeScanningTest, ModtimeSkipping_EnablePlatform_ShouldProcessFilesForPlatform)
-{
- using namespace AzToolsFramework::AssetSystem;
-
- // Enable the features we're testing
- m_assetProcessorManager->m_allowModtimeSkippingFeature = true;
- AssetUtilities::SetUseFileHashOverride(true, true);
-
- // Enable android platform after the initial SetUp has already processed the files for pc
- QDir tempPath(m_tempDir.path());
- AssetBuilderSDK::PlatformInfo androidPlatform("android", { "host", "renderer" });
- m_config->EnablePlatform(androidPlatform, true);
-
- // There's no way to remove scanfolders and adding a new one after enabling the platform will cause the pc assets to build as well, which we don't want
- // Instead we'll just const cast the vector and modify the enabled platforms for the scanfolder
- auto& platforms = const_cast&>(m_config->GetScanFolderAt(0).GetPlatforms());
- platforms.push_back(androidPlatform);
-
- // We need the builder fingerprints to be updated to reflect the newly enabled platform
- m_assetProcessorManager->ComputeBuilderDirty();
-
- QSet filePaths = BuildFileSet();
- SimulateAssetScanner(filePaths);
-
- ExpectWork(4, 2); // CreateJobs = 4, 2 files * 2 platforms. ProcessJobs = 2, just the android platform jobs (pc is already processed)
-
- ASSERT_TRUE(m_data->m_processResults[0].m_destinationPath.contains("android"));
- ASSERT_TRUE(m_data->m_processResults[1].m_destinationPath.contains("android"));
-}
-
-TEST_F(ModtimeScanningTest, ModtimeSkipping_ModifyTimestamp)
-{
- // Update the timestamp on a file without changing its contents
- // This should not cause any job to run since the hash of the file is the same before/after
- // Additionally, the timestamp stored in the database should be updated
- using namespace AzToolsFramework::AssetSystem;
-
- uint64_t timestamp = 1594923423;
-
- QString databaseName, scanfolderName;
- m_config->ConvertToRelativePath(m_data->m_absolutePath[1], databaseName, scanfolderName);
- auto* scanFolder = m_config->GetScanFolderForFile(m_data->m_absolutePath[1]);
-
- AzToolsFramework::AssetDatabase::FileDatabaseEntry fileEntry;
-
- m_assetProcessorManager.get()->m_stateData->GetFileByFileNameAndScanFolderId(databaseName, scanFolder->ScanFolderID(), fileEntry);
-
- ASSERT_NE(fileEntry.m_modTime, timestamp);
- uint64_t existingTimestamp = fileEntry.m_modTime;
-
- // Modify the timestamp on just one file
- AzToolsFramework::ToolsFileUtils::SetModificationTime(m_data->m_absolutePath[1].toUtf8().data(), timestamp);
-
- // Enable the features we're testing
- m_assetProcessorManager->m_allowModtimeSkippingFeature = true;
- AssetUtilities::SetUseFileHashOverride(true, true);
-
- QSet filePaths = BuildFileSet();
- SimulateAssetScanner(filePaths);
-
- ExpectNoWork();
-
- m_assetProcessorManager.get()->m_stateData->GetFileByFileNameAndScanFolderId(databaseName, scanFolder->ScanFolderID(), fileEntry);
-
- // The timestamp should be updated even though nothing processed
- ASSERT_NE(fileEntry.m_modTime, existingTimestamp);
-}
-
-TEST_F(ModtimeScanningTest, ModtimeSkipping_ModifyTimestampNoHashing_ProcessesFile)
-{
- // Update the timestamp on a file without changing its contents
- // This should not cause any job to run since the hash of the file is the same before/after
- // Additionally, the timestamp stored in the database should be updated
- using namespace AzToolsFramework::AssetSystem;
-
- uint64_t timestamp = 1594923423;
-
- // Modify the timestamp on just one file
- AzToolsFramework::ToolsFileUtils::SetModificationTime(m_data->m_absolutePath[1].toUtf8().data(), timestamp);
-
- // Enable the features we're testing
- m_assetProcessorManager->m_allowModtimeSkippingFeature = true;
- AssetUtilities::SetUseFileHashOverride(true, false);
-
- QSet filePaths = BuildFileSet();
- SimulateAssetScanner(filePaths);
-
- ExpectWork(2, 2);
-}
-
-TEST_F(ModtimeScanningTest, ModtimeSkipping_ModifyFile)
-{
- using namespace AzToolsFramework::AssetSystem;
-
- SetFileContents(m_data->m_absolutePath[1].toUtf8().constData(), "hello world");
-
- // Enable the features we're testing
- m_assetProcessorManager->m_allowModtimeSkippingFeature = true;
- AssetUtilities::SetUseFileHashOverride(true, true);
-
- QSet filePaths = BuildFileSet();
- SimulateAssetScanner(filePaths);
-
- // Even though we're only updating one file, we're expecting 2 createJob calls because our test file is a dependency that triggers the other test file to process as well
- ExpectWork(2, 2);
-}
-
-TEST_F(ModtimeScanningTest, ModtimeSkipping_ModifyFile_AndThenRevert_ProcessesAgain)
-{
- using namespace AzToolsFramework::AssetSystem;
- auto theFile = m_data->m_absolutePath[1].toUtf8();
- const char* theFileString = theFile.constData();
-
- SetFileContents(theFileString, "hello world");
-
- // Enable the features we're testing
- m_assetProcessorManager->m_allowModtimeSkippingFeature = true;
- AssetUtilities::SetUseFileHashOverride(true, true);
-
- QSet filePaths = BuildFileSet();
- SimulateAssetScanner(filePaths);
-
- // Even though we're only updating one file, we're expecting 2 createJob calls because our test file is a dependency that triggers the other test file to process as well
- ExpectWork(2, 2);
- ProcessAssetJobs();
-
- m_data->m_mockBuilderInfoHandler.m_createJobsCount = 0;
- m_data->m_processResults.clear();
- m_data->m_deletedSources.clear();
-
- SetFileContents(theFileString, "");
-
- filePaths = BuildFileSet();
- SimulateAssetScanner(filePaths);
-
- // Expect processing to happen again
- ExpectWork(2, 2);
-}
-
-struct LockedFileTest
- : ModtimeScanningTest
- , AssetProcessor::ConnectionBus::Handler
-{
- MOCK_METHOD3(SendRaw, size_t (unsigned, unsigned, const QByteArray&));
- MOCK_METHOD3(SendPerPlatform, size_t (unsigned, const AzFramework::AssetSystem::BaseAssetProcessorMessage&, const QString&));
- MOCK_METHOD4(SendRawPerPlatform, size_t (unsigned, unsigned, const QByteArray&, const QString&));
- MOCK_METHOD2(SendRequest, unsigned (const AzFramework::AssetSystem::BaseAssetProcessorMessage&, const ResponseCallback&));
- MOCK_METHOD2(SendResponse, size_t (unsigned, const AzFramework::AssetSystem::BaseAssetProcessorMessage&));
- MOCK_METHOD1(RemoveResponseHandler, void (unsigned));
-
- size_t Send(unsigned, const AzFramework::AssetSystem::BaseAssetProcessorMessage& message) override
- {
- using SourceFileNotificationMessage = AzToolsFramework::AssetSystem::SourceFileNotificationMessage;
- switch (message.GetMessageType())
- {
- case SourceFileNotificationMessage::MessageType:
- if (const auto sourceFileMessage = azrtti_cast(&message); sourceFileMessage != nullptr &&
- sourceFileMessage->m_type == SourceFileNotificationMessage::NotificationType::FileRemoved)
- {
- // The File Remove message will occur before an attempt to delete the file
- // Wait for more than 1 File Remove message.
- // This indicates the AP has attempted to delete the file once, failed to do so and is now retrying
- ++m_deleteCounter;
-
- if(m_deleteCounter > 1 && m_callback)
- {
- m_callback();
- m_callback = {}; // Unset it to be safe, we only intend to run the callback once
- }
- }
- break;
- default:
- break;
- }
-
- return 0;
- }
-
- void SetUp() override
- {
- ModtimeScanningTest::SetUp();
-
- ConnectionBus::Handler::BusConnect(0);
- }
-
- void TearDown() override
- {
- ConnectionBus::Handler::BusDisconnect();
-
- ModtimeScanningTest::TearDown();
- }
-
- AZStd::atomic_int m_deleteCounter{ 0 };
- AZStd::function m_callback;
-};
-
-TEST_F(LockedFileTest, DeleteFile_LockedProduct_DeleteFails)
-{
- auto theFile = m_data->m_absolutePath[1].toUtf8();
- const char* theFileString = theFile.constData();
- auto [sourcePath, productPath] = *m_data->m_productPaths.find(theFileString);
-
- {
- QFile file(theFileString);
- file.remove();
- }
-
- ASSERT_GT(m_data->m_productPaths.size(), 0);
- QFile product(productPath);
-
- ASSERT_TRUE(product.open(QIODevice::ReadOnly));
-
- // Check if we can delete the file now, if we can't, proceed with the test
- // If we can, it means the OS running this test doesn't lock open files so there's nothing to test
- if (!AZ::IO::SystemFile::Delete(productPath.toUtf8().constData()))
- {
- QMetaObject::invokeMethod(
- m_assetProcessorManager.get(), "AssessDeletedFile", Qt::QueuedConnection, Q_ARG(QString, QString(theFileString)));
-
- EXPECT_TRUE(BlockUntilIdle(5000));
-
- EXPECT_TRUE(QFile::exists(productPath));
- EXPECT_EQ(m_data->m_deletedSources.size(), 0);
- }
- else
- {
- SUCCEED() << "Skipping test. OS does not lock open files.";
- }
-}
-
-TEST_F(LockedFileTest, DeleteFile_LockedProduct_DeletesWhenReleased)
-{
- // This test is intended to verify the AP will successfully retry deleting a source asset
- // when one of its product assets is locked temporarily
- // We'll lock the file by holding it open
-
- auto theFile = m_data->m_absolutePath[1].toUtf8();
- const char* theFileString = theFile.constData();
- auto [sourcePath, productPath] = *m_data->m_productPaths.find(theFileString);
-
- {
- QFile file(theFileString);
- file.remove();
- }
-
- ASSERT_GT(m_data->m_productPaths.size(), 0);
- QFile product(productPath);
-
- // Open the file and keep it open to lock it
- // We'll start a thread later to unlock the file
- // This will allow us to test how AP handles trying to delete a locked file
- ASSERT_TRUE(product.open(QIODevice::ReadOnly));
-
- // Check if we can delete the file now, if we can't, proceed with the test
- // If we can, it means the OS running this test doesn't lock open files so there's nothing to test
- if (!AZ::IO::SystemFile::Delete(productPath.toUtf8().constData()))
- {
- m_deleteCounter = 0;
-
- // Set up a callback which will fire after at least 1 retry
- // Unlock the file at that point so AP can successfully delete it
- m_callback = [&product]()
- {
- product.close();
- };
-
- QMetaObject::invokeMethod(
- m_assetProcessorManager.get(), "AssessDeletedFile", Qt::QueuedConnection, Q_ARG(QString, QString(theFileString)));
-
- EXPECT_TRUE(BlockUntilIdle(5000));
-
- EXPECT_FALSE(QFile::exists(productPath));
- EXPECT_EQ(m_data->m_deletedSources.size(), 1);
-
- EXPECT_GT(m_deleteCounter, 1); // Make sure the AP tried more than once to delete the file
- m_errorAbsorber->ExpectAsserts(0);
- }
- else
- {
- SUCCEED() << "Skipping test. OS does not lock open files.";
- }
-}
-
-TEST_F(ModtimeScanningTest, ModtimeSkipping_ModifyFilesSameHash_BothProcess)
-{
- using namespace AzToolsFramework::AssetSystem;
-
- SetFileContents(m_data->m_absolutePath[1].toUtf8().constData(), "hello world");
-
- // Enable the features we're testing
- m_assetProcessorManager->m_allowModtimeSkippingFeature = true;
- AssetUtilities::SetUseFileHashOverride(true, true);
-
- QSet filePaths = BuildFileSet();
- SimulateAssetScanner(filePaths);
-
- // Even though we're only updating one file, we're expecting 2 createJob calls because our test file is a dependency that triggers the other test file to process as well
- ExpectWork(2, 2);
- ProcessAssetJobs();
-
- m_data->m_mockBuilderInfoHandler.m_createJobsCount = 0;
- m_data->m_processResults.clear();
- m_data->m_deletedSources.clear();
-
- // Make file 0 have the same contents as file 1
- SetFileContents(m_data->m_absolutePath[0].toUtf8().constData(), "hello world");
-
- filePaths = BuildFileSet();
- SimulateAssetScanner(filePaths);
-
- ExpectWork(1, 1);
-}
-
-TEST_F(ModtimeScanningTest, ModtimeSkipping_ModifyMetadataFile)
-{
- using namespace AzToolsFramework::AssetSystem;
-
- SetFileContents(m_data->m_absolutePath[2].toUtf8().constData(), "hello world");
-
- // Enable the features we're testing
- m_assetProcessorManager->m_allowModtimeSkippingFeature = true;
- AssetUtilities::SetUseFileHashOverride(true, true);
-
- QSet filePaths = BuildFileSet();
- SimulateAssetScanner(filePaths);
-
- // Even though we're only updating one file, we're expecting 2 createJob calls because our test file is a metadata file
- // that triggers the source file which is a dependency that triggers the other test file to process as well
- ExpectWork(2, 2);
-}
-
-TEST_F(ModtimeScanningTest, ModtimeSkipping_DeleteFile)
-{
- using namespace AzToolsFramework::AssetSystem;
-
- // Enable the features we're testing
- m_assetProcessorManager->m_allowModtimeSkippingFeature = true;
- AssetUtilities::SetUseFileHashOverride(true, true);
-
- ASSERT_TRUE(QFile::remove(m_data->m_absolutePath[0]));
-
- // Feed in ONLY one file (the one we didn't delete)
- QSet filePaths;
- QFileInfo fileInfo(m_data->m_absolutePath[1]);
- auto modtime = fileInfo.lastModified();
- AZ::u64 fileSize = fileInfo.size();
- filePaths.insert(AssetFileInfo(m_data->m_absolutePath[1], modtime, fileSize, &m_config->GetScanFolderAt(0), false));
-
- SimulateAssetScanner(filePaths);
-
- QElapsedTimer timer;
- timer.start();
-
- do
- {
- QCoreApplication::processEvents(QEventLoop::AllEvents, 10);
- } while (m_data->m_deletedSources.size() < m_data->m_relativePathFromWatchFolder[0].size() && timer.elapsed() < 5000);
-
- ASSERT_EQ(m_data->m_mockBuilderInfoHandler.m_createJobsCount, 0);
- ASSERT_EQ(m_data->m_processResults.size(), 0);
- ASSERT_THAT(m_data->m_deletedSources, testing::ElementsAre(m_data->m_relativePathFromWatchFolder[0]));
-}
-
-TEST_F(ModtimeScanningTest, ReprocessRequest_FileNotModified_FileProcessed)
-{
- using namespace AzToolsFramework::AssetSystem;
-
- m_assetProcessorManager->RequestReprocess(m_data->m_absolutePath[0]);
-
- ASSERT_TRUE(BlockUntilIdle(5000));
-
- ASSERT_EQ(m_data->m_mockBuilderInfoHandler.m_createJobsCount, 1);
- ASSERT_EQ(m_data->m_processResults.size(), 1);
-}
-
-TEST_F(ModtimeScanningTest, ReprocessRequest_SourceWithDependency_BothWillProcess)
-{
- using namespace AzToolsFramework::AssetSystem;
-
- using SourceFileDependencyEntry = AzToolsFramework::AssetDatabase::SourceFileDependencyEntry;
-
- SourceFileDependencyEntry newEntry1;
- newEntry1.m_sourceDependencyID = AzToolsFramework::AssetDatabase::InvalidEntryId;
- newEntry1.m_builderGuid = AZ::Uuid::CreateRandom();
- newEntry1.m_source = m_data->m_absolutePath[0].toUtf8().constData();
- newEntry1.m_dependsOnSource = m_data->m_absolutePath[1].toUtf8().constData();
- newEntry1.m_typeOfDependency = SourceFileDependencyEntry::DEP_SourceToSource;
-
- m_assetProcessorManager->RequestReprocess(m_data->m_absolutePath[0]);
- ASSERT_TRUE(BlockUntilIdle(5000));
-
- ASSERT_EQ(m_data->m_mockBuilderInfoHandler.m_createJobsCount, 1);
- ASSERT_EQ(m_data->m_processResults.size(), 1);
-
- m_assetProcessorManager->RequestReprocess(m_data->m_absolutePath[1]);
- ASSERT_TRUE(BlockUntilIdle(5000));
-
- ASSERT_EQ(m_data->m_mockBuilderInfoHandler.m_createJobsCount, 3);
- ASSERT_EQ(m_data->m_processResults.size(), 3);
-}
-
-TEST_F(ModtimeScanningTest, ReprocessRequest_RequestFolder_SourceAssetsWillProcess)
-{
- using namespace AzToolsFramework::AssetSystem;
-
- const auto& scanFolder = m_config->GetScanFolderAt(0);
-
- QString scanPath = scanFolder.ScanPath();
- m_assetProcessorManager->RequestReprocess(scanPath);
- ASSERT_TRUE(BlockUntilIdle(5000));
-
- // two text files are source assets, assetinfo is not
- ASSERT_EQ(m_data->m_mockBuilderInfoHandler.m_createJobsCount, 2);
- ASSERT_EQ(m_data->m_processResults.size(), 2);
-}
-
//////////////////////////////////////////////////////////////////////////
MockBuilderInfoHandler::~MockBuilderInfoHandler()
@@ -5205,130 +4477,7 @@ TEST_F(ChainJobDependencyTest, TestChainDependency_Multi)
}
}
-void DeleteTest::SetUp()
-{
- AssetProcessorManagerTest::SetUp();
- m_data = AZStd::make_unique();
-
- m_assetProcessorManager->m_allowModtimeSkippingFeature = true;
-
- // We don't want the mock application manager to provide builder descriptors, mockBuilderInfoHandler will provide our own
- m_mockApplicationManager->BusDisconnect();
-
- m_data->m_mockBuilderInfoHandler.m_builderDesc = m_data->m_mockBuilderInfoHandler.CreateBuilderDesc("test builder", "{DF09DDC0-FD22-43B6-9E22-22C8574A6E1E}", { AssetBuilderSDK::AssetBuilderPattern("*.txt", AssetBuilderSDK::AssetBuilderPattern::Wildcard) });
- m_data->m_mockBuilderInfoHandler.BusConnect();
-
- ASSERT_TRUE(m_mockApplicationManager->GetBuilderByID("txt files", m_data->m_builderTxtBuilder));
-
- // Run this twice so the test builder doesn't get counted as a "new" builder and bypass the modtime skipping
- m_assetProcessorManager->ComputeBuilderDirty();
- m_assetProcessorManager->ComputeBuilderDirty();
-
- auto setupConnectionsFunc = [this]()
- {
- QObject::connect(m_assetProcessorManager.get(), &AssetProcessorManager::AssetToProcess, [this](JobDetails details)
- {
- m_data->m_processResults.push_back(AZStd::move(details));
- });
-
- QObject::connect(m_assetProcessorManager.get(), &AssetProcessorManager::SourceDeleted, [this](QString file)
- {
- m_data->m_deletedSources.push_back(file);
- });
- };
-
- auto createFileAndAddToDatabaseFunc = [this](const AssetProcessor::ScanFolderInfo* scanFolder, QString file)
- {
- using namespace AzToolsFramework::AssetDatabase;
-
- QString watchFolderPath = scanFolder->ScanPath();
- QString absPath(QDir(watchFolderPath).absoluteFilePath(file));
- UnitTestUtils::CreateDummyFile(absPath);
-
- m_data->m_absolutePath.push_back(absPath);
-
- AzToolsFramework::AssetDatabase::FileDatabaseEntry fileEntry;
- fileEntry.m_fileName = file.toUtf8().constData();
- fileEntry.m_modTime = 0;
- fileEntry.m_isFolder = false;
- fileEntry.m_scanFolderPK = scanFolder->ScanFolderID();
-
- bool entryAlreadyExists;
- ASSERT_TRUE(m_assetProcessorManager->m_stateData->InsertFile(fileEntry, entryAlreadyExists));
- ASSERT_FALSE(entryAlreadyExists);
- };
-
- setupConnectionsFunc();
-
- // Create test files
- QDir tempPath(m_tempDir.path());
- const auto* scanFolder1 = m_config->GetScanFolderByPath(tempPath.absoluteFilePath("subfolder1"));
- const auto* scanFolder4 = m_config->GetScanFolderByPath(tempPath.absoluteFilePath("subfolder4"));
-
- createFileAndAddToDatabaseFunc(scanFolder1, QString("textures/a.txt"));
- createFileAndAddToDatabaseFunc(scanFolder4, QString("textures/b.txt"));
-
- // Run the test files through AP all the way to processing stage
- QSet filePaths = BuildFileSet();
- SimulateAssetScanner(filePaths);
-
- ASSERT_TRUE(BlockUntilIdle(5000));
- ASSERT_EQ(m_data->m_mockBuilderInfoHandler.m_createJobsCount, 2);
- ASSERT_EQ(m_data->m_processResults.size(), 2);
- ASSERT_EQ(m_data->m_deletedSources.size(), 0);
-
- ProcessAssetJobs();
-
- m_data->m_processResults.clear();
- m_data->m_mockBuilderInfoHandler.m_createJobsCount = 0;
-
- // Reboot the APM since we added stuff to the database that needs to be loaded on-startup of the APM
- m_assetProcessorManager.reset(new AssetProcessorManager_Test(m_config.get()));
-
- m_idleConnection = QObject::connect(m_assetProcessorManager.get(), &AssetProcessor::AssetProcessorManager::AssetProcessorManagerIdleState, [this](bool newState)
- {
- m_isIdling = newState;
- });
-
- setupConnectionsFunc();
-
- m_assetProcessorManager->ComputeBuilderDirty();
-}
-
-TEST_F(DeleteTest, DeleteFolderSharedAcrossTwoScanFolders_CorrectFileAndFolderAreDeletedFromCache)
-{
- // There was a bug where AP wasn't repopulating the "known folders" list when modtime skipping was enabled and no work was needed
- // As a result, deleting a folder didn't count as a "folder", so the wrong code path was taken. This test makes sure the correct deletion events fire
-
- using namespace AzToolsFramework::AssetSystem;
-
- // Modtime skipping has to be on for this
- m_assetProcessorManager->m_allowModtimeSkippingFeature = true;
-
- // Feed in the files from the asset scanner, no jobs should run since they're already up-to-date
- QSet filePaths = BuildFileSet();
- SimulateAssetScanner(filePaths);
-
- ExpectNoWork();
-
- // Delete one of the folders
- QDir tempPath(m_tempDir.path());
- QString absPath(tempPath.absoluteFilePath("subfolder1/textures"));
- QDir(absPath).removeRecursively();
-
- AZStd::vector deletedFolders;
- QObject::connect(m_assetProcessorManager.get(), &AssetProcessorManager::SourceFolderDeleted, [&deletedFolders](QString file)
- {
- deletedFolders.push_back(file.toUtf8().constData());
- });
-
- m_assetProcessorManager->AssessDeletedFile(absPath);
- ASSERT_TRUE(BlockUntilIdle(5000));
-
- ASSERT_THAT(m_data->m_deletedSources, testing::UnorderedElementsAre("textures/a.txt"));
- ASSERT_THAT(deletedFolders, testing::UnorderedElementsAre("textures"));
-}
void DuplicateProcessTest::SetUp()
{
diff --git a/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.h b/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.h
index c532b08016..4e644ea457 100644
--- a/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.h
+++ b/Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.h
@@ -37,6 +37,114 @@ public:
MOCK_METHOD1(GetAssetDatabaseLocation, bool(AZStd::string&));
};
+class AssetProcessorManager_Test : public AssetProcessor::AssetProcessorManager
+{
+public:
+ friend class GTEST_TEST_CLASS_NAME_(
+ AssetProcessorManagerTest, AssetProcessedImpl_DifferentProductDependenciesPerProduct_SavesCorrectlyToDatabase);
+
+ friend class GTEST_TEST_CLASS_NAME_(MultiplatformPathDependencyTest, AssetProcessed_Impl_MultiplatformDependencies);
+ friend class GTEST_TEST_CLASS_NAME_(MultiplatformPathDependencyTest, AssetProcessed_Impl_MultiplatformDependencies_DeferredResolution);
+ friend class GTEST_TEST_CLASS_NAME_(MultiplatformPathDependencyTest, SameFilenameForAllPlatforms);
+
+ friend class GTEST_TEST_CLASS_NAME_(MultiplatformPathDependencyTest, AssetProcessed_Impl_MultiplatformDependencies_SourcePath);
+
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, DeleteFolder_SignalsDeleteOfContainedFiles);
+
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, QueryAbsolutePathDependenciesRecursive_BasicTest);
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, QueryAbsolutePathDependenciesRecursive_WithDifferentTypes_BasicTest);
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, QueryAbsolutePathDependenciesRecursive_Reverse_BasicTest);
+ friend class GTEST_TEST_CLASS_NAME_(
+ AssetProcessorManagerTest, QueryAbsolutePathDependenciesRecursive_MissingFiles_ReturnsNoPathWithPlaceholders);
+
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_BeforeComputingDirtiness_AllDirty);
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_EmptyDatabase_AllDirty);
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_SameAsLastTime_NoneDirty);
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_MoreThanLastTime_NewOneIsDirty);
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_FewerThanLastTime_Dirty);
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_ChangedPattern_CountsAsNew);
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_ChangedPatternType_CountsAsNew);
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_NewPattern_CountsAsNewBuilder);
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_NewVersionNumber_IsNotANewBuilder);
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, BuilderDirtiness_NewAnalysisFingerprint_IsNotANewBuilder);
+
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_BasicTest);
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_UpdateTest);
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_MissingFiles_ByUuid);
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_MissingFiles_ByName);
+ friend class GTEST_TEST_CLASS_NAME_(
+ AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_MissingFiles_ByUuid_UpdatesWhenTheyAppear);
+ friend class GTEST_TEST_CLASS_NAME_(
+ AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_MissingFiles_ByName_UpdatesWhenTheyAppear);
+ friend class GTEST_TEST_CLASS_NAME_(
+ AssetProcessorManagerTest, UpdateSourceFileDependenciesDatabase_WildcardMissingFiles_ByName_UpdatesWhenTheyAppear);
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, JobDependencyOrderOnce_MultipleJobs_EmitOK);
+
+ friend class GTEST_TEST_CLASS_NAME_(AssetProcessorManagerTest, SourceFileProcessFailure_ClearsFingerprint);
+
+ friend class GTEST_TEST_CLASS_NAME_(
+ AbsolutePathProductDependencyTest, UnresolvedProductPathDependency_AssetProcessedTwice_DoesNotDuplicateDependency);
+ friend class GTEST_TEST_CLASS_NAME_(
+ AbsolutePathProductDependencyTest, AbsolutePathProductDependency_RetryDeferredDependenciesWithMatchingSource_DependencyResolves);
+ friend class GTEST_TEST_CLASS_NAME_(
+ AbsolutePathProductDependencyTest, UnresolvedProductPathDependency_AssetProcessedTwice_ValidatePathDependenciesMap);
+ friend class GTEST_TEST_CLASS_NAME_(
+ AbsolutePathProductDependencyTest,
+ UnresolvedSourceFileTypeProductPathDependency_DependencyHasNoProductOutput_ValidatePathDependenciesMap);
+
+ friend class GTEST_TEST_CLASS_NAME_(DeleteTest, DeleteFolderSharedAcrossTwoScanFolders_CorrectFileAndFolderAreDeletedFromCache);
+ friend class GTEST_TEST_CLASS_NAME_(MetadataFileTest, MetadataFile_SourceFileExtensionDifferentCase);
+
+ friend class AssetProcessorManagerTest;
+ friend struct JobDependencyTest;
+ friend struct ChainJobDependencyTest;
+ friend struct DeleteTest;
+ friend struct PathDependencyTest;
+ friend struct DuplicateProductsTest;
+ friend struct DuplicateProcessTest;
+ friend struct AbsolutePathProductDependencyTest;
+ friend struct WildcardSourceDependencyTest;
+
+ explicit AssetProcessorManager_Test(AssetProcessor::PlatformConfiguration* config, QObject* parent = nullptr);
+ ~AssetProcessorManager_Test() override;
+
+ bool CheckJobKeyToJobRunKeyMap(AZStd::string jobKey);
+
+ int CountDirtyBuilders() const
+ {
+ int numDirty = 0;
+ for (const auto& element : m_builderDataCache)
+ {
+ if (element.second.m_isDirty)
+ {
+ ++numDirty;
+ }
+ }
+ return numDirty;
+ }
+
+ bool IsBuilderDirty(const AZ::Uuid& builderBusId) const
+ {
+ auto finder = m_builderDataCache.find(builderBusId);
+ if (finder == m_builderDataCache.end())
+ {
+ return true;
+ }
+ return finder->second.m_isDirty;
+ }
+
+ void RecomputeDirtyBuilders()
+ {
+ // Run this twice so the test builder doesn't get counted as a "new" builder and bypass the modtime skipping
+ ComputeBuilderDirty();
+ ComputeBuilderDirty();
+ }
+
+ using AssetProcessorManager::m_stateData;
+ using AssetProcessorManager::ComputeBuilderDirty;
+};
+
+
class AssetProcessorManagerTest
: public AssetProcessor::AssetProcessorTest
{
@@ -165,33 +273,6 @@ struct MockBuilderInfoHandler
int m_createJobsCount = 0;
};
-struct ModtimeScanningTest
- : public AssetProcessorManagerTest
-{
- void SetUp() override;
- void TearDown() override;
-
- void ProcessAssetJobs();
- void SimulateAssetScanner(QSet filePaths);
- QSet BuildFileSet();
- void ExpectWork(int createJobs, int processJobs);
- void ExpectNoWork();
- void SetFileContents(QString filePath, QString contents);
-
- struct StaticData
- {
- QString m_relativePathFromWatchFolder[3];
- AZStd::vector m_absolutePath;
- AZStd::vector m_processResults;
- AZStd::unordered_multimap m_productPaths;
- AZStd::vector m_deletedSources;
- AZStd::shared_ptr m_builderTxtBuilder;
- MockBuilderInfoHandler m_mockBuilderInfoHandler;
- };
-
- AZStd::unique_ptr m_data;
-};
-
struct MetadataFileTest
: public AssetProcessorManagerTest
@@ -274,9 +355,3 @@ struct DuplicateProductsTest
{
void SetupDuplicateProductsTest(QString& sourceFile, QDir& tempPath, QString& productFile, AZStd::vector& jobDetails, AssetBuilderSDK::ProcessJobResponse& response, bool multipleOutputs, QString extension);
};
-
-struct DeleteTest
- : public ModtimeScanningTest
-{
- void SetUp() override;
-};
diff --git a/Code/Tools/AssetProcessor/native/tests/assetmanager/ModtimeScanningTests.cpp b/Code/Tools/AssetProcessor/native/tests/assetmanager/ModtimeScanningTests.cpp
new file mode 100644
index 0000000000..6b3124ca00
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/tests/assetmanager/ModtimeScanningTests.cpp
@@ -0,0 +1,706 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include
+#include
+#include
+#include
+
+namespace UnitTests
+{
+ using AssetFileInfo = AssetProcessor::AssetFileInfo;
+
+ void ModtimeScanningTest::SetUpAssetProcessorManager()
+ {
+ using namespace AssetProcessor;
+
+ m_assetProcessorManager->SetEnableModtimeSkippingFeature(true);
+ m_assetProcessorManager->RecomputeDirtyBuilders();
+
+ QObject::connect(
+ m_assetProcessorManager.get(), &AssetProcessorManager::AssetToProcess,
+ [this](JobDetails details)
+ {
+ m_data->m_processResults.push_back(AZStd::move(details));
+ });
+
+ QObject::connect(
+ m_assetProcessorManager.get(), &AssetProcessorManager::SourceDeleted,
+ [this](QString file)
+ {
+ m_data->m_deletedSources.push_back(file);
+ });
+
+ m_idleConnection = QObject::connect(
+ m_assetProcessorManager.get(), &AssetProcessor::AssetProcessorManager::AssetProcessorManagerIdleState,
+ [this](bool newState)
+ {
+ m_isIdling = newState;
+ });
+ }
+
+ void ModtimeScanningTest::SetUp()
+ {
+ using namespace AssetProcessor;
+
+ AssetProcessorManagerTest::SetUp();
+
+ m_data = AZStd::make_unique();
+
+ // We don't want the mock application manager to provide builder descriptors, mockBuilderInfoHandler will provide our own
+ m_mockApplicationManager->BusDisconnect();
+
+ m_data->m_mockBuilderInfoHandler.m_builderDesc = m_data->m_mockBuilderInfoHandler.CreateBuilderDesc(
+ "test builder", "{DF09DDC0-FD22-43B6-9E22-22C8574A6E1E}",
+ { AssetBuilderSDK::AssetBuilderPattern("*.txt", AssetBuilderSDK::AssetBuilderPattern::Wildcard) });
+ m_data->m_mockBuilderInfoHandler.BusConnect();
+
+ ASSERT_TRUE(m_mockApplicationManager->GetBuilderByID("txt files", m_data->m_builderTxtBuilder));
+
+ SetUpAssetProcessorManager();
+
+ // Create the test file
+ const auto& scanFolder = m_config->GetScanFolderAt(0);
+ m_data->m_relativePathFromWatchFolder[0] = "modtimeTestFile.txt";
+ m_data->m_absolutePath.push_back(QDir(scanFolder.ScanPath()).absoluteFilePath(m_data->m_relativePathFromWatchFolder[0]));
+
+ m_data->m_relativePathFromWatchFolder[1] = "modtimeTestDependency.txt";
+ m_data->m_absolutePath.push_back(QDir(scanFolder.ScanPath()).absoluteFilePath(m_data->m_relativePathFromWatchFolder[1]));
+
+ m_data->m_relativePathFromWatchFolder[2] = "modtimeTestDependency.txt.assetinfo";
+ m_data->m_absolutePath.push_back(QDir(scanFolder.ScanPath()).absoluteFilePath(m_data->m_relativePathFromWatchFolder[2]));
+
+ for (const auto& path : m_data->m_absolutePath)
+ {
+ ASSERT_TRUE(UnitTestUtils::CreateDummyFile(path, ""));
+ }
+
+ m_data->m_mockBuilderInfoHandler.m_dependencyFilePath = m_data->m_absolutePath[1].toUtf8().data();
+
+ // Add file to database with no modtime
+ {
+ AssetDatabaseConnection connection;
+ ASSERT_TRUE(connection.OpenDatabase());
+ AzToolsFramework::AssetDatabase::FileDatabaseEntry fileEntry;
+ fileEntry.m_fileName = m_data->m_relativePathFromWatchFolder[0].toUtf8().data();
+ fileEntry.m_modTime = 0;
+ fileEntry.m_isFolder = false;
+ fileEntry.m_scanFolderPK = scanFolder.ScanFolderID();
+
+ bool entryAlreadyExists;
+ ASSERT_TRUE(connection.InsertFile(fileEntry, entryAlreadyExists));
+ ASSERT_FALSE(entryAlreadyExists);
+
+ fileEntry.m_fileID = AzToolsFramework::AssetDatabase::InvalidEntryId; // Reset the id so we make a new entry
+ fileEntry.m_fileName = m_data->m_relativePathFromWatchFolder[1].toUtf8().data();
+ ASSERT_TRUE(connection.InsertFile(fileEntry, entryAlreadyExists));
+ ASSERT_FALSE(entryAlreadyExists);
+
+ fileEntry.m_fileID = AzToolsFramework::AssetDatabase::InvalidEntryId; // Reset the id so we make a new entry
+ fileEntry.m_fileName = m_data->m_relativePathFromWatchFolder[2].toUtf8().data();
+ ASSERT_TRUE(connection.InsertFile(fileEntry, entryAlreadyExists));
+ ASSERT_FALSE(entryAlreadyExists);
+ }
+
+ QSet filePaths = BuildFileSet();
+ SimulateAssetScanner(filePaths);
+
+ ASSERT_TRUE(BlockUntilIdle(5000));
+ ASSERT_EQ(m_data->m_mockBuilderInfoHandler.m_createJobsCount, 2);
+ ASSERT_EQ(m_data->m_processResults.size(), 2);
+ ASSERT_EQ(m_data->m_deletedSources.size(), 0);
+
+ ProcessAssetJobs();
+
+ m_data->m_processResults.clear();
+ m_data->m_mockBuilderInfoHandler.m_createJobsCount = 0;
+
+ m_isIdling = false;
+ }
+
+ void ModtimeScanningTest::TearDown()
+ {
+ m_data = nullptr;
+
+ AssetProcessorManagerTest::TearDown();
+ }
+
+ void ModtimeScanningTest::ProcessAssetJobs()
+ {
+ m_data->m_productPaths.clear();
+
+ for (const auto& processResult : m_data->m_processResults)
+ {
+ auto file =
+ QDir(processResult.m_destinationPath).absoluteFilePath(processResult.m_jobEntry.m_databaseSourceName.toLower() + ".arc1");
+ m_data->m_productPaths.emplace(
+ QDir(processResult.m_jobEntry.m_watchFolderPath)
+ .absoluteFilePath(processResult.m_jobEntry.m_databaseSourceName)
+ .toUtf8()
+ .constData(),
+ file);
+
+ // Create the file on disk
+ ASSERT_TRUE(UnitTestUtils::CreateDummyFile(file, "products."));
+
+ AssetBuilderSDK::ProcessJobResponse response;
+ response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
+ response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(file.toUtf8().constData(), AZ::Uuid::CreateNull(), 1));
+
+ using JobEntry = AssetProcessor::JobEntry;
+
+ QMetaObject::invokeMethod(
+ m_assetProcessorManager.get(), "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResult.m_jobEntry),
+ Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
+ }
+
+ ASSERT_TRUE(BlockUntilIdle(5000));
+
+ m_isIdling = false;
+ }
+
+ void ModtimeScanningTest::SimulateAssetScanner(QSet filePaths)
+ {
+ QMetaObject::invokeMethod(
+ m_assetProcessorManager.get(), "OnAssetScannerStatusChange", Qt::QueuedConnection,
+ Q_ARG(AssetProcessor::AssetScanningStatus, AssetProcessor::AssetScanningStatus::Started));
+ QMetaObject::invokeMethod(
+ m_assetProcessorManager.get(), "AssessFilesFromScanner", Qt::QueuedConnection, Q_ARG(QSet, filePaths));
+ QMetaObject::invokeMethod(
+ m_assetProcessorManager.get(), "OnAssetScannerStatusChange", Qt::QueuedConnection,
+ Q_ARG(AssetProcessor::AssetScanningStatus, AssetProcessor::AssetScanningStatus::Completed));
+ }
+
+ QSet ModtimeScanningTest::BuildFileSet()
+ {
+ QSet filePaths;
+
+ for (const auto& path : m_data->m_absolutePath)
+ {
+ QFileInfo fileInfo(path);
+ auto modtime = fileInfo.lastModified();
+ AZ::u64 fileSize = fileInfo.size();
+ filePaths.insert(AssetFileInfo(path, modtime, fileSize, m_config->GetScanFolderForFile(path), false));
+ }
+
+ return filePaths;
+ }
+
+ void ModtimeScanningTest::ExpectWork(int createJobs, int processJobs)
+ {
+ ASSERT_TRUE(BlockUntilIdle(5000));
+
+ EXPECT_EQ(m_data->m_mockBuilderInfoHandler.m_createJobsCount, createJobs);
+ EXPECT_EQ(m_data->m_processResults.size(), processJobs);
+ for (int i = 0; i < processJobs; ++i)
+ {
+ EXPECT_FALSE(m_data->m_processResults[i].m_autoFail);
+ }
+ EXPECT_EQ(m_data->m_deletedSources.size(), 0);
+
+ m_isIdling = false;
+ }
+
+ void ModtimeScanningTest::ExpectNoWork()
+ {
+ // Since there's no work to do, the idle event isn't going to trigger, just process events a couple times
+ for (int i = 0; i < 10; ++i)
+ {
+ QCoreApplication::processEvents(QEventLoop::AllEvents, 10);
+ }
+
+ ASSERT_EQ(m_data->m_mockBuilderInfoHandler.m_createJobsCount, 0);
+ ASSERT_EQ(m_data->m_processResults.size(), 0);
+ ASSERT_EQ(m_data->m_deletedSources.size(), 0);
+
+ m_isIdling = false;
+ }
+
+ void ModtimeScanningTest::SetFileContents(QString filePath, QString contents)
+ {
+ QFile file(filePath);
+ file.open(QIODevice::WriteOnly | QIODevice::Truncate);
+ file.write(contents.toUtf8().constData());
+ file.close();
+ }
+
+ TEST_F(ModtimeScanningTest, ModtimeSkipping_FileUnchanged_WithoutModtimeSkipping)
+ {
+ using namespace AzToolsFramework::AssetSystem;
+
+ // Make sure modtime skipping is disabled
+ // We're just going to do 1 quick sanity test to make sure the files are still processed when modtime skipping is turned off
+ m_assetProcessorManager->SetEnableModtimeSkippingFeature(false);
+
+ QSet filePaths = BuildFileSet();
+ SimulateAssetScanner(filePaths);
+
+ // 2 create jobs but 0 process jobs because the file has already been processed before in SetUp
+ ExpectWork(2, 0);
+ }
+
+ TEST_F(ModtimeScanningTest, ModtimeSkipping_FileUnchanged)
+ {
+ using namespace AzToolsFramework::AssetSystem;
+
+ AssetUtilities::SetUseFileHashOverride(true, true);
+
+ QSet filePaths = BuildFileSet();
+ SimulateAssetScanner(filePaths);
+
+ ExpectNoWork();
+ }
+
+ TEST_F(ModtimeScanningTest, ModtimeSkipping_EnablePlatform_ShouldProcessFilesForPlatform)
+ {
+ using namespace AzToolsFramework::AssetSystem;
+
+ AssetUtilities::SetUseFileHashOverride(true, true);
+
+ // Enable android platform after the initial SetUp has already processed the files for pc
+ QDir tempPath(m_tempDir.path());
+ AssetBuilderSDK::PlatformInfo androidPlatform("android", { "host", "renderer" });
+ m_config->EnablePlatform(androidPlatform, true);
+
+ // There's no way to remove scanfolders and adding a new one after enabling the platform will cause the pc assets to build as well,
+ // which we don't want Instead we'll just const cast the vector and modify the enabled platforms for the scanfolder
+ auto& platforms = const_cast&>(m_config->GetScanFolderAt(0).GetPlatforms());
+ platforms.push_back(androidPlatform);
+
+ // We need the builder fingerprints to be updated to reflect the newly enabled platform
+ m_assetProcessorManager->ComputeBuilderDirty();
+
+ QSet filePaths = BuildFileSet();
+ SimulateAssetScanner(filePaths);
+
+ ExpectWork(
+ 4, 2); // CreateJobs = 4, 2 files * 2 platforms. ProcessJobs = 2, just the android platform jobs (pc is already processed)
+
+ ASSERT_TRUE(m_data->m_processResults[0].m_destinationPath.contains("android"));
+ ASSERT_TRUE(m_data->m_processResults[1].m_destinationPath.contains("android"));
+ }
+
+ TEST_F(ModtimeScanningTest, ModtimeSkipping_ModifyTimestamp)
+ {
+ // Update the timestamp on a file without changing its contents
+ // This should not cause any job to run since the hash of the file is the same before/after
+ // Additionally, the timestamp stored in the database should be updated
+ using namespace AzToolsFramework::AssetSystem;
+
+ uint64_t timestamp = 1594923423;
+
+ QString databaseName, scanfolderName;
+ m_config->ConvertToRelativePath(m_data->m_absolutePath[1], databaseName, scanfolderName);
+ auto* scanFolder = m_config->GetScanFolderForFile(m_data->m_absolutePath[1]);
+
+ AzToolsFramework::AssetDatabase::FileDatabaseEntry fileEntry;
+
+ m_assetProcessorManager->m_stateData->GetFileByFileNameAndScanFolderId(databaseName, scanFolder->ScanFolderID(), fileEntry);
+
+ ASSERT_NE(fileEntry.m_modTime, timestamp);
+ uint64_t existingTimestamp = fileEntry.m_modTime;
+
+ // Modify the timestamp on just one file
+ AzToolsFramework::ToolsFileUtils::SetModificationTime(m_data->m_absolutePath[1].toUtf8().data(), timestamp);
+
+ AssetUtilities::SetUseFileHashOverride(true, true);
+
+ QSet filePaths = BuildFileSet();
+ SimulateAssetScanner(filePaths);
+
+ ExpectNoWork();
+
+ m_assetProcessorManager->m_stateData->GetFileByFileNameAndScanFolderId(databaseName, scanFolder->ScanFolderID(), fileEntry);
+
+ // The timestamp should be updated even though nothing processed
+ ASSERT_NE(fileEntry.m_modTime, existingTimestamp);
+ }
+
+ TEST_F(ModtimeScanningTest, ModtimeSkipping_ModifyTimestampNoHashing_ProcessesFile)
+ {
+ // Update the timestamp on a file without changing its contents
+ // This should not cause any job to run since the hash of the file is the same before/after
+ // Additionally, the timestamp stored in the database should be updated
+ using namespace AzToolsFramework::AssetSystem;
+
+ uint64_t timestamp = 1594923423;
+
+ // Modify the timestamp on just one file
+ AzToolsFramework::ToolsFileUtils::SetModificationTime(m_data->m_absolutePath[1].toUtf8().data(), timestamp);
+
+ AssetUtilities::SetUseFileHashOverride(true, false);
+
+ QSet filePaths = BuildFileSet();
+ SimulateAssetScanner(filePaths);
+
+ ExpectWork(2, 2);
+ }
+
+ TEST_F(ModtimeScanningTest, ModtimeSkipping_ModifyFile)
+ {
+ using namespace AzToolsFramework::AssetSystem;
+
+ SetFileContents(m_data->m_absolutePath[1].toUtf8().constData(), "hello world");
+
+ AssetUtilities::SetUseFileHashOverride(true, true);
+
+ QSet filePaths = BuildFileSet();
+ SimulateAssetScanner(filePaths);
+
+ // Even though we're only updating one file, we're expecting 2 createJob calls because our test file is a dependency that triggers
+ // the other test file to process as well
+ ExpectWork(2, 2);
+ }
+
+ TEST_F(ModtimeScanningTest, ModtimeSkipping_ModifyFile_AndThenRevert_ProcessesAgain)
+ {
+ using namespace AzToolsFramework::AssetSystem;
+ auto theFile = m_data->m_absolutePath[1].toUtf8();
+ const char* theFileString = theFile.constData();
+
+ SetFileContents(theFileString, "hello world");
+
+ AssetUtilities::SetUseFileHashOverride(true, true);
+
+ QSet filePaths = BuildFileSet();
+ SimulateAssetScanner(filePaths);
+
+ // Even though we're only updating one file, we're expecting 2 createJob calls because our test file is a dependency that triggers
+ // the other test file to process as well
+ ExpectWork(2, 2);
+ ProcessAssetJobs();
+
+ m_data->m_mockBuilderInfoHandler.m_createJobsCount = 0;
+ m_data->m_processResults.clear();
+ m_data->m_deletedSources.clear();
+
+ SetFileContents(theFileString, "");
+
+ filePaths = BuildFileSet();
+ SimulateAssetScanner(filePaths);
+
+ // Expect processing to happen again
+ ExpectWork(2, 2);
+ }
+
+ TEST_F(ModtimeScanningTest, ModtimeSkipping_ModifyFilesSameHash_BothProcess)
+ {
+ using namespace AzToolsFramework::AssetSystem;
+
+ SetFileContents(m_data->m_absolutePath[1].toUtf8().constData(), "hello world");
+
+ AssetUtilities::SetUseFileHashOverride(true, true);
+
+ QSet filePaths = BuildFileSet();
+ SimulateAssetScanner(filePaths);
+
+ // Even though we're only updating one file, we're expecting 2 createJob calls because our test file is a dependency that triggers
+ // the other test file to process as well
+ ExpectWork(2, 2);
+ ProcessAssetJobs();
+
+ m_data->m_mockBuilderInfoHandler.m_createJobsCount = 0;
+ m_data->m_processResults.clear();
+ m_data->m_deletedSources.clear();
+
+ // Make file 0 have the same contents as file 1
+ SetFileContents(m_data->m_absolutePath[0].toUtf8().constData(), "hello world");
+
+ filePaths = BuildFileSet();
+ SimulateAssetScanner(filePaths);
+
+ ExpectWork(1, 1);
+ }
+
+ TEST_F(ModtimeScanningTest, ModtimeSkipping_ModifyMetadataFile)
+ {
+ using namespace AzToolsFramework::AssetSystem;
+
+ SetFileContents(m_data->m_absolutePath[2].toUtf8().constData(), "hello world");
+
+ AssetUtilities::SetUseFileHashOverride(true, true);
+
+ QSet filePaths = BuildFileSet();
+ SimulateAssetScanner(filePaths);
+
+ // Even though we're only updating one file, we're expecting 2 createJob calls because our test file is a metadata file
+ // that triggers the source file which is a dependency that triggers the other test file to process as well
+ ExpectWork(2, 2);
+ }
+
+ TEST_F(ModtimeScanningTest, ModtimeSkipping_DeleteFile)
+ {
+ using namespace AzToolsFramework::AssetSystem;
+
+ AssetUtilities::SetUseFileHashOverride(true, true);
+
+ ASSERT_TRUE(QFile::remove(m_data->m_absolutePath[0]));
+
+ // Feed in ONLY one file (the one we didn't delete)
+ QSet filePaths;
+ QFileInfo fileInfo(m_data->m_absolutePath[1]);
+ auto modtime = fileInfo.lastModified();
+ AZ::u64 fileSize = fileInfo.size();
+ filePaths.insert(AssetFileInfo(m_data->m_absolutePath[1], modtime, fileSize, &m_config->GetScanFolderAt(0), false));
+
+ SimulateAssetScanner(filePaths);
+
+ QElapsedTimer timer;
+ timer.start();
+
+ do
+ {
+ QCoreApplication::processEvents(QEventLoop::AllEvents, 10);
+ } while (m_data->m_deletedSources.size() < m_data->m_relativePathFromWatchFolder[0].size() && timer.elapsed() < 5000);
+
+ ASSERT_EQ(m_data->m_mockBuilderInfoHandler.m_createJobsCount, 0);
+ ASSERT_EQ(m_data->m_processResults.size(), 0);
+ ASSERT_THAT(m_data->m_deletedSources, testing::ElementsAre(m_data->m_relativePathFromWatchFolder[0]));
+ }
+
+ TEST_F(ModtimeScanningTest, ReprocessRequest_FileNotModified_FileProcessed)
+ {
+ using namespace AzToolsFramework::AssetSystem;
+
+ m_assetProcessorManager->RequestReprocess(m_data->m_absolutePath[0]);
+
+ ASSERT_TRUE(BlockUntilIdle(5000));
+
+ ASSERT_EQ(m_data->m_mockBuilderInfoHandler.m_createJobsCount, 1);
+ ASSERT_EQ(m_data->m_processResults.size(), 1);
+ }
+
+ TEST_F(ModtimeScanningTest, ReprocessRequest_SourceWithDependency_BothWillProcess)
+ {
+ using namespace AzToolsFramework::AssetSystem;
+
+ using SourceFileDependencyEntry = AzToolsFramework::AssetDatabase::SourceFileDependencyEntry;
+
+ SourceFileDependencyEntry newEntry1;
+ newEntry1.m_sourceDependencyID = AzToolsFramework::AssetDatabase::InvalidEntryId;
+ newEntry1.m_builderGuid = AZ::Uuid::CreateRandom();
+ newEntry1.m_source = m_data->m_absolutePath[0].toUtf8().constData();
+ newEntry1.m_dependsOnSource = m_data->m_absolutePath[1].toUtf8().constData();
+ newEntry1.m_typeOfDependency = SourceFileDependencyEntry::DEP_SourceToSource;
+
+ m_assetProcessorManager->RequestReprocess(m_data->m_absolutePath[0]);
+ ASSERT_TRUE(BlockUntilIdle(5000));
+
+ ASSERT_EQ(m_data->m_mockBuilderInfoHandler.m_createJobsCount, 1);
+ ASSERT_EQ(m_data->m_processResults.size(), 1);
+
+ m_assetProcessorManager->RequestReprocess(m_data->m_absolutePath[1]);
+ ASSERT_TRUE(BlockUntilIdle(5000));
+
+ ASSERT_EQ(m_data->m_mockBuilderInfoHandler.m_createJobsCount, 3);
+ ASSERT_EQ(m_data->m_processResults.size(), 3);
+ }
+
+ TEST_F(ModtimeScanningTest, ReprocessRequest_RequestFolder_SourceAssetsWillProcess)
+ {
+ using namespace AzToolsFramework::AssetSystem;
+
+ const auto& scanFolder = m_config->GetScanFolderAt(0);
+
+ QString scanPath = scanFolder.ScanPath();
+ m_assetProcessorManager->RequestReprocess(scanPath);
+ ASSERT_TRUE(BlockUntilIdle(5000));
+
+ // two text files are source assets, assetinfo is not
+ ASSERT_EQ(m_data->m_mockBuilderInfoHandler.m_createJobsCount, 2);
+ ASSERT_EQ(m_data->m_processResults.size(), 2);
+ }
+
+ void DeleteTest::SetUp()
+ {
+ AssetProcessorManagerTest::SetUp();
+
+ m_data = AZStd::make_unique();
+
+ // We don't want the mock application manager to provide builder descriptors, mockBuilderInfoHandler will provide our own
+ m_mockApplicationManager->BusDisconnect();
+
+ m_data->m_mockBuilderInfoHandler.m_builderDesc = m_data->m_mockBuilderInfoHandler.CreateBuilderDesc(
+ "test builder", "{DF09DDC0-FD22-43B6-9E22-22C8574A6E1E}",
+ { AssetBuilderSDK::AssetBuilderPattern("*.txt", AssetBuilderSDK::AssetBuilderPattern::Wildcard) });
+ m_data->m_mockBuilderInfoHandler.BusConnect();
+
+ ASSERT_TRUE(m_mockApplicationManager->GetBuilderByID("txt files", m_data->m_builderTxtBuilder));
+
+ SetUpAssetProcessorManager();
+
+ auto createFileAndAddToDatabaseFunc = [this](const AssetProcessor::ScanFolderInfo* scanFolder, QString file)
+ {
+ using namespace AzToolsFramework::AssetDatabase;
+
+ QString watchFolderPath = scanFolder->ScanPath();
+ QString absPath(QDir(watchFolderPath).absoluteFilePath(file));
+ UnitTestUtils::CreateDummyFile(absPath);
+
+ m_data->m_absolutePath.push_back(absPath);
+
+ AzToolsFramework::AssetDatabase::FileDatabaseEntry fileEntry;
+ fileEntry.m_fileName = file.toUtf8().constData();
+ fileEntry.m_modTime = 0;
+ fileEntry.m_isFolder = false;
+ fileEntry.m_scanFolderPK = scanFolder->ScanFolderID();
+
+ bool entryAlreadyExists;
+ ASSERT_TRUE(m_assetProcessorManager->m_stateData->InsertFile(fileEntry, entryAlreadyExists));
+ ASSERT_FALSE(entryAlreadyExists);
+ };
+
+ // Create test files
+ QDir tempPath(m_tempDir.path());
+ const auto* scanFolder1 = m_config->GetScanFolderByPath(tempPath.absoluteFilePath("subfolder1"));
+ const auto* scanFolder4 = m_config->GetScanFolderByPath(tempPath.absoluteFilePath("subfolder4"));
+
+ createFileAndAddToDatabaseFunc(scanFolder1, QString("textures/a.txt"));
+ createFileAndAddToDatabaseFunc(scanFolder4, QString("textures/b.txt"));
+
+ // Run the test files through AP all the way to processing stage
+ QSet filePaths = BuildFileSet();
+ SimulateAssetScanner(filePaths);
+
+ ASSERT_TRUE(BlockUntilIdle(5000));
+ ASSERT_EQ(m_data->m_mockBuilderInfoHandler.m_createJobsCount, 2);
+ ASSERT_EQ(m_data->m_processResults.size(), 2);
+ ASSERT_EQ(m_data->m_deletedSources.size(), 0);
+
+ ProcessAssetJobs();
+
+ m_data->m_processResults.clear();
+ m_data->m_mockBuilderInfoHandler.m_createJobsCount = 0;
+
+ // Reboot the APM since we added stuff to the database that needs to be loaded on-startup of the APM
+ m_assetProcessorManager.reset(new AssetProcessorManager_Test(m_config.get()));
+
+ SetUpAssetProcessorManager();
+ }
+
+ TEST_F(DeleteTest, DeleteFolderSharedAcrossTwoScanFolders_CorrectFileAndFolderAreDeletedFromCache)
+ {
+ // There was a bug where AP wasn't repopulating the "known folders" list when modtime skipping was enabled and no work was needed
+ // As a result, deleting a folder didn't count as a "folder", so the wrong code path was taken. This test makes sure the correct
+ // deletion events fire
+
+ using namespace AzToolsFramework::AssetSystem;
+
+ // Feed in the files from the asset scanner, no jobs should run since they're already up-to-date
+ QSet filePaths = BuildFileSet();
+ SimulateAssetScanner(filePaths);
+
+ ExpectNoWork();
+
+ // Delete one of the folders
+ QDir tempPath(m_tempDir.path());
+ QString absPath(tempPath.absoluteFilePath("subfolder1/textures"));
+ QDir(absPath).removeRecursively();
+
+ AZStd::vector deletedFolders;
+ QObject::connect(
+ m_assetProcessorManager.get(), &AssetProcessor::AssetProcessorManager::SourceFolderDeleted,
+ [&deletedFolders](QString file)
+ {
+ deletedFolders.push_back(file.toUtf8().constData());
+ });
+
+ m_assetProcessorManager->AssessDeletedFile(absPath);
+ ASSERT_TRUE(BlockUntilIdle(5000));
+
+ ASSERT_THAT(m_data->m_deletedSources, testing::UnorderedElementsAre("textures/a.txt"));
+ ASSERT_THAT(deletedFolders, testing::UnorderedElementsAre("textures"));
+ }
+
+ TEST_F(LockedFileTest, DeleteFile_LockedProduct_DeleteFails)
+ {
+ auto theFile = m_data->m_absolutePath[1].toUtf8();
+ const char* theFileString = theFile.constData();
+ auto [sourcePath, productPath] = *m_data->m_productPaths.find(theFileString);
+
+ {
+ QFile file(theFileString);
+ file.remove();
+ }
+
+ ASSERT_GT(m_data->m_productPaths.size(), 0);
+ QFile product(productPath);
+
+ ASSERT_TRUE(product.open(QIODevice::ReadOnly));
+
+ // Check if we can delete the file now, if we can't, proceed with the test
+ // If we can, it means the OS running this test doesn't lock open files so there's nothing to test
+ if (!AZ::IO::SystemFile::Delete(productPath.toUtf8().constData()))
+ {
+ QMetaObject::invokeMethod(
+ m_assetProcessorManager.get(), "AssessDeletedFile", Qt::QueuedConnection, Q_ARG(QString, QString(theFileString)));
+
+ EXPECT_TRUE(BlockUntilIdle(5000));
+
+ EXPECT_TRUE(QFile::exists(productPath));
+ EXPECT_EQ(m_data->m_deletedSources.size(), 0);
+ }
+ else
+ {
+ SUCCEED() << "Skipping test. OS does not lock open files.";
+ }
+ }
+
+ TEST_F(LockedFileTest, DeleteFile_LockedProduct_DeletesWhenReleased)
+ {
+ // This test is intended to verify the AP will successfully retry deleting a source asset
+ // when one of its product assets is locked temporarily
+ // We'll lock the file by holding it open
+
+ auto theFile = m_data->m_absolutePath[1].toUtf8();
+ const char* theFileString = theFile.constData();
+ auto [sourcePath, productPath] = *m_data->m_productPaths.find(theFileString);
+
+ {
+ QFile file(theFileString);
+ file.remove();
+ }
+
+ ASSERT_GT(m_data->m_productPaths.size(), 0);
+ QFile product(productPath);
+
+ // Open the file and keep it open to lock it
+ // We'll start a thread later to unlock the file
+ // This will allow us to test how AP handles trying to delete a locked file
+ ASSERT_TRUE(product.open(QIODevice::ReadOnly));
+
+ // Check if we can delete the file now, if we can't, proceed with the test
+ // If we can, it means the OS running this test doesn't lock open files so there's nothing to test
+ if (!AZ::IO::SystemFile::Delete(productPath.toUtf8().constData()))
+ {
+ m_deleteCounter = 0;
+
+ // Set up a callback which will fire after at least 1 retry
+ // Unlock the file at that point so AP can successfully delete it
+ m_callback = [&product]()
+ {
+ product.close();
+ };
+
+ QMetaObject::invokeMethod(
+ m_assetProcessorManager.get(), "AssessDeletedFile", Qt::QueuedConnection, Q_ARG(QString, QString(theFileString)));
+
+ EXPECT_TRUE(BlockUntilIdle(5000));
+
+ EXPECT_FALSE(QFile::exists(productPath));
+ EXPECT_EQ(m_data->m_deletedSources.size(), 1);
+
+ EXPECT_GT(m_deleteCounter, 1); // Make sure the AP tried more than once to delete the file
+ m_errorAbsorber->ExpectAsserts(0);
+ }
+ else
+ {
+ SUCCEED() << "Skipping test. OS does not lock open files.";
+ }
+ }
+}
diff --git a/Code/Tools/AssetProcessor/native/tests/assetmanager/ModtimeScanningTests.h b/Code/Tools/AssetProcessor/native/tests/assetmanager/ModtimeScanningTests.h
new file mode 100644
index 0000000000..ef57c70536
--- /dev/null
+++ b/Code/Tools/AssetProcessor/native/tests/assetmanager/ModtimeScanningTests.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#pragma once
+
+#include
+
+namespace UnitTests
+{
+ struct ModtimeScanningTest : AssetProcessorManagerTest
+ {
+ void SetUpAssetProcessorManager();
+ void SetUp() override;
+ void TearDown() override;
+
+ void ProcessAssetJobs();
+ void SimulateAssetScanner(QSet filePaths);
+ QSet BuildFileSet();
+ void ExpectWork(int createJobs, int processJobs);
+ void ExpectNoWork();
+ void SetFileContents(QString filePath, QString contents);
+
+ struct StaticData
+ {
+ QString m_relativePathFromWatchFolder[3];
+ AZStd::vector m_absolutePath;
+ AZStd::vector m_processResults;
+ AZStd::unordered_multimap m_productPaths;
+ AZStd::vector m_deletedSources;
+ AZStd::shared_ptr m_builderTxtBuilder;
+ MockBuilderInfoHandler m_mockBuilderInfoHandler;
+ };
+
+ AZStd::unique_ptr m_data;
+ };
+
+ struct DeleteTest : ModtimeScanningTest
+ {
+ void SetUp() override;
+ };
+
+
+ struct LockedFileTest
+ : ModtimeScanningTest
+ , AssetProcessor::ConnectionBus::Handler
+ {
+ MOCK_METHOD3(SendRaw, size_t(unsigned, unsigned, const QByteArray&));
+ MOCK_METHOD3(SendPerPlatform, size_t(unsigned, const AzFramework::AssetSystem::BaseAssetProcessorMessage&, const QString&));
+ MOCK_METHOD4(SendRawPerPlatform, size_t(unsigned, unsigned, const QByteArray&, const QString&));
+ MOCK_METHOD2(SendRequest, unsigned(const AzFramework::AssetSystem::BaseAssetProcessorMessage&, const ResponseCallback&));
+ MOCK_METHOD2(SendResponse, size_t(unsigned, const AzFramework::AssetSystem::BaseAssetProcessorMessage&));
+ MOCK_METHOD1(RemoveResponseHandler, void(unsigned));
+
+ size_t Send(unsigned, const AzFramework::AssetSystem::BaseAssetProcessorMessage& message) override
+ {
+ using SourceFileNotificationMessage = AzToolsFramework::AssetSystem::SourceFileNotificationMessage;
+ switch (message.GetMessageType())
+ {
+ case SourceFileNotificationMessage::MessageType:
+ if (const auto sourceFileMessage = azrtti_cast(&message);
+ sourceFileMessage != nullptr &&
+ sourceFileMessage->m_type == SourceFileNotificationMessage::NotificationType::FileRemoved)
+ {
+ // The File Remove message will occur before an attempt to delete the file
+ // Wait for more than 1 File Remove message.
+ // This indicates the AP has attempted to delete the file once, failed to do so and is now retrying
+ ++m_deleteCounter;
+
+ if (m_deleteCounter > 1 && m_callback)
+ {
+ m_callback();
+ m_callback = {}; // Unset it to be safe, we only intend to run the callback once
+ }
+ }
+ break;
+ default:
+ break;
+ }
+
+ return 0;
+ }
+
+ void SetUp() override
+ {
+ ModtimeScanningTest::SetUp();
+
+ AssetProcessor::ConnectionBus::Handler::BusConnect(0);
+ }
+
+ void TearDown() override
+ {
+ AssetProcessor::ConnectionBus::Handler::BusDisconnect();
+
+ ModtimeScanningTest::TearDown();
+ }
+
+ AZStd::atomic_int m_deleteCounter{ 0 };
+ AZStd::function m_callback;
+ };
+}
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
index ebabff45cc..8f8c8fb3cb 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemCatalogScreen.cpp
@@ -98,15 +98,17 @@ namespace O3DE::ProjectManager
constexpr int minHeaderSectionWidth = 100;
AdjustableHeaderWidget* listHeaderWidget = new AdjustableHeaderWidget(
- QStringList{ tr("Gem Name"), tr("Gem Summary"), tr("Status") },
+ QStringList{ tr("Gem Image"), tr("Gem Name"), tr("Gem Summary"), tr("Status") },
QVector{
- GemItemDelegate::s_defaultSummaryStartX - 30,
+ GemPreviewImageWidth + AdjustableHeaderWidget::s_headerTextIndent,
+ -GemPreviewImageWidth - AdjustableHeaderWidget::s_headerTextIndent + GemItemDelegate::s_defaultSummaryStartX - 30,
0, // Section is set to stretch to fit
- GemItemDelegate::s_buttonWidth + GemItemDelegate::s_itemMargins.left() + GemItemDelegate::s_itemMargins.right() + GemItemDelegate::s_contentMargins.right()
+ GemItemDelegate::s_statusIconSize + GemItemDelegate::s_statusButtonSpacing + GemItemDelegate::s_buttonWidth + GemItemDelegate::s_contentMargins.right()
},
minHeaderSectionWidth,
QVector
{
+ QHeaderView::ResizeMode::Fixed,
QHeaderView::ResizeMode::Interactive,
QHeaderView::ResizeMode::Stretch,
QHeaderView::ResizeMode::Fixed
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp
index d960145057..e46f71106b 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemFilterWidget.cpp
@@ -116,7 +116,7 @@ namespace O3DE::ProjectManager
// Separating line
QFrame* hLine = new QFrame();
hLine->setFrameShape(QFrame::HLine);
- hLine->setStyleSheet("color: #666666;");
+ hLine->setObjectName("horizontalSeparatingLine");
vLayout->addWidget(hLine);
UpdateCollapseState();
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp
index 8bdd1f0f0f..f6689281b8 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.cpp
@@ -8,7 +8,9 @@
#include
#include
+#include
+#include
#include
#include
#include
@@ -118,10 +120,12 @@ namespace O3DE::ProjectManager
{
m_dependingGems->Update(tr("Depending Gems"), tr("The following Gems will be automatically enabled with this Gem."), dependingGemTags);
m_dependingGems->show();
+ m_dependingGemsSpacer->changeSize(0, 20, QSizePolicy::Fixed, QSizePolicy::Fixed);
}
else
{
m_dependingGems->hide();
+ m_dependingGemsSpacer->changeSize(0, 0, QSizePolicy::Fixed, QSizePolicy::Fixed);
}
// Additional information
@@ -246,7 +250,8 @@ namespace O3DE::ProjectManager
m_dependingGems = new GemsSubWidget();
connect(m_dependingGems, &GemsSubWidget::TagClicked, this, [this](const Tag& tag){ emit TagClicked(tag); });
m_mainLayout->addWidget(m_dependingGems);
- m_mainLayout->addSpacing(20);
+ m_dependingGemsSpacer = new QSpacerItem(0, 20, QSizePolicy::Fixed, QSizePolicy::Fixed);
+ m_mainLayout->addSpacerItem(m_dependingGemsSpacer);
// Additional information
QLabel* additionalInfoLabel = CreateStyledLabel(m_mainLayout, 14, s_headerColor);
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.h
index c71d43eaac..96cbe23ee9 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemInspector.h
@@ -75,8 +75,9 @@ namespace O3DE::ProjectManager
QLabel* m_requirementsTextLabel = nullptr;
QSpacerItem* m_requirementsMainSpacer = nullptr;
- // Depending and conflicting gems
+ // Depending gems
GemsSubWidget* m_dependingGems = nullptr;
+ QSpacerItem* m_dependingGemsSpacer = nullptr;
// Additional information
QLabel* m_versionLabel = nullptr;
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
index 1733257e3b..2b9c21bff7 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.cpp
@@ -10,6 +10,7 @@
#include
#include
#include
+#include
#include
@@ -25,6 +26,7 @@
#include
#include
#include
+#include
namespace O3DE::ProjectManager
{
@@ -117,18 +119,27 @@ namespace O3DE::ProjectManager
painter->restore();
}
+ // Gem preview
+ QString previewPath = QDir(GemModel::GetPath(modelIndex)).filePath(ProjectPreviewImagePath);
+ QPixmap gemPreviewImage(previewPath);
+ QRect gemPreviewRect(
+ contentRect.left() + AdjustableHeaderWidget::s_headerTextIndent,
+ contentRect.center().y() - GemPreviewImageHeight / 2,
+ GemPreviewImageWidth, GemPreviewImageHeight);
+ painter->drawPixmap(gemPreviewRect, gemPreviewImage);
+
// Gem name
QString gemName = GemModel::GetDisplayName(modelIndex);
QFont gemNameFont(options.font);
QPair nameXBounds = CalcColumnXBounds(HeaderOrder::Name);
const int nameStartX = nameXBounds.first;
- const int firstColumnTextStartX = s_itemMargins.left() + nameStartX + AdjustableHeaderWidget::s_headerTextIndent;
- const int firstColumnMaxTextWidth = nameXBounds.second - nameStartX - AdjustableHeaderWidget::s_headerTextIndent;
+ const int nameColumnTextStartX = s_itemMargins.left() + nameStartX + AdjustableHeaderWidget::s_headerTextIndent;
+ const int nameColumnMaxTextWidth = nameXBounds.second - nameStartX - AdjustableHeaderWidget::s_headerTextIndent;
gemNameFont.setPixelSize(static_cast(s_gemNameFontSize));
gemNameFont.setBold(true);
- gemName = QFontMetrics(gemNameFont).elidedText(gemName, Qt::TextElideMode::ElideRight, firstColumnMaxTextWidth);
+ gemName = QFontMetrics(gemNameFont).elidedText(gemName, Qt::TextElideMode::ElideRight, nameColumnMaxTextWidth);
QRect gemNameRect = GetTextRect(gemNameFont, gemName, s_gemNameFontSize);
- gemNameRect.moveTo(firstColumnTextStartX, contentRect.top());
+ gemNameRect.moveTo(nameColumnTextStartX, contentRect.top());
painter->setFont(gemNameFont);
painter->setPen(m_textColor);
gemNameRect = painter->boundingRect(gemNameRect, Qt::TextSingleLine, gemName);
@@ -136,9 +147,9 @@ namespace O3DE::ProjectManager
// Gem creator
QString gemCreator = GemModel::GetCreator(modelIndex);
- gemCreator = standardFontMetrics.elidedText(gemCreator, Qt::TextElideMode::ElideRight, firstColumnMaxTextWidth);
+ gemCreator = standardFontMetrics.elidedText(gemCreator, Qt::TextElideMode::ElideRight, nameColumnMaxTextWidth);
QRect gemCreatorRect = GetTextRect(standardFont, gemCreator, s_fontSize);
- gemCreatorRect.moveTo(firstColumnTextStartX, contentRect.top() + gemNameRect.height());
+ gemCreatorRect.moveTo(nameColumnTextStartX, contentRect.top() + gemNameRect.height());
painter->setFont(standardFont);
gemCreatorRect = painter->boundingRect(gemCreatorRect, Qt::TextSingleLine, gemCreator);
@@ -161,7 +172,7 @@ namespace O3DE::ProjectManager
QRect GemItemDelegate::CalcSummaryRect(const QRect& contentRect, bool hasTags) const
{
- const int featureTagAreaHeight = 30;
+ const int featureTagAreaHeight = 40;
const int summaryHeight = contentRect.height() - (hasTags * featureTagAreaHeight);
const auto [summaryStartX, summaryEndX] = CalcColumnXBounds(HeaderOrder::Summary);
@@ -316,7 +327,7 @@ namespace O3DE::ProjectManager
QRect GemItemDelegate::CalcButtonRect(const QRect& contentRect) const
{
- const QPoint topLeft = QPoint(
+ const QPoint topLeft = QPoint(
s_itemMargins.left() + CalcColumnXBounds(HeaderOrder::Status).first + AdjustableHeaderWidget::s_headerTextIndent + s_statusIconSize +
s_statusButtonSpacing,
contentRect.center().y() - s_buttonHeight / 2);
@@ -327,7 +338,7 @@ namespace O3DE::ProjectManager
void GemItemDelegate::DrawPlatformIcons(QPainter* painter, const QRect& contentRect, const QModelIndex& modelIndex) const
{
const GemInfo::Platforms platforms = GemModel::GetPlatforms(modelIndex);
- int startX = 0;
+ int startX = s_itemMargins.left() + CalcColumnXBounds(HeaderOrder::Name).first + AdjustableHeaderWidget::s_headerTextIndent;
// Iterate and draw the platforms in the order they are defined in the enum.
for (int i = 0; i < GemInfo::NumPlatforms; ++i)
@@ -453,7 +464,7 @@ namespace O3DE::ProjectManager
}
else
{
- circleCenter = buttonRect.center() + QPoint(-buttonRect.width() / 2 + s_buttonBorderRadius, 1);
+ circleCenter = buttonRect.center() + QPoint(-buttonRect.width() / 2 + s_buttonBorderRadius + 1, 1);
}
// Rounded rect
diff --git a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.h b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.h
index a08fcb0a4b..f034ffce10 100644
--- a/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.h
+++ b/Code/Tools/ProjectManager/Source/GemCatalog/GemItemDelegate.h
@@ -47,11 +47,11 @@ namespace O3DE::ProjectManager
inline constexpr static int s_height = 105; // Gem item total height
inline constexpr static qreal s_gemNameFontSize = 13.0;
inline constexpr static qreal s_fontSize = 12.0;
- inline constexpr static int s_defaultSummaryStartX = 190;
+ inline constexpr static int s_defaultSummaryStartX = 270;
// Margin and borders
- inline constexpr static QMargins s_itemMargins = QMargins(/*left=*/16, /*top=*/8, /*right=*/16, /*bottom=*/8); // Item border distances
- inline constexpr static QMargins s_contentMargins = QMargins(/*left=*/20, /*top=*/12, /*right=*/20, /*bottom=*/12); // Distances of the elements within an item to the item borders
+ inline constexpr static QMargins s_itemMargins = QMargins(/*left=*/16, /*top=*/5, /*right=*/16, /*bottom=*/5); // Item border distances
+ inline constexpr static QMargins s_contentMargins = QMargins(/*left=*/10, /*top=*/12, /*right=*/20, /*bottom=*/12); // Distances of the elements within an item to the item borders
inline constexpr static int s_borderWidth = 4;
inline constexpr static int s_extraSummarySpacing = s_itemMargins.right();
@@ -68,8 +68,13 @@ namespace O3DE::ProjectManager
inline constexpr static int s_featureTagBorderMarginY = 3;
inline constexpr static int s_featureTagSpacing = 7;
+ // Status icon
+ inline constexpr static int s_statusIconSize = 16;
+ inline constexpr static int s_statusButtonSpacing = 5;
+
enum class HeaderOrder
{
+ Preview,
Name,
Summary,
Status
@@ -109,8 +114,6 @@ namespace O3DE::ProjectManager
// Status icons
void SetStatusIcon(QPixmap& m_iconPixmap, const QString& iconPath);
- inline constexpr static int s_statusIconSize = 16;
- inline constexpr static int s_statusButtonSpacing = 5;
QPixmap m_unknownStatusPixmap;
QPixmap m_notDownloadedPixmap;
diff --git a/Code/Tools/ProjectManager/Source/ProjectManagerDefs.h b/Code/Tools/ProjectManager/Source/ProjectManagerDefs.h
index f184fd2e17..9b2cd73d77 100644
--- a/Code/Tools/ProjectManager/Source/ProjectManagerDefs.h
+++ b/Code/Tools/ProjectManager/Source/ProjectManagerDefs.h
@@ -15,6 +15,8 @@ namespace O3DE::ProjectManager
inline constexpr static int ProjectPreviewImageWidth = 210;
inline constexpr static int ProjectPreviewImageHeight = 280;
inline constexpr static int ProjectTemplateImageWidth = 92;
+ inline constexpr static int GemPreviewImageWidth = 70;
+ inline constexpr static int GemPreviewImageHeight = 40;
inline constexpr static int ProjectCommandLineTimeoutSeconds = 30;
static const QString ProjectBuildDirectoryName = "build";
diff --git a/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionManager.cpp b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionManager.cpp
index c52d3be088..8b75a26a43 100644
--- a/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionManager.cpp
+++ b/Gems/AWSCore/Code/Source/Editor/Attribution/AWSCoreAttributionManager.cpp
@@ -223,7 +223,7 @@ namespace AWSCore
return;
}
- [[maybe_unused]] bool saved {};
+ [[maybe_unused]] bool saved = false;
constexpr auto configurationMode =
AZ::IO::SystemFile::SF_OPEN_CREATE | AZ::IO::SystemFile::SF_OPEN_CREATE_PATH | AZ::IO::SystemFile::SF_OPEN_WRITE_ONLY;
if (AZ::IO::SystemFile outputFile; outputFile.Open(resolvedPathAWSPreference.c_str(), configurationMode))
diff --git a/Gems/AssetValidation/preview.png b/Gems/AssetValidation/preview.png
index 2f1ed47754..2979dbb6a4 100644
--- a/Gems/AssetValidation/preview.png
+++ b/Gems/AssetValidation/preview.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6d6204c6730e5675791765ca194e9b1cbec282208e280507de830afc2805e5fa
-size 41127
+oid sha256:de0e6e480ece5b423222f4feacf56553d73713fe9afea8bbc9a2660a3cd54ec7
+size 1232
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp
index 0387ec5c7b..2b1e822db4 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp
@@ -999,79 +999,81 @@ namespace ImageProcessingAtom
}
// TODO: not working yet, debug and enable
- //static void SplitAlgorithm(const void* i, void* o, struct prcparm* templ, int threads = 8)
- //{
- // struct prcparm fraction[32];
- // int t, istart = 0, sstart = 0, ostart = 0;
- // const bool scaler = true;
+ /*
+ static void SplitAlgorithm(const void* i, void* o, struct prcparm* templ, int threads = 8)
+ {
+ struct prcparm fraction[32];
+ int t, istart = 0, sstart = 0, ostart = 0;
+ const bool scaler = true;
- // int theight = 0;
+ int theight = 0;
- // /* prepare data to be emitted to the threads */
- // for (t = 0; t < threads; t++)
- // {
- // fraction[t] = *templ;
+ // prepare data to be emitted to the threads
+ for (t = 0; t < threads; t++)
+ {
+ fraction[t] = *templ;
- // /* adjust the processing-region according to the available threads */
- // {
- //#undef split /* only prefix-threads need aligned transpose (for not trashing suffix-thread data) */
- //#define split(rows) !scaler \
- // ? ((rows * (t + 1)) / threads) & (~(t != threads - 1 ? 15 : 0)) \
- // : ((rows * (t + 1)) / threads) & (~0)
+ // adjust the processing-region according to the available threads
+ {
+ #undef split // only prefix-threads need aligned transpose (for not trashing suffix-thread data)
+ #define split(rows) !scaler \
+ ? ((rows * (t + 1)) / threads) & (~(t != threads - 1 ? 15 : 0)) \
+ : ((rows * (t + 1)) / threads) & (~0)
- // /* area covered */
- // const int inrows = (fraction[t].regional ? fraction[t].region.inrows : fraction[t].inrows);
- // const int incols = (fraction[t].regional ? fraction[t].region.incols : fraction[t].incols);
- // const int subrows = (fraction[t].regional ? fraction[t].region.subrows : fraction[t].subrows);
- // const int subcols = (fraction[t].regional ? fraction[t].region.subcols : fraction[t].subcols);
- // const int outrows = (fraction[t].regional ? fraction[t].region.outrows : fraction[t].outrows);
- // const int outcols = (fraction[t].regional ? fraction[t].region.outcols : fraction[t].outcols);
+ // area covered
+ const int inrows = (fraction[t].regional ? fraction[t].region.inrows : fraction[t].inrows);
+ const int incols = (fraction[t].regional ? fraction[t].region.incols : fraction[t].incols);
+ const int subrows = (fraction[t].regional ? fraction[t].region.subrows : fraction[t].subrows);
+ const int subcols = (fraction[t].regional ? fraction[t].region.subcols : fraction[t].subcols);
+ const int outrows = (fraction[t].regional ? fraction[t].region.outrows : fraction[t].outrows);
+ const int outcols = (fraction[t].regional ? fraction[t].region.outcols : fraction[t].outcols);
- // /* splitting blocks */
- // const int istop = split(inrows), sstop = split(subrows), ostop = split(outrows);
- // const int irows = istop - istart, srows = sstop - sstart, orows = ostop - ostart;
- // const int icols = incols, scols = subcols, ocols = outcols;
+ // splitting blocks
+ const int istop = split(inrows), sstop = split(subrows), ostop = split(outrows);
+ const int irows = istop - istart, srows = sstop - sstart, orows = ostop - ostart;
+ const int icols = incols, scols = subcols, ocols = outcols;
- // AZ_Assert(irows > 0, "%s: Expect row count to be above zero!", __FUNCTION__);
- // AZ_Assert(orows > 0, "%s: Expect row count to be above zero!", __FUNCTION__);
- // AZ_Assert(icols > 0, "%s: Expect column count to be above zero!", __FUNCTION__);
- // AZ_Assert(ocols > 0, "%s: Expect column count to be above zero!", __FUNCTION__);
+ AZ_Assert(irows > 0, "%s: Expect row count to be above zero!", __FUNCTION__);
+ AZ_Assert(orows > 0, "%s: Expect row count to be above zero!", __FUNCTION__);
+ AZ_Assert(icols > 0, "%s: Expect column count to be above zero!", __FUNCTION__);
+ AZ_Assert(ocols > 0, "%s: Expect column count to be above zero!", __FUNCTION__);
- // /* now we are regional */
- // fraction[t].regional = true;
+ // now we are regional
+ fraction[t].regional = true;
- // /* take previous regionality into account */
- // fraction[t].region.intop += istart;
- // fraction[t].region.subtop += sstart;
- // fraction[t].region.outtop += ostart;
- // fraction[t].region.inrows = irows;
- // fraction[t].region.subrows = srows;
- // fraction[t].region.outrows = orows;
+ // take previous regionality into account
+ fraction[t].region.intop += istart;
+ fraction[t].region.subtop += sstart;
+ fraction[t].region.outtop += ostart;
+ fraction[t].region.inrows = irows;
+ fraction[t].region.subrows = srows;
+ fraction[t].region.outrows = orows;
- // /* take previous regionality into account */
- // fraction[t].region.inleft += 0;
- // fraction[t].region.subleft += 0;
- // fraction[t].region.outleft += 0;
- // fraction[t].region.incols = icols;
- // fraction[t].region.subcols = scols;
- // fraction[t].region.outcols = ocols;
+ // take previous regionality into account
+ fraction[t].region.inleft += 0;
+ fraction[t].region.subleft += 0;
+ fraction[t].region.outleft += 0;
+ fraction[t].region.incols = icols;
+ fraction[t].region.subcols = scols;
+ fraction[t].region.outcols = ocols;
- // /* advance block */
- // istart = istop;
- // sstart = sstop;
- // ostart = ostop;
+ // advance block
+ istart = istop;
+ sstart = sstop;
+ ostart = ostop;
- // /* check */
- // theight += irows;
- // }
+ // check
+ theight += irows;
+ }
- // // the algorithm supports "i" and "o" pointing to the same memory
- // CheckBoundaries((float*)i, (float*)o, &fraction[t]);
- // RunAlgorithm((float*)i, (float*)o, &fraction[t]);
- // }
+ // the algorithm supports "i" and "o" pointing to the same memory
+ CheckBoundaries((float*)i, (float*)o, &fraction[t]);
+ RunAlgorithm((float*)i, (float*)o, &fraction[t]);
+ }
- // AZ_Assert(theight >= (templ->regional ? templ->region.inrows : templ->inrows), "%s: Invalid height!", __FUNCTION__);
- //}
+ AZ_Assert(theight >= (templ->regional ? templ->region.inrows : templ->inrows), "%s: Invalid height!", __FUNCTION__);
+ }
+ */
/* #################################################################################################################### \
*/
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/preview.png b/Gems/Atom/Asset/ImageProcessingAtom/preview.png
new file mode 100644
index 0000000000..2979dbb6a4
--- /dev/null
+++ b/Gems/Atom/Asset/ImageProcessingAtom/preview.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de0e6e480ece5b423222f4feacf56553d73713fe9afea8bbc9a2660a3cd54ec7
+size 1232
diff --git a/Gems/Atom/Asset/Shader/preview.png b/Gems/Atom/Asset/Shader/preview.png
new file mode 100644
index 0000000000..2979dbb6a4
--- /dev/null
+++ b/Gems/Atom/Asset/Shader/preview.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de0e6e480ece5b423222f4feacf56553d73713fe9afea8bbc9a2660a3cd54ec7
+size 1232
diff --git a/Gems/Atom/Bootstrap/preview.png b/Gems/Atom/Bootstrap/preview.png
new file mode 100644
index 0000000000..2979dbb6a4
--- /dev/null
+++ b/Gems/Atom/Bootstrap/preview.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de0e6e480ece5b423222f4feacf56553d73713fe9afea8bbc9a2660a3cd54ec7
+size 1232
diff --git a/Gems/Atom/Component/DebugCamera/preview.png b/Gems/Atom/Component/DebugCamera/preview.png
new file mode 100644
index 0000000000..2979dbb6a4
--- /dev/null
+++ b/Gems/Atom/Component/DebugCamera/preview.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de0e6e480ece5b423222f4feacf56553d73713fe9afea8bbc9a2660a3cd54ec7
+size 1232
diff --git a/Gems/Atom/Feature/Common/Assets/Models/DiffuseProbeSphere.fbx b/Gems/Atom/Feature/Common/Assets/Models/DiffuseProbeSphere.fbx
new file mode 100644
index 0000000000..0fdf350c1f
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Assets/Models/DiffuseProbeSphere.fbx
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:18a2bfdeeabfbbf6397daab7c89f9f7321e4863b54a4669fa87e457cb113322c
+size 78256
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/DiffuseGlobalIllumination.pass b/Gems/Atom/Feature/Common/Assets/Passes/DiffuseGlobalIllumination.pass
index 45278cd511..a70f4446a4 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/DiffuseGlobalIllumination.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/DiffuseGlobalIllumination.pass
@@ -42,6 +42,22 @@
},
"LoadAction": "Clear"
}
+ },
+ {
+ "Name": "VisualizationOutput",
+ "SlotType": "Output",
+ "ScopeAttachmentUsage": "RenderTarget",
+ "LoadStoreAction": {
+ "ClearValue": {
+ "Value": [
+ 0.0,
+ 0.0,
+ 0.0,
+ 0.0
+ ]
+ },
+ "LoadAction": "Clear"
+ }
}
],
"ImageAttachments": [
@@ -73,7 +89,14 @@
"AttachmentRef": {
"Pass": "This",
"Attachment": "IrradianceImage"
- }
+ }
+ },
+ {
+ "LocalSlot": "VisualizationOutput",
+ "AttachmentRef": {
+ "Pass": "DiffuseProbeGridVisualizationRayTracingPass",
+ "Attachment": "Output"
+ }
}
],
"PassRequests": [
@@ -193,6 +216,18 @@
}
}
]
+ },
+ {
+ "Name": "DiffuseProbeGridVisualizationPreparePass",
+ "TemplateName": "DiffuseProbeGridVisualizationPreparePassTemplate"
+ },
+ {
+ "Name": "DiffuseProbeGridVisualizationAccelerationStructurePass",
+ "TemplateName": "DiffuseProbeGridVisualizationAccelerationStructurePassTemplate"
+ },
+ {
+ "Name": "DiffuseProbeGridVisualizationRayTracingPass",
+ "TemplateName": "DiffuseProbeGridVisualizationRayTracingPassTemplate"
}
]
}
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/DiffuseProbeGridVisualizationAccelerationStructure.pass b/Gems/Atom/Feature/Common/Assets/Passes/DiffuseProbeGridVisualizationAccelerationStructure.pass
new file mode 100644
index 0000000000..78d4c82dcf
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Assets/Passes/DiffuseProbeGridVisualizationAccelerationStructure.pass
@@ -0,0 +1,13 @@
+{
+ "Type": "JsonSerialization",
+ "Version": 1,
+ "ClassName": "PassAsset",
+ "ClassData":
+ {
+ "PassTemplate":
+ {
+ "Name": "DiffuseProbeGridVisualizationAccelerationStructurePassTemplate",
+ "PassClass": "DiffuseProbeGridVisualizationAccelerationStructurePass"
+ }
+ }
+}
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/DiffuseProbeGridVisualizationComposite.pass b/Gems/Atom/Feature/Common/Assets/Passes/DiffuseProbeGridVisualizationComposite.pass
new file mode 100644
index 0000000000..9f19fde4af
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Assets/Passes/DiffuseProbeGridVisualizationComposite.pass
@@ -0,0 +1,40 @@
+{
+ "Type": "JsonSerialization",
+ "Version": 1,
+ "ClassName": "PassAsset",
+ "ClassData": {
+ "PassTemplate": {
+ "Name": "DiffuseProbeGridVisualizationCompositePassTemplate",
+ "PassClass": "DiffuseProbeGridVisualizationCompositePass",
+ "Slots": [
+ {
+ "Name": "VisualizationInput",
+ "SlotType": "Input",
+ "ScopeAttachmentUsage": "Shader"
+ },
+ {
+ "Name": "Depth",
+ "SlotType": "Input",
+ "ScopeAttachmentUsage": "Shader",
+ "ImageViewDesc": {
+ "AspectFlags": [
+ "Depth"
+ ]
+ }
+ },
+ {
+ "Name": "ColorInputOutput",
+ "SlotType": "InputOutput",
+ "ScopeAttachmentUsage": "RenderTarget"
+ }
+ ],
+ "PassData": {
+ "$type": "FullscreenTrianglePassData",
+ "ShaderAsset": {
+ "FilePath": "Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationComposite.shader"
+ },
+ "PipelineViewTag": "MainCamera"
+ }
+ }
+ }
+}
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/DiffuseProbeGridVisualizationPrepare.pass b/Gems/Atom/Feature/Common/Assets/Passes/DiffuseProbeGridVisualizationPrepare.pass
new file mode 100644
index 0000000000..aa95128a2e
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Assets/Passes/DiffuseProbeGridVisualizationPrepare.pass
@@ -0,0 +1,13 @@
+{
+ "Type": "JsonSerialization",
+ "Version": 1,
+ "ClassName": "PassAsset",
+ "ClassData":
+ {
+ "PassTemplate":
+ {
+ "Name": "DiffuseProbeGridVisualizationPreparePassTemplate",
+ "PassClass": "DiffuseProbeGridVisualizationPreparePass"
+ }
+ }
+}
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/DiffuseProbeGridVisualizationRayTracing.pass b/Gems/Atom/Feature/Common/Assets/Passes/DiffuseProbeGridVisualizationRayTracing.pass
new file mode 100644
index 0000000000..bdfba0d478
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Assets/Passes/DiffuseProbeGridVisualizationRayTracing.pass
@@ -0,0 +1,54 @@
+{
+ "Type": "JsonSerialization",
+ "Version": 1,
+ "ClassName": "PassAsset",
+ "ClassData": {
+ "PassTemplate": {
+ "Name": "DiffuseProbeGridVisualizationRayTracingPassTemplate",
+ "PassClass": "DiffuseProbeGridVisualizationRayTracingPass",
+ "Slots": [
+ {
+ "Name": "Output",
+ "SlotType": "Output",
+ "ShaderInputName": "m_output",
+ "ScopeAttachmentUsage": "Shader",
+ "LoadStoreAction": {
+ "ClearValue": {
+ "Value": [
+ 0.0,
+ 0.0,
+ 0.0,
+ 0.0
+ ]
+ },
+ "LoadAction": "Clear"
+ }
+ }
+ ],
+ "ImageAttachments": [
+ {
+ "Name": "VisualizationImage",
+ "SizeSource": {
+ "Source": {
+ "Pass": "Parent",
+ "Attachment": "NormalInput"
+ }
+ },
+ "ImageDescriptor": {
+ "Format": "R32G32B32A32_FLOAT",
+ "SharedQueueMask": "Graphics"
+ }
+ }
+ ],
+ "Connections": [
+ {
+ "LocalSlot": "Output",
+ "AttachmentRef": {
+ "Pass": "This",
+ "Attachment": "VisualizationImage"
+ }
+ }
+ ]
+ }
+ }
+}
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/MainPipeline.pass b/Gems/Atom/Feature/Common/Assets/Passes/MainPipeline.pass
index 314d999e4d..f0c1c212c0 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/MainPipeline.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/MainPipeline.pass
@@ -357,6 +357,33 @@
}
]
},
+ {
+ "Name": "DiffuseProbeGridVisualizationCompositePass",
+ "TemplateName": "DiffuseProbeGridVisualizationCompositePassTemplate",
+ "Connections": [
+ {
+ "LocalSlot": "VisualizationInput",
+ "AttachmentRef": {
+ "Pass": "OpaquePass",
+ "Attachment": "DiffuseProbeGridVisualization"
+ }
+ },
+ {
+ "LocalSlot": "Depth",
+ "AttachmentRef": {
+ "Pass": "DepthPrePass",
+ "Attachment": "Depth"
+ }
+ },
+ {
+ "LocalSlot": "ColorInputOutput",
+ "AttachmentRef": {
+ "Pass": "PostProcessPass",
+ "Attachment": "Output"
+ }
+ }
+ ]
+ },
{
"Name": "AuxGeomPass",
"TemplateName": "AuxGeomPassTemplate",
@@ -365,8 +392,8 @@
{
"LocalSlot": "ColorInputOutput",
"AttachmentRef": {
- "Pass": "PostProcessPass",
- "Attachment": "Output"
+ "Pass": "DiffuseProbeGridVisualizationCompositePass",
+ "Attachment": "ColorInputOutput"
}
},
{
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/OpaqueParent.pass b/Gems/Atom/Feature/Common/Assets/Passes/OpaqueParent.pass
index 752d565234..dcf5ef3550 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/OpaqueParent.pass
+++ b/Gems/Atom/Feature/Common/Assets/Passes/OpaqueParent.pass
@@ -46,6 +46,10 @@
"Name": "Output",
"SlotType": "Output"
},
+ {
+ "Name": "DiffuseProbeGridVisualization",
+ "SlotType": "Output"
+ },
// SwapChain here is only used to reference the frame height and format
{
"Name": "SwapChainOutput",
@@ -59,6 +63,13 @@
"Pass": "DiffuseSpecularMergePass",
"Attachment": "Output"
}
+ },
+ {
+ "LocalSlot": "DiffuseProbeGridVisualization",
+ "AttachmentRef": {
+ "Pass": "DiffuseGlobalIlluminationPass",
+ "Attachment": "VisualizationOutput"
+ }
}
],
"PassRequests": [
diff --git a/Gems/Atom/Feature/Common/Assets/Passes/PassTemplates.azasset b/Gems/Atom/Feature/Common/Assets/Passes/PassTemplates.azasset
index 96cf769690..16e6a7ee72 100644
--- a/Gems/Atom/Feature/Common/Assets/Passes/PassTemplates.azasset
+++ b/Gems/Atom/Feature/Common/Assets/Passes/PassTemplates.azasset
@@ -476,6 +476,22 @@
"Name": "DiffuseCompositePassTemplate",
"Path": "Passes/DiffuseComposite.pass"
},
+ {
+ "Name": "DiffuseProbeGridVisualizationPreparePassTemplate",
+ "Path": "Passes/DiffuseProbeGridVisualizationPrepare.pass"
+ },
+ {
+ "Name": "DiffuseProbeGridVisualizationAccelerationStructurePassTemplate",
+ "Path": "Passes/DiffuseProbeGridVisualizationAccelerationStructure.pass"
+ },
+ {
+ "Name": "DiffuseProbeGridVisualizationRayTracingPassTemplate",
+ "Path": "Passes/DiffuseProbeGridVisualizationRayTracing.pass"
+ },
+ {
+ "Name": "DiffuseProbeGridVisualizationCompositePassTemplate",
+ "Path": "Passes/DiffuseProbeGridVisualizationComposite.pass"
+ },
{
"Name": "DiffuseGlobalFullscreenPassTemplate",
"Path": "Passes/DiffuseGlobalFullscreen.pass"
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationComposite.azsl b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationComposite.azsl
new file mode 100644
index 0000000000..e6b28da8c8
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationComposite.azsl
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project.
+ * For complete copyright and license terms please see the LICENSE at the root of this distribution.
+ *
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+ShaderResourceGroup PassSrg : SRG_PerPass
+{
+ Texture2D m_visualization;
+ Texture2D m_depth;
+
+ Sampler LinearSampler
+ {
+ MinFilter = Linear;
+ MagFilter = Linear;
+ MipFilter = Linear;
+ AddressU = Clamp;
+ AddressV = Clamp;
+ AddressW = Clamp;
+ };
+}
+
+// Vertex Shader
+VSOutput MainVS(VSInput input)
+{
+ VSOutput OUT;
+
+ float4 posTex = GetVertexPositionAndTexCoords(input.m_vertexID);
+ OUT.m_position = float4(posTex.x, posTex.y, 0.0, 1.0);
+
+ return OUT;
+}
+
+// Pixel Shader
+PSOutput MainPS(VSOutput IN)
+{
+ uint2 screenCoords = IN.m_position.xy;
+ float depth = PassSrg::m_depth.Load(uint3(screenCoords, 0)).r;
+ float4 visualization = PassSrg::m_visualization.Load(uint3(screenCoords, 0));
+
+ if (!any(visualization))
+ {
+ discard;
+ }
+
+ if (depth > visualization.a)
+ {
+ discard;
+ }
+
+ PSOutput OUT;
+ OUT.m_color = float4(visualization.rgb, 1.0f);
+ return OUT;
+}
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationComposite.shader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationComposite.shader
new file mode 100644
index 0000000000..8d758b9b6d
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationComposite.shader
@@ -0,0 +1,42 @@
+{
+ "Source" : "DiffuseProbeGridVisualizationComposite.azsl",
+
+ "RasterState" :
+ {
+ "CullMode" : "Back"
+ },
+
+ "DepthStencilState" :
+ {
+ "Depth" :
+ {
+ "Enable" : false
+ }
+ },
+
+ "DrawList" : "forward",
+
+ "ProgramSettings":
+ {
+ "EntryPoints":
+ [
+ {
+ "name": "MainVS",
+ "type": "Vertex"
+ },
+ {
+ "name": "MainPS",
+ "type": "Fragment"
+ }
+ ]
+ },
+
+ "Supervariants":
+ [
+ {
+ "Name": "NoMSAA",
+ "PlusArguments": "--no-ms",
+ "MinusArguments": ""
+ }
+ ]
+}
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationPrepare.precompiledshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationPrepare.precompiledshader
new file mode 100644
index 0000000000..d77b7fcb0e
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationPrepare.precompiledshader
@@ -0,0 +1,34 @@
+{
+ "Type": "JsonSerialization",
+ "Version": 1,
+ "ClassName": "PrecompiledShaderAssetSourceData",
+ "ClassData":
+ {
+ "ShaderAssetFileName": "diffuseprobegridvisualizationprepare.azshader",
+ "PlatformIdentifiers": [
+ "pc",
+ "linux"
+ ],
+ "Supervariants":
+ [
+ {
+ "Name": "",
+ "RootShaderVariantAssets":
+ [
+ {
+ "APIName": "dx12",
+ "RootShaderVariantAssetFileName": "diffuseprobegridvisualizationprepare_dx12_0.azshadervariant"
+ },
+ {
+ "APIName": "vulkan",
+ "RootShaderVariantAssetFileName": "diffuseprobegridvisualizationprepare_vulkan_0.azshadervariant"
+ },
+ {
+ "APIName": "null",
+ "RootShaderVariantAssetFileName": "diffuseprobegridvisualizationprepare_null_0.azshadervariant"
+ }
+ ]
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationRayTracing.precompiledshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationRayTracing.precompiledshader
new file mode 100644
index 0000000000..ff38bfd843
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationRayTracing.precompiledshader
@@ -0,0 +1,34 @@
+{
+ "Type": "JsonSerialization",
+ "Version": 1,
+ "ClassName": "PrecompiledShaderAssetSourceData",
+ "ClassData":
+ {
+ "ShaderAssetFileName": "diffuseprobegridvisualizationraytracing.azshader",
+ "PlatformIdentifiers": [
+ "pc",
+ "linux"
+ ],
+ "Supervariants":
+ [
+ {
+ "Name": "",
+ "RootShaderVariantAssets":
+ [
+ {
+ "APIName": "dx12",
+ "RootShaderVariantAssetFileName": "diffuseprobegridvisualizationraytracing_dx12_0.azshadervariant"
+ },
+ {
+ "APIName": "vulkan",
+ "RootShaderVariantAssetFileName": "diffuseprobegridvisualizationraytracing_vulkan_0.azshadervariant"
+ },
+ {
+ "APIName": "null",
+ "RootShaderVariantAssetFileName": "diffuseprobegridvisualizationraytracing_null_0.azshadervariant"
+ }
+ ]
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationRayTracingClosestHit.precompiledshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationRayTracingClosestHit.precompiledshader
new file mode 100644
index 0000000000..1f0d0f7e11
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationRayTracingClosestHit.precompiledshader
@@ -0,0 +1,35 @@
+{
+ "Type": "JsonSerialization",
+ "Version": 1,
+ "ClassName": "PrecompiledShaderAssetSourceData",
+ "ClassData":
+ {
+ "ShaderAssetFileName": "diffuseprobegridvisualizationraytracingclosesthit.azshader",
+ "PlatformIdentifiers":
+ [
+ "pc",
+ "linux"
+ ],
+ "Supervariants":
+ [
+ {
+ "Name": "",
+ "RootShaderVariantAssets":
+ [
+ {
+ "APIName": "dx12",
+ "RootShaderVariantAssetFileName": "diffuseprobegridvisualizationraytracingclosesthit_dx12_0.azshadervariant"
+ },
+ {
+ "APIName": "vulkan",
+ "RootShaderVariantAssetFileName": "diffuseprobegridvisualizationraytracingclosesthit_vulkan_0.azshadervariant"
+ },
+ {
+ "APIName": "null",
+ "RootShaderVariantAssetFileName": "diffuseprobegridvisualizationraytracingclosesthit_null_0.azshadervariant"
+ }
+ ]
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationRayTracingMiss.precompiledshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationRayTracingMiss.precompiledshader
new file mode 100644
index 0000000000..905006d92a
--- /dev/null
+++ b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridVisualizationRayTracingMiss.precompiledshader
@@ -0,0 +1,35 @@
+{
+ "Type": "JsonSerialization",
+ "Version": 1,
+ "ClassName": "PrecompiledShaderAssetSourceData",
+ "ClassData":
+ {
+ "ShaderAssetFileName": "diffuseprobegridvisualizationraytracingmiss.azshader",
+ "PlatformIdentifiers":
+ [
+ "pc",
+ "linux"
+ ],
+ "Supervariants":
+ [
+ {
+ "Name": "",
+ "RootShaderVariantAssets":
+ [
+ {
+ "APIName": "dx12",
+ "RootShaderVariantAssetFileName": "diffuseprobegridvisualizationraytracingmiss_dx12_0.azshadervariant"
+ },
+ {
+ "APIName": "vulkan",
+ "RootShaderVariantAssetFileName": "diffuseprobegridvisualizationraytracingmiss_vulkan_0.azshadervariant"
+ },
+ {
+ "APIName": "null",
+ "RootShaderVariantAssetFileName": "diffuseprobegridvisualizationraytracingmiss_null_0.azshadervariant"
+ }
+ ]
+ }
+ ]
+ }
+}
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation.azshader
index 4186489303..69507ebd96 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation.azshader and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation.azshader differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_dx12_0.azshadervariant
index 7cfce8e245..e2e46af613 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_dx12_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_dx12_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_null_0.azshadervariant
index 3fa87b4e79..b7a82735bc 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_null_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_null_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_vulkan_0.azshadervariant
index 9b831386eb..570f94dc34 100644
Binary files a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_vulkan_0.azshadervariant and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridrelocation_vulkan_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationprepare.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationprepare.azshader
new file mode 100644
index 0000000000..3d9904c607
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationprepare.azshader differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationprepare_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationprepare_dx12_0.azshadervariant
new file mode 100644
index 0000000000..507fd5e5a9
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationprepare_dx12_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationprepare_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationprepare_null_0.azshadervariant
new file mode 100644
index 0000000000..84b6226022
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationprepare_null_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationprepare_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationprepare_vulkan_0.azshadervariant
new file mode 100644
index 0000000000..9ad3c0deb1
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationprepare_vulkan_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracing.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracing.azshader
new file mode 100644
index 0000000000..0b8181e53f
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracing.azshader differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracing_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracing_dx12_0.azshadervariant
new file mode 100644
index 0000000000..99c5a3791b
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracing_dx12_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracing_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracing_null_0.azshadervariant
new file mode 100644
index 0000000000..6c9bcb846b
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracing_null_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracing_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracing_vulkan_0.azshadervariant
new file mode 100644
index 0000000000..8d0eb8a2a8
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracing_vulkan_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingclosesthit.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingclosesthit.azshader
new file mode 100644
index 0000000000..045817ff6a
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingclosesthit.azshader differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingclosesthit_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingclosesthit_dx12_0.azshadervariant
new file mode 100644
index 0000000000..e20b15d485
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingclosesthit_dx12_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingclosesthit_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingclosesthit_null_0.azshadervariant
new file mode 100644
index 0000000000..4f3437ccda
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingclosesthit_null_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingclosesthit_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingclosesthit_vulkan_0.azshadervariant
new file mode 100644
index 0000000000..918e729d99
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingclosesthit_vulkan_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingmiss.azshader b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingmiss.azshader
new file mode 100644
index 0000000000..bf5102b8fa
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingmiss.azshader differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingmiss_dx12_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingmiss_dx12_0.azshadervariant
new file mode 100644
index 0000000000..db77503c25
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingmiss_dx12_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingmiss_null_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingmiss_null_0.azshadervariant
new file mode 100644
index 0000000000..b44637279f
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingmiss_null_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingmiss_vulkan_0.azshadervariant b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingmiss_vulkan_0.azshadervariant
new file mode 100644
index 0000000000..095e78c700
Binary files /dev/null and b/Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/diffuseprobegridvisualizationraytracingmiss_vulkan_0.azshadervariant differ
diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessorInterface.h b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessorInterface.h
index 066efabb96..5aedc2f6c6 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessorInterface.h
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DiffuseGlobalIllumination/DiffuseProbeGridFeatureProcessorInterface.h
@@ -125,6 +125,9 @@ namespace AZ
virtual void SetUseDiffuseIbl(const DiffuseProbeGridHandle& probeGrid, bool useDiffuseIbl) = 0;
virtual void SetMode(const DiffuseProbeGridHandle& probeGrid, DiffuseProbeGridMode mode) = 0;
virtual void SetBakedTextures(const DiffuseProbeGridHandle& probeGrid, const DiffuseProbeGridBakedTextures& bakedTextures) = 0;
+ virtual void SetVisualizationEnabled(const DiffuseProbeGridHandle& probeGrid, bool visualizationEnabled) = 0;
+ virtual void SetVisualizationShowInactiveProbes(const DiffuseProbeGridHandle& probeGrid, bool visualizationShowInactiveProbes) = 0;
+ virtual void SetVisualizationSphereRadius(const DiffuseProbeGridHandle& probeGrid, float visualizationSphereRadius) = 0;
virtual void BakeTextures(
const DiffuseProbeGridHandle& probeGrid,
diff --git a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/ParamMacrosHowTo.inl b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/ParamMacrosHowTo.inl
index e6fd6c10ba..ecf63ff5f6 100644
--- a/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/ParamMacrosHowTo.inl
+++ b/Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ParamMacros/ParamMacrosHowTo.inl
@@ -6,239 +6,241 @@
*
*/
-//
-// This is a quick guide on how to use the parameter macros included in this folder
-//
-// Part I: The Pattern
-//
-// The aim of this macro system is to allow users to define parameters once and have the macros generate a bunch of boilerplate code for each defined parameter.
-// While these macros makes things a little more complex upfront, the ability to add and remove variables in just one place without having to dig
-// through multiple files every time is great for iteration speed and maintenance. To accomplish this, we use a pattern similar to the following example:
-//
-// Let's say we want to specify class members in one place and have the members, getters and setters be auto generated.
-// First, we define a macro MY_CLASS_PARAMS that uses a yet-undefined macro MAKE_PARAM(TYPE, NAME):
-//
-// #define MY_CLASS_PARAMS \
-// MAKE_PARAM(float, Width) \
-// MAKE_PARAM(float, Height) \
-// MAKE_PARAM(float, Depth) \
-//
-// Now we need only specify what MAKE_PARAM needs to do and then we can call the MY_CLASS_PARAMS macro to apply the logic to all defined params. For instance:
-//
-// #define MAKE_PARAM(TYPE, NAME) TYPE m_##NAME;
-// MY_CLASS_PARAMS
-// #undef MAKE_PARAM
-//
-// This will generate the members as follows:
-//
-// float m_Width;
-// float m_Height;
-// float m_Depth;
-//
-// Now elsewhere in the class definition we can generate getters and setters:
-//
-// #define MAKE_PARAM(TYPE, NAME) \
-// TYPE Get##NAME() { return m_##NAME; } \
-// void Set##NAME(TYPE NAME) { m_##NAME = NAME; } \
-//
-// MY_CLASS_PARAMS
-//
-// #undef MAKE_PARAM
-//
-// This will generate the following:
-//
-// float GetWidth() { return m_Width; }
-// void SetWidth(float Width) { m_Width = Width; }
-// float GetHeight() { return m_Height; }
-// void SetHeight(float Width) { m_Height = Height; }
-// float GetDepth() { return m_Width; }
-// void SetDepth(float Depth) { m_Depth = Depth; }
-//
-// If we wanted to generate further code for each variable, we need only redefine the MAKE_PARAM macro and invoke MY_CLASS_PARAMS
-//
-// ___________________________________________________________________________________________________________________________________________________
-//
-// Part II: Using .inl files
-//
-// A key difference between the above example and our macro system is that we put macro definitions in .inl files so they can be easily reused
-// If we were to reuse the above example, it would look something like this:
-//
-// GenerateMembers.inl
-//
-// #define MAKE_PARAM(TYPE, NAME) TYPE m_##NAME;
-//
-// GenerateGettersAndSetters.inl
-//
-// #define MAKE_PARAM(TYPE, NAME) \
-// TYPE Get##NAME() { return m_##NAME; } \
-// void Set##NAME(TYPE NAME) { m_##NAME = NAME; } \
-//
-// BoxParams.inl
-//
-// MAKE_PARAM(float, Width) \
-// MAKE_PARAM(float, Height) \
-// MAKE_PARAM(float, Depth) \
-//
-// CylinderParams.inl
-//
-// MAKE_PARAM(float, Radius) \
-// MAKE_PARAM(float, Height) \
-//
-// Now we can use these .inl files to generate two classes, each with members, getters and setters
-//
-// class Box
-// {
-// // Auto-gen members from BoxParams.inl
-// #include
-// #include
-// #undef MAKE_PARAM
-//
-// // Auto-gen getters and setters from BoxParams.inl
-// #include
-// #include
-// #undef MAKE_PARAM
-// }
-//
-// class Cylinder
-// {
-// // Auto-gen members from CylinderParams.inl
-// #include
-// #include
-// #undef MAKE_PARAM
-//
-// // Auto-gen getters and setters from CylinderParams.inl
-// #include
-// #include
-// #undef MAKE_PARAM
-// }
-//
-// This will result in the following code:
-//
-// class Box
-// {
-// // Auto-gen members from BoxParams.inl
-// float m_Width;
-// float m_Height;
-// float m_Depth;
-//
-// // Auto-gen getters and setters from BoxParams.inl
-// float GetWidth() { return m_Width; }
-// void SetWidth(float Width) { m_Width = Width; }
-// float GetHeight() { return m_Height; }
-// void SetHeight(float Width) { m_Height = Height; }
-// float GetDepth() { return m_Width; }
-// void SetDepth(float Depth) { m_Depth = Depth; }
-// }
-//
-// class Cylinder
-// {
-// // Auto-gen members from CylinderParams.inl
-// float m_Radius;
-// float m_Height;
-//
-// // Auto-gen getters and setters from CylinderParams.inl
-// float GetRadius() { return m_Radius; }
-// void SetRadius(float Radius) { m_Radius = Raidus; }
-// float GetHeight() { return m_Height; }
-// void SetHeight(float Width) { m_Height = Height; }
-// }
-//
-// As you can see, this macro pattern allows us to add a member to Box or Cylinder by adding a single line to BoxParams.inl or CylinderParams.inl
-// Because of the number of classes an boiler plate code involved in creating Open 3D Engine Component, this macro system allows us to change one line
-// in one file instead of changing over a dozens of lines in half a dozen files.
-//
-// ___________________________________________________________________________________________________________________________________________________
-//
-// Part III: Using the Macros for Post Process members
-//
-// If you want to create a new post process, you can create a .inl file (see DepthOfFieldParams.inl for an example) and declare members using the macros below:
-//
-// #define AZ_GFX_BOOL_PARAM(Name, MemberName, DefaultValue)
-// #define AZ_GFX_FLOAT_PARAM(Name, MemberName, DefaultValue)
-// #define AZ_GFX_UINT32_PARAM(Name, MemberName, DefaultValue)
-// #define AZ_GFX_VEC2_PARAM(Name, MemberName, DefaultValue)
-// #define AZ_GFX_VEC3_PARAM(Name, MemberName, DefaultValue)
-// #define AZ_GFX_VEC4_PARAM(Name, MemberName, DefaultValue)
-//
-// Where:
-// Name - The name of the param that will be used for reflection and appended to setters and getters, for example Width
-// MemberName - The name of the member defined inside your class, for example m_width
-// DefaultValue - The default value that the member will be statically initialized to, for example 1.0f
-// BOOL, FLOAT, UINT32, VEC2 etc. all designate the type of the param you are defining
-//
-// If you have a custom type for your parameter, you can use the AZ_GFX_COMMON_PARAM macro:
-// AZ_GFX_COMMON_PARAM(Name, MemberName, DefaultValue, ValueType)
-// The keywords here are the same as above, with the addition of ValueType: the custom type you want your param to be
-//
-// Example usages:
-//
-// #define AZ_GFX_VEC3_PARAM(Position, m_position, Vector3(0.0f, 0.0f, 0.0f))
-//
-// #define AZ_GFX_COMMON_PARAM(Format, m_format, Format::Unknown, FormatEnum)
-//
-// ___________________________________________________________________________________________________________________________________________________
-//
-// Part IV: Using the Macros for Post Process overrides
-//
-// The Post Process System allows users to specify whether settings should be overridden or not on a per-member basis.
-// To enable this, when you declare a member that can be overridden by higher priority Post Process Settings, in addition
-// to using the above macros to define the member, you should also use one of the following to specify the override:
-//
-// #define AZ_GFX_ANY_PARAM_BOOL_OVERRIDE(Name, MemberName, ValueType)
-// #define AZ_GFX_INTEGER_PARAM_FLOAT_OVERRIDE(Name, MemberName, ValueType)
-// #define AZ_GFX_FLOAT_PARAM_FLOAT_OVERRIDE(Name, MemberName, ValueType)
-//
-// Where:
-// Name - The name of the param that will be used for reflection and appended to setters and getters, for example Width
-// MemberName - The name of the member defined inside your class, for example m_width
-// ValueType - The type of the parameter you defined (bool, float, uint32_t, Vector2 etc.)
-//
-// A bit more details on each of the override macros:
-//
-// AZ_GFX_ANY_PARAM_BOOL_OVERRIDE can be used for params of any type. The override variable will be a bool (checkbox in the UI).
-// The override application is a simple binary operation: take all of the source or the target (no lerp) depending on the bool.
-//
-// AZ_GFX_INTEGER_PARAM_FLOAT_OVERRIDE should be used for params of integer types (int, uint, integer vectors...) The override variable
-// will be a float from 0.0 to 1.0 (slider in the UI). The override will lerp between target and source using the override float
-// variable. Note that for this reason the param integer type must support multiplication by a float value.
-//
-// AZ_GFX_FLOAT_PARAM_FLOAT_OVERRIDE should be used for params of floating point types (float, double, Vector4...) The override variable
-// will be a float from 0.0 to 1.0 (slider in the UI). The override will lerp between target and source using the override float.
-//
-// Example usage:
-//
-// #define AZ_GFX_VEC3_PARAM(Position, m_position, Vector3(0.0f, 0.0f, 0.0f))
-// #define AZ_GFX_FLOAT_PARAM_FLOAT_OVERRIDE(Position, m_position, Vector3)
-//
-// ___________________________________________________________________________________________________________________________________________________
-//
-// Part V: Defining functionality with .inl files
-//
-// There are many .inl fies in this folder that provide pre-defined behaviors for params declared with the above macros
-// To use these files, start by including the .inl file that specifies the behavior, then include your own .inl that defines your params
-// then include EndParams.inl (this will #undef all used macros so as to avoid collisions with subsequent macro usage further in the file)
-//
-// Here is an example of how that looks:
-//
-// #include <- The behavior you want (behavior is described in each file)
-// #include <- Your file in which you declare your params
-// #include <- This #undef a bunch of macros to avoid conflicts
-//
-// You may of course use your own custom behaviors by specifying your definition for the param and override macros.
-// You can specify each macro individually (AZ_GFX_BOOL_PARAM, AZ_GFX_FLOAT_PARAM, AZ_GFX_UINT32_PARAM, AZ_GFX_VEC2_PARAM, etc.)
-// or you can specify the AZ_GFX_COMMON_PARAM and AZ_GFX_COMMON_OVERRIDE macros if there's no difference between variable types.
-//
-// AZ_GFX_COMMON_PARAM and AZ_GFX_COMMON_OVERRIDE are helper macros that the other _PARAM and _OVERRIDE macros can be mapped to
-// using MapAllCommon.inl, allowing you to specify one definition for all types rather than each type individually.
-// Here is an example of how we can use AZ_GFX_COMMON_PARAM and AZ_GFX_COMMON_OVERRIDE to auto-generate getters for our member parameters:
-//
-// #define AZ_GFX_COMMON_PARAM(Name, MemberName, DefaultValue, ValueType) \
-// ValueType Get##Name() const override { return MemberName; } \
-//
-// #define AZ_GFX_COMMON_OVERRIDE(Name, MemberName, ValueType, OverrideValueType) \
-// OverrideValueType Get##Name##Override() const override { return MemberName##Override; } \
-//
-// #include
-// #include
-// #include
-//
+/*
+
+ This is a quick guide on how to use the parameter macros included in this folder
+
+ Part I: The Pattern
+
+ The aim of this macro system is to allow users to define parameters once and have the macros generate a bunch of boilerplate code for each defined parameter.
+ While these macros makes things a little more complex upfront, the ability to add and remove variables in just one place without having to dig
+ through multiple files every time is great for iteration speed and maintenance. To accomplish this, we use a pattern similar to the following example:
+
+ Let's say we want to specify class members in one place and have the members, getters and setters be auto generated.
+ First, we define a macro MY_CLASS_PARAMS that uses a yet-undefined macro MAKE_PARAM(TYPE, NAME):
+
+ #define MY_CLASS_PARAMS \
+ MAKE_PARAM(float, Width) \
+ MAKE_PARAM(float, Height) \
+ MAKE_PARAM(float, Depth) \
+
+ Now we need only specify what MAKE_PARAM needs to do and then we can call the MY_CLASS_PARAMS macro to apply the logic to all defined params. For instance:
+
+ #define MAKE_PARAM(TYPE, NAME) TYPE m_##NAME;
+ MY_CLASS_PARAMS
+ #undef MAKE_PARAM
+
+ This will generate the members as follows:
+
+ float m_Width;
+ float m_Height;
+ float m_Depth;
+
+ Now elsewhere in the class definition we can generate getters and setters:
+
+ #define MAKE_PARAM(TYPE, NAME) \
+ TYPE Get##NAME() { return m_##NAME; } \
+ void Set##NAME(TYPE NAME) { m_##NAME = NAME; } \
+
+ MY_CLASS_PARAMS
+
+ #undef MAKE_PARAM
+
+ This will generate the following:
+
+ float GetWidth() { return m_Width; }
+ void SetWidth(float Width) { m_Width = Width; }
+ float GetHeight() { return m_Height; }
+ void SetHeight(float Width) { m_Height = Height; }
+ float GetDepth() { return m_Width; }
+ void SetDepth(float Depth) { m_Depth = Depth; }
+
+ If we wanted to generate further code for each variable, we need only redefine the MAKE_PARAM macro and invoke MY_CLASS_PARAMS
+
+ ___________________________________________________________________________________________________________________________________________________
+
+ Part II: Using .inl files
+
+ A key difference between the above example and our macro system is that we put macro definitions in .inl files so they can be easily reused
+ If we were to reuse the above example, it would look something like this:
+
+ GenerateMembers.inl
+
+ #define MAKE_PARAM(TYPE, NAME) TYPE m_##NAME;
+
+ GenerateGettersAndSetters.inl
+
+ #define MAKE_PARAM(TYPE, NAME) \
+ TYPE Get##NAME() { return m_##NAME; } \
+ void Set##NAME(TYPE NAME) { m_##NAME = NAME; } \
+
+ BoxParams.inl
+
+ MAKE_PARAM(float, Width) \
+ MAKE_PARAM(float, Height) \
+ MAKE_PARAM(float, Depth) \
+
+ CylinderParams.inl
+
+ MAKE_PARAM(float, Radius) \
+ MAKE_PARAM(float, Height) \
+
+ Now we can use these .inl files to generate two classes, each with members, getters and setters
+
+ class Box
+ {
+ // Auto-gen members from BoxParams.inl
+ #include
+ #include
+ #undef MAKE_PARAM
+
+ // Auto-gen getters and setters from BoxParams.inl
+ #include
+ #include
+ #undef MAKE_PARAM
+ }
+
+ class Cylinder
+ {
+ // Auto-gen members from CylinderParams.inl
+ #include