izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

nDisplay: Updated nDisplay plugin icons to new SVG icons, refactored the plugin's editor style set to adhere to UE5 recommendations, removed unused icons and style elements, and tweaked various UI element bahaviors and appearances in the nDisplay Config Editor to more closely adhere UE5 style guidelines.

Browse Source 
#jira UETOOL-4329
#rb Patrick.Hardy
#preflight 61dc8faa2d5fd64ff7d5fbe2

#ROBOMERGE-AUTHOR: trystan.binkley-jone
#ROBOMERGE-SOURCE: CL 18564232 in //UE5/Release-5.0/... via CL 18564239
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18564251 by trystan binkley-jone in ue5-release-engine-test branch]
This commit is contained in:
trystan binkley-jone
2022-01-10 15:08:24 -05:00
parent f55fe34bb0
commit 7c4e2db2ef
46 changed files with 956 additions and 981 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Build/Commit.gitdeps.xml
+47 -69
View File
@@ -60159,7 +60159,31 @@
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Blueprints/ReprojectionCamera/BP_IncameraSettings.uasset" Hash="e983b9415c24e99a770534685ead163729786a24" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Blueprints/ReprojectionCamera/BP_IncameraStagePawn.uasset" Hash="8eedf8bd9ac9ba8122ec51906538181c8677a9e0" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Blueprints/ReprojectionCamera/BP_IncameraStageSettings.uasset" Hash="d049d4c8d2a5199f1665bb59b3c0551c4410ee0e" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/S_nDisplayViewOrigin.uasset" Hash="50e6a775241ca4495abab80afc0446a17c975dee" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/Cluster/Cluster.svg" Hash="568dc565db69c3dc326660c471e6ca567f452a83" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/Cluster/ClusterNode.svg" Hash="41a7ddc51663701621f1e3a76fdf0602283ed19c" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/Cluster/Host.svg" Hash="905c7e6ade48aba8ffc11515c32157c985e0a4ac" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/Cluster/Viewport.svg" Hash="88cdf39bb9ed4608162fb067ac8dc9e538e4718a" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/Components/nDisplayCamera.svg" Hash="179d8529e827977fcf990c7c6aa0b8eed12042b5" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/Components/nDisplayRootComponent.svg" Hash="03a5c7e95197d214c35234b9c5f6f657ab9df430" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/Components/nDisplayScreen.svg" Hash="eb955b62524e230cc267e53bcb60c656eec26357" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/Components/nDisplayViewOrigin.svg" Hash="8796888ca7bfbeb7628143e78dec5a355cf44638" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/Components/nDisplayViewOrigin_64.svg" Hash="1d41f28320dc5af17a6a5e231da8f55bcb789d07" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/Components/nDisplayXform.svg" Hash="6647e6938da2430458fe78b4e056e2fbfe2be60a" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/OutputMapping/CornerImage.svg" Hash="0e3e7040ef16a47b87d60abafb11476bc6ded5fc" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/OutputMapping/ResizeAreaHandle_20x.png" Hash="6242c54270b3fed8c1d74deb7ba67f4f5d38e0d2" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/OutputMapping/Snapping.svg" Hash="a09935b2561d2070c2e57365aa841d165f09a603" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/OutputMapping/ToggleOutsideViewports.svg" Hash="7f3ee17fdf70ce7f3ccebb67b29f701593e21941" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/OutputMapping/ToggleWindowInfo.svg" Hash="a0b64935100dfbffddb7681f37330adf7ce0a514" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/OutputMapping/Transform.svg" Hash="e04618f734f4ac80842ef69e4f94e85db99da3b1" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/OutputMapping/ViewScale.svg" Hash="d8517991b1e95bfc588f8501c9c9718c3ff7fed5" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/OutputMapping/ZoomToFit.svg" Hash="dc7c46292a872e2704326d0cc1a9cacd4c96aa90" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/RootActor/nDisplay.svg" Hash="0f9ae0b8a4f2d2e105005b13b34b318369c43530" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/RootActor/nDisplay_64.svg" Hash="8297a3b223bcfa5f44d92734ab212f9557d4702f" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/S_nDisplayViewOrigin.uasset" Hash="99d9987eaca4d49093220a29b8b5211e0ec9d2de" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/Slate/NonMarchingAnts.png" Hash="2d03bc51a2a9e02d95ca4955448aec55a429679a" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/Tabs/Cluster.svg" Hash="568dc565db69c3dc326660c471e6ca567f452a83" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/Tabs/OutputMapping.svg" Hash="1744823a86de5a18f6b37de87a7d7e8343d9dcc4" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Icons/Viewport/Frustum.svg" Hash="b65e5ba476790b1d8ea133447daf272333504be3" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/LightCard/ELightCardMask.uasset" Hash="c0f8397602962f397dbcddc5c0fc128e304b1a38" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/LightCard/LightCard.uasset" Hash="f6856d1d32328d8f34dc630773e30ffb3ace5f7b" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/LightCard/LightCardSplineMesh.uasset" Hash="7db86cab4e433bc1886d3c55f4bd845c850796be" />
@@ -60189,46 +60213,7 @@
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Textures/T_TrackingMarker_B.uasset" Hash="a7ff107353c0eda3804bcdf75a33f21d94e012e9" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Textures/T_nDisplayGrid.uasset" Hash="8d1360ccf3d9ea3f6e7ca4bdb7503f05f8104d63" />
<File Name="Engine/Plugins/Runtime/nDisplay/Content/Textures/T_nDisplayXform_D.uasset" Hash="a6e0307726662bf9b1f3148af7bb7148e960465a" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Components/ICVFXCamera/nDisplayCamera_x16.png" Hash="dc6614081c6d7b7c7de40650865f989ff793cde9" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Components/ViewOrigin/nDisplayViewOrigin_x128.png" Hash="65cd363970e17b6c08ac71a0396f8c71668ce0de" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Components/ViewOrigin/nDisplayViewOrigin_x16.png" Hash="40fdc7755ceaf5282f53d3b9496418a71abb082a" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Components/ViewOrigin/nDisplayViewOrigin_x256.png" Hash="0c878149b96ca51fce224f643a21a4171f3e9c55" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Components/ViewOrigin/nDisplayViewOrigin_x48.png" Hash="d35d5e9a48421573e49b8b9b6aaf9cf6681c3ec1" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Components/ViewOrigin/nDisplayViewOrigin_x64.png" Hash="88676a1bb8c79b1f38c12684947d1bf7e62fd69a" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Icon128.png" Hash="fa5af3fcde071a61bae169281d6d12da476875e8" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Nodes/Corner.png" Hash="f9c27869421b109bd65f24119c93c652ea059ef9" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Nodes/Node_Body.png" Hash="ac7f93c1940d98c20fa7678e54941f382199b59e" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/OutputMapping/CornerImage_16x.png" Hash="4676013e0d4afbc0c22a36eec5b699e613ae58e8" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/OutputMapping/ResizeAreaHandle_20x.png" Hash="6242c54270b3fed8c1d74deb7ba67f4f5d38e0d2" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/OutputMapping/ToggleOutsideViewports_16x.png" Hash="02451f85b2cbe653bdeacbdeb479e541815ec339" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/OutputMapping/ToggleWindowInfo_16x.png" Hash="5bf56be1578411675df8721389f1cadbb0bc1749" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/OutputMapping/ViewScale_16x.png" Hash="330eadc19ddeb318b0740ce8f5e180f7078f18a2" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/OutputMapping/ZoomToFit_16x.png" Hash="c873061705d2cf50c64d5ef66bfb53e2fe0140be" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/RootActor/nDisplay_x128.png" Hash="ea0eaaeb35a8ea512448e2b0e4fb554fa0cbb074" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/RootActor/nDisplay_x16.png" Hash="c5de560dac69de3afff2eefeecbafd8957d991f1" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/RootActor/nDisplay_x256.png" Hash="aa0c1372b16d69a7763858c324079e22268d7836" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/RootActor/nDisplay_x48.png" Hash="e2b5595c5b8e868bd2f2b093d49dede9d34839a5" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/RootActor/nDisplay_x64.png" Hash="334e9d6e2016ce00af16535341e17d53f93e4503" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Slate/NonMarchingAnts.png" Hash="2d03bc51a2a9e02d95ca4955448aec55a429679a" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Tabs/Cluster_16x.png" Hash="c9674c7efc4dbe89481cb53084cfb8100dac75fc" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Tabs/Details_16x.png" Hash="3cda6f0ae1d11438f0a2721c176c1169a5b8ea5d" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Tabs/General_16x.png" Hash="ea9484c1382cb3acb0bd570ee4fb015494df63e9" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Tabs/Log_16x.png" Hash="b8cd86880e8b0828524a5d8522f4f4ca53c52a99" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Tabs/OutputMapping_16x.png" Hash="9e4fa61b9a8b16e9284925e8e265aa2b967f6521" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Tabs/Scene_16x.png" Hash="a75cd5062896f0a4d028de8ef372695c55f33ecf" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Tabs/Viewport_16x.png" Hash="c7c3a564c64743bc9ee1af942e97f29f73aa1585" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Toolbar/EditConfig_40x.png" Hash="9016f4bdf34b008038490493446141ab5edc94f2" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Toolbar/Import_40x.png" Hash="264f962b035e327bda7ba6fb8651154a2059bbe3" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/Toolbar/SaveToFile_40x.png" Hash="a8738ebab88788000b3ca01ec11a85afa0151f24" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/TreeItems/ClusterNode_16x.png" Hash="4202cfd95fd681e859212aa61934b31ec1b28f85" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/TreeItems/Cluster_16x.png" Hash="4361977188c6241cce5defd61e1779c232b6cf29" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/TreeItems/Container_12x.png" Hash="690f442fb5c233b523c0a648d019ef9da5312fb3" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/TreeItems/Postprocess_12x.png" Hash="65c81093106b1fccdbd7343d83d89dbf11e90f10" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/TreeItems/SceneComponentCamera_16x.png" Hash="ffbe9643d0d0864f253a67026a80a092d6818497" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/TreeItems/SceneComponentScreen_16x.png" Hash="fac15df9ca58af6c5b3537817edc88faca33f018" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/TreeItems/SceneComponentXform_16x.png" Hash="00b8ef742e7d6ca0558eb3c0549c3bc3cac23a73" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/TreeItems/Scene_16x.png" Hash="df2e549e564198e528b1da49bd7c1a664e5ac900" />
<File Name="Engine/Plugins/Runtime/nDisplay/Resources/TreeItems/Viewport_16x.png" Hash="8a54edad808b52d8a461c0981dbecb333441858e" />
<File Name="Engine/Plugins/Runtime/nDisplay/ThirdParty/Domeprojection/DLL/WibuCm64.dll" Hash="6c9ffc04f2e2abbf33e616dcf2365ed42f27a49e" />
<File Name="Engine/Plugins/Runtime/nDisplay/ThirdParty/Domeprojection/DLL/dpLib.dll" Hash="fc843101bd7879d27434b5a4ee0b9bd8fa9d8f00" />
<File Name="Engine/Plugins/Runtime/nDisplay/ThirdParty/EasyBlend/DLL/mplEasyBlendSDKDX1164.dll" Hash="c4d9c563f2a443b61045196fdcdcd1f6b043ac8b" />
@@ -81676,7 +81661,6 @@
<Blob Hash="00b705ee6415fd9592edd5d3ae5bd446ce4444fb" Size="1731" PackHash="112d7718f4a79008c129711d3bc8efa410c54ee1" PackOffset="2093400" />
<Blob Hash="00b72725d46fd7235fe6bf0d16c94aecaa9fc7d1" Size="1035" PackHash="21d4acb97ddc0799e196615b15a0e188dc66807b" PackOffset="1336858" />
<Blob Hash="00b8a6653eee8835b4b1a73bb3d0457b8197ed87" Size="2926" PackHash="69146025117e38b4ea1dffcf690df90fb382c97e" PackOffset="313878" />
<Blob Hash="00b8ef742e7d6ca0558eb3c0549c3bc3cac23a73" Size="262" PackHash="185b125e1e9c727b28d2be690ffdd93c74e74b00" PackOffset="167255" />
<Blob Hash="00b93e225740e6bf0a7dc671efa3360bab5e30f1" Size="14720" PackHash="e5cdcd6e137f76c62b086ae9202f4baadd2fcf12" PackOffset="1732064" />
<Blob Hash="00b990c4b1ba51411f2c47ab55cb1333b3c23e5c" Size="1189" PackHash="c6a87a27121ee980a108fbacde92cb925b2682d0" PackOffset="235867" />
<Blob Hash="00baed2ed50f65024713d7daf7a59c5f2202498c" Size="16162" PackHash="80aba82ae1c5a511f4ec1924f8f568af0c128b27" PackOffset="793882" />
@@ -82045,7 +82029,6 @@
<Blob Hash="024297bdcfdeebf7594eeb202d5809f7cc9da1e9" Size="1095590" PackHash="f9120573f3609bb14ae9a758762c56dbd6fed948" PackOffset="8" />
<Blob Hash="0243d1e505c378390133b30a8051e1fa0dbb4e65" Size="3977" PackHash="cc329416499fbc018b751c44c5b3757064ecbd4b" PackOffset="1596095" />
<Blob Hash="0244f4635a36dc99cdcf65c024ea2c23175c83e0" Size="44089" PackHash="cbafcbe19329c889151577a995439d8c09b69f61" PackOffset="1118256" />
<Blob Hash="02451f85b2cbe653bdeacbdeb479e541815ec339" Size="374" PackHash="29bc28c319492ab29fd3d4b0acbb6a2651a1222f" PackOffset="238" />
<Blob Hash="0247700b483d00db602295e167b613c9f06c739f" Size="27037764" PackHash="5f7234baa16f3e63d04ff6b333c8963b4ee2593f" PackOffset="8" />
<Blob Hash="0247f036ffdeb5b746370db08558d7b919722e47" Size="244698" PackHash="801295549915c66473e6cd436dc1623ad50a6868" PackOffset="544932" />
<Blob Hash="024946ba925b107efaa0788a1428c5f05e267eb3" Size="47724" PackHash="b2546cec9ff42b47632d72e5a083295011c8037f" PackOffset="8" />
@@ -82344,6 +82327,7 @@
<Blob Hash="03a2d5b5b4bd3bff6fc9356fcfea1be90c7897ff" Size="3354624" PackHash="4e3319c6def38fc3572ee0ebb3794b12c2ff5081" PackOffset="8" />
<Blob Hash="03a3842898bda1b23f78015e04f784a5183bb83d" Size="94122" PackHash="dc152ab1649d6d0c3db72d6a6bc7f0f740c074d4" PackOffset="8" />
<Blob Hash="03a45272dc3d4b3026681bfc04c17d35936f0daa" Size="316416" PackHash="46f8d47e0809954e9f2b2f7561007c47b6cc448a" PackOffset="8" />
<Blob Hash="03a5c7e95197d214c35234b9c5f6f657ab9df430" Size="999" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="1955" />
<Blob Hash="03a630ff5fb714504b3c562cb1bf86ff307a103a" Size="10372" PackHash="60268517ce102b3ab96039800667a78e6d6c5f5e" PackOffset="1424201" />
<Blob Hash="03a6ebdb3fdbd1c5df6936a81be905bc011c03c0" Size="137992" PackHash="d3baef2e92cd401f502bd67b30b5d3d4f3f8d777" PackOffset="1681414" />
<Blob Hash="03a7a03e14126b3d9cd86faa614dea6b40060c4d" Size="73710" PackHash="bfbd0f297a832e1bd4ba1c56ffec9a73cfe28c19" PackOffset="229116" />
@@ -84382,7 +84366,6 @@
<Blob Hash="0c86a925289c198fe27047bef82f1f522648a5b5" Size="944" PackHash="a44dc4b35972b9dad88e2ad3e0a47c8db7399c27" PackOffset="520956" />
<Blob Hash="0c86f4041aae96b5b80382baa1ce5b5a9a86ebc9" Size="219" PackHash="4b0f6024494e02f2b2cdd75b48b059c81bde532c" PackOffset="1486102" />
<Blob Hash="0c875b0d3033df67acef467e813e7850bf155cf9" Size="52" PackHash="9456e8f6abc1da08997d9694b42905f3c4596dd6" PackOffset="2095872" />
<Blob Hash="0c878149b96ca51fce224f643a21a4171f3e9c55" Size="24891" PackHash="135d2dfcfa4bbe7dd725f03f844323624525ed4a" PackOffset="92310" />
<Blob Hash="0c87f4705276cc62d564a6f40402ef0d90d32790" Size="15224" PackHash="8ee3024c1375fa3938c32e2c3b7a71a0f1b77452" PackOffset="32008" />
<Blob Hash="0c8892002ae780685a77bee3758d4c480bccd1f9" Size="3133" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="2085607" />
<Blob Hash="0c892642791dbf5288c2617e3f96bdc9960bcfe3" Size="452" PackHash="bf6ccb8b8cb10a5dfa1a4c6e7c988496d81ee69d" PackOffset="1780716" />
@@ -84730,6 +84713,7 @@
<Blob Hash="0e3b717b68889ccbc05aec351bf97ceefb756bd0" Size="105" PackHash="cca5a69a24718ef21c5a46099acf07d223f787fd" PackOffset="1552345" />
<Blob Hash="0e3c222dcaa1900de11017ad2880394e9ab58438" Size="10720" PackHash="de2e42ad57386aaae5fdc67c8512ac9ea3798d6d" PackOffset="955960" />
<Blob Hash="0e3d40475d0a026e8eb370153df0d0ca58e4c770" Size="603" PackHash="68d71f2240450c6a61fa1ce16c6da304926bdc26" PackOffset="7786" />
<Blob Hash="0e3e7040ef16a47b87d60abafb11476bc6ded5fc" Size="145" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="9782" />
<Blob Hash="0e3ee98b4f527e0bcdc9535414dc3052fb9a589e" Size="186" PackHash="93d888ea1d0c0c35ed11a546ea9cf97409838899" PackOffset="2096899" />
<Blob Hash="0e40c2d29b1d96cdcaf10d9655bbfc51c882da7d" Size="308104" PackHash="80290f11485461173de062138647ae2dab18d6e5" PackOffset="349056" />
<Blob Hash="0e416517ee23a30e111e2c8de19685be9c8aabdb" Size="1816" PackHash="b127bfae1b1e0cda9df90f4b3d71b7d1cceb3363" PackOffset="212036" />
@@ -85030,6 +85014,7 @@
<Blob Hash="0f99418cff0054918ec910b2567feed0d058ec1d" Size="815" PackHash="91ad79d9fedf81623073c141762397c53d576e03" PackOffset="3327" />
<Blob Hash="0f9a4fb1156312ebd0b9c81da2164e89d21878e1" Size="172" PackHash="eef645665d668dc309bebdc77ca5e0d66043c9e6" PackOffset="581630" />
<Blob Hash="0f9a89c6d030e7f686ca014a23269ad3208103e8" Size="99521" PackHash="c4b8d538071a0ad9faae137aa35dad4917c61dc9" PackOffset="461018" />
<Blob Hash="0f9ae0b8a4f2d2e105005b13b34b318369c43530" Size="753" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="15236" />
<Blob Hash="0f9d4b02730149263daa3055626103a6d8e6cff0" Size="718" PackHash="bf6ccb8b8cb10a5dfa1a4c6e7c988496d81ee69d" PackOffset="636147" />
<Blob Hash="0fa16b557f303b868ddb2ba50aa98984b446a6c3" Size="28872" PackHash="830cc93f966e96754b4b160b2d5ffbe64678ec80" PackOffset="685316" />
<Blob Hash="0fa54b76cc7f4174024a4ddae45fe6c6a968b250" Size="9160" PackHash="2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" PackOffset="1386616" />
@@ -86695,6 +86680,7 @@
<Blob Hash="17412c3c2f76a621f07c5492efed4423199c1b7d" Size="55880" PackHash="112d7718f4a79008c129711d3bc8efa410c54ee1" PackOffset="1879792" />
<Blob Hash="17442912f2516df815ea452bafb4147672bbad6c" Size="1558" PackHash="c84bd30af6fa1fcf421ac304beb74c010fb23b6e" PackOffset="25250" />
<Blob Hash="1744357ce6340d179924ea58f43f4b6654c786bf" Size="9229" PackHash="5e7d96af5e5b1cafa670bd77ae918457a118f7a5" PackOffset="153953" />
<Blob Hash="1744823a86de5a18f6b37de87a7d7e8343d9dcc4" Size="317" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="51718" />
<Blob Hash="1745ab88798cec14de36173e32cf5246554b4666" Size="175" PackHash="77198ff1705583671a8381b91e527374e415145f" PackOffset="940308" />
<Blob Hash="174ae94a6b0d3f8e4ed8c2115232a96d87ab7e41" Size="2053" PackHash="a53ace70829094b1d9b28362c5064e1dad0adf72" PackOffset="116016" />
<Blob Hash="174c7c9a73f665b974affa3753ad0fbaf4cb8739" Size="38630912" PackHash="494bd84f6cfce864c6e47863daf113c41de68f10" PackOffset="8" />
@@ -86770,6 +86756,7 @@
<Blob Hash="179a0e86cb81eb302835c839ec89ba7142b76fc4" Size="18510760" PackHash="30db2072d135bf47eeefd744ad9250df2d9b72e5" PackOffset="8" />
<Blob Hash="179bd2457c6134ee04cd1c9e920f2b052b437482" Size="1168" PackHash="6974b9c6f99dd329465ca79c60ac6eebd6d448a5" PackOffset="586727" />
<Blob Hash="179c6a8ce42e884224434257b1b3153e38a5757b" Size="3928" PackHash="f9b9adede9a3330b968a0106f6160c829b65f2c3" PackOffset="10647" />
<Blob Hash="179d8529e827977fcf990c7c6aa0b8eed12042b5" Size="469" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="1486" />
<Blob Hash="17a554c2f609d690c586237d7dbd36d39da06dc7" Size="26710" PackHash="60268517ce102b3ab96039800667a78e6d6c5f5e" PackOffset="1542182" />
<Blob Hash="17a586f40bbffef73a97ab9edaed784391830d0e" Size="1212" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="549548" />
<Blob Hash="17a66a8809f454325c6b96016e32c635c841af83" Size="2088" PackHash="0d87206250762e3264a81cb83c89634475b63275" PackOffset="8" />
@@ -87992,6 +87979,7 @@
<Blob Hash="1d3fea364b3dc129de3998a1455d5588ebaa6ff8" Size="279" PackHash="f25f5da5b49f7c1000f7e4195d4038bda16e5c38" PackOffset="1878528" />
<Blob Hash="1d40a82dbbe101a794df02a8ae3ac125fa967d8e" Size="71984" PackHash="45e0fae2dff65b32fa2aae02958e70ea89f608c3" PackOffset="528400" />
<Blob Hash="1d4106f2bcace84eef4ea5968613ab648d804578" Size="190584" PackHash="3b693a2d96c46774df823e7e42265fbbb6504753" PackOffset="1880908" />
<Blob Hash="1d41f28320dc5af17a6a5e231da8f55bcb789d07" Size="5171" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="4265" />
<Blob Hash="1d4249042301812e06720419a688211a6242441e" Size="13096" PackHash="2efd7a7fd90724f8180abfe166fa9344bc4d0879" PackOffset="1320381" />
<Blob Hash="1d42f1b9077f2df8935854f11443a3c48761774a" Size="115830" PackHash="a25d5e1b9c4ff3a301a5c383a6042b48392c22fc" PackOffset="1651076" />
<Blob Hash="1d4460f8a880e1fb48c3cae9fceec097fdd65578" Size="121" PackHash="72092af7bb664227bd490ad562ae12701de7c0af" PackOffset="2085656" />
@@ -92877,7 +92865,6 @@
<Blob Hash="33495b8bc2b0b7c3618bc2c72bb212a0c45aa921" Size="618" PackHash="24759b543697070a8ce1c8f804c2db147685fe2e" PackOffset="931956" />
<Blob Hash="334cc90a6bf6f196eb3aff627fa0f9892453520e" Size="1074" PackHash="7a6fe9c99d5d46d916c7c836c5c38b95826d6600" PackOffset="1220290" />
<Blob Hash="334d6563d4bb38dc850610165217a7d2e1549753" Size="13688" PackHash="d8ada64b4675fd69021068e5ad3348c77bd2728c" PackOffset="1434480" />
<Blob Hash="334e9d6e2016ce00af16535341e17d53f93e4503" Size="3877" PackHash="135d2dfcfa4bbe7dd725f03f844323624525ed4a" PackOffset="155963" />
<Blob Hash="334fa9dfc6740b1d1ce510be261c1a9847e50fd4" Size="498912" PackHash="3ed58aca75f6f0ac372ca9523324431d9dd4aa89" PackOffset="1144" />
<Blob Hash="33504d85bfe589a777998ce534efb1bfc59faa45" Size="1548" PackHash="60268517ce102b3ab96039800667a78e6d6c5f5e" PackOffset="1572271" />
<Blob Hash="33508f70a4c834fec53dc7eb6b15871d2f7fbc1d" Size="22917" PackHash="a2b5c99155a77cf445d1c1ce1017ffdbb23e58b1" PackOffset="1524892" />
@@ -96018,7 +96005,6 @@
<Blob Hash="40f54ecaf63eaacac22eedcab79aabbc6bbfcfe4" Size="454" PackHash="c6edc2e062f935eb2159b5b4717d92fc94c3ee07" PackOffset="2088826" />
<Blob Hash="40f605947b1045132f31118094e44c3bf6f61066" Size="243222346" PackHash="5ed248e83178d77a49251eb1a53cf41ca7f354fa" PackOffset="8" />
<Blob Hash="40f83ac21c49915a372655eca55daa41dd79cbaa" Size="303480" PackHash="e365c8a99f274c26de0e3ff44d72be73fca575a3" PackOffset="8" />
<Blob Hash="40fdc7755ceaf5282f53d3b9496418a71abb082a" Size="588" PackHash="135d2dfcfa4bbe7dd725f03f844323624525ed4a" PackOffset="91722" />
<Blob Hash="40ff532860341ed81a5eea1cf744223c33da903e" Size="1580" PackHash="5cb17f3f8319e59e99cf89cdd430848948628eee" PackOffset="1184652" />
<Blob Hash="410009da4e75456af902864b240a6f06f25b01b5" Size="250" PackHash="b296f6b71f82957ad9a40beab6aac9a7ce13637e" PackOffset="187728" />
<Blob Hash="41030aae3f2d707c9bdb3469105e177498b17234" Size="5803" PackHash="02b7d31ac32c2f3c4c7a387ddf6bce216cf1a0c4" PackOffset="1342724" />
@@ -96179,6 +96165,7 @@
<Blob Hash="41a449c82f57e9825ec80322ffa5823859e627cf" Size="2335" PackHash="dd3879c8412ca5655fecfb160744dc2f1032689a" PackOffset="969376" />
<Blob Hash="41a78af2f5cae632a2f21128858f7d551d6be230" Size="19840" PackHash="729708db6f7b1047c4382e48d64d3822b9a0041c" PackOffset="672152" />
<Blob Hash="41a79ad553a110c662f3bb7e3f7063c6eaeb971f" Size="161792" PackHash="46f8d47e0809954e9f2b2f7561007c47b6cc448a" PackOffset="1151448" />
<Blob Hash="41a7ddc51663701621f1e3a76fdf0602283ed19c" Size="414" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="8" />
<Blob Hash="41aa72b1ea9ee13678a6e959ca0a3ab761342a28" Size="20025" PackHash="e6c3d3a7d041d8fecb9399548174729182d6f31b" PackOffset="1278215" />
<Blob Hash="41aad4bd3b72ccbb6a762feed3c24931642dd867" Size="1285" PackHash="f25f5da5b49f7c1000f7e4195d4038bda16e5c38" PackOffset="1678911" />
<Blob Hash="41aec3c5491064b247547b5b052d4c67d5460d8f" Size="37991" PackHash="df832a8e13dbfc1cddc39c8fa9fe3bef1f40a1d2" PackOffset="1899017" />
@@ -96264,7 +96251,6 @@
<Blob Hash="41fec72d2a715720d61905aa5392bd5d7e51dc26" Size="165351" PackHash="3e0514a8447504118339e4ed81085e2ddb8fc470" PackOffset="1275849" />
<Blob Hash="420097808dd2d05288282eaf561f0eecda788c19" Size="89486" PackHash="9a637c8b66ce187f32f3e53ea4b685fdf032a75f" PackOffset="8" />
<Blob Hash="42021069f6cc88b1c51cdcf0e15e2e631a6a03b9" Size="63352" PackHash="ed6cdc3e6218442b73b108da4a7f1aaac088a4e0" PackOffset="1556352" />
<Blob Hash="4202cfd95fd681e859212aa61934b31ec1b28f85" Size="201" PackHash="558d1360cbac67e747eab7204402bd299a13ef53" PackOffset="1760965" />
<Blob Hash="4203cddbb8baaf6e3566dd64fd0f65b2634e7a1f" Size="30584" PackHash="112d7718f4a79008c129711d3bc8efa410c54ee1" PackOffset="1176024" />
<Blob Hash="42057082f84b9a5075610176f9593fa638f3d166" Size="110317" PackHash="e795f96fb114057b0bc2a61b73127640a6c48952" PackOffset="65430" />
<Blob Hash="4206afa6855ea6b22d85d84022a22abe423c6fc4" Size="3652" PackHash="7a6fe9c99d5d46d916c7c836c5c38b95826d6600" PackOffset="814997" />
@@ -96567,7 +96553,6 @@
<Blob Hash="43600c37b131369622e563ab63e4db6794363009" Size="18594" PackHash="ec120b0303abfd30cf405350811331acb5e02ad9" PackOffset="2036396" />
<Blob Hash="4360c2aa576c8cc51ea594a8171e839b21289d6b" Size="1184588" PackHash="e68fd345f57007c501cf74e2d02946684e887bcb" PackOffset="478039" />
<Blob Hash="43615686014eead8ba02bb0d29e723723fe70544" Size="286422" PackHash="fbbd59dbf49156f3dcae98ebb03e2c60489780ba" PackOffset="1767906" />
<Blob Hash="4361977188c6241cce5defd61e1779c232b6cf29" Size="138" PackHash="558d1360cbac67e747eab7204402bd299a13ef53" PackOffset="1760827" />
<Blob Hash="4361f2c66fbbf9acd4af1e7b1ed30ae814644fdd" Size="7439" PackHash="1cfe20e73efc3a734f908ce4215a18d0e856c3a7" PackOffset="860678" />
<Blob Hash="436438d4216c3157f6ab7f826ea8d6844de7eaae" Size="1580" PackHash="5cb17f3f8319e59e99cf89cdd430848948628eee" PackOffset="1279452" />
<Blob Hash="43682f5b499068c07a2c7f1bcffa550545d9f761" Size="15005" PackHash="77f03c66e7c43010c9ca62602372048fd94efaef" PackOffset="1340677" />
@@ -97250,7 +97235,6 @@
<Blob Hash="4671244ec2bdfd4816523bfb5744a5e478df102b" Size="854" PackHash="740468294ff5dc113d230e62ae67c145d10bfb6c" PackOffset="484198" />
<Blob Hash="4671d1b6ac329494d05c8489e4134129a0a3008c" Size="996216" PackHash="a25d5e1b9c4ff3a301a5c383a6042b48392c22fc" PackOffset="8" />
<Blob Hash="4673498e5b8cd4a56a30fc81eef1aeac83a21797" Size="12288" PackHash="03a57b683db3714c332944263de93ccc72e77351" PackOffset="2038280" />
<Blob Hash="4676013e0d4afbc0c22a36eec5b699e613ae58e8" Size="230" PackHash="29bc28c319492ab29fd3d4b0acbb6a2651a1222f" PackOffset="8" />
<Blob Hash="4677009e82cb01d41342bfbd00ab84c3c2d5f2a9" Size="1158" PackHash="2dbfb4ac1342c20e47a4092c5291a2fff552374a" PackOffset="67498" />
<Blob Hash="4677934a68c019186cd7d30929d06ab41e5d450a" Size="200" PackHash="a6169f9b465081a43eb3b255302da88c5f2c95a3" PackOffset="1858392" />
<Blob Hash="46785ca4b21a746b7e7057994cbc2cd1da591f2e" Size="135120" PackHash="8bec18cc663f9372de7f0e332c4c66afb2bf443b" PackOffset="413557" />
@@ -99563,7 +99547,6 @@
<Blob Hash="50e46dcd98bd94c481d1ede434ffc9076cfa0a29" Size="265" PackHash="bf6ccb8b8cb10a5dfa1a4c6e7c988496d81ee69d" PackOffset="1582872" />
<Blob Hash="50e51f7c8802559dd9787b0aebc85f192b7e2563" Size="537432" PackHash="afda99bcb1ab13c8b93ade8b0ecccdf5f5e9a4ee" PackOffset="8" />
<Blob Hash="50e668e10a1fa2da233677e3977be70d4cd36138" Size="101726" PackHash="3c0249257f23f2702bdda0dc2db60ca271e393d0" PackOffset="8" />
<Blob Hash="50e6a775241ca4495abab80afc0446a17c975dee" Size="80433" PackHash="4959f218ae345061365cc42a2fee0bf64607e88d" PackOffset="8" />
<Blob Hash="50e6eee15bf85fbc860d7d6d173f05194d240dd8" Size="4409" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="104196" />
<Blob Hash="50e78782f86f2fdae4d0a079ef26bf8772ca4c09" Size="984576" PackHash="d4271e1a88d7e30d9e45d4f7c779dd4666c41c7e" PackOffset="8" />
<Blob Hash="50e873966f75855d0abda844aaa7e8a103ce0e4b" Size="3614" PackHash="03d7a089cf0f6275a8598a08a2b9ae81d47f7047" PackOffset="1969449" />
@@ -104241,13 +104224,11 @@
<Blob Hash="65c2b02876fb4c07ef7639d251c32e3752cfe22a" Size="148" PackHash="ec47a61c9e578fd55eb52d1035235a98b560b026" PackOffset="705164" />
<Blob Hash="65c5ee5d08964e37393e6a78aba0db16d51240e2" Size="1114" PackHash="7bef3b4a940848d82dfd45a21576016bcc3de743" PackOffset="2088632" />
<Blob Hash="65c7bfc37462ef72ba884f6296f1692660cb0f3e" Size="6050" PackHash="1a516c559dc42691267538ebc20032ea3d16c528" PackOffset="219897" />
<Blob Hash="65c81093106b1fccdbd7343d83d89dbf11e90f10" Size="248" PackHash="185b125e1e9c727b28d2be690ffdd93c74e74b00" PackOffset="166090" />
<Blob Hash="65c8a4bfe928df523f301e5ad84fa45fddf35166" Size="216448" PackHash="1d5c2628787e5654f0e5b7aa940a94c528d9ed54" PackOffset="1173384" />
<Blob Hash="65c97d31b4865a61299b4b3c1676b7b79be7ae0a" Size="479" PackHash="c6edc2e062f935eb2159b5b4717d92fc94c3ee07" PackOffset="2085517" />
<Blob Hash="65ca76770785c119712df62b2935771fad9b7c3f" Size="3891" PackHash="d0725cabae557ef43da01a5a7b63181693453f36" PackOffset="197268" />
<Blob Hash="65cc9e894f3b35bd3320eeab304a08ad74bf451f" Size="8796" PackHash="ff5dc842a06fb1fd8568383d211bb331bcfd0e04" PackOffset="2052364" />
<Blob Hash="65cd331f32eb192dfef41d387bb68f02c5fe1153" Size="635" PackHash="c8bef679441e6c48de9825aa23d959c9cfdc6486" PackOffset="12015" />
<Blob Hash="65cd363970e17b6c08ac71a0396f8c71668ce0de" Size="10919" PackHash="135d2dfcfa4bbe7dd725f03f844323624525ed4a" PackOffset="80803" />
<Blob Hash="65ce3f97195ac13b2886cf3c253fff31ee2ac56c" Size="95201" PackHash="73875117d3a4cb60d297280e2f1a880ca8e7180a" PackOffset="1212579" />
<Blob Hash="65d24eb1444b13c3bbf73930343a428aada478b2" Size="4454714" PackHash="0a5fd4afe7a8e3e343d8e730510653683e4a59f2" PackOffset="8" />
<Blob Hash="65d3aa17fe20fa2ec7616ef60db81f2c802e8294" Size="9186" PackHash="eef645665d668dc309bebdc77ca5e0d66043c9e6" PackOffset="400666" />
@@ -104355,6 +104336,7 @@
<Blob Hash="664620f9ad8d40e9f9c8a069c15e17198b13b817" Size="76" PackHash="28007685046ed82473f6da7e76279a9459daea2c" PackOffset="1790384" />
<Blob Hash="6646544ea53b0beef1c136a406fce18831fefec0" Size="1309" PackHash="c53d3d2921dd9a78272006151a6bd70c6b9c28cb" PackOffset="96054" />
<Blob Hash="6646b843571de5712ee351404a5da903ca7f4886" Size="1438" PackHash="dd3879c8412ca5655fecfb160744dc2f1032689a" PackOffset="227660" />
<Blob Hash="6647e6938da2430458fe78b4e056e2fbfe2be60a" Size="346" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="9436" />
<Blob Hash="66486c5dd9f9417cb644578507d9ef76363d5b74" Size="232" PackHash="59a22d89e715263368cd4cef014c11cb8f400878" PackOffset="489784" />
<Blob Hash="66489c7af32550affd8a9f41a265067472215361" Size="26472" PackHash="54401710d670ee5c2b246b4c0f01a4ad0b1c2ed5" PackOffset="1070944" />
<Blob Hash="6648d767e454de1056aa60f68941ab78523aef85" Size="53300" PackHash="ff5dc842a06fb1fd8568383d211bb331bcfd0e04" PackOffset="282836" />
@@ -105002,7 +104984,6 @@
<Blob Hash="6908b81c77183b52f7c1ccae9c4a148407727161" Size="2648" PackHash="830cc93f966e96754b4b160b2d5ffbe64678ec80" PackOffset="1689864" />
<Blob Hash="690a242bde9e7f55d39f47ec01067df0155843d0" Size="148872" PackHash="7188bda706d089ad83e6185cd3757079aaddd051" PackOffset="1171472" />
<Blob Hash="690df9c2c2b0f9952db23592161a99482faa0cd9" Size="168454" PackHash="2cb807a799d2d94e9d9630de379ee02807309b8c" PackOffset="1572035" />
<Blob Hash="690f442fb5c233b523c0a648d019ef9da5312fb3" Size="251" PackHash="558d1360cbac67e747eab7204402bd299a13ef53" PackOffset="1761166" />
<Blob Hash="691042f2258764ddc86ef06a942d95f87804d5aa" Size="2487" PackHash="77198ff1705583671a8381b91e527374e415145f" PackOffset="224807" />
<Blob Hash="6911009a573216114b0168708e1af4c998e1cd05" Size="6684494" PackHash="1e8a25cc8a1cc3d27b1ebf444a8826b82fbb5a85" PackOffset="8" />
<Blob Hash="6912b30d7678b0895b92fe5c9052a8c91a39ac3b" Size="256812" PackHash="2ca16df04e63b00d51beb1389c06bf309421b646" PackOffset="1771308" />
@@ -110052,6 +110033,7 @@
<Blob Hash="7f3ac8e35107e9423bc46239e05c337645c1ed10" Size="9241" PackHash="b5b52b49e9daa1407edb66997fba1a5ae4a59ec2" PackOffset="200220" />
<Blob Hash="7f3c07e98d2026e31eef23228423adce4ed3e487" Size="766900" PackHash="16024915a7fafe58a22485ef662e57979f1b6b6b" PackOffset="8" />
<Blob Hash="7f3db34607e22f6745cb72e61d57438d9ec8f20f" Size="14200" PackHash="d8ada64b4675fd69021068e5ad3348c77bd2728c" PackOffset="252160" />
<Blob Hash="7f3ee17fdf70ce7f3ccebb67b29f701593e21941" Size="1157" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="10573" />
<Blob Hash="7f3fa841505e5632185de8d6181bd83f7210b553" Size="1114" PackHash="b5b52b49e9daa1407edb66997fba1a5ae4a59ec2" PackOffset="422658" />
<Blob Hash="7f4014c21bd2d976c298fc3fd228548ae9d4c7bd" Size="187" PackHash="82cb21b227e582936389d89d9046bc819223c778" PackOffset="1691431" />
<Blob Hash="7f4121a7577fbaf1ec4bd6bad37c1f75129b4d7b" Size="17488" PackHash="21f8fdf6b242f2ec76db5708b9ea9a4d66a1781b" PackOffset="589656" />
@@ -110820,6 +110802,7 @@
<Blob Hash="8294b5e45585255dce7eafd6e793e5ca2c9fb394" Size="77816" PackHash="98a8a45851bb0249c139b14d9b5d1cb85385b1c7" PackOffset="1937254" />
<Blob Hash="829506c48bf825ae696de4bfa430ed6010f662dc" Size="25683" PackHash="afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753" PackOffset="1055707" />
<Blob Hash="829552ce033e752ac3e707d922a451bd95e2eb46" Size="3435" PackHash="642c1881a26196aef2a8440b10c79fc89ef891ef" PackOffset="601615" />
<Blob Hash="8297a3b223bcfa5f44d92734ab212f9557d4702f" Size="1842" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="15989" />
<Blob Hash="8298e768833e57a1aeaa32cb9bcff1f20ad43b2d" Size="1741" PackHash="0ecfb87d8907ba6a963b5230ca824ebfb88b2855" PackOffset="959007" />
<Blob Hash="8299b250c62e4ca2d031bc8c8603a85321240a45" Size="5632" PackHash="d4f5183f0b0dbcdd750144216c988e4227831fee" PackOffset="1476616" />
<Blob Hash="829d4402c35cc38431dbe0c4b8cc3cf2fb5fbb06" Size="120" PackHash="5cb17f3f8319e59e99cf89cdd430848948628eee" PackOffset="327449" />
@@ -111906,6 +111889,7 @@
<Blob Hash="879581cc914a8d2250a2df868092996986db2c24" Size="3119" PackHash="5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" PackOffset="1275343" />
<Blob Hash="8795ff58e2770da5e6afa91c8bf077bebaf40723" Size="144776" PackHash="9cd69dc17b8f32cf4e3528adf766740e10e9f6b4" PackOffset="1684224" />
<Blob Hash="8796797fa79df32961b13d8aa25e5d0980234420" Size="168" PackHash="6974b9c6f99dd329465ca79c60ac6eebd6d448a5" PackOffset="515461" />
<Blob Hash="8796888ca7bfbeb7628143e78dec5a355cf44638" Size="904" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="3361" />
<Blob Hash="8796ec75d3d45838b63f34ac8354ecea6789deea" Size="9380" PackHash="cca5a69a24718ef21c5a46099acf07d223f787fd" PackOffset="1116960" />
<Blob Hash="879ae034294a2096b0c7cd80c4448167f464b74e" Size="1193" PackHash="740468294ff5dc113d230e62ae67c145d10bfb6c" PackOffset="2060111" />
<Blob Hash="879bc1b7373b6aba7a2250f85cea8b4d27ddb431" Size="89" PackHash="328be60319f9e08c3c125c4aea08b49af1c5d794" PackOffset="2077767" />
@@ -112109,7 +112093,6 @@
<Blob Hash="886585cfc54d6b146e5d572b87dca378e975957d" Size="1326" PackHash="140c433d1a73975deaeb9beefbfd20e7858373b7" PackOffset="11647" />
<Blob Hash="8865f6e60d373b586a5f7ec1a8e195177f691371" Size="1473" PackHash="7ca0e1410f00142dc9791ff1fb493669e443f644" PackOffset="841008" />
<Blob Hash="8866415daf93fe9796ad4d40f2ec155e43667bf5" Size="10" PackHash="27116894ea7e2b325fc00f9a0935afe3719797d5" PackOffset="1833087" />
<Blob Hash="88676a1bb8c79b1f38c12684947d1bf7e62fd69a" Size="5086" PackHash="135d2dfcfa4bbe7dd725f03f844323624525ed4a" PackOffset="121003" />
<Blob Hash="8867f021154e56e9a2fb94a17c7adeac02b1aa8f" Size="222" PackHash="c7a410dea128511415ba77d4b599d33e0e01ea2f" PackOffset="493994" />
<Blob Hash="88685414514a013e774aa28c34cab0737062474b" Size="232" PackHash="12d213957fbfe643a97d5072b1f6ae30aeebcbb7" PackOffset="677973" />
<Blob Hash="8869f0cf97ae43c8842c5d77f9d6141335de4d2b" Size="1038" PackHash="cca5a69a24718ef21c5a46099acf07d223f787fd" PackOffset="1208399" />
@@ -112203,6 +112186,7 @@
<Blob Hash="88ca5c8ed063faa4e0eaa9cc2669a5a8cf7cc12a" Size="1078" PackHash="068e4ec15d55d18af0b7f9137eb1ef52d7a765c8" PackOffset="15052" />
<Blob Hash="88cafc672ca472d0872232e908b98d23b9fcace5" Size="1048" PackHash="4e53bbfdf22250a2aa2ae82b2c80528399dfe4ef" PackOffset="258027" />
<Blob Hash="88cb10e7b7375b22235dd0125f94334f976d78ff" Size="6138" PackHash="1a516c559dc42691267538ebc20032ea3d16c528" PackOffset="103138" />
<Blob Hash="88cdf39bb9ed4608162fb067ac8dc9e538e4718a" Size="221" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="1265" />
<Blob Hash="88cf57829a388684886ba9d54ffa5faade1808fa" Size="163674" PackHash="382c138630d478f7f5746a00ed08a86516cf43fe" PackOffset="1162632" />
<Blob Hash="88cf8dff5a94406ebe3b9e7c9ada48b0cd349110" Size="183" PackHash="964589caa5cca3d525823be35bb45b62203ac57d" PackOffset="258270" />
<Blob Hash="88d083dd4c55c4355c41c6a7d78310dab8464890" Size="261" PackHash="2e3237f4ac211e07a6a21bd72eb72dcb0a8d87ed" PackOffset="1213007" />
@@ -112507,7 +112491,6 @@
<Blob Hash="8a52867c4d41337e7434d4d99602991ddcb58e3f" Size="5120" PackHash="0bdfd33a634ee287981b185b5089e2e34b7dd70c" PackOffset="565772" />
<Blob Hash="8a53d74e4db114f58af5fad218b67dc7bc1c1769" Size="1143" PackHash="c6a87a27121ee980a108fbacde92cb925b2682d0" PackOffset="749793" />
<Blob Hash="8a54cbe7772e7a8c63e4f471f9c226f8a6509b0e" Size="16388" PackHash="cdd37b0108c4fc9eafd1781226b576c6d81d6585" PackOffset="2066048" />
<Blob Hash="8a54edad808b52d8a461c0981dbecb333441858e" Size="265" PackHash="185b125e1e9c727b28d2be690ffdd93c74e74b00" PackOffset="167517" />
<Blob Hash="8a5673a8f616f07196cf170a2833cf01673b2b98" Size="823" PackHash="71afb8f0e6da8c58d1af365d849955a471b13d68" PackOffset="655" />
<Blob Hash="8a56dafd07f4f2c6d56ddd1ec24cc2d015583e40" Size="117624" PackHash="993d9e4a042922c763ec5bda999b895999df147d" PackOffset="1901824" />
<Blob Hash="8a579de16778d1378b84c16d0764db755240c589" Size="17720" PackHash="ec47a61c9e578fd55eb52d1035235a98b560b026" PackOffset="228508" />
@@ -113806,7 +113789,6 @@
<Blob Hash="9014d307dda105d88d48b32b517dd53b6d6873ff" Size="534764" PackHash="57f5a3fd316550fe55fd09cc336eda6cd499a32e" PackOffset="1055062" />
<Blob Hash="9015684fc6ec38834411bcfdc01ee888fcb96aab" Size="1075" PackHash="d2c678c984a7587bb85dc0797f7b47475c7e1391" PackOffset="749816" />
<Blob Hash="9015e2faed81a86ff428b31177ef821cb8d074fc" Size="2229" PackHash="eef645665d668dc309bebdc77ca5e0d66043c9e6" PackOffset="1091722" />
<Blob Hash="9016f4bdf34b008038490493446141ab5edc94f2" Size="4205" PackHash="40132653b8fccd20d9c75bd2f7bd276dd4555534" PackOffset="1215935" />
<Blob Hash="901a321b8242b3dd378f6f47789efa26e575d3ae" Size="9406" PackHash="72739ec58d6cafc8f018af437d7b9604c7087dc3" PackOffset="1358852" />
<Blob Hash="901a7066847e20b4a33ab04b15273167e46208ad" Size="100801" PackHash="01dfb13ad0b69825f9b5d9762990e5763b147862" PackOffset="973353" />
<Blob Hash="901a7771db08e1feeab49cf29de39f29aa455ad9" Size="357" PackHash="ac2a5984d13897ab029fdbc17ed5a36ec057edbc" PackOffset="350994" />
@@ -113868,6 +113850,7 @@
<Blob Hash="90565108a6d0b60a272d30e9cda8e8502afe3d05" Size="7168" PackHash="f07de1bbf2cdb527d64b70ebbf6b56e2cc684fd0" PackOffset="1407648" />
<Blob Hash="9059e26bfe164b56738d0edaaa5c7cf5fd15704e" Size="4901" PackHash="a6169f9b465081a43eb3b255302da88c5f2c95a3" PackOffset="1109146" />
<Blob Hash="905b36cac0b83e99199bca4529f4c181af4baf38" Size="46464" PackHash="0741da9f4aa7211f68c45528b6c88fca62accc5f" PackOffset="89736" />
<Blob Hash="905c7e6ade48aba8ffc11515c32157c985e0a4ac" Size="843" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="422" />
<Blob Hash="905e1b6e64eef7a5e20743a031c38e78cc6de152" Size="7613" PackHash="80aba82ae1c5a511f4ec1924f8f568af0c128b27" PackOffset="157897" />
<Blob Hash="90639d83c6a68f5b2939842366a70f782fb1052b" Size="2123" PackHash="89848bfdce81089461dbf49b67ef0aee84ab9730" PackOffset="1287024" />
<Blob Hash="9064db40007999d775cd00aeb6787f20d1479474" Size="21138" PackHash="62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" PackOffset="507495" />
@@ -115972,6 +115955,7 @@
<Blob Hash="99d8a190cf839b289d9f620322be17478ca76a51" Size="2936" PackHash="7a6fe9c99d5d46d916c7c836c5c38b95826d6600" PackOffset="698863" />
<Blob Hash="99d8b78dbe43cc7206d412201d0042f9d6f9f372" Size="312" PackHash="dd3879c8412ca5655fecfb160744dc2f1032689a" PackOffset="722242" />
<Blob Hash="99d93e1e3636f86c85b0c7c4da2077b4f1ee010c" Size="25020" PackHash="22f3a2c996d429953d5bf230ff8d380635b73f13" PackOffset="155271" />
<Blob Hash="99d9987eaca4d49093220a29b8b5211e0ec9d2de" Size="33887" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="17831" />
<Blob Hash="99dbd8079a81094230c942ee200d3b29c3a76c88" Size="3929" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="1470583" />
<Blob Hash="99dca6c178742ce8bde936e4ae813d5e8762908d" Size="88" PackHash="830cc93f966e96754b4b160b2d5ffbe64678ec80" PackOffset="1004172" />
<Blob Hash="99dcbf9307ad6fc92ffe5138f52c2c560b4c0209" Size="392192" PackHash="a94e6a1353889ac93006f4ae2b46c11916e9af75" PackOffset="245256" />
@@ -117534,6 +117518,7 @@
<Blob Hash="a0982a37ed87fa6f5dba8df23a4a560fc7444858" Size="745" PackHash="bf6ccb8b8cb10a5dfa1a4c6e7c988496d81ee69d" PackOffset="1526795" />
<Blob Hash="a09892be5d3def150aad9a271949fa1853c371dc" Size="37475" PackHash="62754dea17c36b73ffc0555284916620026233b9" PackOffset="1606978" />
<Blob Hash="a0989bd48a520647a56bb3db9a937771bf26c648" Size="1325" PackHash="02f911003167be7b08c3fbf9bdababa124958f48" PackOffset="380506" />
<Blob Hash="a09935b2561d2070c2e57365aa841d165f09a603" Size="646" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="9927" />
<Blob Hash="a0995cbd7bc40e44c47ff9c2b91f3d8a09b7594c" Size="98304" PackHash="a532e1090ce8e02d0f15e9dd043250a4de9326b6" PackOffset="1835016" />
<Blob Hash="a09a064894d4f4d2db36e5b9c1d3d4be506a8c56" Size="104" PackHash="830cc93f966e96754b4b160b2d5ffbe64678ec80" PackOffset="365696" />
<Blob Hash="a09d593e2f92ff5860346863e96dbe3626f807f2" Size="812" PackHash="dd3879c8412ca5655fecfb160744dc2f1032689a" PackOffset="224012" />
@@ -117557,6 +117542,7 @@
<Blob Hash="a0b285264e704edafbe870ace48f7fae56f34b9f" Size="104" PackHash="efd73054c096cd4a5bc1ba2dbe16349a22f5f682" PackOffset="1620376" />
<Blob Hash="a0b4a7a18fd3d65b70f75c7b05a0625cb03e6e60" Size="659968" PackHash="9fa4aa492ff1564aae0bfe927bd3eef4d0bc3b07" PackOffset="317448" />
<Blob Hash="a0b523328d043079543ef689d9fff183c9773f42" Size="363" PackHash="344c3681a64dc0abd05c0f23e5a57955991483da" PackOffset="2055246" />
<Blob Hash="a0b64935100dfbffddb7681f37330adf7ce0a514" Size="1750" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="11730" />
<Blob Hash="a0b6de44255ce7bfade9a5b559dd04f2972bfdc8" Size="608080" PackHash="423ad2069630d40b43f1e60fe794fe4da1bd9519" PackOffset="8" />
<Blob Hash="a0b82ec724bc61f51232b9fa63b25ca4f53d26bc" Size="1189" PackHash="77198ff1705583671a8381b91e527374e415145f" PackOffset="1890453" />
<Blob Hash="a0b859117d4abbd86c831df68116e40742a37148" Size="102656" PackHash="23f1301d78bcd3b6f768428d15cb184c7fc45c57" PackOffset="1534566" />
@@ -119678,7 +119664,6 @@
<Blob Hash="aa06bd3fdddc79585c0c500955a31e5ead7d9d63" Size="136" PackHash="efd73054c096cd4a5bc1ba2dbe16349a22f5f682" PackOffset="1649272" />
<Blob Hash="aa075f95190dc2ec8eb0ecf3d40a910b7f7ec6a8" Size="164352" PackHash="58811f617a012321e5b8a8c1999cff4ecc62b35b" PackOffset="1929117" />
<Blob Hash="aa07d4c4b0c901e23b4d217bb89127cb620f8da8" Size="3296" PackHash="4b0f6024494e02f2b2cdd75b48b059c81bde532c" PackOffset="280862" />
<Blob Hash="aa0c1372b16d69a7763858c324079e22268d7836" Size="18480" PackHash="135d2dfcfa4bbe7dd725f03f844323624525ed4a" PackOffset="134572" />
<Blob Hash="aa0d0808680c919a1be5e6950bf16193a71d0146" Size="9156" PackHash="81eaddb949f59ad9bbce7efa1ca6f9bace37bd86" PackOffset="336917" />
<Blob Hash="aa0d81a457f15a57bd1f125d93d8193b6dbfbc44" Size="1203" PackHash="bf6ccb8b8cb10a5dfa1a4c6e7c988496d81ee69d" PackOffset="1463490" />
<Blob Hash="aa0f9173fe2798338a5f9160b764d4d192acf769" Size="100" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="250456" />
@@ -120227,7 +120212,6 @@
<Blob Hash="ac79c462bdb2ed5a344f72fe5236d1c80565b51c" Size="104" PackHash="d2a5fd36db8b15ae3778e1aee34cc6f737b9f2ac" PackOffset="1554544" />
<Blob Hash="ac7c7652d0462b5e558154145e5b043d7ab7098d" Size="11352" PackHash="76107ffad88e4bd4762670491ea2da0aa178b29f" PackOffset="2049709" />
<Blob Hash="ac7e7f90d1220b6d9507df3810559ea849015160" Size="5971" PackHash="383814cc08c7b5ec1de899d90a5024cd96d0960c" PackOffset="2080857" />
<Blob Hash="ac7f93c1940d98c20fa7678e54941f382199b59e" Size="141" PackHash="29bc28c319492ab29fd3d4b0acbb6a2651a1222f" PackOffset="1568" />
<Blob Hash="ac8103b233797e1a85f5fb788e3082488fb589f3" Size="100" PackHash="efd73054c096cd4a5bc1ba2dbe16349a22f5f682" PackOffset="1802944" />
<Blob Hash="ac8108d2dbd09245b770d51eae0bcc4e22278662" Size="256" PackHash="375fc7daadf4e7c57ed3fb499492997b710a6201" PackOffset="1654756" />
<Blob Hash="ac81d9f4143971972c6fcc17f87cc4d647f208a3" Size="908" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="266280" />
@@ -122473,6 +122457,7 @@
<Blob Hash="b659770452429c39750deb0fc8b10f97c553f977" Size="200" PackHash="2bdc4647ddd822ea2758f782f98d692d70a9cb0c" PackOffset="1335232" />
<Blob Hash="b65bd0043e97abfd4ebefb3af9915cdc95323650" Size="44" PackHash="740468294ff5dc113d230e62ae67c145d10bfb6c" PackOffset="172783" />
<Blob Hash="b65be65ebb4c9e7d12e26b52d7818e12eb6500b2" Size="186157" PackHash="04b2955ed75c42f04f68c6205971efb796d5b3be" PackOffset="1642359" />
<Blob Hash="b65e5ba476790b1d8ea133447daf272333504be3" Size="261" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="52035" />
<Blob Hash="b65e7625cafefa15b582b0131863fc7310ac38e3" Size="12590" PackHash="2db7f4c348d568244ddd15922a46fffd20a8d012" PackOffset="1261799" />
<Blob Hash="b65f80ae1822f142fcdc32b4c82daaed991d652c" Size="12" PackHash="3431b9c905a574820d1e97a0097536296e23e1f9" PackOffset="2097129" />
<Blob Hash="b662c89d3d7eaf9c75a7689b3a38a6df85b41e75" Size="338" PackHash="a6169f9b465081a43eb3b255302da88c5f2c95a3" PackOffset="1858054" />
@@ -125952,7 +125937,6 @@
<Blob Hash="c5dca5f17d8292f19219160aa8659f348462af15" Size="22977" PackHash="e614615af384173b6433920246d521e36fceb520" PackOffset="738229" />
<Blob Hash="c5dd1fa73e64ea8f5252a3e96744bab4f79ae040" Size="4890646" PackHash="85b2f119a77b40558cfba3383b504cef95fbfaa2" PackOffset="8" />
<Blob Hash="c5dd98787382cba2fb937828062d5c8f7762c097" Size="100" PackHash="830cc93f966e96754b4b160b2d5ffbe64678ec80" PackOffset="171472" />
<Blob Hash="c5de560dac69de3afff2eefeecbafd8957d991f1" Size="579" PackHash="135d2dfcfa4bbe7dd725f03f844323624525ed4a" PackOffset="133993" />
<Blob Hash="c5de9fbcd24d8a64d90b7c7ae2c93599960cc5a6" Size="919" PackHash="740468294ff5dc113d230e62ae67c145d10bfb6c" PackOffset="1917204" />
<Blob Hash="c5df208e88220c7a479845555623f1a7984261da" Size="2808" PackHash="33d0a2949662b327b35a881192e85107ecafc8ac" PackOffset="998304" />
<Blob Hash="c5df55012b95f98bd149f7d3f15f233aafad4fbf" Size="3692085" PackHash="71e1157a7e5c9bdc04b690b9e701af13c88edf97" PackOffset="8" />
@@ -128956,7 +128940,6 @@
<Blob Hash="d355d7a7d02eccca013a23b1409f0ef4aa3ba628" Size="205" PackHash="9ed6c07fd6c384ed21fc268d544278fb405b98dc" PackOffset="1015220" />
<Blob Hash="d356ddf809ff2d29511855f5089af5ffe5aee962" Size="908" PackHash="964589caa5cca3d525823be35bb45b62203ac57d" PackOffset="56428" />
<Blob Hash="d35910b1b81a30981b0239599c5c21a28a3bf53e" Size="1580" PackHash="0a79b68fc843ff09e7eeffe5fafe58c90b6ece69" PackOffset="346028" />
<Blob Hash="d35d5e9a48421573e49b8b9b6aaf9cf6681c3ec1" Size="3802" PackHash="135d2dfcfa4bbe7dd725f03f844323624525ed4a" PackOffset="117201" />
<Blob Hash="d35e6e36b13b57f174b8d3840cf5923bd77ecee8" Size="1580" PackHash="0a79b68fc843ff09e7eeffe5fafe58c90b6ece69" PackOffset="447148" />
<Blob Hash="d35ecc33be1fc8983b935dfc8c602365b187f7bb" Size="92417" PackHash="028f04d579c22d71b19bcec0b6fea5796f5d1b63" PackOffset="8" />
<Blob Hash="d35edcd65bdbe49221a963bdb0f567e8e0dcf271" Size="28928" PackHash="af6862dbc4ddd6e1ee5483169daa5e13248d28c4" PackOffset="1411302" />
@@ -130047,6 +130030,7 @@
<Blob Hash="d84d3b6c9ff1a19a42167f3005184fc01a891d26" Size="143092" PackHash="402ddad50dcfa1abbd02e0139894a1626a9cf908" PackOffset="175316" />
<Blob Hash="d84ee9aadad3db2e7ad75682508230517f34b0ee" Size="9088" PackHash="e64432ec9a9b12e80d0050620412a00e9cf0363a" PackOffset="2084821" />
<Blob Hash="d850b10c747db0b79ad944e765ecd6bb37f3c655" Size="111104" PackHash="9fb29672e690dd6ce54cd0dfe2ed5be03c0c1c07" PackOffset="1694371" />
<Blob Hash="d8517991b1e95bfc588f8501c9c9718c3ff7fed5" Size="732" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="13899" />
<Blob Hash="d8517bd75330d116bdaa395e3b066801e43c72c5" Size="711" PackHash="4b0f6024494e02f2b2cdd75b48b059c81bde532c" PackOffset="820848" />
<Blob Hash="d8521209dbfe05615269183e0bf6b6ca8c3f48b9" Size="12800" PackHash="b254311ac9780bf776737b1574cf0a1b1bc70548" PackOffset="919560" />
<Blob Hash="d852bfa52097c45b66bb5f541c2cf44ccd7f72cd" Size="1569" PackHash="dd3879c8412ca5655fecfb160744dc2f1032689a" PackOffset="309584" />
@@ -131040,7 +131024,6 @@
<Blob Hash="dc62ed902ee97c08f0024696e9ace9ace4e9b67c" Size="138240" PackHash="e64432ec9a9b12e80d0050620412a00e9cf0363a" PackOffset="1937503" />
<Blob Hash="dc6369497c3028ccc51f71f01f117d2c498ff414" Size="41" PackHash="ab438577c397b03b4167f21d5cbd197136a686ab" PackOffset="1635129" />
<Blob Hash="dc637c843bd45aab7030ca09418e3b61a2b44557" Size="9375552" PackHash="0a85e36f224c350b058936fdb88cb656864411c4" PackOffset="8" />
<Blob Hash="dc6614081c6d7b7c7de40650865f989ff793cde9" Size="495" PackHash="135d2dfcfa4bbe7dd725f03f844323624525ed4a" PackOffset="80308" />
<Blob Hash="dc6794fb913cff7c416361c282dda76f92bbb636" Size="34341" PackHash="ccdd14b021c6d8a67b79d0cf95f03f5d4bba1be0" PackOffset="1705229" />
<Blob Hash="dc68bbdf5f4fc1544a455eb5b9d4e496e78ef6fc" Size="436" PackHash="830cc93f966e96754b4b160b2d5ffbe64678ec80" PackOffset="1003456" />
<Blob Hash="dc69872962b20674d81a270561390965fa37f870" Size="3555" PackHash="c6a87a27121ee980a108fbacde92cb925b2682d0" PackOffset="1242647" />
@@ -131061,6 +131044,7 @@
<Blob Hash="dc79582d2dd8d96a564c0cfe35313629e2b394fc" Size="285" PackHash="ec43681668e17eb8fcd6134b4f0f102266626db8" PackOffset="2083072" />
<Blob Hash="dc7abb1d3070eb2fb664b7d0678ed61e382a5ebf" Size="255974" PackHash="21aa1f880d7b5c379769216471b3f8a6067a7aa5" PackOffset="1458489" />
<Blob Hash="dc7ae748a8c4c1b15e0df92077de45f72e7f2610" Size="5062" PackHash="d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" PackOffset="2063902" />
<Blob Hash="dc7c46292a872e2704326d0cc1a9cacd4c96aa90" Size="605" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="14631" />
<Blob Hash="dc7c8e8a3020b1ab7a14ce439ae06a396f555a4b" Size="678" PackHash="032fc783d5cb67c7f27a44226cfe66597daa985b" PackOffset="232383" />
<Blob Hash="dc7e5d919249dcd3d38e0ded641eb13e20d0082e" Size="80125" PackHash="26997bbfc6355dd7c34248e38d341a3ffbafdbd1" PackOffset="869017" />
<Blob Hash="dc7ed1cbb186dfb0f536b397a43a41cf2b871dfa" Size="1198" PackHash="dd3879c8412ca5655fecfb160744dc2f1032689a" PackOffset="960170" />
@@ -131707,7 +131691,6 @@
<Blob Hash="df2cdb588803ecae649e3e59b6ac7105d2dd5f54" Size="392" PackHash="e8052cee3deebd0f476f7b6411d75b701be6e1b1" PackOffset="2096639" />
<Blob Hash="df2cf2cd929568861ffd1f04a2a4cc5c78dec028" Size="3185" PackHash="6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" PackOffset="2085350" />
<Blob Hash="df2d2c9ee6b4ebb18c6f3a1a2f2109cc99715b94" Size="6380" PackHash="2db7f4c348d568244ddd15922a46fffd20a8d012" PackOffset="1753696" />
<Blob Hash="df2e549e564198e528b1da49bd7c1a664e5ac900" Size="151" PackHash="558d1360cbac67e747eab7204402bd299a13ef53" PackOffset="1761749" />
<Blob Hash="df2ee2ba726778ecedaedd64b182f259e9444048" Size="232" PackHash="4b0f6024494e02f2b2cdd75b48b059c81bde532c" PackOffset="805731" />
<Blob Hash="df30782826832b0f276946c7b2d574413122b65c" Size="7656" PackHash="b8394a23db9e6efd8594d13cde39d95e60a2b46d" PackOffset="1919205" />
<Blob Hash="df30f48df89979c58a397992280ae674ba5cccaa" Size="80" PackHash="830cc93f966e96754b4b160b2d5ffbe64678ec80" PackOffset="1702920" />
@@ -131951,6 +131934,7 @@
<Blob Hash="e04086f4701f87b0b439ca5e6e940759b4f505d2" Size="4311" PackHash="642c1881a26196aef2a8440b10c79fc89ef891ef" PackOffset="941325" />
<Blob Hash="e0423161db409b13d61ac8fdaf96233021b5df6f" Size="1207" PackHash="60268517ce102b3ab96039800667a78e6d6c5f5e" PackOffset="610592" />
<Blob Hash="e0432356bb29229f6098a10777c08bfc9e2336a3" Size="5117" PackHash="cb73a430e097bac42d93ec902203b7888ed0b681" PackOffset="240281" />
<Blob Hash="e04618f734f4ac80842ef69e4f94e85db99da3b1" Size="419" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="13480" />
<Blob Hash="e047b70c04dd7adf0efd56bb7f130c087bbe4ae2" Size="5447" PackHash="23563ae9b7815c9196c9ea7c27b2c1b78c2e3b77" PackOffset="2088558" />
<Blob Hash="e047c162adca0cf5fc3cd820e2caf0e51b8f6603" Size="9000005" PackHash="ef73b10a710acc48081813b44a37026d23af1dca" PackOffset="8" />
<Blob Hash="e048d68974f7081efdd347841b592e148951ad78" Size="362" PackHash="dd3879c8412ca5655fecfb160744dc2f1032689a" PackOffset="640378" />
@@ -132466,7 +132450,6 @@
<Blob Hash="e2b424b5a20c589c1942e1ea4c905a84f51fb368" Size="61544" PackHash="9b1027acf5a53bd1682d72d3024cae35b5bca51d" PackOffset="1690392" />
<Blob Hash="e2b4f65121b50ea08471b061fce3f7f2cd992dad" Size="9246" PackHash="2f8f5fc123b6a4b73c1c9cdcdb587890e310e3ec" PackOffset="1746616" />
<Blob Hash="e2b53a3d699d8820cede47b208c7d0e66e92c866" Size="113822" PackHash="dd46949ad604d142eeb04f76db1f16c510122f3d" PackOffset="1662957" />
<Blob Hash="e2b5595c5b8e868bd2f2b093d49dede9d34839a5" Size="2911" PackHash="135d2dfcfa4bbe7dd725f03f844323624525ed4a" PackOffset="153052" />
<Blob Hash="e2b83653e54cc4bea643d7753216a48710564fd7" Size="380832" PackHash="47b78c17be09228f798b5909699191ebcf4fc23b" PackOffset="612196" />
<Blob Hash="e2b8761c8d214a1614ba8488a938452ebddb2aae" Size="169" PackHash="bf6ccb8b8cb10a5dfa1a4c6e7c988496d81ee69d" PackOffset="1686472" />
<Blob Hash="e2b9d4d0ceca38a28a5f0251e637e823d1006a3b" Size="32768" PackHash="4895bb3fb59b8c9fa8a6abfbad0bc3c770755dc3" PackOffset="2052104" />
@@ -134091,7 +134074,6 @@
<Blob Hash="ea0aac86797aa4aacd08b7e857e0e80d738759db" Size="27520" PackHash="79a37c3178acd2aac39dc05681867bfe06f5cb5d" PackOffset="2015200" />
<Blob Hash="ea0ad82eac634a6ab61779bd6031688de3135d62" Size="5420" PackHash="1d09bb4f8ba502cef13de6d570839e6790bf3542" PackOffset="421556" />
<Blob Hash="ea0cec1a9df52f4ef064509e13eccbb8d376717a" Size="3299" PackHash="2b8649b093663c0d36e9a74538b0718d12a1aa3a" PackOffset="51554" />
<Blob Hash="ea0eaaeb35a8ea512448e2b0e4fb554fa0cbb074" Size="7904" PackHash="135d2dfcfa4bbe7dd725f03f844323624525ed4a" PackOffset="126089" />
<Blob Hash="ea0eadfe491d9e6fe2bfb74aecc1b6d43ef3ca76" Size="14629" PackHash="a98e666bd37950a891ad58a6c8d65bfa061eb3d0" PackOffset="1590648" />
<Blob Hash="ea10bb10d0c85a527335f22bd1b42cd7619b0e23" Size="2804" PackHash="c4b8d538071a0ad9faae137aa35dad4917c61dc9" PackOffset="891771" />
<Blob Hash="ea11ea6a4f209e6338a92ddfa433233182b8498e" Size="1580" PackHash="0a79b68fc843ff09e7eeffe5fafe58c90b6ece69" PackOffset="391848" />
@@ -134436,6 +134418,7 @@
<Blob Hash="eb9393adf22fdb938b2756c935abfc2f5c2e21dd" Size="236" PackHash="830cc93f966e96754b4b160b2d5ffbe64678ec80" PackOffset="625860" />
<Blob Hash="eb93a1d94a346206b576324f1c95d2e3ddde87e6" Size="20710" PackHash="df832a8e13dbfc1cddc39c8fa9fe3bef1f40a1d2" PackOffset="2005039" />
<Blob Hash="eb94511091f73c566787f58f705ddbe7a6e8dc57" Size="109576" PackHash="bcc5868a68051b57b230c47a32e476b2edf8457c" PackOffset="1002407" />
<Blob Hash="eb955b62524e230cc267e53bcb60c656eec26357" Size="407" PackHash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" PackOffset="2954" />
<Blob Hash="eb95b0de4194c20bc86254bdc7a2f38632a49e9b" Size="4822" PackHash="fc9d37a2c0ab6854c6b039c509d86b9459982472" PackOffset="1171170" />
<Blob Hash="eb95ef59b11115369d71243338b45c842c995859" Size="3395" PackHash="014eafc69467afc0914ed51297e9e0a2805f9234" PackOffset="2086144" />
<Blob Hash="eb97fcb11bdb3c8a02e831e573c93d38238596e1" Size="100" PackHash="d2a5fd36db8b15ae3778e1aee34cc6f737b9f2ac" PackOffset="1586984" />
@@ -137555,7 +137538,6 @@
<Blob Hash="f9bea9cf2938e67825b2bbeb147164e4ae5d3df7" Size="102" PackHash="a3744b86d829468878287439113f41eb3dd66330" PackOffset="1117377" />
<Blob Hash="f9bf0e5d9c4e4a40ca6a79826bccd5f141ab541d" Size="856" PackHash="efd73054c096cd4a5bc1ba2dbe16349a22f5f682" PackOffset="1525996" />
<Blob Hash="f9c160d10cb473f8f9e7a60f4e4f5b7eef170907" Size="218" PackHash="d34c7f438204350ea347c15f760dda671a96eb3e" PackOffset="925738" />
<Blob Hash="f9c27869421b109bd65f24119c93c652ea059ef9" Size="628" PackHash="29bc28c319492ab29fd3d4b0acbb6a2651a1222f" PackOffset="940" />
<Blob Hash="f9c317d6daa125941e6baa7e8f77d75425f10af3" Size="7256" PackHash="dfc1e61f7c15ebc64562b0fe940440d5393205b8" PackOffset="191504" />
<Blob Hash="f9c781c18d6ee0cff60bc4ba8218d10b4abfaeb7" Size="855" PackHash="64706d1e0afcbe94440f85083074fcd14d1c6847" PackOffset="1772461" />
<Blob Hash="f9c865d8019cae32bdb82ad3d60b1cad976f6cd5" Size="4194" PackHash="7ca0e1410f00142dc9791ff1fb493669e443f644" PackOffset="836814" />
@@ -137782,7 +137764,6 @@
<Blob Hash="fabf84bc7f1b55e8bc4e7f0d138937e8ea7cf8e2" Size="9204" PackHash="79089140e5202cefce11d8a2b34030d6624160d9" PackOffset="140963" />
<Blob Hash="fac10827cb4f013d75ba9f5732b15a4fd77aa6aa" Size="13680" PackHash="529198f2ee46d987aeed3fff1a66a0ba7ab79765" PackOffset="1369579" />
<Blob Hash="fac14f3528e87d7b3e05d425311689fd72f15de5" Size="40200" PackHash="d25faf54b177d399192ede835440a8eb4948ab59" PackOffset="1427783" />
<Blob Hash="fac15df9ca58af6c5b3537817edc88faca33f018" Size="151" PackHash="185b125e1e9c727b28d2be690ffdd93c74e74b00" PackOffset="167104" />
<Blob Hash="fac1b7e202dc5094d5f2b5c54f76356808a067f5" Size="1580" PackHash="0a79b68fc843ff09e7eeffe5fafe58c90b6ece69" PackOffset="1197648" />
<Blob Hash="fac20b031d4aca08db26ba39919ccd6228a77142" Size="879" PackHash="328be60319f9e08c3c125c4aea08b49af1c5d794" PackOffset="2010099" />
<Blob Hash="fac22792e50216bcd0ebdf419c33124d77f67042" Size="1097" PackHash="58adfec20126961d3fce91725897355f6d109659" PackOffset="1764112" />
@@ -138932,7 +138913,6 @@
<Blob Hash="ffbc46e09ae6a895d52a359722804703da2e0ca5" Size="904" PackHash="e4f732e50cf204380d15ccd889b0c38bc5a3a022" PackOffset="2084633" />
<Blob Hash="ffbc9215be526093f10b32d0c0ba3e103e73a5f4" Size="351112" PackHash="7492065bfeee39b9d811e6319dd39c04aa300c6f" PackOffset="1128592" />
<Blob Hash="ffbe00f9301e4e929a641be016e40fc1b0e02dbe" Size="2056" PackHash="c6a87a27121ee980a108fbacde92cb925b2682d0" PackOffset="111648" />
<Blob Hash="ffbe9643d0d0864f253a67026a80a092d6818497" Size="227" PackHash="185b125e1e9c727b28d2be690ffdd93c74e74b00" PackOffset="166489" />
<Blob Hash="ffc016e976f7aa9a877a36ebeac607a091b71ef1" Size="1580" PackHash="5cb17f3f8319e59e99cf89cdd430848948628eee" PackOffset="1127772" />
<Blob Hash="ffc07fd10f7a08d7a436c27bb36f3a75346c9e9e" Size="799" PackHash="5ea8c69c317f7f1f33436fc8fd12475ec9f93317" PackOffset="2096166" />
<Blob Hash="ffc6164e593afea44de683d542e9642fbd8f88dd" Size="13983192" PackHash="eafbffb9ec07f34b4b340c8cb038f25064bda77f" PackOffset="8" />
@@ -139420,7 +139400,6 @@
<Pack Hash="13421e8a7df82905336a4a1db973874c761dfe40" Size="6266" CompressedSize="3575" RemotePath="UnrealEngine-6840147-eaabb5f05bf149dd9c75b841ff036dfe" />
<Pack Hash="1356646e356a511f7a00dbedbbd67d1d541c3006" Size="2096604" CompressedSize="1185352" RemotePath="2937058-0f6110266df14ff29898e518624a1ecc" />
<Pack Hash="1356da993296e7a166056a81d096b319276516e1" Size="205132" CompressedSize="165058" RemotePath="UnrealEngine-10126215-c0743d3f344a40be92c2c6dcb22bc41f" />
<Pack Hash="135d2dfcfa4bbe7dd725f03f844323624525ed4a" Size="159840" CompressedSize="157801" RemotePath="UnrealEngine-16624087" />
<Pack Hash="1387091feca4c92c781ea85c8cbfd943d265bc8c" Size="8987696" CompressedSize="4535107" RemotePath="3020245-ac585a3d7e1b4b7da88b690a32e1ee82" />
<Pack Hash="138cd96222aad40a41d890d121c125f72deba6cb" Size="8079471" CompressedSize="8080216" RemotePath="UnrealEngine-17461838" />
<Pack Hash="138e14727390a9698609b6a2a6f49adeb6b7ac78" Size="4006544" CompressedSize="884453" RemotePath="UnrealEngine-5711189-90391b3014da455db2b422c11a5e1a10" />
@@ -139532,7 +139511,6 @@
<Pack Hash="184d7313d2086bd45716906ab09f584ae6de8dd7" Size="2096800" CompressedSize="851097" RemotePath="UnrealEngine-14445373" />
<Pack Hash="185908a865ebe7f6ee31701211aad217de343c7f" Size="12333996" CompressedSize="12335723" RemotePath="2487260-b428468bcd6545bfbb79f02a6605b9ef" />
<Pack Hash="1859aa540c58760b1f684b5e4cfbe560bd7d9099" Size="2692635" CompressedSize="2504284" RemotePath="UnrealEngine-16211397" />
<Pack Hash="185b125e1e9c727b28d2be690ffdd93c74e74b00" Size="167782" CompressedSize="34375" RemotePath="UnrealEngine-14407306-1a49b569ad4545a1ae2fb3727020a1c7" />
<Pack Hash="186056d4d2fc58a68a159c83771bdbd899eb6b5f" Size="22631" CompressedSize="5461" RemotePath="UnrealEngine-15959911" />
<Pack Hash="18675ef381ecc29eb5754731753c089c475f0f48" Size="2096136" CompressedSize="572274" RemotePath="UnrealEngine-14445373" />
<Pack Hash="186a80875b8bb3b9eb31725160b0fd52dc914f02" Size="2094377" CompressedSize="812744" RemotePath="UnrealEngine-17543302" />
@@ -140650,7 +140628,6 @@
<Pack Hash="494bd84f6cfce864c6e47863daf113c41de68f10" Size="38630920" CompressedSize="14354079" RemotePath="UnrealEngine-18269134" />
<Pack Hash="4952fbc1922eb8adf5098191a88bb54a4900e988" Size="2021589" CompressedSize="635638" RemotePath="UnrealEngine-15169440-afebc9ff248a425482c107c739bebf86" />
<Pack Hash="4956a14a824143f172ae22a74b64fbc11a893c7c" Size="17432984" CompressedSize="17325323" RemotePath="UnrealEngine-17034314" />
<Pack Hash="4959f218ae345061365cc42a2fee0bf64607e88d" Size="80441" CompressedSize="78957" RemotePath="UnrealEngine-16693617" />
<Pack Hash="495da235164d48337130f8e5adb020b443c0ac67" Size="58604047" CompressedSize="30700804" RemotePath="UnrealEngine-17741958" />
<Pack Hash="495e3012e66f060f9c2906cb349976dc76ae38f6" Size="111862" CompressedSize="87656" RemotePath="UnrealEngine-4431602-2a26d8330c9e45efabdc329f4e3febe1" />
<Pack Hash="4960db9d662770e20eb0be0913a076e8bcfe266b" Size="2095592" CompressedSize="454329" RemotePath="UnrealEngine-14573744-dc9ec2a9428249708f92b3341d5ccca3" />
@@ -143784,6 +143761,7 @@
<Pack Hash="d00ae09f70cbd74dcd6e4f9c4a8cdc8ed460061c" Size="835005" CompressedSize="214134" RemotePath="UnrealEngine-15631563" />
<Pack Hash="d014dd3d9722e59843f37ab3dd1bc115bbecf67f" Size="3184048" CompressedSize="776062" RemotePath="UnrealEngine-17805357" />
<Pack Hash="d02866ce0956762d41298891cf632807ad2564cd" Size="702953" CompressedSize="132267" RemotePath="UnrealEngine-17583996" />
<Pack Hash="d02b5854b2b34dd3144e1ad17b5b221d99a0f543" Size="52296" CompressedSize="37665" RemotePath="UnrealEngine-18564232" />
<Pack Hash="d02c309c136bab62d973c4ee2468fa652213987f" Size="101151" CompressedSize="23415" RemotePath="UnrealEngine-16841839" />
<Pack Hash="d02cd01745ba4739de2e992742999c6c11f72f0a" Size="5130822" CompressedSize="1008571" RemotePath="UnrealEngine-3720923-5712cc719d4541ffbfdee6e387fdb8bb" />
<Pack Hash="d03c0e0b8acfb0f4fbe9d04a938abe92fed52a47" Size="13388699" CompressedSize="3933319" RemotePath="UnrealEngine-17136822" />
Engine/Plugins/Runtime/nDisplay/Source/DisplayCluster/Private/Game/EngineClasses/Scene/DisplayClusterPreviewComponent.cpp
+1 -1
View File
@@ -95,7 +95,7 @@ void UDisplayClusterPreviewComponent::UpdatePreviewMeshMaterial(bool bRestoreOri
if (PreviewMesh)
{
bool bViewportPreviewEnabled = (ViewportConfig && ViewportConfig->bIsEnabled && RootActor && RootActor->bPreviewEnable);
bool bViewportPreviewEnabled = (ViewportConfig && RootActor && RootActor->bPreviewEnable);
if (bRestoreOriginalMaterial || !bViewportPreviewEnabled)
{
Engine/Plugins/Runtime/nDisplay/Source/DisplayClusterConfiguration/Private/DisplayClusterConfigurationTypes.cpp
+3 -3
View File
@@ -169,7 +169,7 @@ UDisplayClusterConfigurationViewport::UDisplayClusterConfigurationViewport()
{
#if WITH_EDITORONLY_DATA
bIsVisible = true;
bIsEnabled = true;
bIsUnlocked = true;
#endif
}
@@ -201,14 +201,14 @@ UDisplayClusterConfigurationClusterNode::UDisplayClusterConfigurationClusterNode
: bIsSoundEnabled(false)
#if WITH_EDITORONLY_DATA
, bIsVisible(true)
, bIsEnabled(true)
, bIsUnlocked(true)
#endif
{
}
UDisplayClusterConfigurationHostDisplayData::UDisplayClusterConfigurationHostDisplayData()
: bIsVisible(true)
, bIsEnabled(true)
, bIsUnlocked(true)
{
SetFlags(RF_Public);
}
Engine/Plugins/Runtime/nDisplay/Source/DisplayClusterConfiguration/Public/DisplayClusterConfigurationTypes.h
+2 -2
View File
@@ -340,7 +340,7 @@ public:
bool bIsVisible;
UPROPERTY(EditDefaultsOnly, Category = "Configuration", meta = (HideProperty))
bool bIsEnabled;
bool bIsUnlocked;
/** Binds a background preview image for easier output mapping */
UPROPERTY(EditDefaultsOnly, Category = "Configuration")
@@ -404,7 +404,7 @@ public:
bool bIsVisible;
UPROPERTY()
bool bIsEnabled;
bool bIsUnlocked;
};
UCLASS(Blueprintable)
Engine/Plugins/Runtime/nDisplay/Source/DisplayClusterConfiguration/Public/DisplayClusterConfigurationTypes_Viewport.h
+1 -1
View File
@@ -200,7 +200,7 @@ public:
#if WITH_EDITORONLY_DATA
UPROPERTY(EditDefaultsOnly, Category = "Configuration", meta = (HideProperty))
bool bIsEnabled = true;
bool bIsUnlocked = true;
UPROPERTY(EditDefaultsOnly, Category = "Configuration", meta = (HideProperty))
bool bIsVisible = true;
Engine/Plugins/Runtime/nDisplay/Source/DisplayClusterConfigurator/Private/ClusterConfiguration/DisplayClusterConfiguratorClusterUtils.cpp
+1 -1
View File
@@ -472,7 +472,7 @@ UDisplayClusterConfigurationHostDisplayData* FDisplayClusterConfiguratorClusterU
const FString HostName = GetUniqueNameForHost(DefaultNewHostName, Cluster, true);
UDisplayClusterConfigurationHostDisplayData* NewData = NewObject<UDisplayClusterConfigurationHostDisplayData>(Cluster, NAME_None, RF_Transactional);
NewData->HostName = FText::FromString(HostName);
NewData->Color = FDisplayClusterConfiguratorStyle::GetCornerColor(Cluster->HostDisplayData.Num()).CopyWithNewOpacity(1.0f);
NewData->Color = FDisplayClusterConfiguratorStyle::Get().GetDefaultColor(Cluster->HostDisplayData.Num()).CopyWithNewOpacity(1.0f);
Cluster->HostDisplayData.Add(HostIPAddress, NewData);
}
Engine/Plugins/Runtime/nDisplay/Source/DisplayClusterConfigurator/Private/DisplayClusterConfiguratorModule.cpp
+1 -2
View File
@@ -89,7 +89,7 @@ void FDisplayClusterConfiguratorModule::StartupModule()
RegisterSettings();
RegisterPlacementModeItems();
FDisplayClusterConfiguratorStyle::Initialize();
FDisplayClusterConfiguratorStyle::Get();
FDisplayClusterConfiguratorCommands::Register();
FDisplayClusterConfiguratorOutputMappingCommands::Register();
@@ -126,7 +126,6 @@ void FDisplayClusterConfiguratorModule::ShutdownModule()
UnregisterCustomLayouts();
UnregisterPlacementModeItems();
FDisplayClusterConfiguratorStyle::Shutdown();
MenuExtensibilityManager.Reset();
ToolBarExtensibilityManager.Reset();
Engine/Plugins/Runtime/nDisplay/Source/DisplayClusterConfigurator/Private/DisplayClusterConfiguratorStyle.cpp
+125 -173
View File
@@ -2,65 +2,37 @@
#include "DisplayClusterConfiguratorStyle.h"
#include "Brushes/SlateImageBrush.h"
#include "Brushes/SlateBoxBrush.h"
#include "Brushes/SlateBorderBrush.h"
#include "EditorStyleSet.h"
#include "Framework/Application/SlateApplication.h"
#include "Interfaces/IPluginManager.h"
#include "Styling/SlateStyle.h"
#include "Styling/SlateStyleRegistry.h"
#include "Styling/SlateStyleMacros.h"
TSharedPtr<FSlateStyleSet> FDisplayClusterConfiguratorStyle::StyleInstance = nullptr;
TArray<FDisplayClusterConfiguratorStyle::FCornerColor> FDisplayClusterConfiguratorStyle::CornerColors;
void FDisplayClusterConfiguratorStyle::Initialize()
FDisplayClusterConfiguratorStyle::FDisplayClusterConfiguratorStyle()
: FSlateStyleSet(TEXT("DisplayClusterConfiguratorStyle"))
{
if (!StyleInstance.IsValid())
{
StyleInstance = Create();
FSlateStyleRegistry::RegisterSlateStyle(*StyleInstance);
}
Initialize();
FSlateStyleRegistry::RegisterSlateStyle(*this);
}
void FDisplayClusterConfiguratorStyle::Shutdown()
FDisplayClusterConfiguratorStyle::~FDisplayClusterConfiguratorStyle()
{
FSlateStyleRegistry::UnRegisterSlateStyle(*StyleInstance);
ensure(StyleInstance.IsUnique());
StyleInstance.Reset();
FSlateStyleRegistry::UnRegisterSlateStyle(*this);
}
FName FDisplayClusterConfiguratorStyle::GetStyleSetName()
void FDisplayClusterConfiguratorStyle::ReloadTextures()
{
static FName StyleSetName(TEXT("DisplayClusterConfiguratorStyle"));
return StyleSetName;
FSlateApplication::Get().GetRenderer()->ReloadTextureResources();
}
const FLinearColor& FDisplayClusterConfiguratorStyle::GetColor(FName PropertyName, const ANSICHAR* Specifier)
const FLinearColor& FDisplayClusterConfiguratorStyle::GetDefaultColor(uint32 Index)
{
return StyleInstance->GetColor(PropertyName, Specifier);
return DefaultColors[Index % DefaultColors.Num()].Color;
}
const FLinearColor& FDisplayClusterConfiguratorStyle::GetCornerColor(uint32 Index)
{
return CornerColors[Index % CornerColors.Num()].Color;
}
const FMargin& FDisplayClusterConfiguratorStyle::GetMargin(FName PropertyName, const ANSICHAR* Specifier)
{
return StyleInstance->GetMargin(PropertyName, Specifier);
}
const FSlateBrush* FDisplayClusterConfiguratorStyle::GetBrush(FName PropertyName, const ANSICHAR* Specifier)
{
return StyleInstance->GetBrush(PropertyName, Specifier);
}
#define IMAGE_BRUSH( RelativePath, ... ) FSlateImageBrush( Style->RootToContentDir( RelativePath, TEXT(".png") ), __VA_ARGS__ )
#define BOX_BRUSH( RelativePath, ... ) FSlateBoxBrush( Style->RootToContentDir( RelativePath, TEXT(".png") ), __VA_ARGS__ )
#define BORDER_BRUSH( RelativePath, ... ) FSlateBorderBrush( Style->RootToContentDir( RelativePath, TEXT(".png") ), __VA_ARGS__ )
#define EDITOR_BOX_BRUSH( RelativePath, ... ) FSlateBoxBrush( FPaths::EngineContentDir() / "Editor/Slate" / RelativePath + TEXT(".png"), __VA_ARGS__ )
#define DEFAULT_FONT(...) FCoreStyle::GetDefaultFontStyle(__VA_ARGS__)
#define EDITOR_IMAGE_BRUSH_SVG( RelativePath, ... ) FSlateVectorImageBrush(FPaths::EngineContentDir() / "Editor/Slate" / RelativePath + TEXT(".svg"), __VA_ARGS__ )
#define EDITOR_BOX_BRUSH( RelativePath, ... ) FSlateBoxBrush(FPaths::EngineContentDir() / "Editor/Slate" / RelativePath + TEXT(".png"), __VA_ARGS__ )
const FVector2D Icon128x128(128.0f, 128.0f);
const FVector2D Icon64x64(64.0f, 64.0f);
@@ -68,189 +40,184 @@ const FVector2D Icon40x40(40.0f, 40.0f);
const FVector2D Icon20x20(20.0f, 20.0f);
const FVector2D Icon16x16(16.0f, 16.0f);
const FVector2D Icon12x12(12.0f, 12.0f);
TSharedRef< FSlateStyleSet > FDisplayClusterConfiguratorStyle::Create()
{
TSharedRef<FSlateStyleSet> Style = MakeShared<FSlateStyleSet>("DisplayClusterConfiguratorStyle");
void FDisplayClusterConfiguratorStyle::Initialize()
{
TSharedPtr<IPlugin> Plugin = IPluginManager::Get().FindPlugin(TEXT("nDisplay"));
check(Plugin.IsValid());
if (Plugin.IsValid())
{
Style->SetContentRoot(FPaths::Combine(Plugin->GetBaseDir(), TEXT("Resources")));
SetContentRoot(FPaths::Combine(Plugin->GetBaseDir(), TEXT("Content")));
SetCoreContentRoot(FPaths::EngineContentDir() / TEXT("Slate"));
}
Style->Set("ClassIcon.DisplayClusterRootActor", new IMAGE_BRUSH("RootActor/nDisplay_x16", Icon16x16));
Style->Set("ClassThumbnail.DisplayClusterRootActor", new IMAGE_BRUSH("RootActor/nDisplay_x64", Icon64x64));
// Class Icons
{
Set("ClassIcon.DisplayClusterRootActor", new IMAGE_BRUSH_SVG("Icons/RootActor/nDisplay", Icon16x16));
Set("ClassThumbnail.DisplayClusterRootActor", new IMAGE_BRUSH_SVG("Icons/RootActor/nDisplay_64", Icon64x64));
// Tabs
Style->Set("DisplayClusterConfigurator.Tabs.General", new IMAGE_BRUSH("Tabs/General_16x", Icon16x16));
Style->Set("DisplayClusterConfigurator.Tabs.Details", new IMAGE_BRUSH("Tabs/Details_16x", Icon16x16));
Style->Set("DisplayClusterConfigurator.Tabs.Log", new IMAGE_BRUSH("Tabs/Log_16x", Icon16x16));
Style->Set("DisplayClusterConfigurator.Tabs.OutputMapping", new IMAGE_BRUSH("Tabs/OutputMapping_16x", Icon16x16));
Style->Set("DisplayClusterConfigurator.Tabs.Scene", new IMAGE_BRUSH("Tabs/Scene_16x", Icon16x16));
Style->Set("DisplayClusterConfigurator.Tabs.Cluster", new IMAGE_BRUSH("Tabs/Cluster_16x", Icon16x16));
Style->Set("DisplayClusterConfigurator.Tabs.Viewport", new IMAGE_BRUSH("Tabs/Viewport_16x", Icon16x16));
Set("ClassIcon.DisplayClusterXformComponent", new IMAGE_BRUSH_SVG("Icons/Components/nDisplayXform", Icon16x16));
Set("ClassThumbnail.DisplayClusterXformComponent", new IMAGE_BRUSH_SVG("Icons/Components/nDisplayXform", Icon64x64));
Set("ClassIcon.DisplayClusterScreenComponent", new IMAGE_BRUSH_SVG("Icons/Components/nDisplayScreen", Icon16x16));
Set("ClassThumbnail.DisplayClusterScreenComponent", new IMAGE_BRUSH_SVG("Icons/Components/nDisplayScreen", Icon64x64));
Set("ClassIcon.DisplayClusterCameraComponent", new IMAGE_BRUSH_SVG("Icons/Components/nDisplayViewOrigin", Icon16x16));
Set("ClassThumbnail.DisplayClusterCameraComponent", new IMAGE_BRUSH_SVG("Icons/Components/nDisplayViewOrigin_64", Icon64x64));
Set("ClassIcon.DisplayClusterICVFXCameraComponent", new IMAGE_BRUSH_SVG("Icons/Components/nDisplayCamera", Icon16x16));
Set("ClassThumbnail.DisplayClusterICVFXCameraComponent", new IMAGE_BRUSH_SVG("Icons/Components/nDisplayCamera", Icon64x64));
Set("ClassIcon.DisplayClusterOriginComponent", new IMAGE_BRUSH_SVG("Icons/Components/nDisplayRootComponent", Icon16x16));
Set("ClassThumbnail.DisplayClusterOriginComponent", new IMAGE_BRUSH_SVG("Icons/Components/nDisplayRootComponent", Icon64x64));
}
// Config Editor Tabs
{
Set("DisplayClusterConfigurator.Tabs.OutputMapping", new IMAGE_BRUSH_SVG("Icons/Tabs/OutputMapping", Icon16x16));
Set("DisplayClusterConfigurator.Tabs.Cluster", new IMAGE_BRUSH_SVG("Icons/Tabs/Cluster", Icon16x16));
}
// Toolbar
Style->Set("DisplayClusterConfigurator.Toolbar.Import", new IMAGE_BRUSH("Toolbar/Import_40x", Icon40x40));
Style->Set("DisplayClusterConfigurator.Toolbar.SaveToFile", new IMAGE_BRUSH("Toolbar/SaveToFile_40x", Icon40x40));
Style->Set("DisplayClusterConfigurator.Toolbar.EditConfig", new IMAGE_BRUSH("Toolbar/EditConfig_40x", Icon40x40));
// TreeItems
Style->Set("DisplayClusterConfigurator.TreeItems.Scene", new IMAGE_BRUSH("TreeItems/Scene_16x", Icon16x16));
Style->Set("DisplayClusterConfigurator.TreeItems.Cluster", new IMAGE_BRUSH("TreeItems/Cluster_16x", Icon16x16));
Style->Set("DisplayClusterConfigurator.TreeItems.Container", new IMAGE_BRUSH("TreeItems/Container_12x", Icon12x12));
// Scene Components
Style->Set("DisplayClusterConfigurator.TreeItems.SceneComponentXform", new IMAGE_BRUSH("TreeItems/SceneComponentXform_16x", Icon16x16));
Style->Set("DisplayClusterConfigurator.TreeItems.SceneComponentScreen", new IMAGE_BRUSH("TreeItems/SceneComponentScreen_16x", Icon16x16));
Style->Set("DisplayClusterConfigurator.TreeItems.SceneComponentCamera", new IMAGE_BRUSH("TreeItems/SceneComponentCamera_16x", Icon16x16));
Style->Set("ClassIcon.DisplayClusterXformComponent", new IMAGE_BRUSH(TEXT("TreeItems/SceneComponentXform_16x"), Icon16x16));
Style->Set("ClassThumbnail.DisplayClusterXformComponent", new IMAGE_BRUSH(TEXT("TreeItems/SceneComponentXform_16x"), Icon16x16));
Style->Set("ClassIcon.DisplayClusterScreenComponent", new IMAGE_BRUSH(TEXT("TreeItems/SceneComponentScreen_16x"), Icon16x16));
Style->Set("ClassThumbnail.DisplayClusterScreenComponent", new IMAGE_BRUSH(TEXT("TreeItems/SceneComponentScreen_16x"), Icon16x16));
Style->Set("ClassIcon.DisplayClusterCameraComponent", new IMAGE_BRUSH(TEXT("Components/ViewOrigin/nDisplayViewOrigin_x16"), Icon16x16));
Style->Set("ClassThumbnail.DisplayClusterCameraComponent", new IMAGE_BRUSH(TEXT("Components/ViewOrigin/nDisplayViewOrigin_x64"), Icon64x64));
Style->Set("ClassIcon.DisplayClusterICVFXCameraComponent", new IMAGE_BRUSH(TEXT("Components/ICVFXCamera/nDisplayCamera_x16"), Icon16x16));
// Config Editor Toolbar
{
Set("DisplayClusterConfigurator.Toolbar.Import", new CORE_IMAGE_BRUSH_SVG("Starship/Common/import", Icon20x20));
Set("DisplayClusterConfigurator.Toolbar.SaveToFile", new EDITOR_IMAGE_BRUSH_SVG("Starship/Common/Export", Icon20x20));
}
// Cluster
Style->Set("DisplayClusterConfigurator.TreeItems.Host", new IMAGE_BRUSH("TreeItems/ClusterNode_16x", Icon16x16));
Style->Set("DisplayClusterConfigurator.TreeItems.ClusterNode", new IMAGE_BRUSH("TreeItems/Viewport_16x", Icon16x16));
Style->Set("DisplayClusterConfigurator.TreeItems.Viewport", new IMAGE_BRUSH("TreeItems/SceneComponentScreen_16x", Icon16x16));
Style->Set("DisplayClusterConfigurator.TreeItems.Postprocess", new IMAGE_BRUSH("TreeItems/Postprocess_12x", Icon12x12));
{
Set("DisplayClusterConfigurator.TreeItems.Cluster", new IMAGE_BRUSH_SVG("Icons/Cluster/Cluster", Icon16x16));
Set("DisplayClusterConfigurator.TreeItems.Host", new IMAGE_BRUSH_SVG("Icons/Cluster/Host", Icon16x16));
Set("DisplayClusterConfigurator.TreeItems.ClusterNode", new IMAGE_BRUSH_SVG("Icons/Cluster/ClusterNode", Icon16x16));
Set("DisplayClusterConfigurator.TreeItems.Viewport", new IMAGE_BRUSH_SVG("Icons/Cluster/Viewport", Icon16x16));
}
// Icons
Style->Set("DisplayClusterConfigurator.OutputMapping.ToggleWindowInfo", new IMAGE_BRUSH("OutputMapping/ToggleWindowInfo_16x", Icon16x16));
Style->Set("DisplayClusterConfigurator.OutputMapping.ToggleWindowCornerImage", new IMAGE_BRUSH("OutputMapping/CornerImage_16x", Icon16x16));
Style->Set("DisplayClusterConfigurator.OutputMapping.ToggleOutsideViewports", new IMAGE_BRUSH("OutputMapping/ToggleOutsideViewports_16x", Icon16x16));
Style->Set("DisplayClusterConfigurator.OutputMapping.ZoomToFit", new IMAGE_BRUSH("OutputMapping/ZoomToFit_16x", Icon16x16));
Style->Set("DisplayClusterConfigurator.OutputMapping.ViewScale", new IMAGE_BRUSH("OutputMapping/ViewScale_16x", Icon16x16));
Style->Set("DisplayClusterConfigurator.OutputMapping.ResizeAreaHandle", new IMAGE_BRUSH("OutputMapping/ResizeAreaHandle_20x", Icon20x20));
// Output Mapping Toolbar
{
Set("DisplayClusterConfigurator.OutputMapping.WindowDisplay", new IMAGE_BRUSH_SVG("Icons/OutputMapping/ToggleWindowInfo", Icon16x16));
Set("DisplayClusterConfigurator.OutputMapping.ToggleOutsideViewports", new IMAGE_BRUSH_SVG("Icons/OutputMapping/ToggleOutsideViewports", Icon16x16));
Set("DisplayClusterConfigurator.OutputMapping.ZoomToFit", new IMAGE_BRUSH_SVG("Icons/OutputMapping/ZoomToFit", Icon16x16));
Set("DisplayClusterConfigurator.OutputMapping.ViewScale", new IMAGE_BRUSH_SVG("Icons/OutputMapping/ViewScale", Icon16x16));
Set("DisplayClusterConfigurator.OutputMapping.Transform", new IMAGE_BRUSH_SVG("Icons/OutputMapping/Transform", Icon16x16));
Set("DisplayClusterConfigurator.OutputMapping.Snapping", new IMAGE_BRUSH_SVG("Icons/OutputMapping/Snapping", Icon16x16));
Set("DisplayClusterConfigurator.OutputMapping.ResizeAreaHandle", new IMAGE_BRUSH("Icons/OutputMapping/ResizeAreaHandle_20x", Icon20x20));
}
Style->Set("DisplayClusterConfigurator.Node.Color.Regular", FLinearColor(FColor(97, 97, 97)));
Style->Set("DisplayClusterConfigurator.Node.Color.Selected", FLinearColor(FColor(249, 165, 1)));
Style->Set("DisplayClusterConfigurator.Node.Color.Regular.Opacity_50", FLinearColor(FColor(255, 255, 255, 255 * 0.5f)));
Style->Set("DisplayClusterConfigurator.Node.Color.Selected.Opacity_50", FLinearColor(FColor(249, 165, 1, 255 * 0.5f)));
// Output Mapping Node Colors
{
Set("DisplayClusterConfigurator.Node.Color.Regular", FLinearColor(FColor(97, 97, 97)));
Set("DisplayClusterConfigurator.Node.Color.Selected", FLinearColor(FColor(249, 165, 1)));
Set("DisplayClusterConfigurator.Node.Color.Locked", FLinearColor(FColor(92, 92, 92, 255)));
Set("DisplayClusterConfigurator.Node.Color.Regular.Opacity_50", FLinearColor(FColor(255, 255, 255, 255 * 0.5f)));
Set("DisplayClusterConfigurator.Node.Color.Selected.Opacity_50", FLinearColor(FColor(249, 165, 1, 255 * 0.5f)));
Style->Set("DisplayClusterConfigurator.Node.Text.Color.Regular", FLinearColor(FColor(255, 255, 255)));
Style->Set("DisplayClusterConfigurator.Node.Text.Color.WhiteGray", FLinearColor(FColor(226, 226, 226)));
Set("DisplayClusterConfigurator.Node.Text.Color.Regular", FLinearColor(FColor(255, 255, 255)));
Set("DisplayClusterConfigurator.Node.Text.Color.Selected", FLinearColor(FColor(0, 0, 0)));
Style->Set("DisplayClusterConfigurator.Node.Host.Inner.Background", FLinearColor(FColor(38, 38, 38)));
Style->Set("DisplayClusterConfigurator.Node.Window.Outer.Background", FLinearColor(FColor(63, 63, 63)));
Style->Set("DisplayClusterConfigurator.Node.Window.Inner.Background", FLinearColor(FColor(53, 53, 53)));
Style->Set("DisplayClusterConfigurator.Node.Window.Border.Color", FLinearColor(FColor(64, 164, 255, 255)));
Style->Set("DisplayClusterConfigurator.Node.Window.Corner.Color", FLinearColor(FColor(64, 164, 255, 255)));
Style->Set("DisplayClusterConfigurator.Node.Window.Corner.Color.Locked", FLinearColor(FColor(164, 164, 164, 255)));
Style->Set("DisplayClusterConfigurator.Node.Viewport.Border.Color.Regular", FLinearColor(FColor(164, 164, 164, 255)));
Style->Set("DisplayClusterConfigurator.Node.Viewport.Border.OutsideColor.Regular", FLinearColor(FColor(247, 129, 91, 255)));
Style->Set("DisplayClusterConfigurator.Node.Viewport.Text.Background", FLinearColor(FColor(73, 73, 73, 255 * 0.65f)));
Style->Set("DisplayClusterConfigurator.Node.Viewport.Text.Background.Locked", FLinearColor(FColor(164, 164, 164, 255)));
Set("DisplayClusterConfigurator.Node.Host.Inner.Background", FLinearColor(FColor(38, 38, 38)));
Style->Set("DisplayClusterConfigurator.Node.Viewport.BackgroundColor.Regular", FLinearColor(FColor(155, 155, 155, 255 * 0.85f)));
Style->Set("DisplayClusterConfigurator.Node.Viewport.BackgroundColor.Selected", FLinearColor(FColor(254, 178, 27, 255)));
Style->Set("DisplayClusterConfigurator.Node.Viewport.BackgroundImage.Selected", FLinearColor(FColor(255, 204, 102)));
Style->Set("DisplayClusterConfigurator.Node.Viewport.BackgroundImage.Locked", FLinearColor(FColor(128, 128, 128)));
Set("DisplayClusterConfigurator.Node.Window.Inner.Background", FLinearColor(FColor(53, 53, 53)));
Set("DisplayClusterConfigurator.Node.Window.Corner.Color", FLinearColor(FColor(47, 47, 47, 255)));
Style->Set("DisplayClusterConfigurator.Node.Viewport.OutsideBackgroundColor.Regular", FLinearColor(FColor(255, 87, 34, 255 * 0.85f)));
Style->Set("DisplayClusterConfigurator.Node.Viewport.OutsideBackgroundColor.Selected", FLinearColor(FColor(255, 87, 34, 255)));
Set("DisplayClusterConfigurator.Node.Viewport.Border.Color.Regular", FLinearColor(FColor(164, 164, 164, 255)));
Set("DisplayClusterConfigurator.Node.Viewport.Border.Color.Outside", FLinearColor(FColor(247, 129, 91, 255)));
Set("DisplayClusterConfigurator.Node.Viewport.Text.Background", FLinearColor(FColor(73, 73, 73, 255 * 0.65f)));
Set("DisplayClusterConfigurator.Node.Viewport.Text.Background.Locked", FLinearColor(FColor(92, 92, 92, 255)));
Style->Set("DisplayClusterConfigurator.Node.Body", new BOX_BRUSH("Nodes/Node_Body", FMargin(16.f / 64.f, 16.f / 64.f, 16.f / 64.f, 16.f / 64.f)));
Style->Set("DisplayClusterConfigurator.Node.Brush.Corner", new BOX_BRUSH("Nodes/Corner", 4.0f / 16.0f));
Set("DisplayClusterConfigurator.Node.Viewport.BackgroundColor.Regular", FLinearColor(FColor(155, 155, 155, 255 * 0.85f)));
Set("DisplayClusterConfigurator.Node.Viewport.BackgroundColor.Selected", FLinearColor(FColor(254, 178, 27, 255)));
Set("DisplayClusterConfigurator.Node.Viewport.BackgroundImage.Selected", FLinearColor(FColor(255, 204, 102)));
Set("DisplayClusterConfigurator.Node.Viewport.BackgroundImage.Locked", FLinearColor(FColor(128, 128, 128)));
Set("DisplayClusterConfigurator.Node.Viewport.OutsideBackgroundColor.Regular", FLinearColor(FColor(255, 87, 34, 255 * 0.85f)));
Set("DisplayClusterConfigurator.Node.Viewport.OutsideBackgroundColor.Selected", FLinearColor(FColor(255, 87, 34, 255)));
}
// Node Text
{
FTextBlockStyle TilteTextBlockStyle = FEditorStyle::GetWidgetStyle< FTextBlockStyle >("NormalText");
FTextBlockStyle TilteTextBlockStyle = FEditorStyle::GetWidgetStyle<FTextBlockStyle>("NormalText");
TilteTextBlockStyle.SetFont(FCoreStyle::GetDefaultFontStyle("Regular", 28));
Style->Set("DisplayClusterConfigurator.Node.Text.Regular", TilteTextBlockStyle);
Set("DisplayClusterConfigurator.Node.Text.Regular", TilteTextBlockStyle);
}
{
FTextBlockStyle TilteTextBlockStyle = FEditorStyle::GetWidgetStyle< FTextBlockStyle >("NormalText");
FTextBlockStyle TilteTextBlockStyle = FEditorStyle::GetWidgetStyle<FTextBlockStyle>("NormalText");
TilteTextBlockStyle.SetFont(FCoreStyle::GetDefaultFontStyle("Bold", 28));
Style->Set("DisplayClusterConfigurator.Node.Text.Bold", TilteTextBlockStyle);
Set("DisplayClusterConfigurator.Node.Text.Bold", TilteTextBlockStyle);
}
{
FTextBlockStyle TilteTextBlockStyle = FEditorStyle::GetWidgetStyle<FTextBlockStyle>("Graph.StateNode.NodeTitle");
TilteTextBlockStyle.SetFont(FCoreStyle::GetDefaultFontStyle("Bold", 36));
Style->Set("DisplayClusterConfigurator.Host.Text.Title", TilteTextBlockStyle);
TilteTextBlockStyle.SetShadowColorAndOpacity(FLinearColor::Transparent);
Set("DisplayClusterConfigurator.Host.Text.Title", TilteTextBlockStyle);
}
{
FTextBlockStyle TilteTextBlockStyle = FEditorStyle::GetWidgetStyle< FTextBlockStyle >("NormalText");
FTextBlockStyle TilteTextBlockStyle = FEditorStyle::GetWidgetStyle<FTextBlockStyle>("NormalText");
TilteTextBlockStyle.SetFont(FCoreStyle::GetDefaultFontStyle("Italic", 18));
Style->Set("DisplayClusterConfigurator.Node.Text.Small", TilteTextBlockStyle);
Set("DisplayClusterConfigurator.Node.Text.Small", TilteTextBlockStyle);
}
// Canvas borders
{
Style->Set("DisplayClusterConfigurator.Selected.Canvas.Brush", new BORDER_BRUSH(TEXT("Slate/NonMarchingAnts"), FMargin(0.25f), Style->GetColor("DisplayClusterConfigurator.Node.Color.Selected.Opacity_50")));
Style->Set("DisplayClusterConfigurator.Regular.Canvas.Brush", new BORDER_BRUSH(TEXT("Slate/NonMarchingAnts"), FMargin(0.25f), Style->GetColor("DisplayClusterConfigurator.Node.Color.Regular.Opacity_50")));
Set("DisplayClusterConfigurator.Selected.Canvas.Brush", new BORDER_BRUSH(TEXT("Icons/Slate/NonMarchingAnts"), FMargin(0.25f), GetColor("DisplayClusterConfigurator.Node.Color.Selected.Opacity_50")));
Set("DisplayClusterConfigurator.Regular.Canvas.Brush", new BORDER_BRUSH(TEXT("Icons/Slate/NonMarchingAnts"), FMargin(0.25f), GetColor("DisplayClusterConfigurator.Node.Color.Regular.Opacity_50")));
}
// Window borders
{
Set("DisplayClusterConfigurator.Node.Brush.Corner", new BOX_BRUSH_SVG("Icons/OutputMapping/CornerImage", 4.0f / 16.0f));
FSlateBrush* SelectedBrush = new FSlateBrush();
SelectedBrush->Margin = FMargin(6.f);
SelectedBrush->DrawAs = ESlateBrushDrawType::Border;
SelectedBrush->TintColor = Style->GetColor("DisplayClusterConfigurator.Node.Color.Selected");
SelectedBrush->TintColor = GetColor("DisplayClusterConfigurator.Node.Color.Selected");
Style->Set("DisplayClusterConfigurator.Node.Window.Border.Brush.Selected", SelectedBrush);
Set("DisplayClusterConfigurator.Node.Window.Border.Brush.Selected", SelectedBrush);
FSlateBrush* RegularBrush = new FSlateBrush();
RegularBrush->Margin = FMargin(1.f);
RegularBrush->DrawAs = ESlateBrushDrawType::Border;
RegularBrush->TintColor = Style->GetColor("DisplayClusterConfigurator.Node.Color.Regular");
Style->Set("DisplayClusterConfigurator.Node.Window.Border.Brush.Regular", RegularBrush);
RegularBrush->TintColor = GetColor("DisplayClusterConfigurator.Node.Color.Regular");
Set("DisplayClusterConfigurator.Node.Window.Border.Brush.Regular", RegularBrush);
}
// Viewport borders
{
FSlateBrush* Brush = new FSlateBrush();
Brush->Margin = FMargin(1.f);
Brush->DrawAs = ESlateBrushDrawType::Border;
Brush->TintColor = Style->GetColor("DisplayClusterConfigurator.Node.Window.Border.Color");
Style->Set("DisplayClusterConfigurator.Node.Window.Border.Brush", Brush);
FSlateBrush* SelectedBrush = new FSlateBrush();
SelectedBrush->Margin = FMargin(2.f);
SelectedBrush->DrawAs = ESlateBrushDrawType::Border;
SelectedBrush->TintColor = Style->GetColor("DisplayClusterConfigurator.Node.Color.Selected");
SelectedBrush->TintColor = GetColor("DisplayClusterConfigurator.Node.Color.Selected");
Style->Set("DisplayClusterConfigurator.Node.Viewport.Border.Brush.Selected", SelectedBrush);
Set("DisplayClusterConfigurator.Node.Viewport.Border.Brush.Selected", SelectedBrush);
FSlateBrush* RegularBrush = new FSlateBrush();
RegularBrush->Margin = FMargin(1.f);
RegularBrush->DrawAs = ESlateBrushDrawType::Border;
RegularBrush->TintColor = Style->GetColor("DisplayClusterConfigurator.Node.Viewport.Border.Color.Regular");
Style->Set("DisplayClusterConfigurator.Node.Viewport.Border.Brush.Regular", RegularBrush);
RegularBrush->TintColor = GetColor("DisplayClusterConfigurator.Node.Viewport.Border.Color.Regular");
Set("DisplayClusterConfigurator.Node.Viewport.Border.Brush.Regular", RegularBrush);
FSlateBrush* OutsideRegularBrush = new FSlateBrush();
OutsideRegularBrush->Margin = FMargin(1.f);
OutsideRegularBrush->DrawAs = ESlateBrushDrawType::Border;
OutsideRegularBrush->TintColor = Style->GetColor("DisplayClusterConfigurator.Node.Viewport.Border.OutsideColor.Regular");
Style->Set("DisplayClusterConfigurator.Node.Viewport.Border.OutsideBrush.Regular", OutsideRegularBrush);
FSlateBrush* OutsideBrush = new FSlateBrush();
OutsideBrush->Margin = FMargin(1.f);
OutsideBrush->DrawAs = ESlateBrushDrawType::Border;
OutsideBrush->TintColor = GetColor("DisplayClusterConfigurator.Node.Viewport.Border.Color.Outside");
Set("DisplayClusterConfigurator.Node.Viewport.Border.Brush.Outside", OutsideBrush);
}
// Corner Colors array
{
CornerColors.Add(FCornerColor("DisplayClusterConfigurator.Node.Corner.Color.0", FLinearColor(FColor(244, 67, 54, 255 * 0.8f))));
CornerColors.Add(FCornerColor("DisplayClusterConfigurator.Node.Corner.Color.1", FLinearColor(FColor(156, 39, 176, 255 * 0.8f))));
CornerColors.Add(FCornerColor("DisplayClusterConfigurator.Node.Corner.Color.2", FLinearColor(FColor(0, 188, 212, 255 * 0.8f))));
CornerColors.Add(FCornerColor("DisplayClusterConfigurator.Node.Corner.Color.3", FLinearColor(FColor(139, 195, 74, 255 * 0.8f))));
CornerColors.Add(FCornerColor("DisplayClusterConfigurator.Node.Corner.Color.4", FLinearColor(FColor(255, 235, 59, 255 * 0.8f))));
CornerColors.Add(FCornerColor("DisplayClusterConfigurator.Node.Corner.Color.5", FLinearColor(FColor(96, 125, 139, 255 * 0.8f))));
DefaultColors.Add(FCornerColor("DisplayClusterConfigurator.Node.Corner.Color.0", FLinearColor(FColor(244, 67, 54, 255 * 0.8f))));
DefaultColors.Add(FCornerColor("DisplayClusterConfigurator.Node.Corner.Color.1", FLinearColor(FColor(156, 39, 176, 255 * 0.8f))));
DefaultColors.Add(FCornerColor("DisplayClusterConfigurator.Node.Corner.Color.2", FLinearColor(FColor(0, 188, 212, 255 * 0.8f))));
DefaultColors.Add(FCornerColor("DisplayClusterConfigurator.Node.Corner.Color.3", FLinearColor(FColor(139, 195, 74, 255 * 0.8f))));
DefaultColors.Add(FCornerColor("DisplayClusterConfigurator.Node.Corner.Color.4", FLinearColor(FColor(255, 235, 59, 255 * 0.8f))));
DefaultColors.Add(FCornerColor("DisplayClusterConfigurator.Node.Corner.Color.5", FLinearColor(FColor(96, 125, 139, 255 * 0.8f))));
for (const FCornerColor& CornerColor : CornerColors)
for (const FCornerColor& Color : DefaultColors)
{
Style->Set(CornerColor.Name, CornerColor.Color);
Set(Color.Name, Color.Color);
}
}
@@ -258,26 +225,11 @@ TSharedRef< FSlateStyleSet > FDisplayClusterConfiguratorStyle::Create()
{
const FTextBlockStyle DefaultTextStyle = FAppStyle::Get().GetWidgetStyle<FTextBlockStyle>("NormalText");
Style->Set("DisplayClusterConfigurator.NewAssetDialog.OptionText", FTextBlockStyle(DefaultTextStyle).SetFont(DEFAULT_FONT("Bold", 11)));
Style->Set("DisplayClusterConfigurator.NewAssetDialog.SubBorder", new EDITOR_BOX_BRUSH("Common/GroupBorderLight", FMargin(4.0f / 16.0f)));
Style->Set("DisplayClusterConfigurator.NewAssetDialog.ActiveOptionBorderColor", FLinearColor(FColor(96, 96, 96)));
Set("DisplayClusterConfigurator.NewAssetDialog.OptionText", FTextBlockStyle(DefaultTextStyle).SetFont(DEFAULT_FONT("Bold", 11)));
Set("DisplayClusterConfigurator.NewAssetDialog.SubBorder", new EDITOR_BOX_BRUSH("Common/GroupBorderLight", FMargin(4.0f / 16.0f)));
Set("DisplayClusterConfigurator.NewAssetDialog.ActiveOptionBorderColor", FLinearColor(FColor(96, 96, 96)));
}
return Style;
}
#undef IMAGE_BRUSH
#undef BOX_BRUSH
#undef BORDER_BRUSH
#undef EDITOR_IMAGE_BRUSH_SVG
#undef EDITOR_BOX_BRUSH
#undef DEFAULT_FONT
void FDisplayClusterConfiguratorStyle::ReloadTextures()
{
FSlateApplication::Get().GetRenderer()->ReloadTextureResources();
}
const ISlateStyle& FDisplayClusterConfiguratorStyle::Get()
{
return *StyleInstance;
}
Engine/Plugins/Runtime/nDisplay/Source/DisplayClusterConfigurator/Private/DisplayClusterConfiguratorStyle.h
+11 -26
View File
@@ -5,36 +5,24 @@
#include "Styling/ISlateStyle.h"
#include "Styling/SlateStyle.h"
class FDisplayClusterConfiguratorStyle
class FDisplayClusterConfiguratorStyle : public FSlateStyleSet
{
public:
FDisplayClusterConfiguratorStyle();
~FDisplayClusterConfiguratorStyle();
static void Initialize();
static void Shutdown();
static FDisplayClusterConfiguratorStyle& Get()
{
static FDisplayClusterConfiguratorStyle Inst;
return Inst;
}
static void ReloadTextures();
static const ISlateStyle& Get();
static FName GetStyleSetName();
static const FLinearColor& GetColor(FName PropertyName, const ANSICHAR* Specifier = nullptr);
static const FLinearColor& GetCornerColor(uint32 Index);
static const FMargin& GetMargin(FName PropertyName, const ANSICHAR* Specifier = nullptr);
static const FSlateBrush* GetBrush(FName PropertyName, const ANSICHAR* Specifier = nullptr);
template< typename WidgetStyleType >
static const WidgetStyleType& GetWidgetStyle(FName PropertyName, const ANSICHAR* Specifier = nullptr)
{
return StyleInstance->GetWidgetStyle<WidgetStyleType>(PropertyName, Specifier);
}
const FLinearColor& GetDefaultColor(uint32 Index);
private:
static TSharedRef<FSlateStyleSet> Create();
void Initialize();
struct FCornerColor
{
@@ -50,8 +38,5 @@ private:
FLinearColor Color;
};
static TArray<FCornerColor> CornerColors;
private:
static TSharedPtr<FSlateStyleSet> StyleInstance;
TArray<FCornerColor> DefaultColors;
};
Engine/Plugins/Runtime/nDisplay/Source/DisplayClusterConfigurator/Private/DisplayClusterConfiguratorTabSpawners.cpp
+4 -4
View File
@@ -30,7 +30,7 @@ FDisplayClusterViewOutputMappingSummoner::FDisplayClusterViewOutputMappingSummon
TSharedPtr<FDisplayClusterConfiguratorBlueprintEditor> InHostingApp) : FDisplayClusterViewSummoner(FDisplayClusterConfiguratorEditorConfigurationMode::TabID_OutputMapping, InHostingApp)
{
TabLabel = LOCTEXT("OutputMappingTabTitle", "OutputMapping");
TabIcon = FSlateIcon(FDisplayClusterConfiguratorStyle::GetStyleSetName(), "DisplayClusterConfigurator.Tabs.OutputMapping");
TabIcon = FSlateIcon(FDisplayClusterConfiguratorStyle::Get().GetStyleSetName(), "DisplayClusterConfigurator.Tabs.OutputMapping");
ViewMenuDescription = LOCTEXT("OutputMappingTabDescription", "OutputMapping");
ViewMenuTooltip = LOCTEXT("OutputMapping_ToolTip", "Shows output mappings");
@@ -46,7 +46,7 @@ FDisplayClusterViewClusterSummoner::FDisplayClusterViewClusterSummoner(
TSharedPtr<FDisplayClusterConfiguratorBlueprintEditor> InHostingApp) : FDisplayClusterViewSummoner(FDisplayClusterConfiguratorEditorConfigurationMode::TabID_Cluster, InHostingApp)
{
TabLabel = LOCTEXT("ClusterTabTitle", "Cluster");
TabIcon = FSlateIcon(FDisplayClusterConfiguratorStyle::GetStyleSetName(), "DisplayClusterConfigurator.Tabs.Cluster");
TabIcon = FSlateIcon(FDisplayClusterConfiguratorStyle::Get().GetStyleSetName(), "DisplayClusterConfigurator.Tabs.Cluster");
ViewMenuDescription = LOCTEXT("ClusterTabDescription", "Cluster view");
ViewMenuTooltip = LOCTEXT("Cluster_ToolTip", "Shows the cluster view");
@@ -61,7 +61,7 @@ TSharedRef<SWidget> FDisplayClusterViewClusterSummoner::CreateTabBody(const FWor
FDisplayClusterSCSSummoner::FDisplayClusterSCSSummoner(TSharedPtr<FDisplayClusterConfiguratorBlueprintEditor> InHostingApp) : FDisplayClusterViewSummoner(FDisplayClusterConfiguratorEditorConfigurationMode::TabID_Scene, InHostingApp)
{
TabLabel = LOCTEXT("ComponentsTabLabel", "Components");
TabIcon = FSlateIcon(FEditorStyle::GetStyleSetName(), "Kismet.Tabs.Components");
TabIcon = FSlateIcon(FAppStyle::Get().GetStyleSetName(), "Kismet.Tabs.Components");
bIsSingleton = true;
@@ -79,7 +79,7 @@ FDisplayClusterSCSViewportSummoner::FDisplayClusterSCSViewportSummoner(
TSharedPtr<FDisplayClusterConfiguratorBlueprintEditor> InHostingApp) : FDisplayClusterViewSummoner(FDisplayClusterConfiguratorEditorConfigurationMode::TabID_Viewport, InHostingApp)
{
TabLabel = LOCTEXT("ViewportTabTitle", "Preview");
TabIcon = FSlateIcon(FDisplayClusterConfiguratorStyle::GetStyleSetName(), "DisplayClusterConfigurator.Tabs.Viewport");
TabIcon = FSlateIcon(FSlateIcon(FAppStyle::Get().GetStyleSetName(), "LevelEditor.Tabs.Viewports"));
ViewMenuDescription = LOCTEXT("ViewportTabDescription", "Viewport");
ViewMenuTooltip = LOCTEXT("Viewport_ToolTip", "Shows the viewport");
Engine/Plugins/Runtime/nDisplay/Source/DisplayClusterConfigurator/Private/Views/DisplayClusterConfiguratorToolbar.cpp
+3 -3
View File
@@ -25,7 +25,7 @@ public:
{
SBorder::Construct(
SBorder::FArguments()
.BorderImage(FEditorStyle::GetBrush("BlueprintEditor.PipelineSeparator"))
.BorderImage(FAppStyle::Get().GetBrush("BlueprintEditor.PipelineSeparator"))
.Padding(0.0f)
);
}
@@ -61,13 +61,13 @@ void FDisplayClusterConfiguratorToolbar::FillModesToolbar(FToolBarBuilder& Toolb
NAME_None,
TAttribute<FText>(),
TAttribute<FText>(),
FSlateIcon(FDisplayClusterConfiguratorStyle::GetStyleSetName(), "DisplayClusterConfigurator.Toolbar.Import"));
FSlateIcon(FDisplayClusterConfiguratorStyle::Get().GetStyleSetName(), "DisplayClusterConfigurator.Toolbar.Import"));
ToolbarBuilder.AddToolBarButton(Commands.Export,
NAME_None,
TAttribute<FText>(),
TAttribute<FText>(),
FSlateIcon(FDisplayClusterConfiguratorStyle::GetStyleSetName(), "DisplayClusterConfigurator.Toolbar.SaveToFile"));
FSlateIcon(FDisplayClusterConfiguratorStyle::Get().GetStyleSetName(), "DisplayClusterConfigurator.Toolbar.SaveToFile"));
ToolbarBuilder.AddComboButton(FUIAction(),
FOnGetContent::CreateRaw(this, &FDisplayClusterConfiguratorToolbar::GenerateExportMenu),
Engine/Plugins/Runtime/nDisplay/Source/DisplayClusterConfigurator/Private/Views/OutputMapping/DisplayClusterConfiguratorOutputMappingCommands.cpp
+4 -5
View File
@@ -7,13 +7,12 @@
void FDisplayClusterConfiguratorOutputMappingCommands::RegisterCommands()
{
UI_COMMAND(ToggleWindowInfo, "Show Window Info", "Enables or disables showing the window information", EUserInterfaceActionType::ToggleButton, FInputChord(EKeys::W));
UI_COMMAND(ToggleWindowCornerImage, "Show Window Corner Image", "Enables or disables showing the window corner image", EUserInterfaceActionType::ToggleButton, FInputChord(EKeys::E));
UI_COMMAND(ToggleOutsideViewports, "Show Viewports outside the Window", "Enables or disables showing the viewport which is compleatly outside window", EUserInterfaceActionType::ToggleButton, FInputChord(EKeys::R));
UI_COMMAND(ShowWindowInfo, "Info Bar", "Shows the information bar on cluster nodes", EUserInterfaceActionType::RadioButton, FInputChord());
UI_COMMAND(ShowWindowCorner, "Corner", "Shows only the corner nub on cluster nodes", EUserInterfaceActionType::RadioButton, FInputChord());
UI_COMMAND(ShowWindowNone, "None", "Hides both the information bar and corner nub on cluster nodes", EUserInterfaceActionType::RadioButton, FInputChord());
UI_COMMAND(ToggleOutsideViewports, "Show Viewports outside the Window", "Toggles displaying viewports that are entirely outside a cluster node", EUserInterfaceActionType::ToggleButton, FInputChord(EKeys::R));
UI_COMMAND(ToggleClusterItemOverlap, "Allow Cluster Item Overlap", "Enables or disables allowing cluster items to overlap when being manipulated", EUserInterfaceActionType::ToggleButton, FInputChord());
UI_COMMAND(ToggleLockClusterNodesInHosts, "Keep Cluster Nodes inside Hosts", "Prevents cluster nodes from being moved outside of hosts when being manipulated", EUserInterfaceActionType::ToggleButton, FInputChord());
UI_COMMAND(ToggleLockViewports, "Lock Viewports in place", "Locks viewports in place, preventing them from being selected or dragged", EUserInterfaceActionType::ToggleButton, FInputChord());
UI_COMMAND(ToggleLockClusterNodes, "Lock Cluster Nodes in place", "Locks cluster nodes in place, preventing them from being selected or dragged", EUserInterfaceActionType::ToggleButton, FInputChord());
UI_COMMAND(ToggleTintViewports, "Tint Selected Viewports", "Toggles tinting selected viewports orange to better indicate that they are selected", EUserInterfaceActionType::ToggleButton, FInputChord());
UI_COMMAND(ZoomToFit, "Zoom To Fit", "Zoom To Fit In Graph", EUserInterfaceActionType::Button, FInputChord(EKeys::Z));
Engine/Plugins/Runtime/nDisplay/Source/DisplayClusterConfigurator/Private/Views/OutputMapping/DisplayClusterConfiguratorOutputMappingCommands.h
+4 -5
View File
@@ -13,19 +13,18 @@ class FDisplayClusterConfiguratorOutputMappingCommands
public:
FDisplayClusterConfiguratorOutputMappingCommands()
: TCommands<FDisplayClusterConfiguratorOutputMappingCommands>(TEXT("DisplayClusterConfigurator.OutputMapping"),
NSLOCTEXT("Contexts", "DisplayClusterConfiguratorOutputMapping", "Display Cluster Configurator Output Mapping"), NAME_None, FDisplayClusterConfiguratorStyle::GetStyleSetName())
NSLOCTEXT("Contexts", "DisplayClusterConfiguratorOutputMapping", "Display Cluster Configurator Output Mapping"), NAME_None, FDisplayClusterConfiguratorStyle::Get().GetStyleSetName())
{ }
virtual void RegisterCommands() override;
public:
TSharedPtr<FUICommandInfo> ToggleWindowInfo;
TSharedPtr<FUICommandInfo> ToggleWindowCornerImage;
TSharedPtr<FUICommandInfo> ShowWindowInfo;
TSharedPtr<FUICommandInfo> ShowWindowCorner;
TSharedPtr<FUICommandInfo> ShowWindowNone;
TSharedPtr<FUICommandInfo> ToggleOutsideViewports;
TSharedPtr<FUICommandInfo> ToggleClusterItemOverlap;
TSharedPtr<FUICommandInfo> ToggleLockClusterNodesInHosts;
TSharedPtr<FUICommandInfo> ToggleLockViewports;
TSharedPtr<FUICommandInfo> ToggleLockClusterNodes;
TSharedPtr<FUICommandInfo> ToggleTintViewports;
TSharedPtr<FUICommandInfo> ZoomToFit;
TSharedPtr<FUICommandInfo> BrowseDocumentation;
Engine/Plugins/Runtime/nDisplay/Source/DisplayClusterConfigurator/Private/Views/OutputMapping/DisplayClusterConfiguratorViewOutputMapping.cpp
+18 -4
View File
@@ -112,13 +112,27 @@ void FDisplayClusterConfiguratorViewOutputMapping::BindCommands()
const FDisplayClusterConfiguratorOutputMappingCommands& Commands = FDisplayClusterConfiguratorOutputMappingCommands::Get();
MAP_TOGGLE_COMMAND(Commands.ToggleWindowInfo, OutputMappingSettings.bShowWindowInfo);
MAP_TOGGLE_COMMAND(Commands.ToggleWindowCornerImage, OutputMappingSettings.bShowWindowCornerImage);
CommandList->MapAction(
Commands.ShowWindowInfo,
FExecuteAction::CreateLambda([this]() { OutputMappingSettings.bShowWindowInfo = true; OutputMappingSettings.bShowWindowCornerImage = true; }),
FCanExecuteAction(),
FIsActionChecked::CreateLambda([this]() { return OutputMappingSettings.bShowWindowInfo && OutputMappingSettings.bShowWindowCornerImage; }));
CommandList->MapAction(
Commands.ShowWindowCorner,
FExecuteAction::CreateLambda([this]() { OutputMappingSettings.bShowWindowInfo = false; OutputMappingSettings.bShowWindowCornerImage = true; }),
FCanExecuteAction(),
FIsActionChecked::CreateLambda([this]() { return !OutputMappingSettings.bShowWindowInfo && OutputMappingSettings.bShowWindowCornerImage; }));
CommandList->MapAction(
Commands.ShowWindowNone,
FExecuteAction::CreateLambda([this]() { OutputMappingSettings.bShowWindowInfo = false; OutputMappingSettings.bShowWindowCornerImage = false; }),
FCanExecuteAction(),
FIsActionChecked::CreateLambda([this]() { return !OutputMappingSettings.bShowWindowInfo && !OutputMappingSettings.bShowWindowCornerImage; }));
MAP_TOGGLE_COMMAND(Commands.ToggleOutsideViewports, OutputMappingSettings.bShowOutsideViewports);
MAP_TOGGLE_COMMAND(Commands.ToggleClusterItemOverlap, OutputMappingSettings.bAllowClusterItemOverlap);
MAP_TOGGLE_COMMAND(Commands.ToggleLockClusterNodesInHosts, OutputMappingSettings.bKeepClusterNodesInHosts);
MAP_TOGGLE_COMMAND(Commands.ToggleLockViewports, OutputMappingSettings.bLockViewports);
MAP_TOGGLE_COMMAND(Commands.ToggleLockClusterNodes, OutputMappingSettings.bLockClusterNodes);
MAP_TOGGLE_COMMAND(Commands.ToggleTintViewports, OutputMappingSettings.bTintSelectedViewports);
MAP_TOGGLE_COMMAND(Commands.ToggleAdjacentEdgeSnapping, NodeAlignmentSettings.bSnapAdjacentEdges);
Engine/Plugins/Runtime/nDisplay/Source/DisplayClusterConfigurator/Private/Views/OutputMapping/EdNodes/DisplayClusterConfiguratorBaseNode.h
+1
View File
@@ -98,6 +98,7 @@ public:
virtual int32 GetAuxiliaryLayer(const TSet<UObject*>& SelectionSet) const;
virtual bool IsNodeVisible() const { return true; }
virtual bool IsNodeEnabled() const { return true; }
virtual bool IsNodeUnlocked() const { return true; }
virtual bool IsNodeAutoPositioned() const { return false; }
virtual bool IsNodeAutosized() const { return false; }
virtual bool CanNodeOverlapSiblings() const { return true; }
Engine/Plugins/Runtime/nDisplay/Source/DisplayClusterConfigurator/Private/Views/OutputMapping/EdNodes/DisplayClusterConfiguratorHostNode.cpp
+2 -19
View File
@@ -188,7 +188,7 @@ bool UDisplayClusterConfiguratorHostNode::IsNodeVisible() const
return bIsChildVisible;
}
bool UDisplayClusterConfiguratorHostNode::IsNodeEnabled() const
bool UDisplayClusterConfiguratorHostNode::IsNodeUnlocked() const
{
if (!IsObjectValid())
{
@@ -196,24 +196,7 @@ bool UDisplayClusterConfiguratorHostNode::IsNodeEnabled() const
}
UDisplayClusterConfigurationHostDisplayData* HostDisplayData = GetObjectChecked<UDisplayClusterConfigurationHostDisplayData>();
if (HostDisplayData->bIsEnabled)
{
return true;
}
// If all children of the host node are disabled, make the host node disabled as well.
bool bIsChildEnabled = false;
for (UDisplayClusterConfiguratorBaseNode* Child : Children)
{
if (Child->IsNodeEnabled())
{
bIsChildEnabled = true;
break;
}
}
return bIsChildEnabled;
return HostDisplayData->bIsUnlocked;
}
void UDisplayClusterConfiguratorHostNode::DeleteObject()
Engine/Plugins/Runtime/nDisplay/Source/DisplayClusterConfigurator/Private/Views/OutputMapping/EdNodes/DisplayClusterConfiguratorHostNode.h
+1 -1
View File
@@ -39,7 +39,7 @@ public:
virtual FBox2D GetNodeBounds(bool bAsParent = false) const override;
virtual FNodeAlignmentAnchors GetNodeAlignmentAnchors(bool bAsParent = false) const override;
virtual bool IsNodeVisible() const override;
virtual bool IsNodeEnabled() const override;
virtual bool IsNodeUnlocked() const override;
virtual bool IsNodeAutoPositioned() const { return !CanUserMoveNode(); }
virtual bool IsNodeAutosized() const override { return !CanUserResizeNode(); }
virtual bool CanNodeOverlapSiblings() const override { return false; }
Engine/Plugins/Runtime/nDisplay/Source/DisplayClusterConfigurator/Private/Views/OutputMapping/EdNodes/DisplayClusterConfiguratorViewportNode.cpp
+2 -2
View File
@@ -78,7 +78,7 @@ bool UDisplayClusterConfiguratorViewportNode::IsNodeVisible() const
return Viewport->bIsVisible;
}
bool UDisplayClusterConfiguratorViewportNode::IsNodeEnabled() const
bool UDisplayClusterConfiguratorViewportNode::IsNodeUnlocked() const
{
if (!IsObjectValid())
{
@@ -86,7 +86,7 @@ bool UDisplayClusterConfiguratorViewportNode::IsNodeEnabled() const
}
UDisplayClusterConfigurationViewport* Viewport = GetObjectChecked<UDisplayClusterConfigurationViewport>();
return Viewport->bIsEnabled;
return Viewport->bIsUnlocked;
}
void UDisplayClusterConfiguratorViewportNode::DeleteObject()
Engine/Plugins/Runtime/nDisplay/Source/DisplayClusterConfigurator/Private/Views/OutputMapping/EdNodes/DisplayClusterConfiguratorViewportNode.h
+1 -1
View File
@@ -33,7 +33,7 @@ public:
//~ Begin UDisplayClusterConfiguratorBaseNode Interface
virtual bool IsNodeVisible() const override;
virtual bool IsNodeEnabled() const override;
virtual bool IsNodeUnlocked() const override;
virtual bool CanNodeOverlapSiblings() const override { return false; }
virtual bool CanNodeHaveNegativePosition() const { return false; }
Engine/Plugins/Runtime/nDisplay/Source/DisplayClusterConfigurator/Private/Views/OutputMapping/EdNodes/DisplayClusterConfiguratorWindowNode.cpp
+2 -19
View File
@@ -119,7 +119,7 @@ bool UDisplayClusterConfiguratorWindowNode::IsNodeVisible() const
return bIsChildVisible;
}
bool UDisplayClusterConfiguratorWindowNode::IsNodeEnabled() const
bool UDisplayClusterConfiguratorWindowNode::IsNodeUnlocked() const
{
if (!IsObjectValid())
{
@@ -127,24 +127,7 @@ bool UDisplayClusterConfiguratorWindowNode::IsNodeEnabled() const
}
UDisplayClusterConfigurationClusterNode* ClusterNode = GetObjectChecked<UDisplayClusterConfigurationClusterNode>();
if (ClusterNode->bIsEnabled)
{
return true;
}
// If this node is marked as disabled but it has a child that is enabled, This node needs to remain enabled.
bool bIsChildEnabled = false;
for (UDisplayClusterConfiguratorBaseNode* Child : Children)
{
if (Child->IsNodeEnabled())
{
bIsChildEnabled = true;
break;
}
}
return bIsChildEnabled;
return ClusterNode->bIsUnlocked;
}
bool UDisplayClusterConfiguratorWindowNode::CanNodeExceedParentBounds() const

Some files were not shown because too many files have changed in this diff Show More