diff --git a/111.txt b/111.txt deleted file mode 100644 index ac2b893..0000000 --- a/111.txt +++ /dev/null @@ -1,48 +0,0 @@ -// ------------------------------------------------------------------------- - // 4. 坐标计算与边界检查 - // ------------------------------------------------------------------------- - - // DispatchThreadID 从 0 开始，代表在调度区域内的偏移量。 - // 我们将其加上 UpdateRegionParam.xy (Min.X, Min.Y) 得到全局像素坐标。 - int2 PixelCoord = DispatchThreadID.xy + int2(UpdateRegionParam.x, UpdateRegionParam.y); - - // 边界检查：检查是否超出 UpdateRegionParam.zw (Max.X, Max.Y) - if (PixelCoord.x < UpdateRegionParam.x || PixelCoord.x >= UpdateRegionParam.z || - PixelCoord.y < UpdateRegionParam.y || PixelCoord.y >= UpdateRegionParam.w) - { - // 虽然我们调度时已经只调度了需要的区域，但为了安全起见，保留检查。 - // 理论上，如果 C++ 端调度正确，这个检查应该很少触发。 - return; - } - - // ------------------------------------------------------------------------- - // 5. 变形计算逻辑 (与之前相同) - // ------------------------------------------------------------------------- - - // 从输入纹理读取位置 - // Load 需要 int3，第三个分量 (MipLevel) 设为 0 - float4 OriginalPos = InputTexture.Load(int3(PixelCoord, 0)); - - // 计算到碰撞点的距离 - float dist = distance(OriginalPos.xyz, ImpactPoint); - - // 在变形半径内处理 - if (dist < DeformationRadius) - { - // 计算变形衰减 (高斯衰减) - float falloff = exp(-(dist * dist) / (2.0 * DeformationRadius * DeformationRadius)); - - // 计算变形量 (考虑法线方向) - float3 deformation = ImpactNormal * ImpactForce * falloff * 0.01; - - // 应用塑性变形 - float3 newPos = OriginalPos.xyz + deformation * Plasticity; - - // 写入新位置 - OutputTexture[PixelCoord] = float4(newPos, OriginalPos.w); - } - else - { - // 保持原位置 - OutputTexture[PixelCoord] = OriginalPos; - } \ No newline at end of file diff --git a/BladeSmith.sln.DotSettings.user b/BladeSmith.sln.DotSettings.user deleted file mode 100644 index afc749d..0000000 --- a/BladeSmith.sln.DotSettings.user +++ /dev/null @@ -1,9 +0,0 @@ - - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded \ No newline at end of file diff --git a/Content/BP/BP_FirstPersonCharacter.uasset b/Content/BP/BP_FirstPersonCharacter.uasset new file mode 100644 index 0000000..1564072 Binary files /dev/null and b/Content/BP/BP_FirstPersonCharacter.uasset differ diff --git a/Content/BP/BP_FirstPersonGameMode.uasset b/Content/BP/BP_FirstPersonGameMode.uasset new file mode 100644 index 0000000..30a341e Binary files /dev/null and b/Content/BP/BP_FirstPersonGameMode.uasset differ diff --git a/Content/FirstPerson/Blueprints/BP_HammerHitDecal.uasset b/Content/BP/BP_HammerHitDecal.uasset similarity index 55% rename from Content/FirstPerson/Blueprints/BP_HammerHitDecal.uasset rename to Content/BP/BP_HammerHitDecal.uasset index 251cb5b..94e9b62 100644 Binary files a/Content/FirstPerson/Blueprints/BP_HammerHitDecal.uasset and b/Content/BP/BP_HammerHitDecal.uasset differ diff --git a/Content/BP/BP_IronBlock.uasset b/Content/BP/BP_IronBlock.uasset new file mode 100644 index 0000000..d6c88a8 Binary files /dev/null and b/Content/BP/BP_IronBlock.uasset differ diff --git a/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset b/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset deleted file mode 100644 index d4c9225..0000000 Binary files a/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset and /dev/null differ diff --git a/Content/FirstPerson/Blueprints/BP_FirstPersonGameMode.uasset b/Content/FirstPerson/Blueprints/BP_FirstPersonGameMode.uasset deleted file mode 100644 index bbac1f8..0000000 Binary files a/Content/FirstPerson/Blueprints/BP_FirstPersonGameMode.uasset and /dev/null differ diff --git a/Content/FirstPerson/Blueprints/BP_FirstPersonProjectile.uasset b/Content/FirstPerson/Blueprints/BP_FirstPersonProjectile.uasset deleted file mode 100644 index a6ef71b..0000000 Binary files a/Content/FirstPerson/Blueprints/BP_FirstPersonProjectile.uasset and /dev/null differ diff --git a/Content/FirstPerson/Blueprints/BP_IronBlock.uasset b/Content/FirstPerson/Blueprints/BP_IronBlock.uasset deleted file mode 100644 index da7b676..0000000 Binary files a/Content/FirstPerson/Blueprints/BP_IronBlock.uasset and /dev/null differ diff --git a/Content/FirstPerson/Blueprints/BP_PickUp_Rifle.uasset b/Content/FirstPerson/Blueprints/BP_PickUp_Rifle.uasset deleted file mode 100644 index cd5e82d..0000000 Binary files a/Content/FirstPerson/Blueprints/BP_PickUp_Rifle.uasset and /dev/null differ diff --git a/Content/FirstPerson/Input/Actions/IA_ChangeCam.uasset b/Content/FirstPerson/Input/Actions/IA_ChangeCam.uasset deleted file mode 100644 index 7e1b23a..0000000 Binary files a/Content/FirstPerson/Input/Actions/IA_ChangeCam.uasset and /dev/null differ diff --git a/Content/FirstPerson/Input/Actions/IA_Hammer.uasset b/Content/FirstPerson/Input/Actions/IA_Hammer.uasset deleted file mode 100644 index c243ea1..0000000 Binary files a/Content/FirstPerson/Input/Actions/IA_Hammer.uasset and /dev/null differ diff --git a/Content/FirstPerson/Input/Actions/IA_Jump.uasset b/Content/FirstPerson/Input/Actions/IA_Jump.uasset deleted file mode 100644 index 9201295..0000000 Binary files a/Content/FirstPerson/Input/Actions/IA_Jump.uasset and /dev/null differ diff --git a/Content/FirstPerson/Input/Actions/IA_Look.uasset b/Content/FirstPerson/Input/Actions/IA_Look.uasset deleted file mode 100644 index b6b818a..0000000 Binary files a/Content/FirstPerson/Input/Actions/IA_Look.uasset and /dev/null differ diff --git a/Content/FirstPerson/Input/Actions/IA_Move.uasset b/Content/FirstPerson/Input/Actions/IA_Move.uasset deleted file mode 100644 index 51bd8d3..0000000 Binary files a/Content/FirstPerson/Input/Actions/IA_Move.uasset and /dev/null differ diff --git a/Content/FirstPerson/Input/Actions/IA_Shoot.uasset b/Content/FirstPerson/Input/Actions/IA_Shoot.uasset deleted file mode 100644 index 842a1ba..0000000 Binary files a/Content/FirstPerson/Input/Actions/IA_Shoot.uasset and /dev/null differ diff --git a/Content/FirstPerson/Input/IMC_Weapons.uasset b/Content/FirstPerson/Input/IMC_Weapons.uasset deleted file mode 100644 index bf34dab..0000000 Binary files a/Content/FirstPerson/Input/IMC_Weapons.uasset and /dev/null differ diff --git a/Content/FirstPerson/Input/MobileControls.uasset b/Content/FirstPerson/Input/MobileControls.uasset deleted file mode 100644 index 1ec494b..0000000 Binary files a/Content/FirstPerson/Input/MobileControls.uasset and /dev/null differ diff --git a/Content/FirstPerson/Maps/FirstPersonMap.umap b/Content/FirstPerson/Maps/FirstPersonMap.umap deleted file mode 100644 index f9c99e9..0000000 Binary files a/Content/FirstPerson/Maps/FirstPersonMap.umap and /dev/null differ diff --git a/Content/FirstPerson/Maps/_GENERATED/Administrator/IronBlock_UVFixed.uasset b/Content/FirstPerson/Maps/_GENERATED/Administrator/IronBlock_UVFixed.uasset deleted file mode 100644 index fbb2eb4..0000000 Binary files a/Content/FirstPerson/Maps/_GENERATED/Administrator/IronBlock_UVFixed.uasset and /dev/null differ diff --git a/Content/FirstPerson/Maps/_GENERATED/Administrator/Placeholder.uasset b/Content/FirstPerson/Maps/_GENERATED/Administrator/Placeholder.uasset new file mode 100644 index 0000000..8d1c8b6 --- /dev/null +++ b/Content/FirstPerson/Maps/_GENERATED/Administrator/Placeholder.uasset @@ -0,0 +1 @@ + diff --git a/Content/FirstPerson/Maps/_GENERATED/Administrator/SM_IronBlock.uasset b/Content/FirstPerson/Maps/_GENERATED/Administrator/SM_IronBlock.uasset deleted file mode 100644 index fc299e3..0000000 Binary files a/Content/FirstPerson/Maps/_GENERATED/Administrator/SM_IronBlock.uasset and /dev/null differ diff --git a/Content/FirstPerson/Maps/_GENERATED/starm/Box_55C221F2.uasset b/Content/FirstPerson/Maps/_GENERATED/starm/Box_55C221F2.uasset deleted file mode 100644 index 568834b..0000000 Binary files a/Content/FirstPerson/Maps/_GENERATED/starm/Box_55C221F2.uasset and /dev/null differ diff --git a/Content/FirstPersonArms/Animations/FirstPerson_AnimBP.uasset b/Content/FirstPersonArms/Animations/FirstPerson_AnimBP.uasset index 764bf6f..0b4e1a6 100644 Binary files a/Content/FirstPersonArms/Animations/FirstPerson_AnimBP.uasset and b/Content/FirstPersonArms/Animations/FirstPerson_AnimBP.uasset differ diff --git a/Content/Input/Actions/IA_ChangeCam.uasset b/Content/Input/Actions/IA_ChangeCam.uasset new file mode 100644 index 0000000..51b269b Binary files /dev/null and b/Content/Input/Actions/IA_ChangeCam.uasset differ diff --git a/Content/Input/Actions/IA_Hammer.uasset b/Content/Input/Actions/IA_Hammer.uasset new file mode 100644 index 0000000..10073e2 Binary files /dev/null and b/Content/Input/Actions/IA_Hammer.uasset differ diff --git a/Content/Input/Actions/IA_Jump.uasset b/Content/Input/Actions/IA_Jump.uasset new file mode 100644 index 0000000..4ac49fb Binary files /dev/null and b/Content/Input/Actions/IA_Jump.uasset differ diff --git a/Content/Input/Actions/IA_Look.uasset b/Content/Input/Actions/IA_Look.uasset new file mode 100644 index 0000000..ef797dc Binary files /dev/null and b/Content/Input/Actions/IA_Look.uasset differ diff --git a/Content/Input/Actions/IA_Move.uasset b/Content/Input/Actions/IA_Move.uasset new file mode 100644 index 0000000..869fef7 Binary files /dev/null and b/Content/Input/Actions/IA_Move.uasset differ diff --git a/Content/Input/Actions/IA_Shoot.uasset b/Content/Input/Actions/IA_Shoot.uasset new file mode 100644 index 0000000..68494cc Binary files /dev/null and b/Content/Input/Actions/IA_Shoot.uasset differ diff --git a/Content/FirstPerson/Input/IMC_Default.uasset b/Content/Input/IMC_Default.uasset similarity index 57% rename from Content/FirstPerson/Input/IMC_Default.uasset rename to Content/Input/IMC_Default.uasset index 25cf402..b76b371 100644 Binary files a/Content/FirstPerson/Input/IMC_Default.uasset and b/Content/Input/IMC_Default.uasset differ diff --git a/Content/FirstPerson/Input/IMC_Hammer.uasset b/Content/Input/IMC_Hammer.uasset similarity index 61% rename from Content/FirstPerson/Input/IMC_Hammer.uasset rename to Content/Input/IMC_Hammer.uasset index 8cbc9ca..6b3f798 100644 Binary files a/Content/FirstPerson/Input/IMC_Hammer.uasset and b/Content/Input/IMC_Hammer.uasset differ diff --git a/Content/Input/MobileControls.uasset b/Content/Input/MobileControls.uasset new file mode 100644 index 0000000..1a9794d Binary files /dev/null and b/Content/Input/MobileControls.uasset differ diff --git a/Content/Maps/FirstPersonMap.umap b/Content/Maps/FirstPersonMap.umap new file mode 100644 index 0000000..47a9a8c Binary files /dev/null and b/Content/Maps/FirstPersonMap.umap differ diff --git a/Content/Materials/M_HammerHitDecal_Inst.uasset b/Content/Materials/M_HammerHitDecal_Inst.uasset index 8460533..df448bb 100644 Binary files a/Content/Materials/M_HammerHitDecal_Inst.uasset and b/Content/Materials/M_HammerHitDecal_Inst.uasset differ diff --git a/Content/Materials/M_Iron.uasset b/Content/Materials/M_Iron.uasset deleted file mode 100644 index 2ca34a2..0000000 Binary files a/Content/Materials/M_Iron.uasset and /dev/null differ diff --git a/Content/Materials/M_Iron_Inst.uasset b/Content/Materials/M_Iron_Inst.uasset deleted file mode 100644 index d2c8a11..0000000 Binary files a/Content/Materials/M_Iron_Inst.uasset and /dev/null differ diff --git a/Content/Materials/M_HammerHitDecal.uasset b/Content/Res/Materials/M_HammerHitDecal.uasset similarity index 69% rename from Content/Materials/M_HammerHitDecal.uasset rename to Content/Res/Materials/M_HammerHitDecal.uasset index c908b99..cbbe2a5 100644 Binary files a/Content/Materials/M_HammerHitDecal.uasset and b/Content/Res/Materials/M_HammerHitDecal.uasset differ diff --git a/Content/Res/Materials/M_HammerHitDecal_Inst.uasset b/Content/Res/Materials/M_HammerHitDecal_Inst.uasset new file mode 100644 index 0000000..d43ce6f Binary files /dev/null and b/Content/Res/Materials/M_HammerHitDecal_Inst.uasset differ diff --git a/Content/Materials/M_HitCal.uasset b/Content/Res/Materials/M_HitCal.uasset similarity index 88% rename from Content/Materials/M_HitCal.uasset rename to Content/Res/Materials/M_HitCal.uasset index d053629..3f3b2b9 100644 Binary files a/Content/Materials/M_HitCal.uasset and b/Content/Res/Materials/M_HitCal.uasset differ diff --git a/Content/Res/Materials/M_Iron.uasset b/Content/Res/Materials/M_Iron.uasset new file mode 100644 index 0000000..447bcdb Binary files /dev/null and b/Content/Res/Materials/M_Iron.uasset differ diff --git a/Content/Res/Materials/M_Iron_Inst.uasset b/Content/Res/Materials/M_Iron_Inst.uasset new file mode 100644 index 0000000..e158ce4 Binary files /dev/null and b/Content/Res/Materials/M_Iron_Inst.uasset differ diff --git a/Content/Materials/M_WorldPos.uasset b/Content/Res/Materials/M_WorldPos.uasset similarity index 92% rename from Content/Materials/M_WorldPos.uasset rename to Content/Res/Materials/M_WorldPos.uasset index a5dc2a8..5b9290e 100644 Binary files a/Content/Materials/M_WorldPos.uasset and b/Content/Res/Materials/M_WorldPos.uasset differ diff --git a/Content/Materials/T_UVCheck.uasset b/Content/Res/Materials/T_UVCheck.uasset similarity index 97% rename from Content/Materials/T_UVCheck.uasset rename to Content/Res/Materials/T_UVCheck.uasset index c98e300..fcd6d2a 100644 Binary files a/Content/Materials/T_UVCheck.uasset and b/Content/Res/Materials/T_UVCheck.uasset differ diff --git a/Content/FirstPerson/Maps/_GENERATED/Administrator/材质.uasset b/Content/Res/Materials/材质.uasset similarity index 96% rename from Content/FirstPerson/Maps/_GENERATED/Administrator/材质.uasset rename to Content/Res/Materials/材质.uasset index 43fd257..e5fafa5 100644 Binary files a/Content/FirstPerson/Maps/_GENERATED/Administrator/材质.uasset and b/Content/Res/Materials/材质.uasset differ diff --git a/Content/FirstPerson/Maps/_GENERATED/Administrator/IronBlock_UVFixed1.uasset b/Content/Res/Models/IronBlock_UVFixed1.uasset similarity index 99% rename from Content/FirstPerson/Maps/_GENERATED/Administrator/IronBlock_UVFixed1.uasset rename to Content/Res/Models/IronBlock_UVFixed1.uasset index 5872468..9696ec5 100644 Binary files a/Content/FirstPerson/Maps/_GENERATED/Administrator/IronBlock_UVFixed1.uasset and b/Content/Res/Models/IronBlock_UVFixed1.uasset differ diff --git a/Content/FirstPerson/Maps/_GENERATED/Administrator/T_UVCheck.uasset b/Content/Res/Textures/T_UVCheck.uasset similarity index 98% rename from Content/FirstPerson/Maps/_GENERATED/Administrator/T_UVCheck.uasset rename to Content/Res/Textures/T_UVCheck.uasset index 9856768..16b2840 100644 Binary files a/Content/FirstPerson/Maps/_GENERATED/Administrator/T_UVCheck.uasset and b/Content/Res/Textures/T_UVCheck.uasset differ diff --git a/Content/StarterContent/Architecture/Floor_400x400.uasset b/Content/StarterContent/Architecture/Floor_400x400.uasset index 568b3e2..601ea14 100644 Binary files a/Content/StarterContent/Architecture/Floor_400x400.uasset and b/Content/StarterContent/Architecture/Floor_400x400.uasset differ diff --git a/Content/StarterContent/Audio/Collapse01.uasset b/Content/StarterContent/Audio/Collapse01.uasset index 2cfc455..9c68be4 100644 Binary files a/Content/StarterContent/Audio/Collapse01.uasset and b/Content/StarterContent/Audio/Collapse01.uasset differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/0/0M/LYKU8MRWM4BO3O1FDZBG2U.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/0/0M/LYKU8MRWM4BO3O1FDZBG2U.uasset deleted file mode 100644 index e4d3cea..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/0/0M/LYKU8MRWM4BO3O1FDZBG2U.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/0/7P/QZX5AESKLO855EVPT5JU20.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/0/7P/QZX5AESKLO855EVPT5JU20.uasset deleted file mode 100644 index a0d9e2c..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/0/7P/QZX5AESKLO855EVPT5JU20.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/0/CL/381LM03PFI8AF9NED1SEV2.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/0/CL/381LM03PFI8AF9NED1SEV2.uasset deleted file mode 100644 index 6215a03..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/0/CL/381LM03PFI8AF9NED1SEV2.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/0/GO/I8WEFD3RY9V3NVQLSU6QM4.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/0/GO/I8WEFD3RY9V3NVQLSU6QM4.uasset deleted file mode 100644 index f192f74..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/0/GO/I8WEFD3RY9V3NVQLSU6QM4.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/0/NB/NWWEVRQSGT6ARVZ8HQLCM9.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/0/NB/NWWEVRQSGT6ARVZ8HQLCM9.uasset deleted file mode 100644 index 0891db0..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/0/NB/NWWEVRQSGT6ARVZ8HQLCM9.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/0/XV/VTAF5COFGLO9YT51MQCVTR.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/0/XV/VTAF5COFGLO9YT51MQCVTR.uasset deleted file mode 100644 index 1f62e85..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/0/XV/VTAF5COFGLO9YT51MQCVTR.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/1/2J/R4MRTH8FEAO7ML1BCJFIZ2.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/1/2J/R4MRTH8FEAO7ML1BCJFIZ2.uasset deleted file mode 100644 index efd5343..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/1/2J/R4MRTH8FEAO7ML1BCJFIZ2.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/1/63/MG6FOV6QQX2CAZCGF7O9MM.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/1/63/MG6FOV6QQX2CAZCGF7O9MM.uasset deleted file mode 100644 index b69a6d7..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/1/63/MG6FOV6QQX2CAZCGF7O9MM.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/1/JT/XIHYQ8ZTVL6F9GCUZX1AQ2.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/1/JT/XIHYQ8ZTVL6F9GCUZX1AQ2.uasset deleted file mode 100644 index 9ac2332..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/1/JT/XIHYQ8ZTVL6F9GCUZX1AQ2.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/1/JW/IQ4HLH5ISNNAXZQ2O2OR6P.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/1/JW/IQ4HLH5ISNNAXZQ2O2OR6P.uasset deleted file mode 100644 index f18d5ae..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/1/JW/IQ4HLH5ISNNAXZQ2O2OR6P.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/1/OD/YPSPM063O6XAJVKSDHY2JX.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/1/OD/YPSPM063O6XAJVKSDHY2JX.uasset deleted file mode 100644 index 415d604..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/1/OD/YPSPM063O6XAJVKSDHY2JX.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/3/0O/4IRR0TBO7VGKMMYSZRQTB1.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/3/0O/4IRR0TBO7VGKMMYSZRQTB1.uasset deleted file mode 100644 index 4d9cfb3..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/3/0O/4IRR0TBO7VGKMMYSZRQTB1.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/3/AI/0XWE3RNM2XQC0ST1KXG02O.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/3/AI/0XWE3RNM2XQC0ST1KXG02O.uasset deleted file mode 100644 index 86a5c92..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/3/AI/0XWE3RNM2XQC0ST1KXG02O.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/3/C8/Z38FT77DKZLKDXTQ7PZNM4.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/3/C8/Z38FT77DKZLKDXTQ7PZNM4.uasset deleted file mode 100644 index 0361117..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/3/C8/Z38FT77DKZLKDXTQ7PZNM4.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/3/CP/XRLOR3HVYVHJA3N9PKGXZH.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/3/CP/XRLOR3HVYVHJA3N9PKGXZH.uasset deleted file mode 100644 index 80aa393..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/3/CP/XRLOR3HVYVHJA3N9PKGXZH.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/4/CR/SRVPLA8UNZ8XIIP0E036DI.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/4/CR/SRVPLA8UNZ8XIIP0E036DI.uasset deleted file mode 100644 index be81427..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/4/CR/SRVPLA8UNZ8XIIP0E036DI.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/4/E5/6XON0XLIRNWJCBCE62P2VV.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/4/E5/6XON0XLIRNWJCBCE62P2VV.uasset deleted file mode 100644 index 2ec1344..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/4/E5/6XON0XLIRNWJCBCE62P2VV.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/4/G2/DXY1ROMU8NVTUPH999VNGV.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/4/G2/DXY1ROMU8NVTUPH999VNGV.uasset deleted file mode 100644 index 967bc8f..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/4/G2/DXY1ROMU8NVTUPH999VNGV.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/4/PT/ZXUQMNLL9GZ2UNQ5D0R4A4.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/4/PT/ZXUQMNLL9GZ2UNQ5D0R4A4.uasset deleted file mode 100644 index 73a00da..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/4/PT/ZXUQMNLL9GZ2UNQ5D0R4A4.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/5/80/QQN0UFFAA797E1UT4IMD29.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/5/80/QQN0UFFAA797E1UT4IMD29.uasset deleted file mode 100644 index aeee2d3..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/5/80/QQN0UFFAA797E1UT4IMD29.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/5/DI/1JZHHCOBVQ2F5XRUWSES1X.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/5/DI/1JZHHCOBVQ2F5XRUWSES1X.uasset deleted file mode 100644 index 4496c0f..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/5/DI/1JZHHCOBVQ2F5XRUWSES1X.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/5/SI/6K90CL2ZSQWKILI9NQQLEA.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/5/SI/6K90CL2ZSQWKILI9NQQLEA.uasset deleted file mode 100644 index 4428e86..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/5/SI/6K90CL2ZSQWKILI9NQQLEA.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/5/W4/MXSOOLN47B2MJB5ZNQINHQ.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/5/W4/MXSOOLN47B2MJB5ZNQINHQ.uasset deleted file mode 100644 index 0103c32..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/5/W4/MXSOOLN47B2MJB5ZNQINHQ.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/6/0Z/5RQIHCZ9W3UXRGL4LTLQAK.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/6/0Z/5RQIHCZ9W3UXRGL4LTLQAK.uasset deleted file mode 100644 index d0ddae4..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/6/0Z/5RQIHCZ9W3UXRGL4LTLQAK.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/6/7T/GM0EQ2Z7BN3RV91M3TA1BD.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/6/7T/GM0EQ2Z7BN3RV91M3TA1BD.uasset deleted file mode 100644 index d4ec6d5..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/6/7T/GM0EQ2Z7BN3RV91M3TA1BD.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/6/7Z/7EHFAZ5HVWXAWQ04QO5TH0.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/6/7Z/7EHFAZ5HVWXAWQ04QO5TH0.uasset deleted file mode 100644 index 084bfad..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/6/7Z/7EHFAZ5HVWXAWQ04QO5TH0.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/6/AJ/2XZ3RUK0LFB63FVNQE7P5R.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/6/AJ/2XZ3RUK0LFB63FVNQE7P5R.uasset deleted file mode 100644 index ce51006..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/6/AJ/2XZ3RUK0LFB63FVNQE7P5R.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/6/HC/FI3CQDKJY4J00D2B21FYQZ.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/6/HC/FI3CQDKJY4J00D2B21FYQZ.uasset deleted file mode 100644 index 381dbe6..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/6/HC/FI3CQDKJY4J00D2B21FYQZ.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/5X/6EW8RE9VA2GGHRWK614FCI.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/5X/6EW8RE9VA2GGHRWK614FCI.uasset deleted file mode 100644 index d0457c5..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/5X/6EW8RE9VA2GGHRWK614FCI.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/8K/0OLPBOSZCPU1X7E3PCLCGF.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/8K/0OLPBOSZCPU1X7E3PCLCGF.uasset deleted file mode 100644 index 2b8bdf2..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/8K/0OLPBOSZCPU1X7E3PCLCGF.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/BP/YCEDV73CT6YVZ8EYRFQORA.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/BP/YCEDV73CT6YVZ8EYRFQORA.uasset deleted file mode 100644 index aaaa603..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/BP/YCEDV73CT6YVZ8EYRFQORA.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/DF/1GID8P6B00XRWKYCXU7HT1.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/DF/1GID8P6B00XRWKYCXU7HT1.uasset deleted file mode 100644 index 4e958e8..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/DF/1GID8P6B00XRWKYCXU7HT1.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/GI/GZM47KS5FPIQH5TLSYC1ME.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/GI/GZM47KS5FPIQH5TLSYC1ME.uasset deleted file mode 100644 index aa10913..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/GI/GZM47KS5FPIQH5TLSYC1ME.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/I8/LH9T10MU22N3EEPTZ4GAFC.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/I8/LH9T10MU22N3EEPTZ4GAFC.uasset deleted file mode 100644 index aefad10..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/I8/LH9T10MU22N3EEPTZ4GAFC.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/L5/1ZJ54FMA0DAL3I2Q8RFAIB.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/L5/1ZJ54FMA0DAL3I2Q8RFAIB.uasset deleted file mode 100644 index 2a3eba8..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/7/L5/1ZJ54FMA0DAL3I2Q8RFAIB.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/3M/4ATOKH0ZGPCVBS85MPKAXK.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/3M/4ATOKH0ZGPCVBS85MPKAXK.uasset deleted file mode 100644 index 33592c4..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/3M/4ATOKH0ZGPCVBS85MPKAXK.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/80/RCXALNT3NG94XMV0V6D4XE.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/80/RCXALNT3NG94XMV0V6D4XE.uasset deleted file mode 100644 index badd240..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/80/RCXALNT3NG94XMV0V6D4XE.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/CF/ZNIOCRD90Z70MMV9NMW778.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/CF/ZNIOCRD90Z70MMV9NMW778.uasset deleted file mode 100644 index 4d40449..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/CF/ZNIOCRD90Z70MMV9NMW778.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/CW/6HT16P8P5RAXNJG3EVYWE9.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/CW/6HT16P8P5RAXNJG3EVYWE9.uasset deleted file mode 100644 index cc18cf4..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/CW/6HT16P8P5RAXNJG3EVYWE9.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/N6/7HWHBG6K5ONLNTKPMLXMYR.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/N6/7HWHBG6K5ONLNTKPMLXMYR.uasset deleted file mode 100644 index 9e4facd..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/N6/7HWHBG6K5ONLNTKPMLXMYR.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/SZ/D1AHM62WL9TXSNPYQDXQMZ.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/SZ/D1AHM62WL9TXSNPYQDXQMZ.uasset deleted file mode 100644 index 07e1045..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/SZ/D1AHM62WL9TXSNPYQDXQMZ.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/Y4/KY9ZXT77SAVGWBRTNCFCSC.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/Y4/KY9ZXT77SAVGWBRTNCFCSC.uasset deleted file mode 100644 index c6c879a..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/Y4/KY9ZXT77SAVGWBRTNCFCSC.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/Z7/W1SXRCM1KAKBJOIZDLHZ47.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/Z7/W1SXRCM1KAKBJOIZDLHZ47.uasset deleted file mode 100644 index 5e70b62..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/8/Z7/W1SXRCM1KAKBJOIZDLHZ47.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/9/6K/53TOYTOLDEUBMS5SLUFP3V.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/9/6K/53TOYTOLDEUBMS5SLUFP3V.uasset deleted file mode 100644 index 3725193..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/9/6K/53TOYTOLDEUBMS5SLUFP3V.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/9/ET/4MV9T547BZ4CWY6UHUJU0X.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/9/ET/4MV9T547BZ4CWY6UHUJU0X.uasset deleted file mode 100644 index 29c9606..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/9/ET/4MV9T547BZ4CWY6UHUJU0X.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/9/JW/IY5R6I5N0YWU9LYWKXFXH9.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/9/JW/IY5R6I5N0YWU9LYWKXFXH9.uasset deleted file mode 100644 index 9a7d4aa..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/9/JW/IY5R6I5N0YWU9LYWKXFXH9.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/9/OJ/9MHHMH0XHVZ04YDZ7NPC32.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/9/OJ/9MHHMH0XHVZ04YDZ7NPC32.uasset deleted file mode 100644 index ce950b0..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/9/OJ/9MHHMH0XHVZ04YDZ7NPC32.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/9/Q2/TOKV0KMMZ7RIQ78R0UEDQL.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/9/Q2/TOKV0KMMZ7RIQ78R0UEDQL.uasset deleted file mode 100644 index 1dfe396..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/9/Q2/TOKV0KMMZ7RIQ78R0UEDQL.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/9/VP/FVTPO8KZ0WPMCSQLVJE6O9.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/9/VP/FVTPO8KZ0WPMCSQLVJE6O9.uasset deleted file mode 100644 index d574514..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/9/VP/FVTPO8KZ0WPMCSQLVJE6O9.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/A/2W/U0XT0R08XQA6C15NK8ILFA.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/A/2W/U0XT0R08XQA6C15NK8ILFA.uasset deleted file mode 100644 index 28bfe8b..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/A/2W/U0XT0R08XQA6C15NK8ILFA.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/A/RJ/Z7CLKO8GGJ7RXH5PUAF4T4.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/A/RJ/Z7CLKO8GGJ7RXH5PUAF4T4.uasset deleted file mode 100644 index 4a1fa7a..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/A/RJ/Z7CLKO8GGJ7RXH5PUAF4T4.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/A/XJ/HL558UUAGCS9HVVOI0S7PX.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/A/XJ/HL558UUAGCS9HVVOI0S7PX.uasset deleted file mode 100644 index d8b9650..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/A/XJ/HL558UUAGCS9HVVOI0S7PX.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/B/51/6JKB4DNGJP09QUHY23FHRV.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/B/51/6JKB4DNGJP09QUHY23FHRV.uasset deleted file mode 100644 index a6135d5..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/B/51/6JKB4DNGJP09QUHY23FHRV.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/B/DD/654T6CAPVSXAN1LXEX71EI.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/B/DD/654T6CAPVSXAN1LXEX71EI.uasset deleted file mode 100644 index 2a6da42..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/B/DD/654T6CAPVSXAN1LXEX71EI.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/B/EF/G3O7YJR3QU51OHQGRYB635.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/B/EF/G3O7YJR3QU51OHQGRYB635.uasset deleted file mode 100644 index 740e2c2..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/B/EF/G3O7YJR3QU51OHQGRYB635.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/B/YQ/KT6JL4FVCNJJ9VFOCSF32J.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/B/YQ/KT6JL4FVCNJJ9VFOCSF32J.uasset deleted file mode 100644 index 050478f..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/B/YQ/KT6JL4FVCNJJ9VFOCSF32J.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/C/P8/0GJ9TLQE2YKOIFZ6YHG33H.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/C/P8/0GJ9TLQE2YKOIFZ6YHG33H.uasset deleted file mode 100644 index 5d4e371..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/C/P8/0GJ9TLQE2YKOIFZ6YHG33H.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/C/VO/VMN4G7K3NKKV6F8HTPHHDB.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/C/VO/VMN4G7K3NKKV6F8HTPHHDB.uasset deleted file mode 100644 index eb741c8..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/C/VO/VMN4G7K3NKKV6F8HTPHHDB.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/D/0W/E1FKEGVKGOLM7HGLQPCIPO.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/D/0W/E1FKEGVKGOLM7HGLQPCIPO.uasset deleted file mode 100644 index 8a7f150..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/D/0W/E1FKEGVKGOLM7HGLQPCIPO.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/D/OJ/2028JO54KEAJB1N98IRKL0.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/D/OJ/2028JO54KEAJB1N98IRKL0.uasset deleted file mode 100644 index 4ac29f7..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/D/OJ/2028JO54KEAJB1N98IRKL0.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/E/MX/R1GV431P5FDO08OFULRA01.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/E/MX/R1GV431P5FDO08OFULRA01.uasset deleted file mode 100644 index 9f9f3bb..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/E/MX/R1GV431P5FDO08OFULRA01.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/E/UE/YUZ9741T50O1SYRX90OB0S.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/E/UE/YUZ9741T50O1SYRX90OB0S.uasset deleted file mode 100644 index 1304e83..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/E/UE/YUZ9741T50O1SYRX90OB0S.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/F/2F/0SPQG8P507LI9VUAFG20OA.uasset b/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/F/2F/0SPQG8P507LI9VUAFG20OA.uasset deleted file mode 100644 index a4fe216..0000000 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/F/2F/0SPQG8P507LI9VUAFG20OA.uasset and /dev/null differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/0/0N/4GAFXWBBJ1BNWD0E51TBXH.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/0/0N/4GAFXWBBJ1BNWD0E51TBXH.uasset new file mode 100644 index 0000000..101e3fc Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/0/0N/4GAFXWBBJ1BNWD0E51TBXH.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/0/35/B0SHKW9VJW9SUPWOCDN4V2.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/0/35/B0SHKW9VJW9SUPWOCDN4V2.uasset new file mode 100644 index 0000000..75c1171 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/0/35/B0SHKW9VJW9SUPWOCDN4V2.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/0/84/R8NF626KASE07HRG3QSW9G.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/0/84/R8NF626KASE07HRG3QSW9G.uasset new file mode 100644 index 0000000..63cb21f Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/0/84/R8NF626KASE07HRG3QSW9G.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/0/BW/38PEA5R3SCQ4DJH92XXEL0.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/0/BW/38PEA5R3SCQ4DJH92XXEL0.uasset new file mode 100644 index 0000000..bbf85c2 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/0/BW/38PEA5R3SCQ4DJH92XXEL0.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/0/JW/FCLJRRSMOBD5WYYNUU4QLT.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/0/JW/FCLJRRSMOBD5WYYNUU4QLT.uasset new file mode 100644 index 0000000..5d11f79 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/0/JW/FCLJRRSMOBD5WYYNUU4QLT.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/0/RW/PG2ZMEX3WNNKNDZO7PWYF2.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/0/RW/PG2ZMEX3WNNKNDZO7PWYF2.uasset new file mode 100644 index 0000000..a1fe63b Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/0/RW/PG2ZMEX3WNNKNDZO7PWYF2.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/0/SU/8R3FLSOLTR1R1ANFT7T2UK.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/0/SU/8R3FLSOLTR1R1ANFT7T2UK.uasset new file mode 100644 index 0000000..af5d029 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/0/SU/8R3FLSOLTR1R1ANFT7T2UK.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/1/R6/FGQ1ZOOGKCC22OW3L1V80M.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/1/R6/FGQ1ZOOGKCC22OW3L1V80M.uasset new file mode 100644 index 0000000..4248d11 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/1/R6/FGQ1ZOOGKCC22OW3L1V80M.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/1/RE/VX0AI6CMC4652Z2CJLADUI.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/1/RE/VX0AI6CMC4652Z2CJLADUI.uasset new file mode 100644 index 0000000..0007025 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/1/RE/VX0AI6CMC4652Z2CJLADUI.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/2/7H/VXLCHFD8T7T5SML8K9OZ7P.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/2/7H/VXLCHFD8T7T5SML8K9OZ7P.uasset new file mode 100644 index 0000000..73d42f9 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/2/7H/VXLCHFD8T7T5SML8K9OZ7P.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/2/I8/UEV3C8FOOTBWQ4U7WUCQ5Z.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/2/I8/UEV3C8FOOTBWQ4U7WUCQ5Z.uasset new file mode 100644 index 0000000..bfb8b09 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/2/I8/UEV3C8FOOTBWQ4U7WUCQ5Z.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/2/KU/21XH64WKH8B2K6I7F89LQU.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/2/KU/21XH64WKH8B2K6I7F89LQU.uasset new file mode 100644 index 0000000..9df2f43 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/2/KU/21XH64WKH8B2K6I7F89LQU.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/2/M4/BT7BLLF1EO8W5WF75CS9GA.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/2/M4/BT7BLLF1EO8W5WF75CS9GA.uasset new file mode 100644 index 0000000..ae16886 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/2/M4/BT7BLLF1EO8W5WF75CS9GA.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/3/3I/JFE5NWI51I7KGU0WNFX6OD.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/3/3I/JFE5NWI51I7KGU0WNFX6OD.uasset new file mode 100644 index 0000000..f61a08c Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/3/3I/JFE5NWI51I7KGU0WNFX6OD.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/3/6Q/8BJIO53MF2WBXDEVV7HQZM.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/3/6Q/8BJIO53MF2WBXDEVV7HQZM.uasset new file mode 100644 index 0000000..e288ed6 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/3/6Q/8BJIO53MF2WBXDEVV7HQZM.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/4/5V/9NGWTYZO4KCSCUMXUJT9I0.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/4/5V/9NGWTYZO4KCSCUMXUJT9I0.uasset new file mode 100644 index 0000000..bf85b1e Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/4/5V/9NGWTYZO4KCSCUMXUJT9I0.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/4/7K/5GEPR53RRN7RY6U6JKIFVB.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/4/7K/5GEPR53RRN7RY6U6JKIFVB.uasset new file mode 100644 index 0000000..40eae4f Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/4/7K/5GEPR53RRN7RY6U6JKIFVB.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/4/EM/ZBUMYOAJH6TO0HQJVW2X2M.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/4/EM/ZBUMYOAJH6TO0HQJVW2X2M.uasset new file mode 100644 index 0000000..1c82b20 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/4/EM/ZBUMYOAJH6TO0HQJVW2X2M.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/5/26/NYALG7I6EEVAQNHQOWYO0O.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/5/26/NYALG7I6EEVAQNHQOWYO0O.uasset new file mode 100644 index 0000000..2aaedca Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/5/26/NYALG7I6EEVAQNHQOWYO0O.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/5/BE/6UQSM6IJPVR55XAZ5WDHT4.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/5/BE/6UQSM6IJPVR55XAZ5WDHT4.uasset new file mode 100644 index 0000000..3a5197a Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/5/BE/6UQSM6IJPVR55XAZ5WDHT4.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/5/BM/D38KL5DXRI7VYKJF6C08W9.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/5/BM/D38KL5DXRI7VYKJF6C08W9.uasset new file mode 100644 index 0000000..4458126 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/5/BM/D38KL5DXRI7VYKJF6C08W9.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/5/D8/QVDS4BTVBMBW1O979BUR7O.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/5/D8/QVDS4BTVBMBW1O979BUR7O.uasset new file mode 100644 index 0000000..d0d2bd8 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/5/D8/QVDS4BTVBMBW1O979BUR7O.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/6/4J/8LOV213BAQZC2FHXHFHHY4.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/6/4J/8LOV213BAQZC2FHXHFHHY4.uasset new file mode 100644 index 0000000..80955b6 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/6/4J/8LOV213BAQZC2FHXHFHHY4.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/6/64/YTSZXZGL8AYOX4FS2K9WB4.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/6/64/YTSZXZGL8AYOX4FS2K9WB4.uasset new file mode 100644 index 0000000..ebbf075 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/6/64/YTSZXZGL8AYOX4FS2K9WB4.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/6/ER/Q1L9UXCS7YRHAE6RNDX3IA.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/6/ER/Q1L9UXCS7YRHAE6RNDX3IA.uasset new file mode 100644 index 0000000..2067cae Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/6/ER/Q1L9UXCS7YRHAE6RNDX3IA.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/6/KN/UFYJ7RY0VDB7Z7S8XEXXNX.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/6/KN/UFYJ7RY0VDB7Z7S8XEXXNX.uasset new file mode 100644 index 0000000..1dd82f9 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/6/KN/UFYJ7RY0VDB7Z7S8XEXXNX.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/7/FH/N5INMPT2UA00TYEQKBR772.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/7/FH/N5INMPT2UA00TYEQKBR772.uasset new file mode 100644 index 0000000..05ac1cd Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/7/FH/N5INMPT2UA00TYEQKBR772.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/7/FK/HBLP4LAX21RTH4MFF6O0VU.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/7/FK/HBLP4LAX21RTH4MFF6O0VU.uasset new file mode 100644 index 0000000..c314236 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/7/FK/HBLP4LAX21RTH4MFF6O0VU.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/7/V7/97WEQOKQQN5DQITDZMHQWR.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/7/V7/97WEQOKQQN5DQITDZMHQWR.uasset new file mode 100644 index 0000000..c3121e7 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/7/V7/97WEQOKQQN5DQITDZMHQWR.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/7/YA/GCA9IR4G7XX0U0I6AS42X3.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/7/YA/GCA9IR4G7XX0U0I6AS42X3.uasset new file mode 100644 index 0000000..0051eb6 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/7/YA/GCA9IR4G7XX0U0I6AS42X3.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/7/ZD/Q86CPX0C9YED797IWS1DHY.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/7/ZD/Q86CPX0C9YED797IWS1DHY.uasset new file mode 100644 index 0000000..612e6d6 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/7/ZD/Q86CPX0C9YED797IWS1DHY.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/8/6B/TU0177PP422NI4GEDFQH3M.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/8/6B/TU0177PP422NI4GEDFQH3M.uasset new file mode 100644 index 0000000..6eba384 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/8/6B/TU0177PP422NI4GEDFQH3M.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/8/DH/MEDI4UR4HY461ABQD3C29Q.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/8/DH/MEDI4UR4HY461ABQD3C29Q.uasset new file mode 100644 index 0000000..2eca2ab Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/8/DH/MEDI4UR4HY461ABQD3C29Q.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/8/HJ/27DC1EE3DDRN7941EAV3PF.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/8/HJ/27DC1EE3DDRN7941EAV3PF.uasset new file mode 100644 index 0000000..7c6fac8 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/8/HJ/27DC1EE3DDRN7941EAV3PF.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/8/KS/9MMFCWUSK30UKT1YGWCNL9.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/8/KS/9MMFCWUSK30UKT1YGWCNL9.uasset new file mode 100644 index 0000000..c08846a Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/8/KS/9MMFCWUSK30UKT1YGWCNL9.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/8/SI/Y0YLUYQVRD7GPEYVXQAPTG.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/8/SI/Y0YLUYQVRD7GPEYVXQAPTG.uasset new file mode 100644 index 0000000..e64c5c6 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/8/SI/Y0YLUYQVRD7GPEYVXQAPTG.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/8/SY/LJI52ES0Y7UV5FKUVLYMJ6.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/8/SY/LJI52ES0Y7UV5FKUVLYMJ6.uasset new file mode 100644 index 0000000..72cbc93 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/8/SY/LJI52ES0Y7UV5FKUVLYMJ6.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/8/U6/9FC3Z580O8EAS5DTWBBKB0.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/8/U6/9FC3Z580O8EAS5DTWBBKB0.uasset new file mode 100644 index 0000000..509523e Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/8/U6/9FC3Z580O8EAS5DTWBBKB0.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/9/8Y/EHGLATHR6SJ8N4BBKSKI1H.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/9/8Y/EHGLATHR6SJ8N4BBKSKI1H.uasset new file mode 100644 index 0000000..1e0f64e Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/9/8Y/EHGLATHR6SJ8N4BBKSKI1H.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/9/ID/QADNH8B9KK1B1MWTU23JA9.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/9/ID/QADNH8B9KK1B1MWTU23JA9.uasset new file mode 100644 index 0000000..a09e4c1 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/9/ID/QADNH8B9KK1B1MWTU23JA9.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/9/UX/U6GCM69W2NIDJEHY1DQZNS.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/9/UX/U6GCM69W2NIDJEHY1DQZNS.uasset new file mode 100644 index 0000000..26e6b09 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/9/UX/U6GCM69W2NIDJEHY1DQZNS.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/9/VG/P1U5LAIIDAMGSSOF8D42J5.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/9/VG/P1U5LAIIDAMGSSOF8D42J5.uasset new file mode 100644 index 0000000..fabfb37 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/9/VG/P1U5LAIIDAMGSSOF8D42J5.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/A/L1/077Z4KTIDU3B6NDKJ2N0YM.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/A/L1/077Z4KTIDU3B6NDKJ2N0YM.uasset new file mode 100644 index 0000000..49c1e41 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/A/L1/077Z4KTIDU3B6NDKJ2N0YM.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/A/PL/KWA7W0DBO08IBOSKCTIMEG.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/A/PL/KWA7W0DBO08IBOSKCTIMEG.uasset new file mode 100644 index 0000000..bc99290 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/A/PL/KWA7W0DBO08IBOSKCTIMEG.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/A/PQ/CLW33LT9EXIN6IUR4G3XKE.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/A/PQ/CLW33LT9EXIN6IUR4G3XKE.uasset new file mode 100644 index 0000000..56e14f9 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/A/PQ/CLW33LT9EXIN6IUR4G3XKE.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/B/79/R9DGG19Z0DIPQUR2UQFUB1.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/B/79/R9DGG19Z0DIPQUR2UQFUB1.uasset new file mode 100644 index 0000000..77adf31 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/B/79/R9DGG19Z0DIPQUR2UQFUB1.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/B/8N/NU2ZBWCUBNX5GJVIVSE07J.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/B/8N/NU2ZBWCUBNX5GJVIVSE07J.uasset new file mode 100644 index 0000000..b9500ac Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/B/8N/NU2ZBWCUBNX5GJVIVSE07J.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/B/8R/55P3KETBXRBLEBDF3DLJNN.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/B/8R/55P3KETBXRBLEBDF3DLJNN.uasset new file mode 100644 index 0000000..29da999 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/B/8R/55P3KETBXRBLEBDF3DLJNN.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/B/D0/47PXUBWBUXPV95S4OEQ7HH.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/B/D0/47PXUBWBUXPV95S4OEQ7HH.uasset new file mode 100644 index 0000000..4c3f6e3 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/B/D0/47PXUBWBUXPV95S4OEQ7HH.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/C/MT/ZLKTM96EN5FZVKJ8M1AO7Q.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/C/MT/ZLKTM96EN5FZVKJ8M1AO7Q.uasset new file mode 100644 index 0000000..d470ad3 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/C/MT/ZLKTM96EN5FZVKJ8M1AO7Q.uasset differ diff --git a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/A/KU/12YG9I1QW2GU72MG8QQX1K.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/D/5U/4JFVZ0OWOE6KHQ6LDEGHZB.uasset similarity index 51% rename from Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/A/KU/12YG9I1QW2GU72MG8QQX1K.uasset rename to Content/__ExternalActors__/Maps/FirstPersonMap/D/5U/4JFVZ0OWOE6KHQ6LDEGHZB.uasset index 338980f..6f46d24 100644 Binary files a/Content/__ExternalActors__/FirstPerson/Maps/FirstPersonMap/A/KU/12YG9I1QW2GU72MG8QQX1K.uasset and b/Content/__ExternalActors__/Maps/FirstPersonMap/D/5U/4JFVZ0OWOE6KHQ6LDEGHZB.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/D/IR/38OWU4P27F23UMKGX99WFG.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/D/IR/38OWU4P27F23UMKGX99WFG.uasset new file mode 100644 index 0000000..07ce053 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/D/IR/38OWU4P27F23UMKGX99WFG.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/D/P6/OUV9NOJPJ6DJM0NLDN0KLI.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/D/P6/OUV9NOJPJ6DJM0NLDN0KLI.uasset new file mode 100644 index 0000000..d513a7f Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/D/P6/OUV9NOJPJ6DJM0NLDN0KLI.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/D/YA/2KNLFBWIKK6BWCB5OAJIKU.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/D/YA/2KNLFBWIKK6BWCB5OAJIKU.uasset new file mode 100644 index 0000000..82114b0 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/D/YA/2KNLFBWIKK6BWCB5OAJIKU.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/E/6O/XO1VJK4G8S619K4LOF30GA.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/E/6O/XO1VJK4G8S619K4LOF30GA.uasset new file mode 100644 index 0000000..f600806 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/E/6O/XO1VJK4G8S619K4LOF30GA.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/E/9X/W5W5AUP8AQ5B6IZZLDEEOS.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/E/9X/W5W5AUP8AQ5B6IZZLDEEOS.uasset new file mode 100644 index 0000000..cec70c2 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/E/9X/W5W5AUP8AQ5B6IZZLDEEOS.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/E/AM/0O72WHSSB0KUG3TNJ0K0TP.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/E/AM/0O72WHSSB0KUG3TNJ0K0TP.uasset new file mode 100644 index 0000000..cb14774 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/E/AM/0O72WHSSB0KUG3TNJ0K0TP.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/E/CA/OB703EEPMG1TO3ZHD9TBRH.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/E/CA/OB703EEPMG1TO3ZHD9TBRH.uasset new file mode 100644 index 0000000..c500a2d Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/E/CA/OB703EEPMG1TO3ZHD9TBRH.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/E/JJ/FYK234SX70BUT2NE0G5G9Y.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/E/JJ/FYK234SX70BUT2NE0G5G9Y.uasset new file mode 100644 index 0000000..2568068 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/E/JJ/FYK234SX70BUT2NE0G5G9Y.uasset differ diff --git a/Content/__ExternalActors__/Maps/FirstPersonMap/E/WI/5FDODL6M9EYTP218GQHZPB.uasset b/Content/__ExternalActors__/Maps/FirstPersonMap/E/WI/5FDODL6M9EYTP218GQHZPB.uasset new file mode 100644 index 0000000..c910a15 Binary files /dev/null and b/Content/__ExternalActors__/Maps/FirstPersonMap/E/WI/5FDODL6M9EYTP218GQHZPB.uasset differ diff --git a/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/1/KG/WXBHR5YF7EMN5ENSKZGERE.uasset b/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/1/KG/WXBHR5YF7EMN5ENSKZGERE.uasset deleted file mode 100644 index 4f8efdd..0000000 Binary files a/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/1/KG/WXBHR5YF7EMN5ENSKZGERE.uasset and /dev/null differ diff --git a/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/3/BY/K2NKB37FY83282ZJ5Q84B9.uasset b/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/3/BY/K2NKB37FY83282ZJ5Q84B9.uasset deleted file mode 100644 index c060d56..0000000 Binary files a/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/3/BY/K2NKB37FY83282ZJ5Q84B9.uasset and /dev/null differ diff --git a/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/5/68/DK3EWP7A4H1CU1MWJ4M3SR.uasset b/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/5/68/DK3EWP7A4H1CU1MWJ4M3SR.uasset deleted file mode 100644 index 492668b..0000000 Binary files a/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/5/68/DK3EWP7A4H1CU1MWJ4M3SR.uasset and /dev/null differ diff --git a/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/6/B8/RE8N15L5TGXIQNKLJO5ONQ.uasset b/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/6/B8/RE8N15L5TGXIQNKLJO5ONQ.uasset deleted file mode 100644 index 58faa97..0000000 Binary files a/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/6/B8/RE8N15L5TGXIQNKLJO5ONQ.uasset and /dev/null differ diff --git a/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/6/VE/TF378B0L0V6R2E9RYZ61WK.uasset b/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/6/VE/TF378B0L0V6R2E9RYZ61WK.uasset deleted file mode 100644 index df555a6..0000000 Binary files a/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/6/VE/TF378B0L0V6R2E9RYZ61WK.uasset and /dev/null differ diff --git a/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/7/XG/B4XEEQD3M51IAE3XXUCIGI.uasset b/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/7/XG/B4XEEQD3M51IAE3XXUCIGI.uasset deleted file mode 100644 index bcff0f3..0000000 Binary files a/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/7/XG/B4XEEQD3M51IAE3XXUCIGI.uasset and /dev/null differ diff --git a/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/9/NP/OGSW48O49NB75KV3Y5NAUU.uasset b/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/9/NP/OGSW48O49NB75KV3Y5NAUU.uasset deleted file mode 100644 index f8cd35f..0000000 Binary files a/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/9/NP/OGSW48O49NB75KV3Y5NAUU.uasset and /dev/null differ diff --git a/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/E/D1/9XTHNJ7RYMHRDCEYQKNIYP.uasset b/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/E/D1/9XTHNJ7RYMHRDCEYQKNIYP.uasset deleted file mode 100644 index 24caa46..0000000 Binary files a/Content/__ExternalObjects__/FirstPerson/Maps/FirstPersonMap/E/D1/9XTHNJ7RYMHRDCEYQKNIYP.uasset and /dev/null differ diff --git a/Content/__ExternalObjects__/Maps/FirstPersonMap/1/20/K35OQDW2OQ2NMBZ0EW88ZL.uasset b/Content/__ExternalObjects__/Maps/FirstPersonMap/1/20/K35OQDW2OQ2NMBZ0EW88ZL.uasset new file mode 100644 index 0000000..bcf6543 Binary files /dev/null and b/Content/__ExternalObjects__/Maps/FirstPersonMap/1/20/K35OQDW2OQ2NMBZ0EW88ZL.uasset differ diff --git a/Content/__ExternalObjects__/Maps/FirstPersonMap/1/5T/ZSSNR1Z1MALIXZ78AQVRCD.uasset b/Content/__ExternalObjects__/Maps/FirstPersonMap/1/5T/ZSSNR1Z1MALIXZ78AQVRCD.uasset new file mode 100644 index 0000000..b7b1c4a Binary files /dev/null and b/Content/__ExternalObjects__/Maps/FirstPersonMap/1/5T/ZSSNR1Z1MALIXZ78AQVRCD.uasset differ diff --git a/Content/__ExternalObjects__/Maps/FirstPersonMap/1/DS/OBMA16L16JDM01LKIOWB85.uasset b/Content/__ExternalObjects__/Maps/FirstPersonMap/1/DS/OBMA16L16JDM01LKIOWB85.uasset new file mode 100644 index 0000000..3982cae Binary files /dev/null and b/Content/__ExternalObjects__/Maps/FirstPersonMap/1/DS/OBMA16L16JDM01LKIOWB85.uasset differ diff --git a/Content/__ExternalObjects__/Maps/FirstPersonMap/1/I8/Z6WZC3YCF0RH9L0UQPE1SG.uasset b/Content/__ExternalObjects__/Maps/FirstPersonMap/1/I8/Z6WZC3YCF0RH9L0UQPE1SG.uasset new file mode 100644 index 0000000..42b4bfa Binary files /dev/null and b/Content/__ExternalObjects__/Maps/FirstPersonMap/1/I8/Z6WZC3YCF0RH9L0UQPE1SG.uasset differ diff --git a/Content/__ExternalObjects__/Maps/FirstPersonMap/2/KS/UCOWRKYUTN6ES67QC1H3RD.uasset b/Content/__ExternalObjects__/Maps/FirstPersonMap/2/KS/UCOWRKYUTN6ES67QC1H3RD.uasset new file mode 100644 index 0000000..bb52334 Binary files /dev/null and b/Content/__ExternalObjects__/Maps/FirstPersonMap/2/KS/UCOWRKYUTN6ES67QC1H3RD.uasset differ diff --git a/Content/__ExternalObjects__/Maps/FirstPersonMap/2/QV/P9I4QJXIC0ESVD9NP7AS56.uasset b/Content/__ExternalObjects__/Maps/FirstPersonMap/2/QV/P9I4QJXIC0ESVD9NP7AS56.uasset new file mode 100644 index 0000000..75af674 Binary files /dev/null and b/Content/__ExternalObjects__/Maps/FirstPersonMap/2/QV/P9I4QJXIC0ESVD9NP7AS56.uasset differ diff --git a/Content/__ExternalObjects__/Maps/FirstPersonMap/4/AJ/ZSFKIN8LN4PS5U38XDXA8P.uasset b/Content/__ExternalObjects__/Maps/FirstPersonMap/4/AJ/ZSFKIN8LN4PS5U38XDXA8P.uasset new file mode 100644 index 0000000..a40e97e Binary files /dev/null and b/Content/__ExternalObjects__/Maps/FirstPersonMap/4/AJ/ZSFKIN8LN4PS5U38XDXA8P.uasset differ diff --git a/Content/__ExternalObjects__/Maps/FirstPersonMap/D/3W/ODAR8TFQ54HNHJ68MWXNHX.uasset b/Content/__ExternalObjects__/Maps/FirstPersonMap/D/3W/ODAR8TFQ54HNHJ68MWXNHX.uasset new file mode 100644 index 0000000..04826c6 Binary files /dev/null and b/Content/__ExternalObjects__/Maps/FirstPersonMap/D/3W/ODAR8TFQ54HNHJ68MWXNHX.uasset differ diff --git a/Plugins/Developer/RiderLink/Resources/Icon128.png b/Plugins/Developer/RiderLink/Resources/Icon128.png new file mode 100644 index 0000000..4160954 Binary files /dev/null and b/Plugins/Developer/RiderLink/Resources/Icon128.png differ diff --git a/Plugins/Developer/RiderLink/Resources/checksum b/Plugins/Developer/RiderLink/Resources/checksum new file mode 100644 index 0000000..82f09e6 --- /dev/null +++ b/Plugins/Developer/RiderLink/Resources/checksum @@ -0,0 +1 @@ +qH7 \ No newline at end of file diff --git a/Plugins/Developer/RiderLink/RiderLink.uplugin b/Plugins/Developer/RiderLink/RiderLink.uplugin new file mode 100644 index 0000000..f11b3f7 --- /dev/null +++ b/Plugins/Developer/RiderLink/RiderLink.uplugin @@ -0,0 +1,61 @@ +{ + "FileVersion": 3, + "Version": 1, + "VersionName": "2024.3.2", + "FriendlyName": "RiderLink", + "Description": "Plugin for establishing IPC connection with JetBrains Rider IDE", + "Category": "Programming", + "CreatedBy": "JetBrains", + "CreatedByURL": "https://www.jetbrains.com/", + "DocsURL": "", + "MarketplaceURL": "", + "SupportURL": "", + "CanContainContent": false, + "Installed": false, + "Modules": [ + { + "Name": "RD", + "Type": "EditorNoCommandlet", + "LoadingPhase": "PreDefault" + }, + { + "Name": "RiderLink", + "Type": "EditorNoCommandlet", + "LoadingPhase": "PreDefault" + }, + { + "Name": "RiderLogging", + "Type": "EditorNoCommandlet", + "LoadingPhase": "PreDefault" + }, + { + "Name": "RiderBlueprint", + "Type": "EditorNoCommandlet", + "LoadingPhase": "Default" + }, + { + "Name": "RiderGameControl", + "Type": "EditorNoCommandlet", + "LoadingPhase": "Default" + }, + { + "Name": "RiderShaderInfo", + "Type": "EditorNoCommandlet", + "LoadingPhase": "PostEngineInit" + }, + { + "Name": "RiderLC", + "Type": "EditorNoCommandlet", + "LoadingPhase": "PostEngineInit" + }, + { + "Name": "RiderDebuggerSupport", + "Type": "EditorNoCommandlet", + "LoadingPhase": "PreDefault", + "PlatformAllowList": [ + "Win64" + ] + } + ], + "EnabledByDefault": true +} \ No newline at end of file diff --git a/Plugins/Developer/RiderLink/Source/RD/RD.Build.cs b/Plugins/Developer/RiderLink/Source/RD/RD.Build.cs new file mode 100644 index 0000000..e3b7168 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/RD.Build.cs @@ -0,0 +1,85 @@ +using System.IO; +using UnrealBuildTool; + +public class RD : ModuleRules +{ + public RD(ReadOnlyTargetRules Target) : base(Target) + { + PublicDependencyModuleNames.Add("Core"); + bUseRTTI = true; + +#if UE_5_2_OR_LATER + bDisableStaticAnalysis = true; +#endif + +#if UE_5_2_OR_LATER + IWYUSupport = IWYUSupport.KeepAsIs; +#else + bEnforceIWYU = false; +#endif + +#if UE_4_22_OR_LATER + CppStandard = CppStandardVersion.Cpp17; +#endif + +#if UE_4_22_OR_LATER + PCHUsage = PCHUsageMode.NoPCHs; +#else + PCHUsage = PCHUsageMode.NoSharedPCHs; +#endif + +#if UE_4_24_OR_LATER + ShadowVariableWarningLevel = WarningLevel.Off; + bUseUnity = false; +#else + bEnableShadowVariableWarnings = false; + bFasterWithoutUnity = true; +#endif + + PublicDefinitions.Add("_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS"); + + if (Target.Platform == UnrealTargetPlatform.Win64) + { + PublicDefinitions.Add("_WINSOCK_DEPRECATED_NO_WARNINGS"); + PublicDefinitions.Add("_CRT_SECURE_NO_WARNINGS"); + PublicDefinitions.Add("_CRT_NONSTDC_NO_DEPRECATE"); + PublicDefinitions.Add("SPDLOG_WCHAR_FILENAMES"); + PublicDefinitions.Add("SPDLOG_WCHAR_TO_UTF8_SUPPORT"); + PrivateDefinitions.Add("WIN32_LEAN_AND_MEAN"); + } + + if (Target.Platform == UnrealTargetPlatform.Mac) + { + PublicDefinitions.Add("_DARWIN"); + } + + // Common dependencies + PrivateDefinitions.Add("rd_framework_cpp_EXPORTS"); + PrivateDefinitions.Add("rd_core_cpp_EXPORTS"); + PrivateDefinitions.Add("spdlog_EXPORTS"); + PrivateDefinitions.Add("FMT_EXPORT"); + + PublicDefinitions.Add("SPDLOG_NO_EXCEPTIONS"); + PublicDefinitions.Add("SPDLOG_COMPILED_LIB"); + PublicDefinitions.Add("SPDLOG_SHARED_LIB"); + PublicDefinitions.Add( + "nssv_CONFIG_SELECT_STRING_VIEW=nssv_STRING_VIEW_NONSTD"); + PublicDefinitions.Add("FMT_SHARED"); + + string[] Paths = + { + "src", "src/rd_core_cpp", "src/rd_core_cpp/src/main" + , "src/rd_framework_cpp", "src/rd_framework_cpp/src/main" + , "src/rd_framework_cpp/src/main/util", "src/rd_gen_cpp/src" + , "thirdparty", "thirdparty/ordered-map/include" + , "thirdparty/optional/tl", "thirdparty/variant/include" + , "thirdparty/string-view-lite/include", "thirdparty/spdlog/include" + , "thirdparty/clsocket/src", "thirdparty/CTPL/include", "thirdparty/utf-cpp/include" + }; + + foreach (var Item in Paths) + { + PublicIncludePaths.Add(Path.Combine(ModuleDirectory, Item)); + } + } +} diff --git a/Plugins/Developer/RiderLink/Source/RD/RD.cpp b/Plugins/Developer/RiderLink/Source/RD/RD.cpp new file mode 100644 index 0000000..3840428 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/RD.cpp @@ -0,0 +1,11 @@ +#include "RD.h" + +#include + +#define LOCTEXT_NAMESPACE "RD" + +DEFINE_LOG_CATEGORY(FLogRDModule); + +IMPLEMENT_MODULE(FRDModule, RD); + +#undef LOCTEXT_NAMESPACE \ No newline at end of file diff --git a/Plugins/Developer/RiderLink/Source/RD/RD.h b/Plugins/Developer/RiderLink/Source/RD/RD.h new file mode 100644 index 0000000..4a477e1 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/RD.h @@ -0,0 +1,16 @@ +// Copyright 1998-2018 Epic Games, Inc. All Rights Reserved. + +#pragma once + +#include "Logging/LogMacros.h" +#include "Logging/LogVerbosity.h" +#include "Modules/ModuleInterface.h" + +DECLARE_LOG_CATEGORY_EXTERN(FLogRDModule, Log, All); + +class FRDModule : public IModuleInterface +{ +public: + FRDModule() = default; + ~FRDModule() = default; +}; diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/rd_core_export.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/rd_core_export.h new file mode 100644 index 0000000..50b8f72 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/rd_core_export.h @@ -0,0 +1,83 @@ + +#ifndef RD_CORE_API_H +#define RD_CORE_API_H + +#if defined(_WIN32) +#ifdef RD_CORE_STATIC_DEFINE +# define RD_CORE_API +# define RD_CORE_NO_EXPORT +#else +# ifndef RD_CORE_API +# ifdef rd_core_cpp_EXPORTS + /* We are building this library */ +# define RD_CORE_API __declspec(dllexport) +# else + /* We are using this library */ +# define RD_CORE_API __declspec(dllimport) +# endif +# endif + +# ifndef RD_CORE_NO_EXPORT +# define RD_CORE_NO_EXPORT +# endif +#endif + +#ifndef RD_CORE_DEPRECATED +# define RD_CORE_DEPRECATED __declspec(deprecated) +#endif + +#ifndef RD_CORE_DEPRECATED_EXPORT +# define RD_CORE_DEPRECATED_EXPORT RD_CORE_API RD_CORE_DEPRECATED +#endif + +#ifndef RD_CORE_DEPRECATED_NO_EXPORT +# define RD_CORE_DEPRECATED_NO_EXPORT RD_CORE_NO_EXPORT RD_CORE_DEPRECATED +#endif + +#if 0 /* DEFINE_NO_DEPRECATED */ +# ifndef RD_CORE_NO_DEPRECATED +# define RD_CORE_NO_DEPRECATED +# endif +#endif +#endif + +#if defined(unix) || defined(__unix__) || defined(__unix) || defined(__APPLE__) +#ifdef RD_CORE_STATIC_DEFINE +# define RD_CORE_API +# define RD_CORE_NO_EXPORT +#else +# ifndef RD_CORE_API +# ifdef rd_core_cpp_EXPORTS + /* We are building this library */ +# define RD_CORE_API __attribute__((visibility("default"))) +# else + /* We are using this library */ +# define RD_CORE_API __attribute__((visibility("default"))) +# endif +# endif + +# ifndef RD_CORE_NO_EXPORT +# define RD_CORE_NO_EXPORT __attribute__((visibility("hidden"))) +# endif +#endif + +#ifndef RD_CORE_DEPRECATED +# define RD_CORE_DEPRECATED __attribute__ ((__deprecated__)) +#endif + +#ifndef RD_CORE_DEPRECATED_EXPORT +# define RD_CORE_DEPRECATED_EXPORT RD_CORE_API RD_CORE_DEPRECATED +#endif + +#ifndef RD_CORE_DEPRECATED_NO_EXPORT +# define RD_CORE_DEPRECATED_NO_EXPORT RD_CORE_NO_EXPORT RD_CORE_DEPRECATED +#endif + +#if 0 /* DEFINE_NO_DEPRECATED */ +# ifndef RD_CORE_NO_DEPRECATED +# define RD_CORE_NO_DEPRECATED +# endif +#endif +#endif + +#endif /* RD_CORE_API_H */ diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/Lifetime.cpp b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/Lifetime.cpp new file mode 100644 index 0000000..d63a9bf --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/Lifetime.cpp @@ -0,0 +1,49 @@ +#include "Lifetime.h" + +#include + +#include +#include +#include + +namespace rd +{ +/*thread_local */ Lifetime::Allocator Lifetime::allocator; + +LifetimeImpl* Lifetime::operator->() const +{ + return ptr.operator->(); +} + +std::once_flag onceFlag; + +Lifetime::Lifetime(bool is_eternal) : ptr(std::allocate_shared(allocator, is_eternal)) +{ + std::call_once(onceFlag, [] { + spdlog::set_default_logger(spdlog::stderr_color_mt("default", spdlog::color_mode::automatic)); + }); +} + +Lifetime Lifetime::create_nested() const +{ + Lifetime lw(false); + ptr->attach_nested(lw.ptr); + return lw; +} + +Lifetime const& Lifetime::Eternal() +{ + static Lifetime ETERNAL(true); + return ETERNAL; +} + +bool operator==(Lifetime const& lw1, Lifetime const& lw2) +{ + return lw1.ptr == lw2.ptr; +} + +bool operator!=(Lifetime const& lw1, Lifetime const& lw2) +{ + return !(lw1 == lw2); +} +} // namespace rd diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/Lifetime.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/Lifetime.h new file mode 100644 index 0000000..72c48cf --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/Lifetime.h @@ -0,0 +1,76 @@ +#ifndef RD_CPP_CORE_LIFETIMEWRAPPER_H +#define RD_CPP_CORE_LIFETIMEWRAPPER_H + +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4251) +#endif + +#include "LifetimeImpl.h" + +#include + +#include + +#include + +namespace rd +{ +class Lifetime; + +template <> +struct RD_CORE_API hash +{ + size_t operator()(const Lifetime& value) const noexcept; +}; + +class RD_CORE_API Lifetime final +{ +private: + using Allocator = std::allocator; + + static /*thread_local */ Allocator allocator; + + friend class LifetimeDefinition; + + friend struct hash; + + std::shared_ptr ptr; + +public: + static Lifetime const& Eternal(); + + // region ctor/dtor + + Lifetime(Lifetime const& other) = default; + + Lifetime& operator=(Lifetime const& other) = default; + + Lifetime(Lifetime&& other) noexcept = default; + + Lifetime& operator=(Lifetime&& other) noexcept = default; + + ~Lifetime() = default; + // endregion + + friend bool RD_CORE_API operator==(Lifetime const& lw1, Lifetime const& lw2); + friend bool RD_CORE_API operator!=(Lifetime const& lw1, Lifetime const& lw2); + + explicit Lifetime(bool is_eternal = false); + + LifetimeImpl* operator->() const; + + Lifetime create_nested() const; +}; + +inline size_t hash::operator()(const Lifetime& value) const noexcept +{ + return hash >()(value.ptr); +} +} // namespace rd +#if defined(_MSC_VER) +#pragma warning(pop) +#endif + + +#endif // RD_CPP_CORE_LIFETIMEWRAPPER_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.cpp b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.cpp new file mode 100644 index 0000000..afadd73 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.cpp @@ -0,0 +1,54 @@ +#include "LifetimeDefinition.h" + +#include + +namespace rd +{ +LifetimeDefinition::LifetimeDefinition(bool eternaled) : eternaled(eternaled), lifetime(eternaled) +{ +} + +LifetimeDefinition::LifetimeDefinition(const Lifetime& parent) : LifetimeDefinition(false) +{ + parent->attach_nested(lifetime.ptr); +} + +bool LifetimeDefinition::is_terminated() const +{ + return lifetime->is_terminated(); +} + +void LifetimeDefinition::terminate() +{ + lifetime->terminate(); +} + +bool LifetimeDefinition::is_eternal() const +{ + return lifetime->is_eternal(); +} + +namespace +{ +LifetimeDefinition ETERNAL(true); +} + +std::shared_ptr LifetimeDefinition::get_shared_eternal() +{ + return std::shared_ptr(&ETERNAL, [](LifetimeDefinition* /*ld*/) {}); +} + +LifetimeDefinition::~LifetimeDefinition() +{ + if (lifetime.ptr != nullptr) + { // wasn't moved + if (!is_eternal()) + { + if (!lifetime->is_terminated()) + { + lifetime->terminate(); + } + } + } +} +} // namespace rd diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.h new file mode 100644 index 0000000..f28584d --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/LifetimeDefinition.h @@ -0,0 +1,59 @@ +#ifndef RD_CPP_CORE_LIFETIME_DEFINITION_H +#define RD_CPP_CORE_LIFETIME_DEFINITION_H + +#include "util/core_traits.h" + +#include "LifetimeImpl.h" +#include "Lifetime.h" + +#include +#include + +#include + +namespace rd +{ +class RD_CORE_API LifetimeDefinition +{ +private: + friend class SequentialLifetimes; + + bool eternaled = false; + +public: + Lifetime lifetime; + + explicit LifetimeDefinition(bool is_eternal = false); + + explicit LifetimeDefinition(const Lifetime& parent); + + LifetimeDefinition(LifetimeDefinition const& other) = delete; + + LifetimeDefinition& operator=(LifetimeDefinition const& other) = delete; + + LifetimeDefinition(LifetimeDefinition&& other) = default; + + LifetimeDefinition& operator=(LifetimeDefinition&& other) = default; + + virtual ~LifetimeDefinition(); + + // static std::shared_ptr eternal; + static std::shared_ptr get_shared_eternal(); + + bool is_terminated() const; + + bool is_eternal() const; + + void terminate(); + + template + static auto use(F&& block) -> typename util::result_of_t + { + LifetimeDefinition definition(false); + Lifetime lw = definition.lifetime.create_nested(); + return block(lw); + } +}; +} // namespace rd + +#endif // RD_CPP_CORE_LIFETIME_DEFINITION_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/LifetimeImpl.cpp b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/LifetimeImpl.cpp new file mode 100644 index 0000000..fa6953b --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/LifetimeImpl.cpp @@ -0,0 +1,66 @@ +#include "LifetimeImpl.h" + +#include + +namespace rd +{ +#if __cplusplus < 201703L +LifetimeImpl::counter_t LifetimeImpl::get_id = 0; +#endif + +LifetimeImpl::LifetimeImpl(bool is_eternal) : eternaled(is_eternal), id(LifetimeImpl::get_id++) +{ +} + +void LifetimeImpl::terminate() +{ + if (is_eternal()) + return; + + terminated = true; + + // region thread-safety section + + actions_t actions_copy; + { + std::lock_guard guard(actions_lock); + actions_copy = std::move(actions); + + actions.clear(); + } + // endregion + + for (auto it = actions_copy.rbegin(); it != actions_copy.rend(); ++it) + { + it->second(); + } +} + +bool LifetimeImpl::is_terminated() const +{ + return terminated; +} + +bool LifetimeImpl::is_eternal() const +{ + return eternaled; +} + +void LifetimeImpl::attach_nested(std::shared_ptr nested) +{ + if (nested->is_terminated() || is_eternal()) + return; + + std::function action = [nested] { nested->terminate(); }; + counter_t action_id = add_action(action); + nested->add_action([this, id = action_id] { actions.erase(id); }); +} + +LifetimeImpl::~LifetimeImpl() +{ + /*if (!is_eternal() && !is_terminated()) { + spdlog::error("forget to terminate lifetime with id: {}", to_string(id)); + terminate(); + }*/ +} +} // namespace rd diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/LifetimeImpl.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/LifetimeImpl.h new file mode 100644 index 0000000..455f28c --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/LifetimeImpl.h @@ -0,0 +1,108 @@ +#ifndef RD_CPP_CORE_LIFETIME_H +#define RD_CPP_CORE_LIFETIME_H + +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4251) +#endif + +#include + +#include +#include +#include +#include +#include +#include + +#include + +#include + +namespace rd +{ +class RD_CORE_API LifetimeImpl final +{ +public: + friend class LifetimeDefinition; + + friend class Lifetime; + + using counter_t = int32_t; + +private: + bool eternaled = false; + std::atomic terminated{false}; + + counter_t id = 0; + + counter_t action_id_in_map = 0; + using actions_t = ordered_map, rd::hash>; + actions_t actions; + + void terminate(); + + std::mutex actions_lock; + +public: + // region ctor/dtor + explicit LifetimeImpl(bool is_eternal = false); + + LifetimeImpl(LifetimeImpl const& other) = delete; + + ~LifetimeImpl(); + // endregion + + template + counter_t add_action(F&& action) + { + std::lock_guard guard(actions_lock); + + if (is_eternal()) + { + return -1; + } + if (is_terminated()) + { + throw std::invalid_argument("Already Terminated"); + } + + actions[action_id_in_map] = std::forward(action); + return action_id_in_map++; + } + + void remove_action(counter_t i) + { + std::lock_guard guard(actions_lock); + + actions.erase(i); + } + +#if __cplusplus >= 201703L + static inline counter_t get_id = 0; +#else + static counter_t get_id; +#endif + + template + void bracket(F&& opening, G&& closing) + { + if (is_terminated()) + return; + opening(); + add_action(std::forward(closing)); + } + + bool is_terminated() const; + + bool is_eternal() const; + + void attach_nested(std::shared_ptr nested); +}; +} // namespace rd +#if defined(_MSC_VER) +#pragma warning(pop) +#endif + + +#endif // RD_CPP_CORE_LIFETIME_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.cpp b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.cpp new file mode 100644 index 0000000..f57c5c6 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.cpp @@ -0,0 +1,33 @@ +#include "SequentialLifetimes.h" + +namespace rd +{ +SequentialLifetimes::SequentialLifetimes(Lifetime parent_lifetime) : parent_lifetime(std::move(parent_lifetime)) +{ + this->parent_lifetime->add_action([this] { set_current_lifetime(LifetimeDefinition::get_shared_eternal()); }); +} + +Lifetime SequentialLifetimes::next() +{ + std::shared_ptr new_def = std::make_shared(parent_lifetime); + set_current_lifetime(new_def); + return current_def->lifetime; +} + +void SequentialLifetimes::terminate_current() +{ + set_current_lifetime(LifetimeDefinition::get_shared_eternal()); +} + +bool SequentialLifetimes::is_terminated() const +{ + return current_def->is_eternal() || current_def->is_terminated(); +} + +void SequentialLifetimes::set_current_lifetime(std::shared_ptr new_def) +{ + std::shared_ptr prev = current_def; + current_def = new_def; + prev->terminate(); +} +} // namespace rd diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.h new file mode 100644 index 0000000..2a42275 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/lifetime/SequentialLifetimes.h @@ -0,0 +1,51 @@ +#ifndef RD_CPP_CORE_SEQUENTIAL_LIFETIMES_H +#define RD_CPP_CORE_SEQUENTIAL_LIFETIMES_H + +#if defined(_MSC_VER) +#pragma warning(push) +#pragma warning(disable:4251) +#endif + +#include "LifetimeDefinition.h" +#include "Lifetime.h" + +#include + +namespace rd +{ +class RD_CORE_API SequentialLifetimes +{ +private: + std::shared_ptr current_def = LifetimeDefinition::get_shared_eternal(); + Lifetime parent_lifetime; + +public: + // region ctor/dtor + SequentialLifetimes() = delete; + + SequentialLifetimes(SequentialLifetimes const&) = delete; + + SequentialLifetimes& operator=(SequentialLifetimes const&) = delete; + + SequentialLifetimes(SequentialLifetimes&&) = delete; + + SequentialLifetimes& operator=(SequentialLifetimes&&) = delete; + + explicit SequentialLifetimes(Lifetime parent_lifetime); + // endregion + + Lifetime next(); + + void terminate_current(); + + bool is_terminated() const; + + void set_current_lifetime(std::shared_ptr new_def); +}; +} // namespace rd +#if defined(_MSC_VER) +#pragma warning(pop) +#endif + + +#endif // RD_CPP_CORE_SEQUENTIAL_LIFETIMES_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/Property.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/Property.h new file mode 100644 index 0000000..24fc8b1 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/Property.h @@ -0,0 +1,75 @@ +#ifndef RD_CPP_CORE_PROPERTY_H +#define RD_CPP_CORE_PROPERTY_H + +#include "base/IProperty.h" +#include "reactive/base/SignalX.h" + +#include + +namespace rd +{ +/** + * \brief complete class which has \a Property 's properties. + * \tparam T type of stored value (may be abstract) + */ +template +class Property : public IProperty +{ + using WT = typename IProperty::WT; + +public: + // region ctor/dtor + + Property() = default; + + Property(Property&& other) = default; + + Property& operator=(Property&& other) = default; + + virtual ~Property() = default; + + template + explicit Property(F&& value) : IProperty(std::forward(value)) + { + } + // endregion + + T const& get() const override + { + RD_ASSERT_THROW_MSG(this->has_value(), "get of uninitialized value from property"); + return *(this->value); + } + + void set(WT new_value) const override + { + if (!this->has_value() || (this->get() != wrapper::get(new_value))) + { + if (this->has_value()) + { + this->before_change.fire(*(this->value)); + } + this->value = std::move(new_value); + this->change.fire(*(this->value)); + } + } + + friend bool operator==(const Property& lhs, const Property& rhs) + { + return &lhs == &rhs; + } + + friend bool operator!=(const Property& lhs, const Property& rhs) + { + return !(rhs == lhs); + } + + friend std::string to_string(Property const& value) + { + return value.has_value() ? to_string(value.get()) : "empty property"s; + } +}; +} // namespace rd + +static_assert(std::is_move_constructible>::value, "Is not move constructible from Property"); + +#endif // RD_CPP_CORE_PROPERTY_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/ViewableList.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/ViewableList.h new file mode 100644 index 0000000..e214e70 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/ViewableList.h @@ -0,0 +1,331 @@ +#ifndef RD_CPP_CORE_VIEWABLELIST_H +#define RD_CPP_CORE_VIEWABLELIST_H + +#include "base/IViewableList.h" +#include "reactive/base/SignalX.h" +#include "util/core_util.h" + +#include +#include +#include + +namespace rd +{ +/** + * \brief complete class which has @code IViewableList's properties + */ +template > +class ViewableList : public IViewableList +{ +public: + using Event = typename IViewableList::Event; + +private: + using WA = typename std::allocator_traits::template rebind_alloc>; + + using data_t = std::vector, WA>; + mutable data_t list; + Signal change; + +protected: + using WT = typename IViewableList::WT; + + const std::vector>& getList() const override + { + return list; + } + +public: + // region ctor/dtor + + ViewableList() = default; + + ViewableList(ViewableList&&) = default; + + ViewableList& operator=(ViewableList&&) = default; + + virtual ~ViewableList() = default; + + // endregion + + // region iterators +public: + class iterator + { + friend class ViewableList; + + typename data_t::iterator it_; + + explicit iterator(const typename data_t::iterator& it) : it_(it) + { + } + + public: + using iterator_category = std::random_access_iterator_tag; + using value_type = T; + using difference_type = std::ptrdiff_t; + using pointer = T const*; + using reference = T const&; + + iterator(const iterator& other) = default; + + iterator(iterator&& other) noexcept = default; + + iterator& operator=(const iterator& other) = default; + + iterator& operator=(iterator&& other) noexcept = default; + + iterator& operator++() + { + ++it_; + return *this; + } + + iterator operator++(int) + { + auto it = *this; + ++*this; + return it; + } + + iterator& operator--() + { + --it_; + return *this; + } + + iterator operator--(int) + { + auto it = *this; + --*this; + return it; + } + + iterator& operator+=(difference_type delta) + { + it_ += delta; + return *this; + } + + iterator& operator-=(difference_type delta) + { + it_ -= delta; + return *this; + } + + iterator operator+(difference_type delta) const + { + auto it = *this; + return it += delta; + } + + iterator operator-(difference_type delta) const + { + auto it = *this; + return it -= delta; + } + + difference_type operator-(iterator const& other) const + { + return it_ - other.it_; + } + + bool operator<(iterator const& other) const noexcept + { + return this->it_ < other.it_; + } + + bool operator>(iterator const& other) const noexcept + { + return this->it_ > other.it_; + } + + bool operator==(iterator const& other) const noexcept + { + return this->it_ == other.it_; + } + + bool operator!=(iterator const& other) const noexcept + { + return !(*this == other); + } + + bool operator<=(iterator const& other) const noexcept + { + return (this->it_ < other.it_) || (*this == other); + } + + bool operator>=(iterator const& other) const noexcept + { + return (this->it_ > other.it_) || (*this == other); + } + + reference operator*() noexcept + { + return **it_; + } + + reference operator*() const noexcept + { + return **it_; + } + + pointer operator->() noexcept + { + return (*it_).get(); + } + + pointer operator->() const noexcept + { + return (*it_).get(); + } + }; + + using reverse_iterator = std::reverse_iterator; + + iterator begin() const + { + return iterator(list.begin()); + } + + iterator end() const + { + return iterator(list.end()); + } + + reverse_iterator rbegin() const + { + return reverse_iterator(end()); + } + + reverse_iterator rend() const + { + return reverse_iterator(begin()); + } + // endregion + + void advise(Lifetime lifetime, std::function handler) const override + { + if (lifetime->is_terminated()) + return; + change.advise(lifetime, handler); + for (int32_t i = 0; i < static_cast(size()); ++i) + { + handler(typename Event::Add(i, &(*list[i]))); + } + } + + bool add(WT element) const override + { + list.emplace_back(std::move(element)); + change.fire(typename Event::Add(static_cast(size()) - 1, &(*list.back()))); + return true; + } + + bool add(size_t index, WT element) const override + { + list.emplace(list.begin() + index, std::move(element)); + change.fire(typename Event::Add(static_cast(index), &(*list[index]))); + return true; + } + + WT removeAt(size_t index) const override + { + auto res = std::move(list[index]); + list.erase(list.begin() + index); + + change.fire(typename Event::Remove(static_cast(index), &(*res))); + return wrapper::unwrap(std::move(res)); + } + + bool remove(T const& element) const override + { + auto it = std::find_if(list.begin(), list.end(), [&element](auto const& p) { return *p == element; }); + if (it == list.end()) + { + return false; + } + ViewableList::removeAt(std::distance(list.begin(), it)); + return true; + } + + T const& get(size_t index) const override + { + return *list[index]; + } + + WT set(size_t index, WT element) const override + { + auto old_value = std::move(list[index]); + list[index] = Wrapper(std::move(element)); + change.fire(typename Event::Update(static_cast(index), &(*old_value), &(*list[index]))); //??? + return wrapper::unwrap(std::move(old_value)); + } + + bool addAll(size_t index, std::vector elements) const override + { + for (auto& element : elements) + { + ViewableList::add(index, std::move(element)); + ++index; + } + return true; + } + + bool addAll(std::vector elements) const override + { + for (auto&& element : elements) + { + ViewableList::add(std::move(element)); + } + return true; + } + + void clear() const override + { + std::vector changes; + for (size_t i = size(); i > 0; --i) + { + changes.push_back(typename Event::Remove(static_cast(i - 1), &(*list[i - 1]))); + } + for (auto const& e : changes) + { + change.fire(e); + } + list.clear(); + } + + bool removeAll(std::vector elements) const override + { + // TO-DO faster + // std::unordered_set set(elements.begin(), elements.end()); + + bool res = false; + for (size_t i = list.size(); i > 0; --i) + { + auto const& x = list[i - 1]; + if (std::count_if(elements.begin(), elements.end(), + [&x](auto const& elem) { return wrapper::TransparentKeyEqual()(elem, x); }) > 0) + { + removeAt(i - 1); + res = true; + } + } + return res; + } + + size_t size() const override + { + return list.size(); + } + + bool empty() const override + { + return list.empty(); + } +}; +} // namespace rd + +static_assert(std::is_move_constructible>::value, "Is move constructible from ViewableList"); + +#endif // RD_CPP_CORE_VIEWABLELIST_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/ViewableMap.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/ViewableMap.h new file mode 100644 index 0000000..6626949 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/ViewableMap.h @@ -0,0 +1,335 @@ +#ifndef RD_CPP_CORE_VIEWABLE_MAP_H +#define RD_CPP_CORE_VIEWABLE_MAP_H + +#include "base/IViewableMap.h" +#include "reactive/base/SignalX.h" + +#include +#include + +#include + +#include +#include + +namespace rd +{ +/** + * \brief complete class which has @code IViewableMap's properties + */ +template , typename VA = std::allocator> +class ViewableMap : public IViewableMap +{ +public: + using Event = typename IViewableMap::Event; + +private: + using WK = typename IViewableMap::WK; + using WV = typename IViewableMap::WV; + using OV = typename IViewableMap::OV; + using PA = typename std::allocator_traits::template rebind_alloc, Wrapper>>; + + Signal change; + + using data_t = ordered_map, Wrapper, wrapper::TransparentHash, wrapper::TransparentKeyEqual, PA>; + mutable data_t map; + +public: + // region ctor/dtor + + ViewableMap() = default; + + ViewableMap(ViewableMap&&) = default; + + ViewableMap& operator=(ViewableMap&&) = default; + + virtual ~ViewableMap() = default; + // endregion + + // region iterators + +public: + class iterator + { + friend class ViewableMap; + + mutable typename data_t::iterator it_; + + explicit iterator(const typename data_t::iterator& it) : it_(it) + { + } + + public: + using iterator_category = typename data_t::iterator::iterator_category; + using key_type = K; + using value_type = V; + using difference_type = std::ptrdiff_t; + using reference = V const&; + using pointer = V const*; + + iterator(const iterator& other) = default; + + iterator(iterator&& other) noexcept = default; + + iterator& operator=(const iterator& other) = default; + + iterator& operator=(iterator&& other) noexcept = default; + + iterator& operator++() + { + ++it_; + return *this; + } + + iterator operator++(int) + { + auto it = *this; + ++*this; + return it; + } + + iterator& operator--() + { + --it_; + return *this; + } + + iterator operator--(int) + { + auto it = *this; + --*this; + return it; + } + + iterator& operator+=(difference_type delta) + { + it_ += delta; + return *this; + } + + iterator& operator-=(difference_type delta) + { + it_ -= delta; + return *this; + } + + iterator operator+(difference_type delta) const + { + auto it = *this; + return it += delta; + } + + iterator operator-(difference_type delta) const + { + auto it = *this; + return it -= delta; + } + + difference_type operator-(iterator const& other) const + { + return it_ - other.it_; + } + + bool operator<(iterator const& other) const noexcept + { + return this->it_ < other.it_; + } + + bool operator>(iterator const& other) const noexcept + { + return this->it_ > other.it_; + } + + bool operator==(iterator const& other) const noexcept + { + return this->it_ == other.it_; + } + + bool operator!=(iterator const& other) const noexcept + { + return !(*this == other); + } + + bool operator<=(iterator const& other) const noexcept + { + return (this->it_ < other.it_) || (*this == other); + } + + bool operator>=(iterator const& other) const noexcept + { + return (this->it_ > other.it_) || (*this == other); + } + + reference operator*() const noexcept + { + return *it_.value(); + } + + pointer operator->() const noexcept + { + return it_.value().get(); + } + + key_type const& key() const + { + return *it_.key(); + } + + value_type const& value() const + { + return *it_.value(); + } + }; + + class reverse_iterator : public std::reverse_iterator + { + using base_t = std::reverse_iterator; + + public: + using iterator_category = typename iterator::iterator_category; + using key_type = typename iterator::key_type; + using value_type = typename iterator::value_type; + using difference_type = typename iterator::difference_type; + using reference = typename iterator::reference; + using pointer = typename iterator::pointer; + + reverse_iterator(const reverse_iterator& other) = default; + + reverse_iterator& operator=(const reverse_iterator& other) = default; + + explicit reverse_iterator(const iterator& other) : base_t(other){}; + + reverse_iterator& operator=(const iterator& other) + { + static_cast(*this) = other; + }; + + key_type const& key() const + { + auto it = base_t::current; + return (--(it)).key(); + } + + value_type const& value() const + { + auto it = base_t::current; + return (--it).value(); + } + }; + + iterator begin() const + { + return iterator(map.begin()); + } + + iterator end() const + { + return iterator(map.end()); + } + + reverse_iterator rbegin() const + { + return reverse_iterator(end()); + } + + reverse_iterator rend() const + { + return reverse_iterator(begin()); + } + + // endregion + + void advise(Lifetime lifetime, std::function handler) const override + { + change.advise(lifetime, handler); + /*for (auto const &[key, value] : map) {*/ + for (auto const& it : map) + { + auto& key = it.first; + auto& value = it.second; + handler(Event(typename Event::Add(&(*key), &(*value)))); + ; + } + } + + const V* get(K const& key) const override + { + auto it = map.find(key); + if (it == map.end()) + { + return nullptr; + } + return &(*it->second); + } + + const V* set(WK key, WV value) const override + { + if (map.count(key) == 0) + { + /*auto[it, success] = map.emplace(std::make_unique(std::move(key)), std::make_unique(std::move(value)));*/ + auto node = map.emplace(std::move(key), std::move(value)); + auto& it = node.first; + auto const& key_ptr = it->first; + auto const& value_ptr = it->second; + change.fire(typename Event::Add(&(*key_ptr), &(*value_ptr))); + return nullptr; + } + else + { + auto it = map.find(key); + auto const& key_ptr = it->first; + auto const& value_ptr = it->second; + + if (*value_ptr != wrapper::get(value)) + { // TO-DO more effective + Wrapper old_value = std::move(map.at(key)); + + map.at(key_ptr) = Wrapper(std::move(value)); + change.fire(typename Event::Update(&(*key_ptr), &(*old_value), &(*value_ptr))); + } + return &*(value_ptr); + } + } + + OV remove(K const& key) const override + { + if (map.count(key) > 0) + { + Wrapper old_value = std::move(map.at(key)); + change.fire(typename Event::Remove(&key, &(*old_value))); + map.erase(key); + return wrapper::unwrap(std::move(old_value)); + } + return nullopt; + } + + void clear() const override + { + std::vector changes; + /*for (auto const &[key, value] : map) {*/ + for (auto const& it : map) + { + changes.push_back(typename Event::Remove(&(*it.first), &(*it.second))); + } + for (auto const& it : changes) + { + change.fire(it); + } + map.clear(); + } + + size_t size() const override + { + return map.size(); + } + + bool empty() const override + { + return map.empty(); + } +}; +} // namespace rd + +static_assert(std::is_move_constructible>::value, "Is move constructible from ViewableMap"); + +#endif // RD_CPP_CORE_VIEWABLE_MAP_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/ViewableSet.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/ViewableSet.h new file mode 100644 index 0000000..ca3ba7b --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/ViewableSet.h @@ -0,0 +1,272 @@ +#ifndef RD_CPP_CORE_VIEWABLESET_H +#define RD_CPP_CORE_VIEWABLESET_H + +#include "base/IViewableSet.h" +#include "reactive/base/SignalX.h" + +#include +#include + +namespace rd +{ +/** + * \brief complete class which has @code IViewableSet's properties + * \tparam T + */ +template > +class ViewableSet : public IViewableSet +{ +public: + using Event = typename IViewableSet::Event; + + using IViewableSet::advise; + +private: + using WT = typename IViewableSet::WT; + using WA = typename std::allocator_traits::template rebind_alloc>; + + Signal change; + using data_t = ordered_set, wrapper::TransparentHash, wrapper::TransparentKeyEqual, WA>; + mutable data_t set; + +public: + // region ctor/dtor + + ViewableSet() = default; + + ViewableSet(ViewableSet&&) = default; + + ViewableSet& operator=(ViewableSet&&) = default; + + virtual ~ViewableSet() = default; + // endregion + + // region iterators +public: + class iterator + { + friend class ViewableSet; + + typename data_t::iterator it_; + + explicit iterator(const typename data_t::iterator& it) : it_(it) + { + } + + public: + using iterator_category = std::random_access_iterator_tag; + using value_type = T; + using difference_type = std::ptrdiff_t; + using pointer = T const*; + using reference = T const&; + + iterator(const iterator& other) = default; + + iterator(iterator&& other) noexcept = default; + + iterator& operator=(const iterator& other) = default; + + iterator& operator=(iterator&& other) noexcept = default; + + iterator& operator++() + { + ++it_; + return *this; + } + + iterator operator++(int) + { + auto it = *this; + ++*this; + return it; + } + + iterator& operator--() + { + --it_; + return *this; + } + + iterator operator--(int) + { + auto it = *this; + --*this; + return it; + } + + iterator& operator+=(difference_type delta) + { + it_ += delta; + return *this; + } + + iterator& operator-=(difference_type delta) + { + it_ -= delta; + return *this; + } + + iterator operator+(difference_type delta) const + { + auto it = *this; + return it += delta; + } + + iterator operator-(difference_type delta) const + { + auto it = *this; + return it -= delta; + } + + difference_type operator-(iterator const& other) const + { + return it_ - other.it_; + } + + bool operator<(iterator const& other) const noexcept + { + return this->it_ < other.it_; + } + + bool operator>(iterator const& other) const noexcept + { + return this->it_ > other.it_; + } + + bool operator==(iterator const& other) const noexcept + { + return this->it_ == other.it_; + } + + bool operator!=(iterator const& other) const noexcept + { + return !(*this == other); + } + + bool operator<=(iterator const& other) const noexcept + { + return (this->it_ < other.it_) || (*this == other); + } + + bool operator>=(iterator const& other) const noexcept + { + return (this->it_ > other.it_) || (*this == other); + } + + reference operator*() const noexcept + { + return **it_; + } + + pointer operator->() const noexcept + { + return (*it_).get(); + } + }; + + using reverse_iterator = std::reverse_iterator; + + iterator begin() const + { + return iterator(set.begin()); + } + + iterator end() const + { + return iterator(set.end()); + } + + reverse_iterator rbegin() const + { + return reverse_iterator(end()); + } + + reverse_iterator rend() const + { + return reverse_iterator(begin()); + } + + // endregion + + bool add(WT element) const override + { + /*auto const &[it, success] = set.emplace(std::make_unique(std::move(element)));*/ + auto const& it = set.emplace(std::move(element)); + if (!it.second) + { + return false; + } + change.fire(Event(AddRemove::ADD, &(wrapper::get(*it.first)))); + return true; + } + + bool addAll(std::vector elements) const override + { + for (auto&& element : elements) + { + ViewableSet::add(std::move(element)); + } + return true; + } + + void clear() const override + { + std::vector changes; + for (auto const& element : set) + { + changes.push_back(Event(AddRemove::REMOVE, &(*element))); + } + for (auto const& e : changes) + { + change.fire(e); + } + set.clear(); + } + + bool remove(T const& element) const override + { + if (!ViewableSet::contains(element)) + { + return false; + } + auto it = set.find(element); + change.fire(Event(AddRemove::REMOVE, &(wrapper::get(*it)))); + set.erase(it); + return true; + } + + void advise(Lifetime lifetime, std::function handler) const override + { + for (auto const& x : set) + { + handler(Event(AddRemove::ADD, &(*x))); + } + change.advise(lifetime, handler); + } + + size_t size() const override + { + return set.size(); + } + + bool contains(T const& element) const override + { + return set.count(element) > 0; + } + + bool empty() const override + { + return set.empty(); + } + + template + bool emplace_add(Args&&... args) const + { + return add(WT{std::forward(args)...}); + } +}; +} // namespace rd + +static_assert(std::is_move_constructible>::value, "Is move constructible from ViewableSet"); + +#endif // RD_CPP_CORE_VIEWABLESET_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/IProperty.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/IProperty.h new file mode 100644 index 0000000..f8766fc --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/IProperty.h @@ -0,0 +1,96 @@ +#ifndef RD_CPP_IPROPERTY_H +#define RD_CPP_IPROPERTY_H + +#include "SignalX.h" +#include "IPropertyBase.h" + +#include +#include + +#include + +namespace rd +{ +/** + * \brief A mutable property. + * \tparam T type of stored value (may be abstract) + */ +template +class IProperty : public IPropertyBase +{ +protected: + using WT = typename IPropertyBase::WT; + +public: + // region ctor/dtor + + IProperty() = default; + + IProperty(IProperty&& other) = default; + + IProperty& operator=(IProperty&& other) = default; + + explicit IProperty(T const& value) : IPropertyBase(value) + { + } + + template + explicit IProperty(F&& value) : IPropertyBase(std::forward(value)) + { + } + + virtual ~IProperty() = default; + // endregion + + virtual T const& get() const = 0; + +private: + void advise0(Lifetime lifetime, std::function handler, Signal const& signal) const + { + if (lifetime->is_terminated()) + { + return; + } + signal.advise(lifetime, handler); + if (this->has_value()) + { + handler(this->get()); + } + } + + void advise_before(Lifetime lifetime, std::function handler) const override + { + advise0(lifetime, handler, this->before_change); + } + +public: + void advise(Lifetime lifetime, std::function handler) const override + { + advise0(lifetime, std::move(handler), this->change); + } + + /** + * \brief set value of type T or derived type to it. + */ + virtual void set(value_or_wrapper) const = 0; + + /** + * \brief construct value of type T and delegate call to set + */ + template + void emplace(Args&&... args) const + { + set(value_or_wrapper{std::forward(args)...}); + } + + void set_if_empty(WT new_value) const + { + if (!this->has_value()) + { + set(std::move(new_value)); + } + } +}; +} // namespace rd + +#endif // RD_CPP_IPROPERTY_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/IPropertyBase.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/IPropertyBase.h new file mode 100644 index 0000000..209e235 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/IPropertyBase.h @@ -0,0 +1,73 @@ +#ifndef RD_CPP_IPROPERTYBASE_H +#define RD_CPP_IPROPERTYBASE_H + +#include "interfaces.h" +#include "SignalX.h" + +#include +#include + +#include "thirdparty.hpp" + +namespace rd +{ +template +class IPropertyBase : public ISource, public IViewable +{ +protected: + mutable property_storage value; + + Signal change, before_change; + + using WT = value_or_wrapper; + +public: + bool has_value() const + { + return (bool) (value); + } + + // region ctor/dtor + + IPropertyBase() = default; + + IPropertyBase(IPropertyBase&& other) = default; + + IPropertyBase& operator=(IPropertyBase&& other) = default; + + template + explicit IPropertyBase(F&& value) : value(std::forward(value)) + { + } + + virtual ~IPropertyBase() = default; + // endregion + + virtual void advise_before(Lifetime lifetime, std::function handler) const = 0; + + void view(Lifetime lifetime, std::function handler) const override + { + if (lifetime->is_terminated()) + return; + + Lifetime lf = lifetime.create_nested(); + std::shared_ptr seq = std::make_shared(lf); + + this->advise_before(lf, [lf, seq](T const& /*v*/) { + if (!lf->is_terminated()) + { + seq->terminate_current(); + } + }); + + this->advise(lf, [lf, seq, handler](T const& v) { + if (!lf->is_terminated()) + { + handler(seq->next(), v); + } + }); + } +}; +} // namespace rd + +#endif // RD_CPP_IPROPERTYBASE_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/IViewableList.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/IViewableList.h new file mode 100644 index 0000000..cf40c2d --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/IViewableList.h @@ -0,0 +1,257 @@ +#ifndef RD_CPP_IVIEWABLELIST_H +#define RD_CPP_IVIEWABLELIST_H + +#include "interfaces.h" +#include "viewable_collections.h" + +#include +#include +#include + +#include + +#include +#include +#include + +#include "thirdparty.hpp" + +namespace rd +{ +namespace detail +{ +template +class ListEvent +{ +public: + class Add + { + public: + int32_t index; + T const* new_value; + + Add(int32_t index, T const* new_value) : index(index), new_value(new_value) + { + } + }; + + class Update + { + public: + int32_t index; + T const* old_value; + T const* new_value; + + Update(int32_t index, T const* old_value, T const* new_value) : index(index), old_value(old_value), new_value(new_value) + { + } + }; + + class Remove + { + public: + int32_t index; + T const* old_value; + + Remove(int32_t index, T const* old_value) : index(index), old_value(old_value) + { + } + }; + + variant v; + + ListEvent(Add x) : v(x) + { + } + + ListEvent(Update x) : v(x) + { + } + + ListEvent(Remove x) : v(x) + { + } + + int32_t get_index() const + { + return visit(util::make_visitor([](Add const& e) { return e.index; }, [](Update const& e) { return e.index; }, + [](Remove const& e) { return e.index; }), + v); + } + + T const* get_new_value() const + { + return visit(util::make_visitor([](Add const& e) { return e.new_value; }, [](Update const& e) { return e.new_value; }, + [](Remove const& /*e*/) { return static_cast(nullptr); }), + v); + } + + friend std::string to_string(ListEvent const& e) + { + std::string res = visit( + util::make_visitor( + [](typename ListEvent::Add const& e) { return "Add " + std::to_string(e.index) + ":" + to_string(*e.new_value); }, + [](typename ListEvent::Update const& e) { + return "Update " + std::to_string(e.index) + ":" + + // to_string(e.old_value) + ":" + + to_string(*e.new_value); + }, + [](typename ListEvent::Remove const& e) { return "Remove " + std::to_string(e.index); }), + e.v); + return res; + } +}; +} // namespace detail +/** + * \brief A list allowing its contents to be observed. + * \tparam T type of stored values (may be abstract) + */ +template +class IViewableList : public IViewable>, public ISource> +{ +protected: + using WT = value_or_wrapper; + +public: + /** + * \brief Represents an addition, update or removal of an element in the list. + */ + using Event = typename detail::ListEvent; + +protected: + mutable rd::unordered_map> lifetimes; + +public: + // region ctor/dtor + + IViewableList() = default; + + IViewableList(IViewableList&&) = default; + + IViewableList& operator=(IViewableList&&) = default; + + virtual ~IViewableList() = default; + // endregion + + /** + * \brief Adds a subscription to additions and removals of list elements. When a list element is updated, + * the [handler] is called twice: to report the removal of the old element and the addition of the new one. + * \param lifetime lifetime of subscription. + * \param handler to be called. + */ + void advise_add_remove(Lifetime lifetime, std::function handler) const + { + advise(lifetime, [handler](Event e) { + visit(util::make_visitor([handler](typename Event::Add const& e) { handler(AddRemove::ADD, e.index, *e.new_value); }, + [handler](typename Event::Update const& e) { + handler(AddRemove::REMOVE, e.index, *e.old_value); + handler(AddRemove::ADD, e.index, *e.new_value); + }, + [handler](typename Event::Remove const& e) { handler(AddRemove::REMOVE, e.index, *e.old_value); }), + e.v); + }); + } + + /** + * \brief Adds a subscription to changes of the contents of the list. + * \param lifetime lifetime of subscription. + * \param handler to be called. + */ + void view(Lifetime lifetime, std::function const&)> handler) const override + { + view(lifetime, [handler](Lifetime lt, size_t idx, T const& v) { handler(lt, std::make_pair(idx, &v)); }); + } + + /** + * \brief @see view above + */ + void view(Lifetime lifetime, std::function handler) const + { + advise_add_remove(lifetime, [this, lifetime, handler](AddRemove kind, size_t idx, T const& value) { + switch (kind) + { + case AddRemove::ADD: + { + LifetimeDefinition def(lifetime); + std::vector& v = lifetimes[lifetime]; + auto it = v.emplace(v.begin() + idx, std::move(def)); + handler(it->lifetime, idx, value); + break; + } + case AddRemove::REMOVE: + { + LifetimeDefinition def = std::move(lifetimes.at(lifetime)[idx]); + std::vector& v = lifetimes.at(lifetime); + v.erase(v.begin() + idx); + def.terminate(); + break; + } + } + }); + } + + void advise(Lifetime lifetime, std::function handler) const override = 0; + + virtual bool add(WT element) const = 0; + + virtual bool add(size_t index, WT element) const = 0; + + virtual WT removeAt(size_t index) const = 0; + + virtual bool remove(T const& element) const = 0; + + virtual T const& get(size_t index) const = 0; + + virtual WT set(size_t index, WT element) const = 0; + + virtual bool addAll(size_t index, std::vector elements) const = 0; + + virtual bool addAll(std::vector elements) const = 0; + + virtual void clear() const = 0; + + virtual bool removeAll(std::vector elements) const = 0; + + virtual size_t size() const = 0; + + virtual bool empty() const = 0; + + template + bool emplace_add(Args&&... args) const + { + return add(WT{std::forward(args)...}); + } + + template + bool emplace_add(size_t index, Args&&... args) const + { + return add(index, WT{std::forward(args)...}); + } + + template + WT emplace_set(size_t index, Args&&... args) const + { + return set(index, WT{std::forward(args)...}); + } + + template + friend typename std::enable_if<(!std::is_abstract::value), std::vector>::type convert_to_list( + IViewableList const& list); + +protected: + virtual const std::vector>& getList() const = 0; +}; + +template +typename std::enable_if<(!std::is_abstract::value), std::vector>::type convert_to_list(IViewableList const& list) +{ + std::vector res(list.size()); + std::transform(list.getList().begin(), list.getList().end(), res.begin(), [](Wrapper const& ptr) { return *ptr; }); + return res; +} +} // namespace rd + +static_assert( + std::is_move_constructible::Event>::value, "Is move constructible from IViewableList::Event"); + +#endif // RD_CPP_IVIEWABLELIST_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/IViewableMap.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/IViewableMap.h new file mode 100644 index 0000000..6b13ef2 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/IViewableMap.h @@ -0,0 +1,247 @@ +#ifndef RD_CPP_IVIEWABLEMAP_H +#define RD_CPP_IVIEWABLEMAP_H + +#include "lifetime/LifetimeDefinition.h" +#include "util/overloaded.h" +#include "interfaces.h" +#include "viewable_collections.h" +#include "util/core_util.h" + +#include "std/unordered_map.h" + +#include "thirdparty.hpp" + +namespace rd +{ +namespace detail +{ +template +class MapEvent +{ +public: + class Add + { + public: + K const* key; + V const* new_value; + + Add(K const* key, V const* new_value) : key(key), new_value(new_value) + { + } + }; + + class Update + { + public: + K const* key; + V const* old_value; + V const* new_value; + + Update(K const* key, V const* old_value, V const* new_value) : key(key), old_value(old_value), new_value(new_value) + { + } + }; + + class Remove + { + public: + K const* key; + V const* old_value; + + Remove(K const* key, V const* old_value) : key(key), old_value(old_value) + { + } + }; + + variant v; + + MapEvent(Add x) : v(x) + { + } + + MapEvent(Update x) : v(x) + { + } + + MapEvent(Remove x) : v(x) + { + } + + K const* get_key() const + { + return visit( + util::make_visitor([](typename MapEvent::Add const& e) { return e.key; }, + [](typename MapEvent::Update const& e) { return e.key; }, [](typename MapEvent::Remove const& e) { return e.key; }), + v); + } + + V const* get_old_value() const + { + return visit(util::make_visitor([](typename MapEvent::Add const& e) { return static_cast(nullptr); }, + [](typename MapEvent::Update const& e) { return e.old_value; }, + [](typename MapEvent::Remove const& e) { e.old_value; }), + v); + } + + V const* get_new_value() const + { + return visit(util::make_visitor([](typename MapEvent::Add const& e) { return e.new_value; }, + [](typename MapEvent::Update const& e) { return e.new_value; }, + [](typename MapEvent::Remove const& /*e*/) { return static_cast(nullptr); }), + v); + } + + friend std::string to_string(MapEvent const& e) + { + std::string res = + visit(util::make_visitor([](typename MapEvent::Add const& e) + -> std::string { return "Add " + to_string(*e.key) + ":" + to_string(*e.new_value); }, + [](typename MapEvent::Update const& e) -> std::string { + return "Update " + to_string(*e.key) + ":" + + // to_string(e.old_value) + ":" + + to_string(*e.new_value); + }, + [](typename MapEvent::Remove const& e) -> std::string { return "Remove " + to_string(*e.key); }), + e.v); + return res; + } +}; +} // namespace detail + +/** + * \brief A set allowing its contents to be observed. + * \tparam K type of stored keys (may be abstract) + * \tparam V type of stored values (may be abstract) + */ +template +class IViewableMap : public IViewable>, public ISource> +{ +protected: + using WK = value_or_wrapper; + using WV = value_or_wrapper; + using OV = opt_or_wrapper; + + mutable rd::unordered_map, wrapper::TransparentKeyEqual>> + lifetimes; + +public: + /** + * \brief Represents an addition, update or removal of an element in the map. + */ + using Event = typename detail::MapEvent; + + // region ctor/dtor + + IViewableMap() = default; + + IViewableMap(IViewableMap&&) = default; + + IViewableMap& operator=(IViewableMap&&) = default; + + virtual ~IViewableMap() = default; + // endregion + + void view(Lifetime lifetime, std::function const&) + + > + handler) const override + { + advise_add_remove(lifetime, [this, lifetime, handler](AddRemove kind, K const& key, V const& value) { + const std::pair entry = std::make_pair(&key, &value); + switch (kind) + { + case AddRemove::ADD: + { + if (lifetimes[lifetime].count(key) == 0) + { + /*auto const &[it, inserted] = lifetimes[lifetime].emplace(key, LifetimeDefinition(lifetime));*/ + auto const& pair = lifetimes[lifetime].emplace(&key, LifetimeDefinition(lifetime)); + auto& it = pair.first; + auto& inserted = pair.second; + RD_ASSERT_MSG(inserted, "lifetime definition already exists in viewable map by key:" + to_string(key)); + handler(it->second.lifetime, entry); + } + break; + } + case AddRemove::REMOVE: + { + RD_ASSERT_MSG(lifetimes.at(lifetime).count(key) > 0, + "attempting to remove non-existing lifetime in viewable map by key:" + to_string(key)); + LifetimeDefinition def = std::move(lifetimes.at(lifetime).at(key)); + lifetimes.at(lifetime).erase(key); + def.terminate(); + break; + } + } + }); + } + + /** + * \brief Adds a subscription to additions and removals of map elements. When a map element is updated, the [handler] + * is called twice: to report the removal of the old element and the addition of the new one. + * \param lifetime lifetime of subscription. + * \param handler to be called. + */ + void advise_add_remove(Lifetime lifetime, std::function + handler) const + { + advise(lifetime, [handler](Event e) { + visit(util::make_visitor([handler](typename Event::Add const& e) { handler(AddRemove::ADD, *e.key, *e.new_value); }, + [handler](typename Event::Update const& e) { + handler(AddRemove::REMOVE, *e.key, *e.old_value); + handler(AddRemove::ADD, *e.key, *e.new_value); + }, + [handler](typename Event::Remove const& e) { handler(AddRemove::REMOVE, *e.key, *e.old_value); }), + e.v); + }); + } + + /** + * \brief Adds a subscription to changes of the contents of the map, with the handler receiving keys and values + * as separate parameters. + * + * \details When [handler] is initially added, it is called receiving all keys and values currently in the map. + * Every time a key/value pair is added to the map, the [handler] is called receiving the new key and value. + * The [Lifetime] instance passed to the handler expires when the key/value pair is removed from the map. + * + * \param lifetime lifetime of subscription. + * \param handler to be called. + */ + void view(Lifetime lifetime, std::function + handler) const + { + view(lifetime, + [handler](Lifetime lf, const std::pair entry) { handler(lf, *entry.first, *entry.second); }); + } + + void advise(Lifetime lifetime, std::function handler) const override = 0; + + virtual const V* get(K const&) const = 0; + + virtual const V* set(WK, WV) const = 0; + + virtual OV remove(K const&) const = 0; + + virtual void clear() const = 0; + + virtual size_t size() const = 0; + + virtual bool empty() const = 0; + + template + const V* emplace_set(WK wk, Args&&... args) const + { + return set(std::move(wk), WV{std::forward(args)...}); + } +}; +} // namespace rd + +static_assert(std::is_move_constructible::Event>::value, + "Is move constructible from IViewableMap::Event"); + +#endif // RD_CPP_IVIEWABLEMAP_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/IViewableSet.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/IViewableSet.h new file mode 100644 index 0000000..d7ffb2d --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/IViewableSet.h @@ -0,0 +1,148 @@ +#ifndef RD_CPP_IVIEWABLESET_H +#define RD_CPP_IVIEWABLESET_H + +#include "interfaces.h" +#include "viewable_collections.h" + +#include +#include + +#include + +#include + +namespace rd +{ +namespace detail +{ +template +class SetEvent +{ +public: + SetEvent(AddRemove kind, T const* value) : kind(kind), value(value) + { + } + + AddRemove kind; + T const* value; + + friend std::string to_string(SetEvent const& e) + { + return to_string(e.kind) + ":" + to_string(*e.value); + } +}; +} // namespace detail + +/** + * \brief A set allowing its contents to be observed. + * \tparam T type of stored values (may be abstract) + */ +template > +class IViewableSet : public IViewable, public ISource> +{ +protected: + using WT = value_or_wrapper; + mutable rd::unordered_map, wrapper::TransparentKeyEqual>> + lifetimes; + +public: + // region ctor/dtor + + IViewableSet() = default; + + IViewableSet(IViewableSet&&) = default; + + IViewableSet& operator=(IViewableSet&&) = default; + + virtual ~IViewableSet() = default; + // endregion + + /** + * \brief Represents an addition or removal of an element in the set. + */ + using Event = typename detail::SetEvent; + + /** + * \brief Adds a subscription for additions and removals of set elements. When the subscription is initially + * added, [handler] is called with [AddRemove::Add] events for all elements currently in the set. + * + * \param lifetime lifetime of subscription. + * \param handler to be called. + */ + void advise(Lifetime lifetime, std::function handler) const + { + this->advise(lifetime, [handler](Event e) { handler(e.kind, *e.value); }); + } + + /** + * \brief Adds a subscription to changes of the contents of the set. + * + * \details When [handler] is initially added, it is called receiving all elements currently in the set. + * Every time an object is added to the set, the [handler] is called receiving the new element. + * The [Lifetime] instance passed to the handler expires when the element is removed from the set. + * + * \param lifetime + * \param handler + */ + void view(Lifetime lifetime, std::function handler) const override + { + advise(lifetime, [this, lifetime, handler](AddRemove kind, T const& key) { + switch (kind) + { + case AddRemove::ADD: + { + /*auto const &[it, inserted] = lifetimes[lifetime].emplace(key, LifetimeDefinition(lifetime));*/ + auto const& it = lifetimes[lifetime].emplace(&key, lifetime); + RD_ASSERT_MSG(it.second, "lifetime definition already exists in viewable set by key:" + to_string(key)); + handler(it.first->second.lifetime, key); + break; + } + case AddRemove::REMOVE: + { + RD_ASSERT_MSG(lifetimes.at(lifetime).count(key) > 0, + "attempting to remove non-existing lifetime in viewable set by key:" + to_string(key)); + LifetimeDefinition def = std::move(lifetimes.at(lifetime).at(key)); + lifetimes.at(lifetime).erase(key); + def.terminate(); + break; + } + } + }); + } + + /** + * \brief Adds a subscription for additions and removals of set elements. When the subscription is initially + * added, [handler] is called with [AddRemove.Add] events for all elements currently in the set. + * + * \param lifetime lifetime of subscription. + * \param handler to be called. + */ + void advise(Lifetime lifetime, std::function handler) const override = 0; + + virtual bool add(WT) const = 0; + + virtual bool addAll(std::vector elements) const = 0; + + virtual void clear() const = 0; + + virtual bool remove(T const&) const = 0; + + virtual size_t size() const = 0; + + virtual bool contains(T const&) const = 0; + + virtual bool empty() const = 0; + + template + bool emplace_add(Args&&... args) const + { + return add(WT{std::forward(args)...}); + } +}; +} // namespace rd + +static_assert( + std::is_move_constructible::Event>::value, "Is move constructible from IViewableSet::Event"); + +#endif // RD_CPP_IVIEWABLESET_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/SignalCookie.cpp b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/SignalCookie.cpp new file mode 100644 index 0000000..5aa1d78 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/SignalCookie.cpp @@ -0,0 +1,23 @@ +#include "SignalCookie.h" + +#include + +namespace +{ +std::atomic cookie; +} + +void rd_signal_cookie_inc() +{ + ++cookie; +} + +void rd_signal_cookie_dec() +{ + --cookie; +} + +int32_t rd_signal_cookie_get() +{ + return cookie; +} diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/SignalCookie.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/SignalCookie.h new file mode 100644 index 0000000..b2659b7 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/SignalCookie.h @@ -0,0 +1,11 @@ +#ifndef RD_CPP_SIGNALCOOKIE_H +#define RD_CPP_SIGNALCOOKIE_H + +#include +#include + +extern "C" void RD_CORE_API rd_signal_cookie_inc(); +extern "C" void RD_CORE_API rd_signal_cookie_dec(); +extern "C" int32_t RD_CORE_API rd_signal_cookie_get(); + +#endif // RD_CPP_SIGNALCOOKIE_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/SignalX.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/SignalX.h new file mode 100644 index 0000000..598cc60 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/SignalX.h @@ -0,0 +1,138 @@ +#ifndef RD_CPP_CORE_SIGNAL_H +#define RD_CPP_CORE_SIGNAL_H + +#include "interfaces.h" +#include "SignalCookie.h" + +#include +#include + +#include +#include +#include + +namespace rd +{ +/** + * \brief complete class which has \a Signal 's properties + */ +template +class Signal final : public ISignal +{ +private: + using WT = typename ISignal::WT; + + class Event + { + private: + std::function action; + Lifetime lifetime; + + public: + // region ctor/dtor + Event() = delete; + + template + Event(F&& action, Lifetime lifetime) : action(std::forward(action)), lifetime(lifetime) + { + } + + Event(Event&&) = default; + // endregion + + bool is_alive() const + { + return !lifetime->is_terminated(); + } + + void execute_if_alive(T const& value) const + { + if (is_alive()) + { + action(value); + } + } + }; + + using counter_t = int32_t; + using listeners_t = std::map; + + mutable counter_t advise_id = 0; + mutable listeners_t listeners, priority_listeners; + + static void cleanup(listeners_t& queue) + { + util::erase_if(queue, [](Event const& e) -> bool { return !e.is_alive(); }); + } + + void fire_impl(T const& value, listeners_t& queue) const + { + for (auto const& p : queue) + { + auto const& event = p.second; + event.execute_if_alive(value); + } + cleanup(queue); + } + + template + void advise0(const Lifetime& lifetime, F&& handler, listeners_t& queue) const + { + if (lifetime->is_terminated()) + return; + counter_t id = advise_id /*.load()*/; + queue.emplace(id, Event(std::forward(handler), lifetime)); + ++advise_id; + } + +public: + // region ctor/dtor + + Signal() = default; + + Signal(Signal const& other) = delete; + + Signal& operator=(Signal const& other) = delete; + + Signal(Signal&&) = default; + + Signal& operator=(Signal&&) = default; + + virtual ~Signal() = default; + + // endregion + + using ISignal::fire; + + void fire(T const& value) const override + { + fire_impl(value, priority_listeners); + fire_impl(value, listeners); + } + + using ISignal::advise; + + void advise(Lifetime lifetime, std::function handler) const override + { + advise0(lifetime, std::move(handler), isPriorityAdvise() ? priority_listeners : listeners); + } + + static bool isPriorityAdvise() + { + return rd_signal_cookie_get() > 0; + } +}; + +template +void priorityAdviseSection(F&& block) +{ + rd_signal_cookie_inc(); + block(); + rd_signal_cookie_dec(); +} +} // namespace rd + +static_assert(std::is_move_constructible>::value, "Is not move constructible from Signal"); +static_assert(std::is_move_constructible>::value, "Is not move constructible from Signal"); + +#endif // RD_CPP_CORE_SIGNAL_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/interfaces.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/interfaces.h new file mode 100644 index 0000000..6588b34 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/interfaces.h @@ -0,0 +1,90 @@ +#ifndef RD_CPP_CORE_INTERFACES_H +#define RD_CPP_CORE_INTERFACES_H + +#include +#include +#include + +#include +#include + +namespace rd +{ +/** + * \brief An object that allows to subscribe to events. + * \tparam T type of events + */ +template +class ISource +{ +public: + virtual ~ISource() = default; + + /** + * \brief Adds an event subscription. + * \param lifetime lifetime of subscription. + * \param handler to be called, every time an event occurs. + */ + virtual void advise(Lifetime lifetime, std::function handler) const = 0; + + /** + * \brief @code advise with Eternal lifetime + */ + template + void advise_eternal(F&& handler) const + { + advise(Lifetime::Eternal(), std::forward(handler)); + } + + /** + * \brief @code Void specialisation of @code advise method, at @tparam T=Void + */ + void advise(Lifetime lifetime, std::function handler) const + { + advise(lifetime, [handler = std::move(handler)](Void) { handler(); }); + } +}; + +/** + * \brief An object that allows to subscribe to changes of its contents. + * \tparam T type of content + */ +template +class IViewable +{ +public: + virtual ~IViewable() = default; + + virtual void view(Lifetime lifetime, std::function + handler) const = 0; +}; + +/** + * \brief An object which has a collection of event listeners and can broadcast an event to the listeners. + * \tparam T type of events + */ +template +class ISignal : public ISource +{ +protected: + using WT = value_or_wrapper; + +public: + virtual ~ISignal() = default; + + virtual void fire(T const& value) const = 0; + + /** + * \brief @code fire specialisation at T=Void + */ + template + typename std::enable_if_t> fire() const + { + fire(Void{}); + } +}; +} // namespace rd + +#endif // RD_CPP_CORE_INTERFACES_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/viewable_collections.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/viewable_collections.h new file mode 100644 index 0000000..bd90008 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/reactive/base/viewable_collections.h @@ -0,0 +1,53 @@ +#ifndef RD_CPP_VIEWABLE_COLLECTIONS_H +#define RD_CPP_VIEWABLE_COLLECTIONS_H + +#include + +namespace rd +{ +enum class AddRemove +{ + ADD, + REMOVE +}; + +inline std::string to_string(AddRemove kind) +{ + switch (kind) + { + case AddRemove::ADD: + return "Add"; + case AddRemove::REMOVE: + return "Remove"; + default: + return ""; + } +} + +enum class Op +{ + ADD, + UPDATE, + REMOVE, + ACK +}; + +inline std::string to_string(Op op) +{ + switch (op) + { + case Op::ADD: + return "Add"; + case Op::UPDATE: + return "Update"; + case Op::REMOVE: + return "Remove"; + case Op::ACK: + return "Ack"; + default: + return ""; + } +} +} // namespace rd + +#endif // RD_CPP_VIEWABLE_COLLECTIONS_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/std/allocator.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/std/allocator.h new file mode 100644 index 0000000..b8a7227 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/std/allocator.h @@ -0,0 +1,12 @@ +#ifndef RD_CPP_ALLOCATOR_H +#define RD_CPP_ALLOCATOR_H + +#include + +namespace rd +{ +template +using allocator = std::allocator; +} + +#endif // RD_CPP_ALLOCATOR_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/std/hash.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/std/hash.h new file mode 100644 index 0000000..fce90df --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/std/hash.h @@ -0,0 +1,19 @@ +#ifndef RD_CPP_HASH_H +#define RD_CPP_HASH_H + +#include +#include + +namespace rd +{ +template +struct hash +{ + size_t operator()(const T& value) const noexcept + { + return std::hash()(value); + } +}; +} // namespace rd + +#endif // RD_CPP_HASH_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/std/list.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/std/list.h new file mode 100644 index 0000000..dd6ecc8 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/std/list.h @@ -0,0 +1,35 @@ +#ifndef RD_CPP_LIST_H +#define RD_CPP_LIST_H + +#include +#include + +namespace rd +{ +template +int32_t size(T const& value) = delete; + +// c++17 has std::size for std::vector +#if __cplusplus < 201703L + +template +int32_t size(std::vector const& value) +{ + return static_cast(value.size()); +} +#else +template +int32_t size(std::vector const& value) +{ + return std::size(value); +} +#endif + +template +void resize(std::vector& value, int32_t size) +{ + value.resize(size); +} +} // namespace rd + +#endif // RD_CPP_LIST_H diff --git a/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/std/to_string.h b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/std/to_string.h new file mode 100644 index 0000000..91fbab3 --- /dev/null +++ b/Plugins/Developer/RiderLink/Source/RD/src/rd_core_cpp/src/main/std/to_string.h @@ -0,0 +1,147 @@ +// ReSharper disable CppUE4CodingStandardNamingViolationWarning +#ifndef RD_CPP_TO_STRING_H +#define RD_CPP_TO_STRING_H + +#include +#include +#include +#include +#include +#include + +#include "ww898/utf_converters.hpp" + +#include + +namespace rd +{ +namespace detail +{ +using std::to_string; + +inline std::string to_string(std::string const& val) +{ + return val; +} + +inline std::string to_string(const char* val) +{ + return val; +} + +inline std::string to_string(std::wstring const& val) +{ + return ww898::utf::conv(val); +} + +inline std::string to_string(std::thread::id const& id) +{ + std::ostringstream ss; + ss << id; + return ss.str(); +} + +inline std::string to_string(std::exception const& e) +{ + return std::string(e.what()); +} + +inline std::string to_string(std::future_status const& status) +{ + switch (status) + { + case std::future_status::ready: + return "ready"; + case std::future_status::timeout: + return "timeout"; + case std::future_status::deferred: + return "deferred"; + default: + return "unknown"; + } +} + +template +inline std::string to_string(std::chrono::duration const& time) +{ + return std::to_string(std::chrono::duration_cast(time).count()) + "ms"; +} + +template +inline std::string to_string(T const* val) +{ + return val ? to_string(*val) : "nullptr"; +} + +template +inline std::string to_string(std::atomic const& value) +{ + return to_string(value.load()); +} + +template +inline std::string to_string(optional const& val) +{ + if (val.has_value()) + { + return to_string(*val); + } + else + { + return "nullopt"; + } +} + +template +inline std::string to_string(const std::pair p) +{ + return "(" + to_string(p.first) + ", " + to_string(p.second) + ")"; +} + +template