diff --git a/.gitattributes b/.gitattributes index aa113ff..c83ee5a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -70,7 +70,7 @@ text=auto # Always recommended to use, supports all platforms: # For the best compatibility and performance, it is recommended to use H.264 encoded MP4 (.mp4) container files. *.[mM][pP]4 filter=lfs diff=lfs merge=lfs -text -# Can also be used, only some platforms are supported: +Can also be used, only some platforms are supported: *.3[gG]2 filter=lfs diff=lfs merge=lfs -text *.3[gG][pP] filter=lfs diff=lfs merge=lfs -text *.3[gG][pP]2 filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index 8dfa010..2da3c79 100644 --- a/.gitignore +++ b/.gitignore @@ -76,17 +76,3 @@ DerivedDataCache/* # Custom *.rpp-bak *.blend1 - -# Paths -.hg/ -binaries/ -deriveddatacache/ -.vs/ -build/ -intermediate/ -PACKPLUGIN/ -COMPPLUGIN/ -saved/ -*.orig -*.sln -*.xlsx \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index b3f2b0c..c71eda9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,3 @@ [submodule "VIRTUOS_ExpansionPluginTests/Plugins/SPUD"] path = VIRTUOS_ExpansionPluginTests/Plugins/SPUD url = https://github.com/sinbad/SPUD -[submodule "VIRTUOS_ExpansionPluginTests/Plugins/StevesUEHelpers"] - path = VIRTUOS_ExpansionPluginTests/Plugins/StevesUEHelpers - url = https://github.com/sinbad/StevesUEHelpers -[submodule "VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin"] - path = VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin - url = https://github.com/mordentral/VRExpansionPlugin \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/.gitattributes b/VIRTUOS_ExpansionPluginTests/.gitattributes new file mode 100644 index 0000000..3373152 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/.gitattributes @@ -0,0 +1,2 @@ +* text=auto +*.bat eol=crlf \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/.gitignore b/VIRTUOS_ExpansionPluginTests/.gitignore index e69de29..c66e5a0 100644 --- a/VIRTUOS_ExpansionPluginTests/.gitignore +++ b/VIRTUOS_ExpansionPluginTests/.gitignore @@ -0,0 +1,13 @@ + +.hg/ +binaries/ +deriveddatacache/ +.vs/ +build/ +intermediate/ +PACKPLUGIN/ +COMPPLUGIN/ +saved/ +*.orig +*.sln +*.xlsx diff --git a/VIRTUOS_ExpansionPluginTests/.ignore b/VIRTUOS_ExpansionPluginTests/.ignore deleted file mode 100644 index a01d5b2..0000000 --- a/VIRTUOS_ExpansionPluginTests/.ignore +++ /dev/null @@ -1,15 +0,0 @@ -/.vs -/.vscode -/Content -/DerivedDataCache -/Intermediate -/Saved -/UE4ProjectRenamer -/Plugins/AdvancedSessions/AdvancedSessions/Intermediate -/Plugins/AdvancedSessions/AdvancedSteamSessions/Intermediate -/Plugins/SPUD/doc -/Plugins/SPUD/Intermediate -/Plugins/StevesUEHelpers/doc -/Plugins/StevesUEHelpers/Intermediate -/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Intermediate -/Plugins/VRExpansionPlugin/VRExpansionPlugin/Intermediate diff --git a/VIRTUOS_ExpansionPluginTests/.vsconfig b/VIRTUOS_ExpansionPluginTests/.vsconfig index b981b2e..b3c233d 100644 --- a/VIRTUOS_ExpansionPluginTests/.vsconfig +++ b/VIRTUOS_ExpansionPluginTests/.vsconfig @@ -1,14 +1,10 @@ { "version": "1.0", "components": [ - "Component.Unreal.Debugger", - "Component.Unreal.Ide", "Microsoft.Net.Component.4.6.2.TargetingPack", + "Microsoft.VisualStudio.Component.Unreal.Workspace", "Microsoft.VisualStudio.Component.VC.14.38.17.8.ATL", "Microsoft.VisualStudio.Component.VC.14.38.17.8.x86.x64", - "Microsoft.VisualStudio.Component.VC.14.44.17.14.ATL", - "Microsoft.VisualStudio.Component.VC.14.44.17.14.x86.x64", - "Microsoft.VisualStudio.Component.VC.Llvm.Clang", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "Microsoft.VisualStudio.Component.Windows11SDK.22621", "Microsoft.VisualStudio.Workload.CoreEditor", diff --git a/VIRTUOS_ExpansionPluginTests/Config/DefaultEditor.ini b/VIRTUOS_ExpansionPluginTests/Config/DefaultEditor.ini index 05b130e..67cc6e4 100644 --- a/VIRTUOS_ExpansionPluginTests/Config/DefaultEditor.ini +++ b/VIRTUOS_ExpansionPluginTests/Config/DefaultEditor.ini @@ -7,9 +7,8 @@ +Profiles=(ProfileName="Default",DirectionalLightIntensity=2.620000,DirectionalLightColor=(R=0.990000,G=0.839850,B=0.732600,A=1.000000),SkyLightIntensity=0.880000,bRotateLightingRig=False,bShowEnvironment=True,bShowFloor=True,EnvironmentCubeMapPath="",PostProcessingSettings=(bOverride_WhiteTemp=True,bOverride_WhiteTint=False,bOverride_ColorSaturation=True,bOverride_ColorContrast=True,bOverride_ColorGamma=True,bOverride_ColorGain=True,bOverride_ColorOffset=True,bOverride_ColorSaturationShadows=False,bOverride_ColorContrastShadows=False,bOverride_ColorGammaShadows=False,bOverride_ColorGainShadows=False,bOverride_ColorOffsetShadows=False,bOverride_ColorSaturationMidtones=False,bOverride_ColorContrastMidtones=False,bOverride_ColorGammaMidtones=False,bOverride_ColorGainMidtones=False,bOverride_ColorOffsetMidtones=False,bOverride_ColorSaturationHighlights=False,bOverride_ColorContrastHighlights=False,bOverride_ColorGammaHighlights=False,bOverride_ColorGainHighlights=False,bOverride_ColorOffsetHighlights=False,bOverride_ColorCorrectionShadowsMax=False,bOverride_ColorCorrectionHighlightsMin=False,bOverride_FilmWhitePoint=False,bOverride_FilmSaturation=False,bOverride_FilmChannelMixerRed=False,bOverride_FilmChannelMixerGreen=False,bOverride_FilmChannelMixerBlue=False,bOverride_FilmContrast=False,bOverride_FilmDynamicRange=False,bOverride_FilmHealAmount=False,bOverride_FilmToeAmount=False,bOverride_FilmShadowTint=False,bOverride_FilmShadowTintBlend=False,bOverride_FilmShadowTintAmount=False,bOverride_FilmSlope=True,bOverride_FilmToe=True,bOverride_FilmShoulder=True,bOverride_FilmBlackClip=True,bOverride_FilmWhiteClip=True,bOverride_SceneColorTint=False,bOverride_SceneFringeIntensity=False,bOverride_AmbientCubemapTint=False,bOverride_AmbientCubemapIntensity=False,bOverride_BloomIntensity=True,bOverride_BloomThreshold=False,bOverride_Bloom1Tint=False,bOverride_Bloom1Size=False,bOverride_Bloom2Size=False,bOverride_Bloom2Tint=False,bOverride_Bloom3Tint=False,bOverride_Bloom3Size=False,bOverride_Bloom4Tint=False,bOverride_Bloom4Size=False,bOverride_Bloom5Tint=False,bOverride_Bloom5Size=False,bOverride_Bloom6Tint=False,bOverride_Bloom6Size=False,bOverride_BloomSizeScale=False,bOverride_BloomDirtMaskIntensity=False,bOverride_BloomDirtMaskTint=False,bOverride_BloomDirtMask=False,bOverride_AutoExposureMethod=True,bOverride_AutoExposureLowPercent=False,bOverride_AutoExposureHighPercent=False,bOverride_AutoExposureMinBrightness=True,bOverride_AutoExposureMaxBrightness=True,bOverride_AutoExposureSpeedUp=False,bOverride_AutoExposureSpeedDown=False,bOverride_AutoExposureBias=True,bOverride_HistogramLogMin=True,bOverride_HistogramLogMax=True,bOverride_LensFlareIntensity=False,bOverride_LensFlareTint=False,bOverride_LensFlareTints=False,bOverride_LensFlareBokehSize=False,bOverride_LensFlareBokehShape=False,bOverride_LensFlareThreshold=False,bOverride_VignetteIntensity=True,bOverride_GrainIntensity=False,bOverride_GrainJitter=False,bOverride_AmbientOcclusionIntensity=True,bOverride_AmbientOcclusionStaticFraction=True,bOverride_AmbientOcclusionRadius=True,bOverride_AmbientOcclusionFadeDistance=False,bOverride_AmbientOcclusionFadeRadius=False,bOverride_AmbientOcclusionDistance=False,bOverride_AmbientOcclusionRadiusInWS=False,bOverride_AmbientOcclusionPower=True,bOverride_AmbientOcclusionBias=True,bOverride_AmbientOcclusionQuality=True,bOverride_AmbientOcclusionMipBlend=True,bOverride_AmbientOcclusionMipScale=True,bOverride_AmbientOcclusionMipThreshold=True,bOverride_LPVIntensity=False,bOverride_LPVDirectionalOcclusionIntensity=False,bOverride_LPVDirectionalOcclusionRadius=False,bOverride_LPVDiffuseOcclusionExponent=False,bOverride_LPVSpecularOcclusionExponent=False,bOverride_LPVDiffuseOcclusionIntensity=False,bOverride_LPVSpecularOcclusionIntensity=False,bOverride_LPVSize=False,bOverride_LPVSecondaryOcclusionIntensity=False,bOverride_LPVSecondaryBounceIntensity=False,bOverride_LPVGeometryVolumeBias=False,bOverride_LPVVplInjectionBias=False,bOverride_LPVEmissiveInjectionIntensity=False,bOverride_IndirectLightingColor=False,bOverride_IndirectLightingIntensity=False,bOverride_ColorGradingIntensity=True,bOverride_ColorGradingLUT=True,bOverride_DepthOfFieldFocalDistance=False,bOverride_DepthOfFieldFstop=False,bOverride_DepthOfFieldSensorWidth=False,bOverride_DepthOfFieldDepthBlurRadius=False,bOverride_DepthOfFieldDepthBlurAmount=False,bOverride_DepthOfFieldFocalRegion=False,bOverride_DepthOfFieldNearTransitionRegion=False,bOverride_DepthOfFieldFarTransitionRegion=False,bOverride_DepthOfFieldScale=True,bOverride_DepthOfFieldMaxBokehSize=False,bOverride_DepthOfFieldNearBlurSize=False,bOverride_DepthOfFieldFarBlurSize=False,bOverride_DepthOfFieldMethod=True,bOverride_MobileHQGaussian=False,bOverride_DepthOfFieldBokehShape=False,bOverride_DepthOfFieldOcclusion=False,bOverride_DepthOfFieldColorThreshold=False,bOverride_DepthOfFieldSizeThreshold=False,bOverride_DepthOfFieldSkyFocusDistance=False,bOverride_DepthOfFieldVignetteSize=False,bOverride_MotionBlurAmount=False,bOverride_MotionBlurMax=False,bOverride_MotionBlurPerObjectSize=False,bOverride_ScreenPercentage=False,bOverride_ScreenSpaceReflectionIntensity=True,bOverride_ScreenSpaceReflectionQuality=True,bOverride_ScreenSpaceReflectionMaxRoughness=True,bOverride_ScreenSpaceReflectionRoughnessScale=False,WhiteTemp=6700.000000,WhiteTint=0.000000,ColorSaturation=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrast=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGamma=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGain=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffset=(X=0.005000,Y=0.005000,Z=0.005000,W=0.000000),ColorSaturationShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetShadows=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionShadowsMax=0.090000,ColorSaturationMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetMidtones=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetHighlights=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionHighlightsMin=0.500000,FilmWhitePoint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),FilmShadowTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),FilmShadowTintBlend=0.500000,FilmShadowTintAmount=0.000000,FilmSaturation=1.000000,FilmChannelMixerRed=(R=1.000000,G=0.000000,B=0.000000,A=1.000000),FilmChannelMixerGreen=(R=0.000000,G=1.000000,B=0.000000,A=1.000000),FilmChannelMixerBlue=(R=0.000000,G=0.000000,B=1.000000,A=1.000000),FilmContrast=0.030000,FilmToeAmount=1.000000,FilmHealAmount=0.180000,FilmDynamicRange=4.000000,FilmSlope=0.880000,FilmToe=0.550000,FilmShoulder=0.260000,FilmBlackClip=0.000000,FilmWhiteClip=0.040000,SceneColorTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SceneFringeIntensity=0.000000,BloomIntensity=1.000000,BloomThreshold=1.000000,BloomSizeScale=4.000000,Bloom1Size=1.000000,Bloom2Size=4.000000,Bloom3Size=16.000000,Bloom4Size=32.000000,Bloom5Size=64.000000,Bloom6Size=64.000000,Bloom1Tint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),Bloom2Tint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),Bloom3Tint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),Bloom4Tint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),Bloom5Tint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),Bloom6Tint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),BloomDirtMaskIntensity=1.000000,BloomDirtMaskTint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),BloomDirtMask=None,AmbientCubemapTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),AmbientCubemapIntensity=1.000000,AmbientCubemap=None,AutoExposureMethod=AEM_Histogram,AutoExposureLowPercent=80.000000,AutoExposureHighPercent=98.300003,AutoExposureMinBrightness=1.000000,AutoExposureMaxBrightness=1.000000,AutoExposureSpeedUp=3.000000,AutoExposureSpeedDown=1.000000,AutoExposureBias=0.330000,HistogramLogMin=-8.000000,HistogramLogMax=4.000000,LensFlareIntensity=1.000000,LensFlareTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LensFlareBokehSize=3.000000,LensFlareThreshold=8.000000,LensFlareBokehShape=None,LensFlareTints[0]=(R=1.000000,G=0.800000,B=0.400000,A=0.600000),LensFlareTints[1]=(R=1.000000,G=1.000000,B=0.600000,A=0.530000),LensFlareTints[2]=(R=0.800000,G=0.800000,B=1.000000,A=0.460000),LensFlareTints[3]=(R=0.500000,G=1.000000,B=0.400000,A=0.390000),LensFlareTints[4]=(R=0.500000,G=0.800000,B=1.000000,A=0.310000),LensFlareTints[5]=(R=0.900000,G=1.000000,B=0.800000,A=0.270000),LensFlareTints[6]=(R=1.000000,G=0.800000,B=0.400000,A=0.220000),LensFlareTints[7]=(R=0.900000,G=0.700000,B=0.700000,A=0.150000),VignetteIntensity=0.161468,GrainJitter=0.000000,GrainIntensity=0.000000,AmbientOcclusionIntensity=1.000000,AmbientOcclusionStaticFraction=1.000000,AmbientOcclusionRadius=73.477997,AmbientOcclusionRadiusInWS=False,AmbientOcclusionFadeDistance=8000.000000,AmbientOcclusionFadeRadius=5000.000000,AmbientOcclusionDistance=80.000000,AmbientOcclusionPower=1.200000,AmbientOcclusionBias=3.000000,AmbientOcclusionQuality=100.000000,AmbientOcclusionMipBlend=0.600000,AmbientOcclusionMipScale=1.700000,AmbientOcclusionMipThreshold=0.010000,IndirectLightingColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),IndirectLightingIntensity=1.000000,ColorGradingIntensity=0.000000,ColorGradingLUT=Texture2D'/Engine/EditorResources/RGBTable16x1_AssetViewer.RGBTable16x1_AssetViewer',DepthOfFieldMethod=DOFM_BokehDOF,bMobileHQGaussian=False,DepthOfFieldFstop=4.000000,DepthOfFieldSensorWidth=24.576000,DepthOfFieldFocalDistance=1000.000000,DepthOfFieldDepthBlurAmount=1.000000,DepthOfFieldDepthBlurRadius=0.000000,DepthOfFieldFocalRegion=0.000000,DepthOfFieldNearTransitionRegion=300.000000,DepthOfFieldFarTransitionRegion=500.000000,DepthOfFieldScale=0.000000,DepthOfFieldMaxBokehSize=15.000000,DepthOfFieldNearBlurSize=15.000000,DepthOfFieldFarBlurSize=15.000000,DepthOfFieldBokehShape=None,DepthOfFieldOcclusion=0.400000,DepthOfFieldColorThreshold=1.000000,DepthOfFieldSizeThreshold=0.080000,DepthOfFieldSkyFocusDistance=0.000000,DepthOfFieldVignetteSize=200.000000,MotionBlurAmount=0.500000,MotionBlurMax=5.000000,MotionBlurPerObjectSize=0.500000,LPVIntensity=1.000000,LPVVplInjectionBias=0.640000,LPVSize=5312.000000,LPVSecondaryOcclusionIntensity=0.000000,LPVSecondaryBounceIntensity=0.000000,LPVGeometryVolumeBias=0.384000,LPVEmissiveInjectionIntensity=1.000000,LPVDirectionalOcclusionIntensity=0.000000,LPVDirectionalOcclusionRadius=8.000000,LPVDiffuseOcclusionExponent=1.000000,LPVSpecularOcclusionExponent=7.000000,LPVDiffuseOcclusionIntensity=1.000000,LPVSpecularOcclusionIntensity=1.000000,ScreenSpaceReflectionIntensity=100.000000,ScreenSpaceReflectionQuality=100.000000,ScreenSpaceReflectionMaxRoughness=1.000000,ScreenPercentage=100.000000,WeightedBlendables=(Array=),Blendables=),bPostProcessingEnabled=True,LightingRigRotation=109.389069,RotationSpeed=2.000000,DirectionalLightRotation=(Pitch=-39.999985,Yaw=-67.500015,Roll=0.000000)) [/Script/AdvancedPreviewScene.SharedProfiles] -+Profiles=(ProfileName="Epic Headquarters",bSharedProfile=True,bIsEngineDefaultProfile=True,bUseSkyLighting=True,DirectionalLightIntensity=1.000000,DirectionalLightColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SkyLightIntensity=1.000000,bRotateLightingRig=False,bShowEnvironment=True,bShowFloor=False,bShowGrid=False,EnvironmentColor=(R=0.200000,G=0.200000,B=0.200000,A=1.000000),EnvironmentIntensity=1.000000,EnvironmentCubeMapPath="/Engine/EditorMaterials/AssetViewer/EpicQuadPanorama_CC+EV1.EpicQuadPanorama_CC+EV1",bPostProcessingEnabled=True,PostProcessingSettings=(bOverride_TemperatureType=False,bOverride_WhiteTemp=False,bOverride_WhiteTint=False,bOverride_ColorSaturation=False,bOverride_ColorContrast=False,bOverride_ColorGamma=False,bOverride_ColorGain=False,bOverride_ColorOffset=False,bOverride_ColorSaturationShadows=False,bOverride_ColorContrastShadows=False,bOverride_ColorGammaShadows=False,bOverride_ColorGainShadows=False,bOverride_ColorOffsetShadows=False,bOverride_ColorSaturationMidtones=False,bOverride_ColorContrastMidtones=False,bOverride_ColorGammaMidtones=False,bOverride_ColorGainMidtones=False,bOverride_ColorOffsetMidtones=False,bOverride_ColorSaturationHighlights=False,bOverride_ColorContrastHighlights=False,bOverride_ColorGammaHighlights=False,bOverride_ColorGainHighlights=False,bOverride_ColorOffsetHighlights=False,bOverride_ColorCorrectionShadowsMax=False,bOverride_ColorCorrectionHighlightsMin=False,bOverride_ColorCorrectionHighlightsMax=False,bOverride_BlueCorrection=False,bOverride_ExpandGamut=False,bOverride_ToneCurveAmount=False,bOverride_FilmSlope=False,bOverride_FilmToe=False,bOverride_FilmShoulder=False,bOverride_FilmBlackClip=False,bOverride_FilmWhiteClip=False,bOverride_SceneColorTint=False,bOverride_SceneFringeIntensity=False,bOverride_ChromaticAberrationStartOffset=False,bOverride_bMegaLights=False,bOverride_AmbientCubemapTint=False,bOverride_AmbientCubemapIntensity=False,bOverride_BloomMethod=False,bOverride_BloomIntensity=False,bOverride_BloomThreshold=False,bOverride_Bloom1Tint=False,bOverride_Bloom1Size=False,bOverride_Bloom2Size=False,bOverride_Bloom2Tint=False,bOverride_Bloom3Tint=False,bOverride_Bloom3Size=False,bOverride_Bloom4Tint=False,bOverride_Bloom4Size=False,bOverride_Bloom5Tint=False,bOverride_Bloom5Size=False,bOverride_Bloom6Tint=False,bOverride_Bloom6Size=False,bOverride_BloomSizeScale=False,bOverride_BloomConvolutionTexture=False,bOverride_BloomConvolutionScatterDispersion=False,bOverride_BloomConvolutionSize=False,bOverride_BloomConvolutionCenterUV=False,bOverride_BloomConvolutionPreFilterMin=False,bOverride_BloomConvolutionPreFilterMax=False,bOverride_BloomConvolutionPreFilterMult=False,bOverride_BloomConvolutionBufferScale=False,bOverride_BloomDirtMaskIntensity=False,bOverride_BloomDirtMaskTint=False,bOverride_BloomDirtMask=False,bOverride_CameraShutterSpeed=False,bOverride_CameraISO=False,bOverride_AutoExposureMethod=False,bOverride_AutoExposureLowPercent=False,bOverride_AutoExposureHighPercent=False,bOverride_AutoExposureMinBrightness=False,bOverride_AutoExposureMaxBrightness=False,bOverride_AutoExposureSpeedUp=False,bOverride_AutoExposureSpeedDown=False,bOverride_AutoExposureBias=False,bOverride_AutoExposureBiasCurve=False,bOverride_AutoExposureMeterMask=False,bOverride_AutoExposureApplyPhysicalCameraExposure=False,bOverride_HistogramLogMin=False,bOverride_HistogramLogMax=False,bOverride_LocalExposureMethod=False,bOverride_LocalExposureHighlightContrastScale=False,bOverride_LocalExposureShadowContrastScale=False,bOverride_LocalExposureHighlightContrastCurve=False,bOverride_LocalExposureShadowContrastCurve=False,bOverride_LocalExposureHighlightThreshold=False,bOverride_LocalExposureShadowThreshold=False,bOverride_LocalExposureDetailStrength=False,bOverride_LocalExposureBlurredLuminanceBlend=False,bOverride_LocalExposureBlurredLuminanceKernelSizePercent=False,bOverride_LocalExposureHighlightThresholdStrength=False,bOverride_LocalExposureShadowThresholdStrength=False,bOverride_LocalExposureMiddleGreyBias=False,bOverride_LensFlareIntensity=False,bOverride_LensFlareTint=False,bOverride_LensFlareTints=False,bOverride_LensFlareBokehSize=False,bOverride_LensFlareBokehShape=False,bOverride_LensFlareThreshold=False,bOverride_VignetteIntensity=False,bOverride_Sharpen=False,bOverride_FilmGrainIntensity=False,bOverride_FilmGrainIntensityShadows=False,bOverride_FilmGrainIntensityMidtones=False,bOverride_FilmGrainIntensityHighlights=False,bOverride_FilmGrainShadowsMax=False,bOverride_FilmGrainHighlightsMin=False,bOverride_FilmGrainHighlightsMax=False,bOverride_FilmGrainTexelSize=False,bOverride_FilmGrainTexture=False,bOverride_AmbientOcclusionIntensity=False,bOverride_AmbientOcclusionStaticFraction=False,bOverride_AmbientOcclusionRadius=False,bOverride_AmbientOcclusionFadeDistance=False,bOverride_AmbientOcclusionFadeRadius=False,bOverride_AmbientOcclusionRadiusInWS=False,bOverride_AmbientOcclusionPower=False,bOverride_AmbientOcclusionBias=False,bOverride_AmbientOcclusionQuality=False,bOverride_AmbientOcclusionMipBlend=False,bOverride_AmbientOcclusionMipScale=False,bOverride_AmbientOcclusionMipThreshold=False,bOverride_AmbientOcclusionTemporalBlendWeight=False,bOverride_RayTracingAO=False,bOverride_RayTracingAOSamplesPerPixel=False,bOverride_RayTracingAOIntensity=False,bOverride_RayTracingAORadius=False,bOverride_IndirectLightingColor=False,bOverride_IndirectLightingIntensity=False,bOverride_ColorGradingIntensity=False,bOverride_ColorGradingLUT=False,bOverride_DepthOfFieldFocalDistance=False,bOverride_DepthOfFieldFstop=False,bOverride_DepthOfFieldMinFstop=False,bOverride_DepthOfFieldBladeCount=False,bOverride_DepthOfFieldSensorWidth=False,bOverride_DepthOfFieldSqueezeFactor=False,bOverride_DepthOfFieldDepthBlurRadius=False,bOverride_DepthOfFieldUseHairDepth=False,bOverride_DepthOfFieldPetzvalBokeh=False,bOverride_DepthOfFieldPetzvalBokehFalloff=False,bOverride_DepthOfFieldPetzvalExclusionBoxExtents=False,bOverride_DepthOfFieldPetzvalExclusionBoxRadius=False,bOverride_DepthOfFieldAspectRatioScalar=False,bOverride_DepthOfFieldMatteBoxFlags=False,bOverride_DepthOfFieldBarrelRadius=False,bOverride_DepthOfFieldBarrelLength=False,bOverride_DepthOfFieldDepthBlurAmount=False,bOverride_DepthOfFieldFocalRegion=False,bOverride_DepthOfFieldNearTransitionRegion=False,bOverride_DepthOfFieldFarTransitionRegion=False,bOverride_DepthOfFieldScale=False,bOverride_DepthOfFieldNearBlurSize=False,bOverride_DepthOfFieldFarBlurSize=False,bOverride_MobileHQGaussian=False,bOverride_DepthOfFieldOcclusion=False,bOverride_DepthOfFieldSkyFocusDistance=False,bOverride_DepthOfFieldVignetteSize=False,bOverride_MotionBlurAmount=False,bOverride_MotionBlurMax=False,bOverride_MotionBlurTargetFPS=False,bOverride_MotionBlurPerObjectSize=False,bOverride_ReflectionMethod=False,bOverride_LumenReflectionQuality=False,bOverride_ScreenSpaceReflectionIntensity=False,bOverride_ScreenSpaceReflectionQuality=False,bOverride_ScreenSpaceReflectionMaxRoughness=False,bOverride_ScreenSpaceReflectionRoughnessScale=False,bOverride_UserFlags=False,bOverride_RayTracingReflectionsMaxRoughness=False,bOverride_RayTracingReflectionsMaxBounces=False,bOverride_RayTracingReflectionsSamplesPerPixel=False,bOverride_RayTracingReflectionsShadows=False,bOverride_RayTracingReflectionsTranslucency=False,bOverride_TranslucencyType=False,bOverride_RayTracingTranslucencyMaxRoughness=False,bOverride_RayTracingTranslucencyRefractionRays=False,bOverride_RayTracingTranslucencySamplesPerPixel=False,bOverride_RayTracingTranslucencyShadows=False,bOverride_RayTracingTranslucencyRefraction=False,bOverride_RayTracingTranslucencyMaxPrimaryHitEvents=False,bOverride_RayTracingTranslucencyMaxSecondaryHitEvents=False,bOverride_RayTracingTranslucencyUseRayTracedRefraction=False,bOverride_DynamicGlobalIlluminationMethod=False,bOverride_LumenSceneLightingQuality=False,bOverride_LumenSceneDetail=False,bOverride_LumenSceneViewDistance=False,bOverride_LumenSceneLightingUpdateSpeed=False,bOverride_LumenFinalGatherQuality=False,bOverride_LumenFinalGatherLightingUpdateSpeed=False,bOverride_LumenFinalGatherScreenTraces=False,bOverride_LumenMaxTraceDistance=False,bOverride_LumenDiffuseColorBoost=False,bOverride_LumenSkylightLeaking=False,bOverride_LumenSkylightLeakingTint=False,bOverride_LumenFullSkylightLeakingDistance=False,bOverride_LumenRayLightingMode=False,bOverride_LumenReflectionsScreenTraces=False,bOverride_LumenFrontLayerTranslucencyReflections=False,bOverride_LumenMaxRoughnessToTraceReflections=False,bOverride_LumenMaxReflectionBounces=False,bOverride_LumenMaxRefractionBounces=False,bOverride_LumenSurfaceCacheResolution=False,bOverride_RayTracingGI=False,bOverride_RayTracingGIMaxBounces=False,bOverride_RayTracingGISamplesPerPixel=False,bOverride_PathTracingMaxBounces=False,bOverride_PathTracingSamplesPerPixel=False,bOverride_PathTracingMaxPathIntensity=False,bOverride_PathTracingEnableEmissiveMaterials=False,bOverride_PathTracingEnableReferenceDOF=False,bOverride_PathTracingEnableReferenceAtmosphere=False,bOverride_PathTracingEnableDenoiser=False,bOverride_PathTracingIncludeEmissive=False,bOverride_PathTracingIncludeDiffuse=False,bOverride_PathTracingIncludeIndirectDiffuse=False,bOverride_PathTracingIncludeSpecular=False,bOverride_PathTracingIncludeIndirectSpecular=False,bOverride_PathTracingIncludeVolume=False,bOverride_PathTracingIncludeIndirectVolume=False,bMobileHQGaussian=False,BloomMethod=BM_SOG,AutoExposureMethod=AEM_Histogram,TemperatureType=TEMP_WhiteBalance,WhiteTemp=6500.000000,WhiteTint=0.000000,ColorSaturation=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrast=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGamma=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGain=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffset=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetShadows=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetMidtones=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetHighlights=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionHighlightsMin=0.500000,ColorCorrectionHighlightsMax=1.000000,ColorCorrectionShadowsMax=0.090000,BlueCorrection=0.600000,ExpandGamut=1.000000,ToneCurveAmount=1.000000,FilmSlope=0.880000,FilmToe=0.550000,FilmShoulder=0.260000,FilmBlackClip=0.000000,FilmWhiteClip=0.040000,SceneColorTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SceneFringeIntensity=0.000000,ChromaticAberrationStartOffset=0.000000,BloomIntensity=0.675000,BloomThreshold=-1.000000,BloomSizeScale=4.000000,Bloom1Size=0.300000,Bloom2Size=1.000000,Bloom3Size=2.000000,Bloom4Size=10.000000,Bloom5Size=30.000000,Bloom6Size=64.000000,Bloom1Tint=(R=0.346500,G=0.346500,B=0.346500,A=1.000000),Bloom2Tint=(R=0.138000,G=0.138000,B=0.138000,A=1.000000),Bloom3Tint=(R=0.117600,G=0.117600,B=0.117600,A=1.000000),Bloom4Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom5Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom6Tint=(R=0.061000,G=0.061000,B=0.061000,A=1.000000),BloomConvolutionScatterDispersion=1.000000,BloomConvolutionSize=1.000000,BloomConvolutionTexture=None,BloomConvolutionCenterUV=(X=0.500000,Y=0.500000),BloomConvolutionPreFilterMin=7.000000,BloomConvolutionPreFilterMax=15000.000000,BloomConvolutionPreFilterMult=15.000000,BloomConvolutionBufferScale=0.133000,BloomDirtMask=None,BloomDirtMaskIntensity=0.000000,BloomDirtMaskTint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),DynamicGlobalIlluminationMethod=Lumen,IndirectLightingColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),IndirectLightingIntensity=1.000000,LumenRayLightingMode=Default,LumenSceneLightingQuality=1.000000,LumenSceneDetail=1.000000,LumenSceneViewDistance=20000.000000,LumenSceneLightingUpdateSpeed=1.000000,LumenFinalGatherQuality=1.000000,LumenFinalGatherLightingUpdateSpeed=1.000000,LumenFinalGatherScreenTraces=True,LumenMaxTraceDistance=20000.000000,LumenDiffuseColorBoost=1.000000,LumenSkylightLeaking=0.000000,LumenSkylightLeakingTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LumenFullSkylightLeakingDistance=1000.000000,LumenSurfaceCacheResolution=1.000000,ReflectionMethod=Lumen,LumenReflectionQuality=1.000000,LumenReflectionsScreenTraces=True,LumenFrontLayerTranslucencyReflections=False,LumenMaxRoughnessToTraceReflections=0.400000,LumenMaxReflectionBounces=1,LumenMaxRefractionBounces=0,ScreenSpaceReflectionIntensity=100.000000,ScreenSpaceReflectionQuality=50.000000,ScreenSpaceReflectionMaxRoughness=0.600000,bMegaLights=True,AmbientCubemapTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),AmbientCubemapIntensity=1.000000,AmbientCubemap=None,CameraShutterSpeed=60.000000,CameraISO=100.000000,DepthOfFieldFstop=4.000000,DepthOfFieldMinFstop=1.200000,DepthOfFieldBladeCount=5,AutoExposureBias=1.000000,AutoExposureBiasBackup=0.000000,bOverride_AutoExposureBiasBackup=False,AutoExposureApplyPhysicalCameraExposure=True,AutoExposureBiasCurve=None,AutoExposureMeterMask=None,AutoExposureLowPercent=10.000000,AutoExposureHighPercent=90.000000,AutoExposureMinBrightness=0.030000,AutoExposureMaxBrightness=8.000000,AutoExposureSpeedUp=3.000000,AutoExposureSpeedDown=1.000000,HistogramLogMin=-8.000000,HistogramLogMax=4.000000,LocalExposureMethod=Bilateral,LocalExposureHighlightContrastScale=1.000000,LocalExposureShadowContrastScale=1.000000,LocalExposureHighlightContrastCurve=None,LocalExposureShadowContrastCurve=None,LocalExposureHighlightThreshold=0.000000,LocalExposureShadowThreshold=0.000000,LocalExposureDetailStrength=1.000000,LocalExposureBlurredLuminanceBlend=0.600000,LocalExposureBlurredLuminanceKernelSizePercent=50.000000,LocalExposureHighlightThresholdStrength=1.000000,LocalExposureShadowThresholdStrength=1.000000,LocalExposureMiddleGreyBias=0.000000,LensFlareIntensity=1.000000,LensFlareTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LensFlareBokehSize=3.000000,LensFlareThreshold=8.000000,LensFlareBokehShape=None,LensFlareTints[0]=(R=1.000000,G=0.800000,B=0.400000,A=0.600000),LensFlareTints[1]=(R=1.000000,G=1.000000,B=0.600000,A=0.530000),LensFlareTints[2]=(R=0.800000,G=0.800000,B=1.000000,A=0.460000),LensFlareTints[3]=(R=0.500000,G=1.000000,B=0.400000,A=0.390000),LensFlareTints[4]=(R=0.500000,G=0.800000,B=1.000000,A=0.310000),LensFlareTints[5]=(R=0.900000,G=1.000000,B=0.800000,A=0.270000),LensFlareTints[6]=(R=1.000000,G=0.800000,B=0.400000,A=0.220000),LensFlareTints[7]=(R=0.900000,G=0.700000,B=0.700000,A=0.150000),VignetteIntensity=0.400000,Sharpen=0.000000,FilmGrainIntensity=0.000000,FilmGrainIntensityShadows=1.000000,FilmGrainIntensityMidtones=1.000000,FilmGrainIntensityHighlights=1.000000,FilmGrainShadowsMax=0.090000,FilmGrainHighlightsMin=0.500000,FilmGrainHighlightsMax=1.000000,FilmGrainTexelSize=1.000000,FilmGrainTexture=None,AmbientOcclusionIntensity=0.500000,AmbientOcclusionStaticFraction=1.000000,AmbientOcclusionRadius=200.000000,AmbientOcclusionRadiusInWS=False,AmbientOcclusionFadeDistance=8000.000000,AmbientOcclusionFadeRadius=5000.000000,AmbientOcclusionPower=2.000000,AmbientOcclusionBias=3.000000,AmbientOcclusionQuality=50.000000,AmbientOcclusionMipBlend=0.600000,AmbientOcclusionMipScale=1.700000,AmbientOcclusionMipThreshold=0.010000,AmbientOcclusionTemporalBlendWeight=0.100000,RayTracingAO=False,RayTracingAOSamplesPerPixel=1,RayTracingAOIntensity=1.000000,RayTracingAORadius=200.000000,ColorGradingIntensity=1.000000,ColorGradingLUT=None,DepthOfFieldSensorWidth=24.576000,DepthOfFieldSqueezeFactor=1.000000,DepthOfFieldFocalDistance=0.000000,DepthOfFieldDepthBlurAmount=1.000000,DepthOfFieldDepthBlurRadius=0.000000,DepthOfFieldUseHairDepth=False,DepthOfFieldPetzvalBokeh=0.000000,DepthOfFieldPetzvalBokehFalloff=1.000000,DepthOfFieldPetzvalExclusionBoxExtents=(X=0.000000,Y=0.000000),DepthOfFieldPetzvalExclusionBoxRadius=0.000000,DepthOfFieldAspectRatioScalar=1.000000,DepthOfFieldBarrelRadius=5.000000,DepthOfFieldBarrelLength=0.000000,DepthOfFieldMatteBoxFlags[0]=(Pitch=0.000000,Roll=0.000000,Length=0.000000),DepthOfFieldMatteBoxFlags[1]=(Pitch=0.000000,Roll=0.000000,Length=0.000000),DepthOfFieldMatteBoxFlags[2]=(Pitch=0.000000,Roll=0.000000,Length=0.000000),DepthOfFieldFocalRegion=0.000000,DepthOfFieldNearTransitionRegion=300.000000,DepthOfFieldFarTransitionRegion=500.000000,DepthOfFieldScale=0.000000,DepthOfFieldNearBlurSize=15.000000,DepthOfFieldFarBlurSize=15.000000,DepthOfFieldOcclusion=0.400000,DepthOfFieldSkyFocusDistance=0.000000,DepthOfFieldVignetteSize=200.000000,MotionBlurAmount=0.500000,MotionBlurMax=5.000000,MotionBlurTargetFPS=30,MotionBlurPerObjectSize=0.000000,TranslucencyType=Raster,RayTracingTranslucencyMaxRoughness=0.600000,RayTracingTranslucencyRefractionRays=3,RayTracingTranslucencySamplesPerPixel=1,RayTracingTranslucencyMaxPrimaryHitEvents=4,RayTracingTranslucencyMaxSecondaryHitEvents=2,RayTracingTranslucencyShadows=Hard_shadows,RayTracingTranslucencyRefraction=True,RayTracingTranslucencyUseRayTracedRefraction=False,PathTracingMaxBounces=32,PathTracingSamplesPerPixel=2048,PathTracingMaxPathIntensity=24.000000,PathTracingEnableEmissiveMaterials=True,PathTracingEnableReferenceDOF=False,PathTracingEnableReferenceAtmosphere=False,PathTracingEnableDenoiser=True,PathTracingIncludeEmissive=True,PathTracingIncludeDiffuse=True,PathTracingIncludeIndirectDiffuse=True,PathTracingIncludeSpecular=True,PathTracingIncludeIndirectSpecular=True,PathTracingIncludeVolume=True,PathTracingIncludeIndirectVolume=True,UserFlags=0,WeightedBlendables=(Array=)),LightingRigRotation=0.000000,RotationSpeed=2.000000,DirectionalLightRotation=(Pitch=-40.000000,Yaw=-67.500000,Roll=0.000000),bEnableToneMapping=True,bShowMeshEdges=False) -+Profiles=(ProfileName="Grey Wireframe",bSharedProfile=True,bIsEngineDefaultProfile=True,bUseSkyLighting=True,DirectionalLightIntensity=1.000000,DirectionalLightColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SkyLightIntensity=1.000000,bRotateLightingRig=False,bShowEnvironment=False,bShowFloor=False,bShowGrid=True,EnvironmentColor=(R=0.039216,G=0.039216,B=0.039216,A=1.000000),EnvironmentIntensity=1.000000,EnvironmentCubeMapPath="/Engine/EditorMaterials/AssetViewer/EpicQuadPanorama_CC+EV1.EpicQuadPanorama_CC+EV1",bPostProcessingEnabled=False,PostProcessingSettings=(bOverride_TemperatureType=False,bOverride_WhiteTemp=False,bOverride_WhiteTint=False,bOverride_ColorSaturation=False,bOverride_ColorContrast=False,bOverride_ColorGamma=False,bOverride_ColorGain=False,bOverride_ColorOffset=False,bOverride_ColorSaturationShadows=False,bOverride_ColorContrastShadows=False,bOverride_ColorGammaShadows=False,bOverride_ColorGainShadows=False,bOverride_ColorOffsetShadows=False,bOverride_ColorSaturationMidtones=False,bOverride_ColorContrastMidtones=False,bOverride_ColorGammaMidtones=False,bOverride_ColorGainMidtones=False,bOverride_ColorOffsetMidtones=False,bOverride_ColorSaturationHighlights=False,bOverride_ColorContrastHighlights=False,bOverride_ColorGammaHighlights=False,bOverride_ColorGainHighlights=False,bOverride_ColorOffsetHighlights=False,bOverride_ColorCorrectionShadowsMax=False,bOverride_ColorCorrectionHighlightsMin=False,bOverride_ColorCorrectionHighlightsMax=False,bOverride_BlueCorrection=False,bOverride_ExpandGamut=False,bOverride_ToneCurveAmount=False,bOverride_FilmSlope=False,bOverride_FilmToe=False,bOverride_FilmShoulder=False,bOverride_FilmBlackClip=False,bOverride_FilmWhiteClip=False,bOverride_SceneColorTint=False,bOverride_SceneFringeIntensity=False,bOverride_ChromaticAberrationStartOffset=False,bOverride_bMegaLights=False,bOverride_AmbientCubemapTint=False,bOverride_AmbientCubemapIntensity=False,bOverride_BloomMethod=False,bOverride_BloomIntensity=False,bOverride_BloomThreshold=False,bOverride_Bloom1Tint=False,bOverride_Bloom1Size=False,bOverride_Bloom2Size=False,bOverride_Bloom2Tint=False,bOverride_Bloom3Tint=False,bOverride_Bloom3Size=False,bOverride_Bloom4Tint=False,bOverride_Bloom4Size=False,bOverride_Bloom5Tint=False,bOverride_Bloom5Size=False,bOverride_Bloom6Tint=False,bOverride_Bloom6Size=False,bOverride_BloomSizeScale=False,bOverride_BloomConvolutionTexture=False,bOverride_BloomConvolutionScatterDispersion=False,bOverride_BloomConvolutionSize=False,bOverride_BloomConvolutionCenterUV=False,bOverride_BloomConvolutionPreFilterMin=False,bOverride_BloomConvolutionPreFilterMax=False,bOverride_BloomConvolutionPreFilterMult=False,bOverride_BloomConvolutionBufferScale=False,bOverride_BloomDirtMaskIntensity=False,bOverride_BloomDirtMaskTint=False,bOverride_BloomDirtMask=False,bOverride_CameraShutterSpeed=False,bOverride_CameraISO=False,bOverride_AutoExposureMethod=False,bOverride_AutoExposureLowPercent=False,bOverride_AutoExposureHighPercent=False,bOverride_AutoExposureMinBrightness=False,bOverride_AutoExposureMaxBrightness=False,bOverride_AutoExposureSpeedUp=False,bOverride_AutoExposureSpeedDown=False,bOverride_AutoExposureBias=False,bOverride_AutoExposureBiasCurve=False,bOverride_AutoExposureMeterMask=False,bOverride_AutoExposureApplyPhysicalCameraExposure=False,bOverride_HistogramLogMin=False,bOverride_HistogramLogMax=False,bOverride_LocalExposureMethod=False,bOverride_LocalExposureHighlightContrastScale=False,bOverride_LocalExposureShadowContrastScale=False,bOverride_LocalExposureHighlightContrastCurve=False,bOverride_LocalExposureShadowContrastCurve=False,bOverride_LocalExposureHighlightThreshold=False,bOverride_LocalExposureShadowThreshold=False,bOverride_LocalExposureDetailStrength=False,bOverride_LocalExposureBlurredLuminanceBlend=False,bOverride_LocalExposureBlurredLuminanceKernelSizePercent=False,bOverride_LocalExposureHighlightThresholdStrength=False,bOverride_LocalExposureShadowThresholdStrength=False,bOverride_LocalExposureMiddleGreyBias=False,bOverride_LensFlareIntensity=False,bOverride_LensFlareTint=False,bOverride_LensFlareTints=False,bOverride_LensFlareBokehSize=False,bOverride_LensFlareBokehShape=False,bOverride_LensFlareThreshold=False,bOverride_VignetteIntensity=False,bOverride_Sharpen=False,bOverride_FilmGrainIntensity=False,bOverride_FilmGrainIntensityShadows=False,bOverride_FilmGrainIntensityMidtones=False,bOverride_FilmGrainIntensityHighlights=False,bOverride_FilmGrainShadowsMax=False,bOverride_FilmGrainHighlightsMin=False,bOverride_FilmGrainHighlightsMax=False,bOverride_FilmGrainTexelSize=False,bOverride_FilmGrainTexture=False,bOverride_AmbientOcclusionIntensity=False,bOverride_AmbientOcclusionStaticFraction=False,bOverride_AmbientOcclusionRadius=False,bOverride_AmbientOcclusionFadeDistance=False,bOverride_AmbientOcclusionFadeRadius=False,bOverride_AmbientOcclusionRadiusInWS=False,bOverride_AmbientOcclusionPower=False,bOverride_AmbientOcclusionBias=False,bOverride_AmbientOcclusionQuality=False,bOverride_AmbientOcclusionMipBlend=False,bOverride_AmbientOcclusionMipScale=False,bOverride_AmbientOcclusionMipThreshold=False,bOverride_AmbientOcclusionTemporalBlendWeight=False,bOverride_RayTracingAO=False,bOverride_RayTracingAOSamplesPerPixel=False,bOverride_RayTracingAOIntensity=False,bOverride_RayTracingAORadius=False,bOverride_IndirectLightingColor=False,bOverride_IndirectLightingIntensity=False,bOverride_ColorGradingIntensity=False,bOverride_ColorGradingLUT=False,bOverride_DepthOfFieldFocalDistance=False,bOverride_DepthOfFieldFstop=False,bOverride_DepthOfFieldMinFstop=False,bOverride_DepthOfFieldBladeCount=False,bOverride_DepthOfFieldSensorWidth=False,bOverride_DepthOfFieldSqueezeFactor=False,bOverride_DepthOfFieldDepthBlurRadius=False,bOverride_DepthOfFieldUseHairDepth=False,bOverride_DepthOfFieldPetzvalBokeh=False,bOverride_DepthOfFieldPetzvalBokehFalloff=False,bOverride_DepthOfFieldPetzvalExclusionBoxExtents=False,bOverride_DepthOfFieldPetzvalExclusionBoxRadius=False,bOverride_DepthOfFieldAspectRatioScalar=False,bOverride_DepthOfFieldMatteBoxFlags=False,bOverride_DepthOfFieldBarrelRadius=False,bOverride_DepthOfFieldBarrelLength=False,bOverride_DepthOfFieldDepthBlurAmount=False,bOverride_DepthOfFieldFocalRegion=False,bOverride_DepthOfFieldNearTransitionRegion=False,bOverride_DepthOfFieldFarTransitionRegion=False,bOverride_DepthOfFieldScale=False,bOverride_DepthOfFieldNearBlurSize=False,bOverride_DepthOfFieldFarBlurSize=False,bOverride_MobileHQGaussian=False,bOverride_DepthOfFieldOcclusion=False,bOverride_DepthOfFieldSkyFocusDistance=False,bOverride_DepthOfFieldVignetteSize=False,bOverride_MotionBlurAmount=False,bOverride_MotionBlurMax=False,bOverride_MotionBlurTargetFPS=False,bOverride_MotionBlurPerObjectSize=False,bOverride_ReflectionMethod=False,bOverride_LumenReflectionQuality=False,bOverride_ScreenSpaceReflectionIntensity=False,bOverride_ScreenSpaceReflectionQuality=False,bOverride_ScreenSpaceReflectionMaxRoughness=False,bOverride_ScreenSpaceReflectionRoughnessScale=False,bOverride_UserFlags=False,bOverride_RayTracingReflectionsMaxRoughness=False,bOverride_RayTracingReflectionsMaxBounces=False,bOverride_RayTracingReflectionsSamplesPerPixel=False,bOverride_RayTracingReflectionsShadows=False,bOverride_RayTracingReflectionsTranslucency=False,bOverride_TranslucencyType=False,bOverride_RayTracingTranslucencyMaxRoughness=False,bOverride_RayTracingTranslucencyRefractionRays=False,bOverride_RayTracingTranslucencySamplesPerPixel=False,bOverride_RayTracingTranslucencyShadows=False,bOverride_RayTracingTranslucencyRefraction=False,bOverride_RayTracingTranslucencyMaxPrimaryHitEvents=False,bOverride_RayTracingTranslucencyMaxSecondaryHitEvents=False,bOverride_RayTracingTranslucencyUseRayTracedRefraction=False,bOverride_DynamicGlobalIlluminationMethod=False,bOverride_LumenSceneLightingQuality=False,bOverride_LumenSceneDetail=False,bOverride_LumenSceneViewDistance=False,bOverride_LumenSceneLightingUpdateSpeed=False,bOverride_LumenFinalGatherQuality=False,bOverride_LumenFinalGatherLightingUpdateSpeed=False,bOverride_LumenFinalGatherScreenTraces=False,bOverride_LumenMaxTraceDistance=False,bOverride_LumenDiffuseColorBoost=False,bOverride_LumenSkylightLeaking=False,bOverride_LumenSkylightLeakingTint=False,bOverride_LumenFullSkylightLeakingDistance=False,bOverride_LumenRayLightingMode=False,bOverride_LumenReflectionsScreenTraces=False,bOverride_LumenFrontLayerTranslucencyReflections=False,bOverride_LumenMaxRoughnessToTraceReflections=False,bOverride_LumenMaxReflectionBounces=False,bOverride_LumenMaxRefractionBounces=False,bOverride_LumenSurfaceCacheResolution=False,bOverride_RayTracingGI=False,bOverride_RayTracingGIMaxBounces=False,bOverride_RayTracingGISamplesPerPixel=False,bOverride_PathTracingMaxBounces=False,bOverride_PathTracingSamplesPerPixel=False,bOverride_PathTracingMaxPathIntensity=False,bOverride_PathTracingEnableEmissiveMaterials=False,bOverride_PathTracingEnableReferenceDOF=False,bOverride_PathTracingEnableReferenceAtmosphere=False,bOverride_PathTracingEnableDenoiser=False,bOverride_PathTracingIncludeEmissive=False,bOverride_PathTracingIncludeDiffuse=False,bOverride_PathTracingIncludeIndirectDiffuse=False,bOverride_PathTracingIncludeSpecular=False,bOverride_PathTracingIncludeIndirectSpecular=False,bOverride_PathTracingIncludeVolume=False,bOverride_PathTracingIncludeIndirectVolume=False,bMobileHQGaussian=False,BloomMethod=BM_SOG,AutoExposureMethod=AEM_Histogram,TemperatureType=TEMP_WhiteBalance,WhiteTemp=6500.000000,WhiteTint=0.000000,ColorSaturation=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrast=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGamma=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGain=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffset=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetShadows=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetMidtones=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetHighlights=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionHighlightsMin=0.500000,ColorCorrectionHighlightsMax=1.000000,ColorCorrectionShadowsMax=0.090000,BlueCorrection=0.600000,ExpandGamut=1.000000,ToneCurveAmount=1.000000,FilmSlope=0.880000,FilmToe=0.550000,FilmShoulder=0.260000,FilmBlackClip=0.000000,FilmWhiteClip=0.040000,SceneColorTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SceneFringeIntensity=0.000000,ChromaticAberrationStartOffset=0.000000,BloomIntensity=0.675000,BloomThreshold=-1.000000,BloomSizeScale=4.000000,Bloom1Size=0.300000,Bloom2Size=1.000000,Bloom3Size=2.000000,Bloom4Size=10.000000,Bloom5Size=30.000000,Bloom6Size=64.000000,Bloom1Tint=(R=0.346500,G=0.346500,B=0.346500,A=1.000000),Bloom2Tint=(R=0.138000,G=0.138000,B=0.138000,A=1.000000),Bloom3Tint=(R=0.117600,G=0.117600,B=0.117600,A=1.000000),Bloom4Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom5Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom6Tint=(R=0.061000,G=0.061000,B=0.061000,A=1.000000),BloomConvolutionScatterDispersion=1.000000,BloomConvolutionSize=1.000000,BloomConvolutionTexture=None,BloomConvolutionCenterUV=(X=0.500000,Y=0.500000),BloomConvolutionPreFilterMin=7.000000,BloomConvolutionPreFilterMax=15000.000000,BloomConvolutionPreFilterMult=15.000000,BloomConvolutionBufferScale=0.133000,BloomDirtMask=None,BloomDirtMaskIntensity=0.000000,BloomDirtMaskTint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),DynamicGlobalIlluminationMethod=Lumen,IndirectLightingColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),IndirectLightingIntensity=1.000000,LumenRayLightingMode=Default,LumenSceneLightingQuality=1.000000,LumenSceneDetail=1.000000,LumenSceneViewDistance=20000.000000,LumenSceneLightingUpdateSpeed=1.000000,LumenFinalGatherQuality=1.000000,LumenFinalGatherLightingUpdateSpeed=1.000000,LumenFinalGatherScreenTraces=True,LumenMaxTraceDistance=20000.000000,LumenDiffuseColorBoost=1.000000,LumenSkylightLeaking=0.000000,LumenSkylightLeakingTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LumenFullSkylightLeakingDistance=1000.000000,LumenSurfaceCacheResolution=1.000000,ReflectionMethod=Lumen,LumenReflectionQuality=1.000000,LumenReflectionsScreenTraces=True,LumenFrontLayerTranslucencyReflections=False,LumenMaxRoughnessToTraceReflections=0.400000,LumenMaxReflectionBounces=1,LumenMaxRefractionBounces=0,ScreenSpaceReflectionIntensity=100.000000,ScreenSpaceReflectionQuality=50.000000,ScreenSpaceReflectionMaxRoughness=0.600000,bMegaLights=True,AmbientCubemapTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),AmbientCubemapIntensity=1.000000,AmbientCubemap=None,CameraShutterSpeed=60.000000,CameraISO=100.000000,DepthOfFieldFstop=4.000000,DepthOfFieldMinFstop=1.200000,DepthOfFieldBladeCount=5,AutoExposureBias=1.000000,AutoExposureBiasBackup=0.000000,bOverride_AutoExposureBiasBackup=False,AutoExposureApplyPhysicalCameraExposure=True,AutoExposureBiasCurve=None,AutoExposureMeterMask=None,AutoExposureLowPercent=10.000000,AutoExposureHighPercent=90.000000,AutoExposureMinBrightness=0.030000,AutoExposureMaxBrightness=8.000000,AutoExposureSpeedUp=3.000000,AutoExposureSpeedDown=1.000000,HistogramLogMin=-8.000000,HistogramLogMax=4.000000,LocalExposureMethod=Bilateral,LocalExposureHighlightContrastScale=1.000000,LocalExposureShadowContrastScale=1.000000,LocalExposureHighlightContrastCurve=None,LocalExposureShadowContrastCurve=None,LocalExposureHighlightThreshold=0.000000,LocalExposureShadowThreshold=0.000000,LocalExposureDetailStrength=1.000000,LocalExposureBlurredLuminanceBlend=0.600000,LocalExposureBlurredLuminanceKernelSizePercent=50.000000,LocalExposureHighlightThresholdStrength=1.000000,LocalExposureShadowThresholdStrength=1.000000,LocalExposureMiddleGreyBias=0.000000,LensFlareIntensity=1.000000,LensFlareTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LensFlareBokehSize=3.000000,LensFlareThreshold=8.000000,LensFlareBokehShape=None,LensFlareTints[0]=(R=1.000000,G=0.800000,B=0.400000,A=0.600000),LensFlareTints[1]=(R=1.000000,G=1.000000,B=0.600000,A=0.530000),LensFlareTints[2]=(R=0.800000,G=0.800000,B=1.000000,A=0.460000),LensFlareTints[3]=(R=0.500000,G=1.000000,B=0.400000,A=0.390000),LensFlareTints[4]=(R=0.500000,G=0.800000,B=1.000000,A=0.310000),LensFlareTints[5]=(R=0.900000,G=1.000000,B=0.800000,A=0.270000),LensFlareTints[6]=(R=1.000000,G=0.800000,B=0.400000,A=0.220000),LensFlareTints[7]=(R=0.900000,G=0.700000,B=0.700000,A=0.150000),VignetteIntensity=0.400000,Sharpen=0.000000,FilmGrainIntensity=0.000000,FilmGrainIntensityShadows=1.000000,FilmGrainIntensityMidtones=1.000000,FilmGrainIntensityHighlights=1.000000,FilmGrainShadowsMax=0.090000,FilmGrainHighlightsMin=0.500000,FilmGrainHighlightsMax=1.000000,FilmGrainTexelSize=1.000000,FilmGrainTexture=None,AmbientOcclusionIntensity=0.500000,AmbientOcclusionStaticFraction=1.000000,AmbientOcclusionRadius=200.000000,AmbientOcclusionRadiusInWS=False,AmbientOcclusionFadeDistance=8000.000000,AmbientOcclusionFadeRadius=5000.000000,AmbientOcclusionPower=2.000000,AmbientOcclusionBias=3.000000,AmbientOcclusionQuality=50.000000,AmbientOcclusionMipBlend=0.600000,AmbientOcclusionMipScale=1.700000,AmbientOcclusionMipThreshold=0.010000,AmbientOcclusionTemporalBlendWeight=0.100000,RayTracingAO=False,RayTracingAOSamplesPerPixel=1,RayTracingAOIntensity=1.000000,RayTracingAORadius=200.000000,ColorGradingIntensity=1.000000,ColorGradingLUT=None,DepthOfFieldSensorWidth=24.576000,DepthOfFieldSqueezeFactor=1.000000,DepthOfFieldFocalDistance=0.000000,DepthOfFieldDepthBlurAmount=1.000000,DepthOfFieldDepthBlurRadius=0.000000,DepthOfFieldUseHairDepth=False,DepthOfFieldPetzvalBokeh=0.000000,DepthOfFieldPetzvalBokehFalloff=1.000000,DepthOfFieldPetzvalExclusionBoxExtents=(X=0.000000,Y=0.000000),DepthOfFieldPetzvalExclusionBoxRadius=0.000000,DepthOfFieldAspectRatioScalar=1.000000,DepthOfFieldBarrelRadius=5.000000,DepthOfFieldBarrelLength=0.000000,DepthOfFieldMatteBoxFlags[0]=(Pitch=0.000000,Roll=0.000000,Length=0.000000),DepthOfFieldMatteBoxFlags[1]=(Pitch=0.000000,Roll=0.000000,Length=0.000000),DepthOfFieldMatteBoxFlags[2]=(Pitch=0.000000,Roll=0.000000,Length=0.000000),DepthOfFieldFocalRegion=0.000000,DepthOfFieldNearTransitionRegion=300.000000,DepthOfFieldFarTransitionRegion=500.000000,DepthOfFieldScale=0.000000,DepthOfFieldNearBlurSize=15.000000,DepthOfFieldFarBlurSize=15.000000,DepthOfFieldOcclusion=0.400000,DepthOfFieldSkyFocusDistance=0.000000,DepthOfFieldVignetteSize=200.000000,MotionBlurAmount=0.500000,MotionBlurMax=5.000000,MotionBlurTargetFPS=30,MotionBlurPerObjectSize=0.000000,TranslucencyType=Raster,RayTracingTranslucencyMaxRoughness=0.600000,RayTracingTranslucencyRefractionRays=3,RayTracingTranslucencySamplesPerPixel=1,RayTracingTranslucencyMaxPrimaryHitEvents=4,RayTracingTranslucencyMaxSecondaryHitEvents=2,RayTracingTranslucencyShadows=Hard_shadows,RayTracingTranslucencyRefraction=True,RayTracingTranslucencyUseRayTracedRefraction=False,PathTracingMaxBounces=32,PathTracingSamplesPerPixel=2048,PathTracingMaxPathIntensity=24.000000,PathTracingEnableEmissiveMaterials=True,PathTracingEnableReferenceDOF=False,PathTracingEnableReferenceAtmosphere=False,PathTracingEnableDenoiser=True,PathTracingIncludeEmissive=True,PathTracingIncludeDiffuse=True,PathTracingIncludeIndirectDiffuse=True,PathTracingIncludeSpecular=True,PathTracingIncludeIndirectSpecular=True,PathTracingIncludeVolume=True,PathTracingIncludeIndirectVolume=True,UserFlags=0,WeightedBlendables=(Array=)),LightingRigRotation=0.000000,RotationSpeed=2.000000,DirectionalLightRotation=(Pitch=-40.000000,Yaw=-67.500000,Roll=0.000000),bEnableToneMapping=False,bShowMeshEdges=True) -+Profiles=(ProfileName="Grey Ambient",bSharedProfile=True,bIsEngineDefaultProfile=True,bUseSkyLighting=True,DirectionalLightIntensity=4.000000,DirectionalLightColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SkyLightIntensity=2.000000,bRotateLightingRig=False,bShowEnvironment=True,bShowFloor=True,bShowGrid=True,EnvironmentColor=(R=0.200000,G=0.200000,B=0.200000,A=1.000000),EnvironmentIntensity=1.000000,EnvironmentCubeMapPath="/Engine/EditorMaterials/AssetViewer/T_GreyAmbient",bPostProcessingEnabled=False,PostProcessingSettings=(bOverride_TemperatureType=False,bOverride_WhiteTemp=False,bOverride_WhiteTint=False,bOverride_ColorSaturation=False,bOverride_ColorContrast=False,bOverride_ColorGamma=False,bOverride_ColorGain=False,bOverride_ColorOffset=False,bOverride_ColorSaturationShadows=False,bOverride_ColorContrastShadows=False,bOverride_ColorGammaShadows=False,bOverride_ColorGainShadows=False,bOverride_ColorOffsetShadows=False,bOverride_ColorSaturationMidtones=False,bOverride_ColorContrastMidtones=False,bOverride_ColorGammaMidtones=False,bOverride_ColorGainMidtones=False,bOverride_ColorOffsetMidtones=False,bOverride_ColorSaturationHighlights=False,bOverride_ColorContrastHighlights=False,bOverride_ColorGammaHighlights=False,bOverride_ColorGainHighlights=False,bOverride_ColorOffsetHighlights=False,bOverride_ColorCorrectionShadowsMax=False,bOverride_ColorCorrectionHighlightsMin=False,bOverride_ColorCorrectionHighlightsMax=False,bOverride_BlueCorrection=False,bOverride_ExpandGamut=False,bOverride_ToneCurveAmount=False,bOverride_FilmSlope=False,bOverride_FilmToe=False,bOverride_FilmShoulder=False,bOverride_FilmBlackClip=False,bOverride_FilmWhiteClip=False,bOverride_SceneColorTint=False,bOverride_SceneFringeIntensity=False,bOverride_ChromaticAberrationStartOffset=False,bOverride_bMegaLights=False,bOverride_AmbientCubemapTint=False,bOverride_AmbientCubemapIntensity=False,bOverride_BloomMethod=False,bOverride_BloomIntensity=False,bOverride_BloomThreshold=False,bOverride_Bloom1Tint=False,bOverride_Bloom1Size=False,bOverride_Bloom2Size=False,bOverride_Bloom2Tint=False,bOverride_Bloom3Tint=False,bOverride_Bloom3Size=False,bOverride_Bloom4Tint=False,bOverride_Bloom4Size=False,bOverride_Bloom5Tint=False,bOverride_Bloom5Size=False,bOverride_Bloom6Tint=False,bOverride_Bloom6Size=False,bOverride_BloomSizeScale=False,bOverride_BloomConvolutionTexture=False,bOverride_BloomConvolutionScatterDispersion=False,bOverride_BloomConvolutionSize=False,bOverride_BloomConvolutionCenterUV=False,bOverride_BloomConvolutionPreFilterMin=False,bOverride_BloomConvolutionPreFilterMax=False,bOverride_BloomConvolutionPreFilterMult=False,bOverride_BloomConvolutionBufferScale=False,bOverride_BloomDirtMaskIntensity=False,bOverride_BloomDirtMaskTint=False,bOverride_BloomDirtMask=False,bOverride_CameraShutterSpeed=False,bOverride_CameraISO=False,bOverride_AutoExposureMethod=False,bOverride_AutoExposureLowPercent=False,bOverride_AutoExposureHighPercent=False,bOverride_AutoExposureMinBrightness=False,bOverride_AutoExposureMaxBrightness=False,bOverride_AutoExposureSpeedUp=False,bOverride_AutoExposureSpeedDown=False,bOverride_AutoExposureBias=False,bOverride_AutoExposureBiasCurve=False,bOverride_AutoExposureMeterMask=False,bOverride_AutoExposureApplyPhysicalCameraExposure=False,bOverride_HistogramLogMin=False,bOverride_HistogramLogMax=False,bOverride_LocalExposureMethod=False,bOverride_LocalExposureHighlightContrastScale=False,bOverride_LocalExposureShadowContrastScale=False,bOverride_LocalExposureHighlightContrastCurve=False,bOverride_LocalExposureShadowContrastCurve=False,bOverride_LocalExposureHighlightThreshold=False,bOverride_LocalExposureShadowThreshold=False,bOverride_LocalExposureDetailStrength=False,bOverride_LocalExposureBlurredLuminanceBlend=False,bOverride_LocalExposureBlurredLuminanceKernelSizePercent=False,bOverride_LocalExposureHighlightThresholdStrength=False,bOverride_LocalExposureShadowThresholdStrength=False,bOverride_LocalExposureMiddleGreyBias=False,bOverride_LensFlareIntensity=False,bOverride_LensFlareTint=False,bOverride_LensFlareTints=False,bOverride_LensFlareBokehSize=False,bOverride_LensFlareBokehShape=False,bOverride_LensFlareThreshold=False,bOverride_VignetteIntensity=False,bOverride_Sharpen=False,bOverride_FilmGrainIntensity=False,bOverride_FilmGrainIntensityShadows=False,bOverride_FilmGrainIntensityMidtones=False,bOverride_FilmGrainIntensityHighlights=False,bOverride_FilmGrainShadowsMax=False,bOverride_FilmGrainHighlightsMin=False,bOverride_FilmGrainHighlightsMax=False,bOverride_FilmGrainTexelSize=False,bOverride_FilmGrainTexture=False,bOverride_AmbientOcclusionIntensity=False,bOverride_AmbientOcclusionStaticFraction=False,bOverride_AmbientOcclusionRadius=False,bOverride_AmbientOcclusionFadeDistance=False,bOverride_AmbientOcclusionFadeRadius=False,bOverride_AmbientOcclusionRadiusInWS=False,bOverride_AmbientOcclusionPower=False,bOverride_AmbientOcclusionBias=False,bOverride_AmbientOcclusionQuality=False,bOverride_AmbientOcclusionMipBlend=False,bOverride_AmbientOcclusionMipScale=False,bOverride_AmbientOcclusionMipThreshold=False,bOverride_AmbientOcclusionTemporalBlendWeight=False,bOverride_RayTracingAO=False,bOverride_RayTracingAOSamplesPerPixel=False,bOverride_RayTracingAOIntensity=False,bOverride_RayTracingAORadius=False,bOverride_IndirectLightingColor=False,bOverride_IndirectLightingIntensity=False,bOverride_ColorGradingIntensity=False,bOverride_ColorGradingLUT=False,bOverride_DepthOfFieldFocalDistance=False,bOverride_DepthOfFieldFstop=False,bOverride_DepthOfFieldMinFstop=False,bOverride_DepthOfFieldBladeCount=False,bOverride_DepthOfFieldSensorWidth=False,bOverride_DepthOfFieldSqueezeFactor=False,bOverride_DepthOfFieldDepthBlurRadius=False,bOverride_DepthOfFieldUseHairDepth=False,bOverride_DepthOfFieldPetzvalBokeh=False,bOverride_DepthOfFieldPetzvalBokehFalloff=False,bOverride_DepthOfFieldPetzvalExclusionBoxExtents=False,bOverride_DepthOfFieldPetzvalExclusionBoxRadius=False,bOverride_DepthOfFieldAspectRatioScalar=False,bOverride_DepthOfFieldMatteBoxFlags=False,bOverride_DepthOfFieldBarrelRadius=False,bOverride_DepthOfFieldBarrelLength=False,bOverride_DepthOfFieldDepthBlurAmount=False,bOverride_DepthOfFieldFocalRegion=False,bOverride_DepthOfFieldNearTransitionRegion=False,bOverride_DepthOfFieldFarTransitionRegion=False,bOverride_DepthOfFieldScale=False,bOverride_DepthOfFieldNearBlurSize=False,bOverride_DepthOfFieldFarBlurSize=False,bOverride_MobileHQGaussian=False,bOverride_DepthOfFieldOcclusion=False,bOverride_DepthOfFieldSkyFocusDistance=False,bOverride_DepthOfFieldVignetteSize=False,bOverride_MotionBlurAmount=False,bOverride_MotionBlurMax=False,bOverride_MotionBlurTargetFPS=False,bOverride_MotionBlurPerObjectSize=False,bOverride_ReflectionMethod=False,bOverride_LumenReflectionQuality=False,bOverride_ScreenSpaceReflectionIntensity=False,bOverride_ScreenSpaceReflectionQuality=False,bOverride_ScreenSpaceReflectionMaxRoughness=False,bOverride_ScreenSpaceReflectionRoughnessScale=False,bOverride_UserFlags=False,bOverride_RayTracingReflectionsMaxRoughness=False,bOverride_RayTracingReflectionsMaxBounces=False,bOverride_RayTracingReflectionsSamplesPerPixel=False,bOverride_RayTracingReflectionsShadows=False,bOverride_RayTracingReflectionsTranslucency=False,bOverride_TranslucencyType=False,bOverride_RayTracingTranslucencyMaxRoughness=False,bOverride_RayTracingTranslucencyRefractionRays=False,bOverride_RayTracingTranslucencySamplesPerPixel=False,bOverride_RayTracingTranslucencyShadows=False,bOverride_RayTracingTranslucencyRefraction=False,bOverride_RayTracingTranslucencyMaxPrimaryHitEvents=False,bOverride_RayTracingTranslucencyMaxSecondaryHitEvents=False,bOverride_RayTracingTranslucencyUseRayTracedRefraction=False,bOverride_DynamicGlobalIlluminationMethod=False,bOverride_LumenSceneLightingQuality=False,bOverride_LumenSceneDetail=False,bOverride_LumenSceneViewDistance=False,bOverride_LumenSceneLightingUpdateSpeed=False,bOverride_LumenFinalGatherQuality=False,bOverride_LumenFinalGatherLightingUpdateSpeed=False,bOverride_LumenFinalGatherScreenTraces=False,bOverride_LumenMaxTraceDistance=False,bOverride_LumenDiffuseColorBoost=False,bOverride_LumenSkylightLeaking=False,bOverride_LumenSkylightLeakingTint=False,bOverride_LumenFullSkylightLeakingDistance=False,bOverride_LumenRayLightingMode=False,bOverride_LumenReflectionsScreenTraces=False,bOverride_LumenFrontLayerTranslucencyReflections=False,bOverride_LumenMaxRoughnessToTraceReflections=False,bOverride_LumenMaxReflectionBounces=False,bOverride_LumenMaxRefractionBounces=False,bOverride_LumenSurfaceCacheResolution=False,bOverride_RayTracingGI=False,bOverride_RayTracingGIMaxBounces=False,bOverride_RayTracingGISamplesPerPixel=False,bOverride_PathTracingMaxBounces=False,bOverride_PathTracingSamplesPerPixel=False,bOverride_PathTracingMaxPathIntensity=False,bOverride_PathTracingEnableEmissiveMaterials=False,bOverride_PathTracingEnableReferenceDOF=False,bOverride_PathTracingEnableReferenceAtmosphere=False,bOverride_PathTracingEnableDenoiser=False,bOverride_PathTracingIncludeEmissive=False,bOverride_PathTracingIncludeDiffuse=False,bOverride_PathTracingIncludeIndirectDiffuse=False,bOverride_PathTracingIncludeSpecular=False,bOverride_PathTracingIncludeIndirectSpecular=False,bOverride_PathTracingIncludeVolume=False,bOverride_PathTracingIncludeIndirectVolume=False,bMobileHQGaussian=False,BloomMethod=BM_SOG,AutoExposureMethod=AEM_Histogram,TemperatureType=TEMP_WhiteBalance,WhiteTemp=6500.000000,WhiteTint=0.000000,ColorSaturation=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrast=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGamma=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGain=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffset=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetShadows=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetMidtones=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetHighlights=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionHighlightsMin=0.500000,ColorCorrectionHighlightsMax=1.000000,ColorCorrectionShadowsMax=0.090000,BlueCorrection=0.600000,ExpandGamut=1.000000,ToneCurveAmount=1.000000,FilmSlope=0.880000,FilmToe=0.550000,FilmShoulder=0.260000,FilmBlackClip=0.000000,FilmWhiteClip=0.040000,SceneColorTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SceneFringeIntensity=0.000000,ChromaticAberrationStartOffset=0.000000,BloomIntensity=0.675000,BloomThreshold=-1.000000,BloomSizeScale=4.000000,Bloom1Size=0.300000,Bloom2Size=1.000000,Bloom3Size=2.000000,Bloom4Size=10.000000,Bloom5Size=30.000000,Bloom6Size=64.000000,Bloom1Tint=(R=0.346500,G=0.346500,B=0.346500,A=1.000000),Bloom2Tint=(R=0.138000,G=0.138000,B=0.138000,A=1.000000),Bloom3Tint=(R=0.117600,G=0.117600,B=0.117600,A=1.000000),Bloom4Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom5Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom6Tint=(R=0.061000,G=0.061000,B=0.061000,A=1.000000),BloomConvolutionScatterDispersion=1.000000,BloomConvolutionSize=1.000000,BloomConvolutionTexture=None,BloomConvolutionCenterUV=(X=0.500000,Y=0.500000),BloomConvolutionPreFilterMin=7.000000,BloomConvolutionPreFilterMax=15000.000000,BloomConvolutionPreFilterMult=15.000000,BloomConvolutionBufferScale=0.133000,BloomDirtMask=None,BloomDirtMaskIntensity=0.000000,BloomDirtMaskTint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),DynamicGlobalIlluminationMethod=Lumen,IndirectLightingColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),IndirectLightingIntensity=1.000000,LumenRayLightingMode=Default,LumenSceneLightingQuality=1.000000,LumenSceneDetail=1.000000,LumenSceneViewDistance=20000.000000,LumenSceneLightingUpdateSpeed=1.000000,LumenFinalGatherQuality=1.000000,LumenFinalGatherLightingUpdateSpeed=1.000000,LumenFinalGatherScreenTraces=True,LumenMaxTraceDistance=20000.000000,LumenDiffuseColorBoost=1.000000,LumenSkylightLeaking=0.000000,LumenSkylightLeakingTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LumenFullSkylightLeakingDistance=1000.000000,LumenSurfaceCacheResolution=1.000000,ReflectionMethod=Lumen,LumenReflectionQuality=1.000000,LumenReflectionsScreenTraces=True,LumenFrontLayerTranslucencyReflections=False,LumenMaxRoughnessToTraceReflections=0.400000,LumenMaxReflectionBounces=1,LumenMaxRefractionBounces=0,ScreenSpaceReflectionIntensity=100.000000,ScreenSpaceReflectionQuality=50.000000,ScreenSpaceReflectionMaxRoughness=0.600000,bMegaLights=True,AmbientCubemapTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),AmbientCubemapIntensity=1.000000,AmbientCubemap=None,CameraShutterSpeed=60.000000,CameraISO=100.000000,DepthOfFieldFstop=4.000000,DepthOfFieldMinFstop=1.200000,DepthOfFieldBladeCount=5,AutoExposureBias=1.000000,AutoExposureBiasBackup=0.000000,bOverride_AutoExposureBiasBackup=False,AutoExposureApplyPhysicalCameraExposure=True,AutoExposureBiasCurve=None,AutoExposureMeterMask=None,AutoExposureLowPercent=10.000000,AutoExposureHighPercent=90.000000,AutoExposureMinBrightness=0.030000,AutoExposureMaxBrightness=8.000000,AutoExposureSpeedUp=3.000000,AutoExposureSpeedDown=1.000000,HistogramLogMin=-8.000000,HistogramLogMax=4.000000,LocalExposureMethod=Bilateral,LocalExposureHighlightContrastScale=1.000000,LocalExposureShadowContrastScale=1.000000,LocalExposureHighlightContrastCurve=None,LocalExposureShadowContrastCurve=None,LocalExposureHighlightThreshold=0.000000,LocalExposureShadowThreshold=0.000000,LocalExposureDetailStrength=1.000000,LocalExposureBlurredLuminanceBlend=0.600000,LocalExposureBlurredLuminanceKernelSizePercent=50.000000,LocalExposureHighlightThresholdStrength=1.000000,LocalExposureShadowThresholdStrength=1.000000,LocalExposureMiddleGreyBias=0.000000,LensFlareIntensity=1.000000,LensFlareTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LensFlareBokehSize=3.000000,LensFlareThreshold=8.000000,LensFlareBokehShape=None,LensFlareTints[0]=(R=1.000000,G=0.800000,B=0.400000,A=0.600000),LensFlareTints[1]=(R=1.000000,G=1.000000,B=0.600000,A=0.530000),LensFlareTints[2]=(R=0.800000,G=0.800000,B=1.000000,A=0.460000),LensFlareTints[3]=(R=0.500000,G=1.000000,B=0.400000,A=0.390000),LensFlareTints[4]=(R=0.500000,G=0.800000,B=1.000000,A=0.310000),LensFlareTints[5]=(R=0.900000,G=1.000000,B=0.800000,A=0.270000),LensFlareTints[6]=(R=1.000000,G=0.800000,B=0.400000,A=0.220000),LensFlareTints[7]=(R=0.900000,G=0.700000,B=0.700000,A=0.150000),VignetteIntensity=0.400000,Sharpen=0.000000,FilmGrainIntensity=0.000000,FilmGrainIntensityShadows=1.000000,FilmGrainIntensityMidtones=1.000000,FilmGrainIntensityHighlights=1.000000,FilmGrainShadowsMax=0.090000,FilmGrainHighlightsMin=0.500000,FilmGrainHighlightsMax=1.000000,FilmGrainTexelSize=1.000000,FilmGrainTexture=None,AmbientOcclusionIntensity=0.500000,AmbientOcclusionStaticFraction=1.000000,AmbientOcclusionRadius=200.000000,AmbientOcclusionRadiusInWS=False,AmbientOcclusionFadeDistance=8000.000000,AmbientOcclusionFadeRadius=5000.000000,AmbientOcclusionPower=2.000000,AmbientOcclusionBias=3.000000,AmbientOcclusionQuality=50.000000,AmbientOcclusionMipBlend=0.600000,AmbientOcclusionMipScale=1.700000,AmbientOcclusionMipThreshold=0.010000,AmbientOcclusionTemporalBlendWeight=0.100000,RayTracingAO=False,RayTracingAOSamplesPerPixel=1,RayTracingAOIntensity=1.000000,RayTracingAORadius=200.000000,ColorGradingIntensity=1.000000,ColorGradingLUT=None,DepthOfFieldSensorWidth=24.576000,DepthOfFieldSqueezeFactor=1.000000,DepthOfFieldFocalDistance=0.000000,DepthOfFieldDepthBlurAmount=1.000000,DepthOfFieldDepthBlurRadius=0.000000,DepthOfFieldUseHairDepth=False,DepthOfFieldPetzvalBokeh=0.000000,DepthOfFieldPetzvalBokehFalloff=1.000000,DepthOfFieldPetzvalExclusionBoxExtents=(X=0.000000,Y=0.000000),DepthOfFieldPetzvalExclusionBoxRadius=0.000000,DepthOfFieldAspectRatioScalar=1.000000,DepthOfFieldBarrelRadius=5.000000,DepthOfFieldBarrelLength=0.000000,DepthOfFieldMatteBoxFlags[0]=(Pitch=0.000000,Roll=0.000000,Length=0.000000),DepthOfFieldMatteBoxFlags[1]=(Pitch=0.000000,Roll=0.000000,Length=0.000000),DepthOfFieldMatteBoxFlags[2]=(Pitch=0.000000,Roll=0.000000,Length=0.000000),DepthOfFieldFocalRegion=0.000000,DepthOfFieldNearTransitionRegion=300.000000,DepthOfFieldFarTransitionRegion=500.000000,DepthOfFieldScale=0.000000,DepthOfFieldNearBlurSize=15.000000,DepthOfFieldFarBlurSize=15.000000,DepthOfFieldOcclusion=0.400000,DepthOfFieldSkyFocusDistance=0.000000,DepthOfFieldVignetteSize=200.000000,MotionBlurAmount=0.500000,MotionBlurMax=5.000000,MotionBlurTargetFPS=30,MotionBlurPerObjectSize=0.000000,TranslucencyType=Raster,RayTracingTranslucencyMaxRoughness=0.600000,RayTracingTranslucencyRefractionRays=3,RayTracingTranslucencySamplesPerPixel=1,RayTracingTranslucencyMaxPrimaryHitEvents=4,RayTracingTranslucencyMaxSecondaryHitEvents=2,RayTracingTranslucencyShadows=Hard_shadows,RayTracingTranslucencyRefraction=True,RayTracingTranslucencyUseRayTracedRefraction=False,PathTracingMaxBounces=32,PathTracingSamplesPerPixel=2048,PathTracingMaxPathIntensity=24.000000,PathTracingEnableEmissiveMaterials=True,PathTracingEnableReferenceDOF=False,PathTracingEnableReferenceAtmosphere=False,PathTracingEnableDenoiser=True,PathTracingIncludeEmissive=True,PathTracingIncludeDiffuse=True,PathTracingIncludeIndirectDiffuse=True,PathTracingIncludeSpecular=True,PathTracingIncludeIndirectSpecular=True,PathTracingIncludeVolume=True,PathTracingIncludeIndirectVolume=True,UserFlags=0,WeightedBlendables=(Array=)),LightingRigRotation=0.000000,RotationSpeed=2.000000,DirectionalLightRotation=(Pitch=-40.000000,Yaw=-67.500000,Roll=0.000000),bEnableToneMapping=False,bShowMeshEdges=False) ++Profiles=(ProfileName="Epic Headquarters",bSharedProfile=True,bIsEngineDefaultProfile=True,bUseSkyLighting=True,DirectionalLightIntensity=1.000000,DirectionalLightColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SkyLightIntensity=1.000000,bRotateLightingRig=False,bShowEnvironment=True,bShowFloor=True,bShowGrid=False,EnvironmentColor=(R=0.200000,G=0.200000,B=0.200000,A=1.000000),EnvironmentIntensity=1.000000,EnvironmentCubeMapPath="/Engine/EditorMaterials/AssetViewer/EpicQuadPanorama_CC+EV1.EpicQuadPanorama_CC+EV1",bPostProcessingEnabled=True,PostProcessingSettings=(bOverride_TemperatureType=False,bOverride_WhiteTemp=False,bOverride_WhiteTint=False,bOverride_ColorSaturation=False,bOverride_ColorContrast=False,bOverride_ColorGamma=False,bOverride_ColorGain=False,bOverride_ColorOffset=False,bOverride_ColorSaturationShadows=False,bOverride_ColorContrastShadows=False,bOverride_ColorGammaShadows=False,bOverride_ColorGainShadows=False,bOverride_ColorOffsetShadows=False,bOverride_ColorSaturationMidtones=False,bOverride_ColorContrastMidtones=False,bOverride_ColorGammaMidtones=False,bOverride_ColorGainMidtones=False,bOverride_ColorOffsetMidtones=False,bOverride_ColorSaturationHighlights=False,bOverride_ColorContrastHighlights=False,bOverride_ColorGammaHighlights=False,bOverride_ColorGainHighlights=False,bOverride_ColorOffsetHighlights=False,bOverride_ColorCorrectionShadowsMax=False,bOverride_ColorCorrectionHighlightsMin=False,bOverride_ColorCorrectionHighlightsMax=False,bOverride_BlueCorrection=False,bOverride_ExpandGamut=False,bOverride_ToneCurveAmount=False,bOverride_FilmSlope=False,bOverride_FilmToe=False,bOverride_FilmShoulder=False,bOverride_FilmBlackClip=False,bOverride_FilmWhiteClip=False,bOverride_SceneColorTint=False,bOverride_SceneFringeIntensity=False,bOverride_ChromaticAberrationStartOffset=False,bOverride_bMegaLights=False,bOverride_AmbientCubemapTint=False,bOverride_AmbientCubemapIntensity=False,bOverride_BloomMethod=False,bOverride_BloomIntensity=False,bOverride_BloomThreshold=False,bOverride_Bloom1Tint=False,bOverride_Bloom1Size=False,bOverride_Bloom2Size=False,bOverride_Bloom2Tint=False,bOverride_Bloom3Tint=False,bOverride_Bloom3Size=False,bOverride_Bloom4Tint=False,bOverride_Bloom4Size=False,bOverride_Bloom5Tint=False,bOverride_Bloom5Size=False,bOverride_Bloom6Tint=False,bOverride_Bloom6Size=False,bOverride_BloomSizeScale=False,bOverride_BloomConvolutionTexture=False,bOverride_BloomConvolutionScatterDispersion=False,bOverride_BloomConvolutionSize=False,bOverride_BloomConvolutionCenterUV=False,bOverride_BloomConvolutionPreFilterMin=False,bOverride_BloomConvolutionPreFilterMax=False,bOverride_BloomConvolutionPreFilterMult=False,bOverride_BloomConvolutionBufferScale=False,bOverride_BloomDirtMaskIntensity=False,bOverride_BloomDirtMaskTint=False,bOverride_BloomDirtMask=False,bOverride_CameraShutterSpeed=False,bOverride_CameraISO=False,bOverride_AutoExposureMethod=False,bOverride_AutoExposureLowPercent=False,bOverride_AutoExposureHighPercent=False,bOverride_AutoExposureMinBrightness=False,bOverride_AutoExposureMaxBrightness=False,bOverride_AutoExposureSpeedUp=False,bOverride_AutoExposureSpeedDown=False,bOverride_AutoExposureBias=False,bOverride_AutoExposureBiasCurve=False,bOverride_AutoExposureMeterMask=False,bOverride_AutoExposureApplyPhysicalCameraExposure=False,bOverride_HistogramLogMin=False,bOverride_HistogramLogMax=False,bOverride_LocalExposureMethod=False,bOverride_LocalExposureHighlightContrastScale=False,bOverride_LocalExposureShadowContrastScale=False,bOverride_LocalExposureHighlightContrastCurve=False,bOverride_LocalExposureShadowContrastCurve=False,bOverride_LocalExposureHighlightThreshold=False,bOverride_LocalExposureShadowThreshold=False,bOverride_LocalExposureDetailStrength=False,bOverride_LocalExposureBlurredLuminanceBlend=False,bOverride_LocalExposureBlurredLuminanceKernelSizePercent=False,bOverride_LocalExposureMiddleGreyBias=False,bOverride_LensFlareIntensity=False,bOverride_LensFlareTint=False,bOverride_LensFlareTints=False,bOverride_LensFlareBokehSize=False,bOverride_LensFlareBokehShape=False,bOverride_LensFlareThreshold=False,bOverride_VignetteIntensity=False,bOverride_Sharpen=False,bOverride_FilmGrainIntensity=False,bOverride_FilmGrainIntensityShadows=False,bOverride_FilmGrainIntensityMidtones=False,bOverride_FilmGrainIntensityHighlights=False,bOverride_FilmGrainShadowsMax=False,bOverride_FilmGrainHighlightsMin=False,bOverride_FilmGrainHighlightsMax=False,bOverride_FilmGrainTexelSize=False,bOverride_FilmGrainTexture=False,bOverride_AmbientOcclusionIntensity=False,bOverride_AmbientOcclusionStaticFraction=False,bOverride_AmbientOcclusionRadius=False,bOverride_AmbientOcclusionFadeDistance=False,bOverride_AmbientOcclusionFadeRadius=False,bOverride_AmbientOcclusionRadiusInWS=False,bOverride_AmbientOcclusionPower=False,bOverride_AmbientOcclusionBias=False,bOverride_AmbientOcclusionQuality=False,bOverride_AmbientOcclusionMipBlend=False,bOverride_AmbientOcclusionMipScale=False,bOverride_AmbientOcclusionMipThreshold=False,bOverride_AmbientOcclusionTemporalBlendWeight=False,bOverride_RayTracingAO=False,bOverride_RayTracingAOSamplesPerPixel=False,bOverride_RayTracingAOIntensity=False,bOverride_RayTracingAORadius=False,bOverride_IndirectLightingColor=False,bOverride_IndirectLightingIntensity=False,bOverride_ColorGradingIntensity=False,bOverride_ColorGradingLUT=False,bOverride_DepthOfFieldFocalDistance=False,bOverride_DepthOfFieldFstop=False,bOverride_DepthOfFieldMinFstop=False,bOverride_DepthOfFieldBladeCount=False,bOverride_DepthOfFieldSensorWidth=False,bOverride_DepthOfFieldSqueezeFactor=False,bOverride_DepthOfFieldDepthBlurRadius=False,bOverride_DepthOfFieldUseHairDepth=False,bOverride_DepthOfFieldDepthBlurAmount=False,bOverride_DepthOfFieldFocalRegion=False,bOverride_DepthOfFieldNearTransitionRegion=False,bOverride_DepthOfFieldFarTransitionRegion=False,bOverride_DepthOfFieldScale=False,bOverride_DepthOfFieldNearBlurSize=False,bOverride_DepthOfFieldFarBlurSize=False,bOverride_MobileHQGaussian=False,bOverride_DepthOfFieldOcclusion=False,bOverride_DepthOfFieldSkyFocusDistance=False,bOverride_DepthOfFieldVignetteSize=False,bOverride_MotionBlurAmount=False,bOverride_MotionBlurMax=False,bOverride_MotionBlurTargetFPS=False,bOverride_MotionBlurPerObjectSize=False,bOverride_ReflectionMethod=False,bOverride_LumenReflectionQuality=False,bOverride_ScreenSpaceReflectionIntensity=False,bOverride_ScreenSpaceReflectionQuality=False,bOverride_ScreenSpaceReflectionMaxRoughness=False,bOverride_ScreenSpaceReflectionRoughnessScale=False,bOverride_UserFlags=False,bOverride_RayTracingReflectionsMaxRoughness=False,bOverride_RayTracingReflectionsMaxBounces=False,bOverride_RayTracingReflectionsSamplesPerPixel=False,bOverride_RayTracingReflectionsShadows=False,bOverride_RayTracingReflectionsTranslucency=False,bOverride_TranslucencyType=False,bOverride_RayTracingTranslucencyMaxRoughness=False,bOverride_RayTracingTranslucencyRefractionRays=False,bOverride_RayTracingTranslucencySamplesPerPixel=False,bOverride_RayTracingTranslucencyShadows=False,bOverride_RayTracingTranslucencyRefraction=False,bOverride_DynamicGlobalIlluminationMethod=False,bOverride_LumenSceneLightingQuality=False,bOverride_LumenSceneDetail=False,bOverride_LumenSceneViewDistance=False,bOverride_LumenSceneLightingUpdateSpeed=False,bOverride_LumenFinalGatherQuality=False,bOverride_LumenFinalGatherLightingUpdateSpeed=False,bOverride_LumenFinalGatherScreenTraces=False,bOverride_LumenMaxTraceDistance=False,bOverride_LumenDiffuseColorBoost=False,bOverride_LumenSkylightLeaking=False,bOverride_LumenFullSkylightLeakingDistance=False,bOverride_LumenRayLightingMode=False,bOverride_LumenReflectionsScreenTraces=False,bOverride_LumenFrontLayerTranslucencyReflections=False,bOverride_LumenMaxRoughnessToTraceReflections=False,bOverride_LumenMaxReflectionBounces=False,bOverride_LumenMaxRefractionBounces=False,bOverride_LumenSurfaceCacheResolution=False,bOverride_RayTracingGI=False,bOverride_RayTracingGIMaxBounces=False,bOverride_RayTracingGISamplesPerPixel=False,bOverride_PathTracingMaxBounces=False,bOverride_PathTracingSamplesPerPixel=False,bOverride_PathTracingMaxPathIntensity=False,bOverride_PathTracingEnableEmissiveMaterials=False,bOverride_PathTracingEnableReferenceDOF=False,bOverride_PathTracingEnableReferenceAtmosphere=False,bOverride_PathTracingEnableDenoiser=False,bOverride_PathTracingIncludeEmissive=False,bOverride_PathTracingIncludeDiffuse=False,bOverride_PathTracingIncludeIndirectDiffuse=False,bOverride_PathTracingIncludeSpecular=False,bOverride_PathTracingIncludeIndirectSpecular=False,bOverride_PathTracingIncludeVolume=False,bOverride_PathTracingIncludeIndirectVolume=False,bMobileHQGaussian=False,BloomMethod=BM_SOG,AutoExposureMethod=AEM_Histogram,TemperatureType=TEMP_WhiteBalance,WhiteTemp=6500.000000,WhiteTint=0.000000,ColorSaturation=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrast=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGamma=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGain=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffset=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetShadows=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetMidtones=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetHighlights=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionHighlightsMin=0.500000,ColorCorrectionHighlightsMax=1.000000,ColorCorrectionShadowsMax=0.090000,BlueCorrection=0.600000,ExpandGamut=1.000000,ToneCurveAmount=1.000000,FilmSlope=0.880000,FilmToe=0.550000,FilmShoulder=0.260000,FilmBlackClip=0.000000,FilmWhiteClip=0.040000,SceneColorTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SceneFringeIntensity=0.000000,ChromaticAberrationStartOffset=0.000000,BloomIntensity=0.675000,BloomThreshold=-1.000000,BloomSizeScale=4.000000,Bloom1Size=0.300000,Bloom2Size=1.000000,Bloom3Size=2.000000,Bloom4Size=10.000000,Bloom5Size=30.000000,Bloom6Size=64.000000,Bloom1Tint=(R=0.346500,G=0.346500,B=0.346500,A=1.000000),Bloom2Tint=(R=0.138000,G=0.138000,B=0.138000,A=1.000000),Bloom3Tint=(R=0.117600,G=0.117600,B=0.117600,A=1.000000),Bloom4Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom5Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom6Tint=(R=0.061000,G=0.061000,B=0.061000,A=1.000000),BloomConvolutionScatterDispersion=1.000000,BloomConvolutionSize=1.000000,BloomConvolutionTexture=None,BloomConvolutionCenterUV=(X=0.500000,Y=0.500000),BloomConvolutionPreFilterMin=7.000000,BloomConvolutionPreFilterMax=15000.000000,BloomConvolutionPreFilterMult=15.000000,BloomConvolutionBufferScale=0.133000,BloomDirtMask=None,BloomDirtMaskIntensity=0.000000,BloomDirtMaskTint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),DynamicGlobalIlluminationMethod=Lumen,IndirectLightingColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),IndirectLightingIntensity=1.000000,LumenRayLightingMode=Default,LumenSceneLightingQuality=1.000000,LumenSceneDetail=1.000000,LumenSceneViewDistance=20000.000000,LumenSceneLightingUpdateSpeed=1.000000,LumenFinalGatherQuality=1.000000,LumenFinalGatherLightingUpdateSpeed=1.000000,LumenFinalGatherScreenTraces=True,LumenMaxTraceDistance=20000.000000,LumenDiffuseColorBoost=1.000000,LumenSkylightLeaking=0.000000,LumenFullSkylightLeakingDistance=1000.000000,LumenSurfaceCacheResolution=1.000000,ReflectionMethod=Lumen,LumenReflectionQuality=1.000000,LumenReflectionsScreenTraces=True,LumenFrontLayerTranslucencyReflections=False,LumenMaxRoughnessToTraceReflections=0.400000,LumenMaxReflectionBounces=1,LumenMaxRefractionBounces=0,ScreenSpaceReflectionIntensity=100.000000,ScreenSpaceReflectionQuality=50.000000,ScreenSpaceReflectionMaxRoughness=0.600000,bMegaLights=True,AmbientCubemapTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),AmbientCubemapIntensity=1.000000,AmbientCubemap=None,CameraShutterSpeed=60.000000,CameraISO=100.000000,DepthOfFieldFstop=4.000000,DepthOfFieldMinFstop=1.200000,DepthOfFieldBladeCount=5,AutoExposureBias=1.000000,AutoExposureBiasBackup=0.000000,bOverride_AutoExposureBiasBackup=False,AutoExposureApplyPhysicalCameraExposure=True,AutoExposureBiasCurve=None,AutoExposureMeterMask=None,AutoExposureLowPercent=10.000000,AutoExposureHighPercent=90.000000,AutoExposureMinBrightness=0.030000,AutoExposureMaxBrightness=8.000000,AutoExposureSpeedUp=3.000000,AutoExposureSpeedDown=1.000000,HistogramLogMin=-8.000000,HistogramLogMax=4.000000,LocalExposureMethod=Bilateral,LocalExposureHighlightContrastScale=1.000000,LocalExposureShadowContrastScale=1.000000,LocalExposureHighlightContrastCurve=None,LocalExposureShadowContrastCurve=None,LocalExposureHighlightThreshold=0.000000,LocalExposureShadowThreshold=0.000000,LocalExposureDetailStrength=1.000000,LocalExposureBlurredLuminanceBlend=0.600000,LocalExposureBlurredLuminanceKernelSizePercent=50.000000,LocalExposureMiddleGreyBias=0.000000,LensFlareIntensity=1.000000,LensFlareTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LensFlareBokehSize=3.000000,LensFlareThreshold=8.000000,LensFlareBokehShape=None,LensFlareTints[0]=(R=1.000000,G=0.800000,B=0.400000,A=0.600000),LensFlareTints[1]=(R=1.000000,G=1.000000,B=0.600000,A=0.530000),LensFlareTints[2]=(R=0.800000,G=0.800000,B=1.000000,A=0.460000),LensFlareTints[3]=(R=0.500000,G=1.000000,B=0.400000,A=0.390000),LensFlareTints[4]=(R=0.500000,G=0.800000,B=1.000000,A=0.310000),LensFlareTints[5]=(R=0.900000,G=1.000000,B=0.800000,A=0.270000),LensFlareTints[6]=(R=1.000000,G=0.800000,B=0.400000,A=0.220000),LensFlareTints[7]=(R=0.900000,G=0.700000,B=0.700000,A=0.150000),VignetteIntensity=0.400000,Sharpen=0.000000,FilmGrainIntensity=0.000000,FilmGrainIntensityShadows=1.000000,FilmGrainIntensityMidtones=1.000000,FilmGrainIntensityHighlights=1.000000,FilmGrainShadowsMax=0.090000,FilmGrainHighlightsMin=0.500000,FilmGrainHighlightsMax=1.000000,FilmGrainTexelSize=1.000000,FilmGrainTexture=None,AmbientOcclusionIntensity=0.500000,AmbientOcclusionStaticFraction=1.000000,AmbientOcclusionRadius=200.000000,AmbientOcclusionRadiusInWS=False,AmbientOcclusionFadeDistance=8000.000000,AmbientOcclusionFadeRadius=5000.000000,AmbientOcclusionPower=2.000000,AmbientOcclusionBias=3.000000,AmbientOcclusionQuality=50.000000,AmbientOcclusionMipBlend=0.600000,AmbientOcclusionMipScale=1.700000,AmbientOcclusionMipThreshold=0.010000,AmbientOcclusionTemporalBlendWeight=0.100000,RayTracingAO=False,RayTracingAOSamplesPerPixel=1,RayTracingAOIntensity=1.000000,RayTracingAORadius=200.000000,ColorGradingIntensity=1.000000,ColorGradingLUT=None,DepthOfFieldSensorWidth=24.576000,DepthOfFieldSqueezeFactor=1.000000,DepthOfFieldFocalDistance=0.000000,DepthOfFieldDepthBlurAmount=1.000000,DepthOfFieldDepthBlurRadius=0.000000,DepthOfFieldUseHairDepth=False,DepthOfFieldFocalRegion=0.000000,DepthOfFieldNearTransitionRegion=300.000000,DepthOfFieldFarTransitionRegion=500.000000,DepthOfFieldScale=0.000000,DepthOfFieldNearBlurSize=15.000000,DepthOfFieldFarBlurSize=15.000000,DepthOfFieldOcclusion=0.400000,DepthOfFieldSkyFocusDistance=0.000000,DepthOfFieldVignetteSize=200.000000,MotionBlurAmount=0.500000,MotionBlurMax=5.000000,MotionBlurTargetFPS=30,MotionBlurPerObjectSize=0.000000,TranslucencyType=Raster,RayTracingTranslucencyMaxRoughness=0.600000,RayTracingTranslucencyRefractionRays=3,RayTracingTranslucencySamplesPerPixel=1,RayTracingTranslucencyShadows=Hard_shadows,RayTracingTranslucencyRefraction=True,PathTracingMaxBounces=32,PathTracingSamplesPerPixel=2048,PathTracingMaxPathIntensity=24.000000,PathTracingEnableEmissiveMaterials=True,PathTracingEnableReferenceDOF=False,PathTracingEnableReferenceAtmosphere=False,PathTracingEnableDenoiser=True,PathTracingIncludeEmissive=True,PathTracingIncludeDiffuse=True,PathTracingIncludeIndirectDiffuse=True,PathTracingIncludeSpecular=True,PathTracingIncludeIndirectSpecular=True,PathTracingIncludeVolume=True,PathTracingIncludeIndirectVolume=True,UserFlags=0,WeightedBlendables=(Array=)),LightingRigRotation=0.000000,RotationSpeed=2.000000,DirectionalLightRotation=(Pitch=-40.000000,Yaw=-67.500000,Roll=0.000000),bEnableToneMapping=True,bShowMeshEdges=False) ++Profiles=(ProfileName="Grey Wireframe",bSharedProfile=True,bIsEngineDefaultProfile=True,bUseSkyLighting=True,DirectionalLightIntensity=1.000000,DirectionalLightColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SkyLightIntensity=1.000000,bRotateLightingRig=False,bShowEnvironment=False,bShowFloor=False,bShowGrid=True,EnvironmentColor=(R=0.039216,G=0.039216,B=0.039216,A=1.000000),EnvironmentIntensity=1.000000,EnvironmentCubeMapPath="/Engine/EditorMaterials/AssetViewer/EpicQuadPanorama_CC+EV1.EpicQuadPanorama_CC+EV1",bPostProcessingEnabled=False,PostProcessingSettings=(bOverride_TemperatureType=False,bOverride_WhiteTemp=False,bOverride_WhiteTint=False,bOverride_ColorSaturation=False,bOverride_ColorContrast=False,bOverride_ColorGamma=False,bOverride_ColorGain=False,bOverride_ColorOffset=False,bOverride_ColorSaturationShadows=False,bOverride_ColorContrastShadows=False,bOverride_ColorGammaShadows=False,bOverride_ColorGainShadows=False,bOverride_ColorOffsetShadows=False,bOverride_ColorSaturationMidtones=False,bOverride_ColorContrastMidtones=False,bOverride_ColorGammaMidtones=False,bOverride_ColorGainMidtones=False,bOverride_ColorOffsetMidtones=False,bOverride_ColorSaturationHighlights=False,bOverride_ColorContrastHighlights=False,bOverride_ColorGammaHighlights=False,bOverride_ColorGainHighlights=False,bOverride_ColorOffsetHighlights=False,bOverride_ColorCorrectionShadowsMax=False,bOverride_ColorCorrectionHighlightsMin=False,bOverride_ColorCorrectionHighlightsMax=False,bOverride_BlueCorrection=False,bOverride_ExpandGamut=False,bOverride_ToneCurveAmount=False,bOverride_FilmSlope=False,bOverride_FilmToe=False,bOverride_FilmShoulder=False,bOverride_FilmBlackClip=False,bOverride_FilmWhiteClip=False,bOverride_SceneColorTint=False,bOverride_SceneFringeIntensity=False,bOverride_ChromaticAberrationStartOffset=False,bOverride_bMegaLights=False,bOverride_AmbientCubemapTint=False,bOverride_AmbientCubemapIntensity=False,bOverride_BloomMethod=False,bOverride_BloomIntensity=False,bOverride_BloomThreshold=False,bOverride_Bloom1Tint=False,bOverride_Bloom1Size=False,bOverride_Bloom2Size=False,bOverride_Bloom2Tint=False,bOverride_Bloom3Tint=False,bOverride_Bloom3Size=False,bOverride_Bloom4Tint=False,bOverride_Bloom4Size=False,bOverride_Bloom5Tint=False,bOverride_Bloom5Size=False,bOverride_Bloom6Tint=False,bOverride_Bloom6Size=False,bOverride_BloomSizeScale=False,bOverride_BloomConvolutionTexture=False,bOverride_BloomConvolutionScatterDispersion=False,bOverride_BloomConvolutionSize=False,bOverride_BloomConvolutionCenterUV=False,bOverride_BloomConvolutionPreFilterMin=False,bOverride_BloomConvolutionPreFilterMax=False,bOverride_BloomConvolutionPreFilterMult=False,bOverride_BloomConvolutionBufferScale=False,bOverride_BloomDirtMaskIntensity=False,bOverride_BloomDirtMaskTint=False,bOverride_BloomDirtMask=False,bOverride_CameraShutterSpeed=False,bOverride_CameraISO=False,bOverride_AutoExposureMethod=False,bOverride_AutoExposureLowPercent=False,bOverride_AutoExposureHighPercent=False,bOverride_AutoExposureMinBrightness=False,bOverride_AutoExposureMaxBrightness=False,bOverride_AutoExposureSpeedUp=False,bOverride_AutoExposureSpeedDown=False,bOverride_AutoExposureBias=False,bOverride_AutoExposureBiasCurve=False,bOverride_AutoExposureMeterMask=False,bOverride_AutoExposureApplyPhysicalCameraExposure=False,bOverride_HistogramLogMin=False,bOverride_HistogramLogMax=False,bOverride_LocalExposureMethod=False,bOverride_LocalExposureHighlightContrastScale=False,bOverride_LocalExposureShadowContrastScale=False,bOverride_LocalExposureHighlightContrastCurve=False,bOverride_LocalExposureShadowContrastCurve=False,bOverride_LocalExposureHighlightThreshold=False,bOverride_LocalExposureShadowThreshold=False,bOverride_LocalExposureDetailStrength=False,bOverride_LocalExposureBlurredLuminanceBlend=False,bOverride_LocalExposureBlurredLuminanceKernelSizePercent=False,bOverride_LocalExposureMiddleGreyBias=False,bOverride_LensFlareIntensity=False,bOverride_LensFlareTint=False,bOverride_LensFlareTints=False,bOverride_LensFlareBokehSize=False,bOverride_LensFlareBokehShape=False,bOverride_LensFlareThreshold=False,bOverride_VignetteIntensity=False,bOverride_Sharpen=False,bOverride_FilmGrainIntensity=False,bOverride_FilmGrainIntensityShadows=False,bOverride_FilmGrainIntensityMidtones=False,bOverride_FilmGrainIntensityHighlights=False,bOverride_FilmGrainShadowsMax=False,bOverride_FilmGrainHighlightsMin=False,bOverride_FilmGrainHighlightsMax=False,bOverride_FilmGrainTexelSize=False,bOverride_FilmGrainTexture=False,bOverride_AmbientOcclusionIntensity=False,bOverride_AmbientOcclusionStaticFraction=False,bOverride_AmbientOcclusionRadius=False,bOverride_AmbientOcclusionFadeDistance=False,bOverride_AmbientOcclusionFadeRadius=False,bOverride_AmbientOcclusionRadiusInWS=False,bOverride_AmbientOcclusionPower=False,bOverride_AmbientOcclusionBias=False,bOverride_AmbientOcclusionQuality=False,bOverride_AmbientOcclusionMipBlend=False,bOverride_AmbientOcclusionMipScale=False,bOverride_AmbientOcclusionMipThreshold=False,bOverride_AmbientOcclusionTemporalBlendWeight=False,bOverride_RayTracingAO=False,bOverride_RayTracingAOSamplesPerPixel=False,bOverride_RayTracingAOIntensity=False,bOverride_RayTracingAORadius=False,bOverride_IndirectLightingColor=False,bOverride_IndirectLightingIntensity=False,bOverride_ColorGradingIntensity=False,bOverride_ColorGradingLUT=False,bOverride_DepthOfFieldFocalDistance=False,bOverride_DepthOfFieldFstop=False,bOverride_DepthOfFieldMinFstop=False,bOverride_DepthOfFieldBladeCount=False,bOverride_DepthOfFieldSensorWidth=False,bOverride_DepthOfFieldSqueezeFactor=False,bOverride_DepthOfFieldDepthBlurRadius=False,bOverride_DepthOfFieldUseHairDepth=False,bOverride_DepthOfFieldDepthBlurAmount=False,bOverride_DepthOfFieldFocalRegion=False,bOverride_DepthOfFieldNearTransitionRegion=False,bOverride_DepthOfFieldFarTransitionRegion=False,bOverride_DepthOfFieldScale=False,bOverride_DepthOfFieldNearBlurSize=False,bOverride_DepthOfFieldFarBlurSize=False,bOverride_MobileHQGaussian=False,bOverride_DepthOfFieldOcclusion=False,bOverride_DepthOfFieldSkyFocusDistance=False,bOverride_DepthOfFieldVignetteSize=False,bOverride_MotionBlurAmount=False,bOverride_MotionBlurMax=False,bOverride_MotionBlurTargetFPS=False,bOverride_MotionBlurPerObjectSize=False,bOverride_ReflectionMethod=False,bOverride_LumenReflectionQuality=False,bOverride_ScreenSpaceReflectionIntensity=False,bOverride_ScreenSpaceReflectionQuality=False,bOverride_ScreenSpaceReflectionMaxRoughness=False,bOverride_ScreenSpaceReflectionRoughnessScale=False,bOverride_UserFlags=False,bOverride_RayTracingReflectionsMaxRoughness=False,bOverride_RayTracingReflectionsMaxBounces=False,bOverride_RayTracingReflectionsSamplesPerPixel=False,bOverride_RayTracingReflectionsShadows=False,bOverride_RayTracingReflectionsTranslucency=False,bOverride_TranslucencyType=False,bOverride_RayTracingTranslucencyMaxRoughness=False,bOverride_RayTracingTranslucencyRefractionRays=False,bOverride_RayTracingTranslucencySamplesPerPixel=False,bOverride_RayTracingTranslucencyShadows=False,bOverride_RayTracingTranslucencyRefraction=False,bOverride_DynamicGlobalIlluminationMethod=False,bOverride_LumenSceneLightingQuality=False,bOverride_LumenSceneDetail=False,bOverride_LumenSceneViewDistance=False,bOverride_LumenSceneLightingUpdateSpeed=False,bOverride_LumenFinalGatherQuality=False,bOverride_LumenFinalGatherLightingUpdateSpeed=False,bOverride_LumenFinalGatherScreenTraces=False,bOverride_LumenMaxTraceDistance=False,bOverride_LumenDiffuseColorBoost=False,bOverride_LumenSkylightLeaking=False,bOverride_LumenFullSkylightLeakingDistance=False,bOverride_LumenRayLightingMode=False,bOverride_LumenReflectionsScreenTraces=False,bOverride_LumenFrontLayerTranslucencyReflections=False,bOverride_LumenMaxRoughnessToTraceReflections=False,bOverride_LumenMaxReflectionBounces=False,bOverride_LumenMaxRefractionBounces=False,bOverride_LumenSurfaceCacheResolution=False,bOverride_RayTracingGI=False,bOverride_RayTracingGIMaxBounces=False,bOverride_RayTracingGISamplesPerPixel=False,bOverride_PathTracingMaxBounces=False,bOverride_PathTracingSamplesPerPixel=False,bOverride_PathTracingMaxPathIntensity=False,bOverride_PathTracingEnableEmissiveMaterials=False,bOverride_PathTracingEnableReferenceDOF=False,bOverride_PathTracingEnableReferenceAtmosphere=False,bOverride_PathTracingEnableDenoiser=False,bOverride_PathTracingIncludeEmissive=False,bOverride_PathTracingIncludeDiffuse=False,bOverride_PathTracingIncludeIndirectDiffuse=False,bOverride_PathTracingIncludeSpecular=False,bOverride_PathTracingIncludeIndirectSpecular=False,bOverride_PathTracingIncludeVolume=False,bOverride_PathTracingIncludeIndirectVolume=False,bMobileHQGaussian=False,BloomMethod=BM_SOG,AutoExposureMethod=AEM_Histogram,TemperatureType=TEMP_WhiteBalance,WhiteTemp=6500.000000,WhiteTint=0.000000,ColorSaturation=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrast=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGamma=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGain=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffset=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainShadows=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetShadows=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainMidtones=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetMidtones=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorSaturationHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorContrastHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGammaHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorGainHighlights=(X=1.000000,Y=1.000000,Z=1.000000,W=1.000000),ColorOffsetHighlights=(X=0.000000,Y=0.000000,Z=0.000000,W=0.000000),ColorCorrectionHighlightsMin=0.500000,ColorCorrectionHighlightsMax=1.000000,ColorCorrectionShadowsMax=0.090000,BlueCorrection=0.600000,ExpandGamut=1.000000,ToneCurveAmount=1.000000,FilmSlope=0.880000,FilmToe=0.550000,FilmShoulder=0.260000,FilmBlackClip=0.000000,FilmWhiteClip=0.040000,SceneColorTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),SceneFringeIntensity=0.000000,ChromaticAberrationStartOffset=0.000000,BloomIntensity=0.675000,BloomThreshold=-1.000000,BloomSizeScale=4.000000,Bloom1Size=0.300000,Bloom2Size=1.000000,Bloom3Size=2.000000,Bloom4Size=10.000000,Bloom5Size=30.000000,Bloom6Size=64.000000,Bloom1Tint=(R=0.346500,G=0.346500,B=0.346500,A=1.000000),Bloom2Tint=(R=0.138000,G=0.138000,B=0.138000,A=1.000000),Bloom3Tint=(R=0.117600,G=0.117600,B=0.117600,A=1.000000),Bloom4Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom5Tint=(R=0.066000,G=0.066000,B=0.066000,A=1.000000),Bloom6Tint=(R=0.061000,G=0.061000,B=0.061000,A=1.000000),BloomConvolutionScatterDispersion=1.000000,BloomConvolutionSize=1.000000,BloomConvolutionTexture=None,BloomConvolutionCenterUV=(X=0.500000,Y=0.500000),BloomConvolutionPreFilterMin=7.000000,BloomConvolutionPreFilterMax=15000.000000,BloomConvolutionPreFilterMult=15.000000,BloomConvolutionBufferScale=0.133000,BloomDirtMask=None,BloomDirtMaskIntensity=0.000000,BloomDirtMaskTint=(R=0.500000,G=0.500000,B=0.500000,A=1.000000),DynamicGlobalIlluminationMethod=Lumen,IndirectLightingColor=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),IndirectLightingIntensity=1.000000,LumenRayLightingMode=Default,LumenSceneLightingQuality=1.000000,LumenSceneDetail=1.000000,LumenSceneViewDistance=20000.000000,LumenSceneLightingUpdateSpeed=1.000000,LumenFinalGatherQuality=1.000000,LumenFinalGatherLightingUpdateSpeed=1.000000,LumenFinalGatherScreenTraces=True,LumenMaxTraceDistance=20000.000000,LumenDiffuseColorBoost=1.000000,LumenSkylightLeaking=0.000000,LumenFullSkylightLeakingDistance=1000.000000,LumenSurfaceCacheResolution=1.000000,ReflectionMethod=Lumen,LumenReflectionQuality=1.000000,LumenReflectionsScreenTraces=True,LumenFrontLayerTranslucencyReflections=False,LumenMaxRoughnessToTraceReflections=0.400000,LumenMaxReflectionBounces=1,LumenMaxRefractionBounces=0,ScreenSpaceReflectionIntensity=100.000000,ScreenSpaceReflectionQuality=50.000000,ScreenSpaceReflectionMaxRoughness=0.600000,bMegaLights=True,AmbientCubemapTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),AmbientCubemapIntensity=1.000000,AmbientCubemap=None,CameraShutterSpeed=60.000000,CameraISO=100.000000,DepthOfFieldFstop=4.000000,DepthOfFieldMinFstop=1.200000,DepthOfFieldBladeCount=5,AutoExposureBias=1.000000,AutoExposureBiasBackup=0.000000,bOverride_AutoExposureBiasBackup=False,AutoExposureApplyPhysicalCameraExposure=True,AutoExposureBiasCurve=None,AutoExposureMeterMask=None,AutoExposureLowPercent=10.000000,AutoExposureHighPercent=90.000000,AutoExposureMinBrightness=0.030000,AutoExposureMaxBrightness=8.000000,AutoExposureSpeedUp=3.000000,AutoExposureSpeedDown=1.000000,HistogramLogMin=-8.000000,HistogramLogMax=4.000000,LocalExposureMethod=Bilateral,LocalExposureHighlightContrastScale=1.000000,LocalExposureShadowContrastScale=1.000000,LocalExposureHighlightContrastCurve=None,LocalExposureShadowContrastCurve=None,LocalExposureHighlightThreshold=0.000000,LocalExposureShadowThreshold=0.000000,LocalExposureDetailStrength=1.000000,LocalExposureBlurredLuminanceBlend=0.600000,LocalExposureBlurredLuminanceKernelSizePercent=50.000000,LocalExposureMiddleGreyBias=0.000000,LensFlareIntensity=1.000000,LensFlareTint=(R=1.000000,G=1.000000,B=1.000000,A=1.000000),LensFlareBokehSize=3.000000,LensFlareThreshold=8.000000,LensFlareBokehShape=None,LensFlareTints[0]=(R=1.000000,G=0.800000,B=0.400000,A=0.600000),LensFlareTints[1]=(R=1.000000,G=1.000000,B=0.600000,A=0.530000),LensFlareTints[2]=(R=0.800000,G=0.800000,B=1.000000,A=0.460000),LensFlareTints[3]=(R=0.500000,G=1.000000,B=0.400000,A=0.390000),LensFlareTints[4]=(R=0.500000,G=0.800000,B=1.000000,A=0.310000),LensFlareTints[5]=(R=0.900000,G=1.000000,B=0.800000,A=0.270000),LensFlareTints[6]=(R=1.000000,G=0.800000,B=0.400000,A=0.220000),LensFlareTints[7]=(R=0.900000,G=0.700000,B=0.700000,A=0.150000),VignetteIntensity=0.400000,Sharpen=0.000000,FilmGrainIntensity=0.000000,FilmGrainIntensityShadows=1.000000,FilmGrainIntensityMidtones=1.000000,FilmGrainIntensityHighlights=1.000000,FilmGrainShadowsMax=0.090000,FilmGrainHighlightsMin=0.500000,FilmGrainHighlightsMax=1.000000,FilmGrainTexelSize=1.000000,FilmGrainTexture=None,AmbientOcclusionIntensity=0.500000,AmbientOcclusionStaticFraction=1.000000,AmbientOcclusionRadius=200.000000,AmbientOcclusionRadiusInWS=False,AmbientOcclusionFadeDistance=8000.000000,AmbientOcclusionFadeRadius=5000.000000,AmbientOcclusionPower=2.000000,AmbientOcclusionBias=3.000000,AmbientOcclusionQuality=50.000000,AmbientOcclusionMipBlend=0.600000,AmbientOcclusionMipScale=1.700000,AmbientOcclusionMipThreshold=0.010000,AmbientOcclusionTemporalBlendWeight=0.100000,RayTracingAO=False,RayTracingAOSamplesPerPixel=1,RayTracingAOIntensity=1.000000,RayTracingAORadius=200.000000,ColorGradingIntensity=1.000000,ColorGradingLUT=None,DepthOfFieldSensorWidth=24.576000,DepthOfFieldSqueezeFactor=1.000000,DepthOfFieldFocalDistance=0.000000,DepthOfFieldDepthBlurAmount=1.000000,DepthOfFieldDepthBlurRadius=0.000000,DepthOfFieldUseHairDepth=False,DepthOfFieldFocalRegion=0.000000,DepthOfFieldNearTransitionRegion=300.000000,DepthOfFieldFarTransitionRegion=500.000000,DepthOfFieldScale=0.000000,DepthOfFieldNearBlurSize=15.000000,DepthOfFieldFarBlurSize=15.000000,DepthOfFieldOcclusion=0.400000,DepthOfFieldSkyFocusDistance=0.000000,DepthOfFieldVignetteSize=200.000000,MotionBlurAmount=0.500000,MotionBlurMax=5.000000,MotionBlurTargetFPS=30,MotionBlurPerObjectSize=0.000000,TranslucencyType=Raster,RayTracingTranslucencyMaxRoughness=0.600000,RayTracingTranslucencyRefractionRays=3,RayTracingTranslucencySamplesPerPixel=1,RayTracingTranslucencyShadows=Hard_shadows,RayTracingTranslucencyRefraction=True,PathTracingMaxBounces=32,PathTracingSamplesPerPixel=2048,PathTracingMaxPathIntensity=24.000000,PathTracingEnableEmissiveMaterials=True,PathTracingEnableReferenceDOF=False,PathTracingEnableReferenceAtmosphere=False,PathTracingEnableDenoiser=True,PathTracingIncludeEmissive=True,PathTracingIncludeDiffuse=True,PathTracingIncludeIndirectDiffuse=True,PathTracingIncludeSpecular=True,PathTracingIncludeIndirectSpecular=True,PathTracingIncludeVolume=True,PathTracingIncludeIndirectVolume=True,UserFlags=0,WeightedBlendables=(Array=)),LightingRigRotation=0.000000,RotationSpeed=2.000000,DirectionalLightRotation=(Pitch=-40.000000,Yaw=-67.500000,Roll=0.000000),bEnableToneMapping=False,bShowMeshEdges=True) [/Script/UnrealEd.EditorPerformanceProjectSettings] MobileScreenPercentageMode=BasedOnDisplayResolution diff --git a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini index e47a497..39bb7ef 100644 --- a/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini +++ b/VIRTUOS_ExpansionPluginTests/Config/DefaultEngine.ini @@ -33,7 +33,7 @@ ConfiguredInternetSpeed=15000 ConfiguredLanSpeed=20000 [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/Maps/Map_Gameworld.Map_Gameworld +EditorStartupMap=/Game/Maps/MotionControllerMap.MotionControllerMap LocalMapOptions= TransitionMap= bUseSplitscreen=False @@ -101,31 +101,16 @@ r.VirtualTextures=True r.Mobile.ShadingPath=0 r.DefaultFeature.LensFlare=False r.VT.AnisotropicFiltering=True -vr.RoundRobinOcclusion=True -r.SkinCache.CompileShaders=True -r.RayTracing=True -r.RayTracing.RayTracingProxies.ProjectEnabled=True -r.VirtualTexturedLightmaps=True [/Script/NavigationSystem.NavigationSystemV1] -DefaultAgentName=None -CrowdManagerClass=/Script/AIModule.CrowdManager bAutoCreateNavigationData=True -bSpawnNavDataInNavBoundsLevel=False bAllowClientSideNavigation=True -bShouldDiscardSubLevelNavData=True -bTickWhilePaused=False bInitialBuildingLocked=False bSkipAgentHeightCheckWhenPickingNavData=False -GeometryExportTriangleCountWarningThreshold=200000 +DataGatheringMode=Instant bGenerateNavigationOnlyAroundNavigationInvokers=False ActiveTilesUpdateInterval=1.000000 -InvokersMaximumDistanceFromSeed=-1.000000 -DataGatheringMode=Instant -DirtyAreaWarningSizeThreshold=-1.000000 -GatheringNavModifiersWarningLimitTime=-1.000000 -+SupportedAgents=(Name="Default",Color=(B=0,G=75,R=38,A=164),DefaultQueryExtent=(X=50.000000,Y=50.000000,Z=250.000000),NavDataClass="/Script/NavigationSystem.RecastNavMesh",AgentRadius=3.000000,AgentHeight=4.000000,AgentStepHeight=4.000000,NavWalkingSearchHeightScale=0.500000,PreferredNavData="/Script/NavigationSystem.RecastNavMesh",bCanCrouch=False,bCanJump=True,bCanWalk=True,bCanSwim=False,bCanFly=False) -SupportedAgentsMask=(bSupportsAgent0=True,bSupportsAgent1=True,bSupportsAgent2=True,bSupportsAgent3=True,bSupportsAgent4=True,bSupportsAgent5=True,bSupportsAgent6=True,bSupportsAgent7=True,bSupportsAgent8=True,bSupportsAgent9=True,bSupportsAgent10=True,bSupportsAgent11=True,bSupportsAgent12=True,bSupportsAgent13=True,bSupportsAgent14=True,bSupportsAgent15=True) +DirtyAreasUpdateFreq=60.000000 [/Script/Engine.UserInterfaceSettings] RenderFocusRule=NavigationOnly @@ -188,8 +173,6 @@ bSendAnonymousUsageDataToEpic=False +DefaultChannelResponses=(Channel=ECC_GameTraceChannel4,DefaultResponse=ECR_Ignore,bTraceType=True,bStaticObject=False,Name="TossableTrace") +DefaultChannelResponses=(Channel=ECC_GameTraceChannel5,DefaultResponse=ECR_Ignore,bTraceType=True,bStaticObject=False,Name="UI") +DefaultChannelResponses=(Channel=ECC_GameTraceChannel6,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="CharacterSphere") -+DefaultChannelResponses=(Channel=ECC_GameTraceChannel7,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="CharacterProp") -+DefaultChannelResponses=(Channel=ECC_GameTraceChannel8,DefaultResponse=ECR_Ignore,bTraceType=False,bStaticObject=False,Name="SPUDStreamVolume") +EditProfiles=(Name="PhysicsActor",CustomResponses=((Channel="VRTraceChannel"))) +EditProfiles=(Name="BlockAllDynamic",CustomResponses=((Channel="VRTraceChannel"))) -ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") @@ -217,21 +200,23 @@ bDistinctlyDrawTilesBeingBuilt=True DrawOffset=10.000000 bFixedTilePoolSize=False TilePoolSize=1024 -TileSizeUU=544.000000 -NavMeshResolutionParams[0]=(CellSize=1.000000,CellHeight=1.000000,AgentMaxStepHeight=10.000000) -NavMeshResolutionParams[1]=(CellSize=1.000000,CellHeight=1.000000,AgentMaxStepHeight=10.000000) -NavMeshResolutionParams[2]=(CellSize=1.000000,CellHeight=1.000000,AgentMaxStepHeight=10.000000) -AgentRadius=5.000000 -AgentHeight=5.000000 +TileSizeUU=990.000000 +CellSize=19.000000 +CellHeight=10.000000 +AgentMaxStepHeight=35.000000 +NavMeshResolutionParams[0]=(CellSize=15.000000,CellHeight=10.000000,AgentMaxStepHeight=35.000000) +NavMeshResolutionParams[1]=(CellSize=15.000000,CellHeight=10.000000,AgentMaxStepHeight=50.000000) +NavMeshResolutionParams[2]=(CellSize=15.000000,CellHeight=10.000000,AgentMaxStepHeight=35.000000) +AgentRadius=20.000000 +AgentHeight=144.000000 AgentMaxSlope=44.000000 MinRegionArea=0.000000 -MergeRegionSize=100.000000 +MergeRegionSize=400.000000 MaxVerticalMergeError=2147483647 MaxSimplificationError=1.300000 SimplificationElevationRatio=0.000000 MaxSimultaneousTileGenerationJobsCount=1024 TileNumberHardLimit=1048576 -ExpectedMaxLayersPerTile=12 DefaultDrawDistance=5000.000000 DefaultMaxSearchNodes=2048.000000 DefaultMaxHierarchicalSearchNodes=2048.000000 @@ -258,7 +243,7 @@ TimeSliceFilterLedgeSpansMaxYProcess=13 TimeSliceLongDurationDebug=0.002000 InvokerTilePriorityBumpDistanceThresholdInTileUnits=1 InvokerTilePriorityBumpIncrease=1 -NavLinkJumpDownConfig=(bEnabled=True,JumpLength=150.000000,JumpDistanceFromEdge=10.000000,JumpMaxDepth=150.000000,JumpHeight=50.000000,JumpEndsHeightTolerance=80.000000,SamplingSeparationFactor=1.000000,FilterDistanceThreshold=80.000000,LinkBuilderFlags=1,DownDirectionAreaClass="/Script/CoreUObject.Class'/Script/NavigationSystem.NavArea_Default'",UpDirectionAreaClass="/Script/CoreUObject.Class'/Script/NavigationSystem.NavArea_Default'",LinkProxyClass=None,LinkProxyId=(Id=0)) +NavLinkJumpDownConfig=(bEnabled=True,JumpLength=150.000000,JumpDistanceFromEdge=10.000000,JumpMaxDepth=150.000000,JumpHeight=50.000000,JumpEndsHeightTolerance=80.000000,SamplingSeparationFactor=1.000000,FilterDistanceThreshold=80.000000,LinkBuilderFlags=1,AreaClass="/Script/CoreUObject.Class'/Script/NavigationSystem.NavArea_Default'",LinkProxyClass=None,LinkProxyId=(Id=0)) bUseVoxelCache=False TileSetUpdateInterval=1.000000 HeuristicScale=0.999000 @@ -334,7 +319,7 @@ bEnableEnhancedDeterminism=False AnimPhysicsMinDeltaTime=0.000000 bSimulateAnimPhysicsAfterReset=False MaxPhysicsDeltaTime=0.033333 -bSubstepping=False +bSubstepping=True bSubsteppingAsync=False MaxSubstepDeltaTime=0.016667 MaxSubsteps=6 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset index 84ad2f9..edf2536 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObject.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f638016a9279817b9e5098648ca6a0278a3854a6fc39d796c35035db9e7a654 -size 1063543 +oid sha256:afdd12d1f567393244b604e9432ca80013ba0bf96ed6665341d71a14a66acb7b +size 894513 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset index a9b1a2c..c46e0ea 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_DynamicSliceObjectSpawner.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bc7f325c68df2b61c908840d5e5d68205ba5b0b991352969273d81aebf4d3834 -size 872593 +oid sha256:f18a620176b563a705a21e7ebf18364a4075689a9a3f8469876f2c01c92e6167 +size 365979 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset index 0825e4b..cd5fc06 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/BP_Slicer.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b66661cc8a7c0c4ad270ca1cddfe299b373873beb2781cf7508424ca7bb0f75c -size 76289 +oid sha256:146c7577731c4dc389ec00272e7ff9debcd2ae2ba4e263df5a40348a834d3e45 +size 33395 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/DT_MidiEvents.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/DT_MidiEvents.uasset deleted file mode 100644 index a91bdfd..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/DT_MidiEvents.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21a4442aca5b146da95af3b2d48caeb4e32b5f4f8bcd1666992c921a97e6e376 -size 8321 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/GetOwnerSpeed.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/GetOwnerSpeed.uasset deleted file mode 100644 index 5c225e7..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/GetOwnerSpeed.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb1578d482d4c20a37a02a7f316da5af175a8ed906962b035d89e59d7b283733 -size 20382 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/MS_Testsong.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/MS_Testsong.uasset index 9f5953d..33b5eea 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/MS_Testsong.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/MS_Testsong.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26f929f3d1bf8b7e22b237a7785bf0d12a7102d7dbffbd03b2ac09e4d7d0026d -size 283448 +oid sha256:17df7eb98167ee247a9988e7833059254aff8207ac7547a390e1cfd085d791e7 +size 386877 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_ArrowMat_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_ArrowMat_Inst.uasset index c399600..741740f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_ArrowMat_Inst.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_ArrowMat_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc7ce0110544c110cc64b8280d987bce949ba0c814ffdf36fd204fc0deccdae5 -size 11651 +oid sha256:3dcadbb03c6f09d3fa4d4ff5509ab30a3f3b38f7d2903bf433f8935022545bf4 +size 11404 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_CrossFloor.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_CrossFloor.uasset index 514e477..f8bc964 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_CrossFloor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_CrossFloor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4af4b7087ace72c117adf04ac0ded847d346ce1aa8587d1d560ec6e2b95cad62 -size 27186 +oid sha256:7fc87ec476ffe0b5886e9440c7da6ccd466df67bebe74ec2a00d8411b2d8e0a7 +size 26784 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_CrossFloor_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_CrossFloor_Inst.uasset index a95f6fa..863ff01 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_CrossFloor_Inst.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_CrossFloor_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5912cef7e08ed0334b484da583ff979c3b24e9f2da3b86cb1ef4b39d8e79e7cd +oid sha256:d2b3207052e7b0000d7a68e07979bedd979bdce9a204e68126693c0806629f3c size 13876 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_SliceGround.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_SliceGround.uasset deleted file mode 100644 index 24a1fe1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_SliceGround.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:739ad231aa3a091940f616b82382a8f66ecb8ebf911cac382cc55e62aee07e6d -size 12391 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_SliceTrailMat.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_SliceTrailMat.uasset deleted file mode 100644 index e8228c8..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/M_SliceTrailMat.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc5fc04bbf4ed572ac9414d1fb81fac56bbf4b511b537779fc98c92eab7fa165 -size 24691 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/Carbondioxide_003_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/Carbondioxide_003_Bake1_PBR_Diffuse.uasset deleted file mode 100644 index 083cc32..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/Carbondioxide_003_Bake1_PBR_Diffuse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aadb9afdd804085f7f19d7b593273f75ae8e18f786da60ab5f8009ef4aa06168 -size 67852 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Argon.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Argon.uasset deleted file mode 100644 index df7de0b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Argon.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e400d7b2ee1fe6f6b018bc82f7a5f8ef9d28b28d555ce7de75266999aea9be5 -size 9091 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_CO2.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_CO2.uasset deleted file mode 100644 index ebaf230..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_CO2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:794fd2d1565a40b3db28d55fc27d918418240dc07a9d584640fc7ea76f4e954c -size 13648 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Nitrogen.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Nitrogen.uasset deleted file mode 100644 index 398d609..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Nitrogen.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64efe83452097628aaa3c7c878c4e7b034b63a4519b80a41b21ffa3c7725aef9 -size 8458 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Oxygen.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Oxygen.uasset deleted file mode 100644 index b49a4e4..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/MI_Oxygen.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ba216aceffe3fc45ed85deb2dde2b64c84de6c71c201987985aec5cfd71b7ff -size 8367 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/M_SliceGameMolecules.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/M_SliceGameMolecules.uasset deleted file mode 100644 index 27fe1ae..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/M_SliceGameMolecules.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4e6c4a7fd3e596dd59af9db9f95a997fb7d84a2c0877d1225c788dd34a6f377 -size 19789 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Argon.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Argon.uasset deleted file mode 100644 index eff6261..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Argon.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a19e1bf3a30b097cc8c126a285dee5090f2b22eb093a6a17be5f5dbad435e9c9 -size 96774 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_CO2.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_CO2.uasset deleted file mode 100644 index 3027bc3..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_CO2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:24a3f616ebda2e28bd4125c4c76f938f7e489895844248222b67adcb568e2aaf -size 222088 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Nitrogen.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Nitrogen.uasset deleted file mode 100644 index 7d8b5e4..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Nitrogen.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ebc4f25c312659618a2d59dfe4a71bb8bd822a0a32b17cb90ef18620155d6dcf -size 122318 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Oxygen.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Oxygen.uasset deleted file mode 100644 index 3a7a785..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Molecules/SM_Oxygen.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f09b314de72c42ef475bc2b125616a8904a40b3f28205f13d0a3cf85654b0f95 -size 104638 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/NS_SliceSwordTrail.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/NS_SliceSwordTrail.uasset deleted file mode 100644 index bb646b9..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/NS_SliceSwordTrail.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2f3b4419780abfe717a17593c6a4510da299c0be39e8d947e1b6422534660f9 -size 194151 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Song_7.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Song_7.uasset index fe4c06d..daf1897 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Song_7.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/Song_7.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db70615acbe34c61ecf1cde789816f8beca70d2faca56ea1720ba3471a8532cf -size 5326 +oid sha256:6a177b427b765d8823ed923f020062ed3bb389e7c5db73adbd81ec1218089cfc +size 4563 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_SliceGameHealth.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_SliceGameHealth.uasset deleted file mode 100644 index 6bcc300..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/WB_SliceGameHealth.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:abe639e7137c49e4f86bcdc7ee5794f2f63ac25ab887fa4a4443b73231a381d2 -size 42730 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/asd.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/asd.uasset new file mode 100644 index 0000000..5f4b68f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/MIdi_HarmonixPlugin/TestSong/asd.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d7196dc1680abb7d7f9cf412d06c2882aec4be1961f403119b0115c9f028960 +size 3765 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/Portal/Portal_1_Loop.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/Portal/Portal_1_Loop.uasset deleted file mode 100644 index 981adca..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/Portal/Portal_1_Loop.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c4b505f0c494c9255f0895c0debad47c68f4ebaa59266f867b366a66ef4a4bb -size 461879 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/Portal/SA_Portal.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/Portal/SA_Portal.uasset deleted file mode 100644 index 6147a47..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/Portal/SA_Portal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e01173af7fa9cb7e1d712a7bbcc4ca6ec8d2fda789f5fb67426e0967b3bae13a -size 1044 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/A_SliceConfirm.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/A_SliceConfirm.uasset deleted file mode 100644 index f644784..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/A_SliceConfirm.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:52fb56f7f1282dc01ec811b0c097cd8807aad05f502169f4eaa56096ac60d9b2 -size 19602 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/A_SliceFail.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/A_SliceFail.uasset deleted file mode 100644 index 36d8124..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/A_SliceFail.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18c140029cc5d75933311eab0b054eaccd1990746692fd8cbb52594a4ce26dd7 -size 25994 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/MS_Slice.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/MS_Slice.uasset deleted file mode 100644 index efb6fd7..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/MS_Slice.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a70dbd2eb2992db3b09a9c2507f1abf9256879b612a5ee448cbbd2d584cc4cb9 -size 109822 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-001.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-001.uasset deleted file mode 100644 index ceae031..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:16da7cfa184bc61b1ca3eaad64d0c61efa809fd163a86c7b7f7bffda48140235 -size 87666 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-002.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-002.uasset deleted file mode 100644 index c6e5113..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-002.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9758dc0f0190477ad4fcff0d43c5cfc1892286e81afe2ae2e96e5fd3c559afe7 -size 78123 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-003.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-003.uasset deleted file mode 100644 index cf1c3f1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Audio/SliceGame/Slice-003.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96d015dfac7fb79e26111e7e20ad758d4846b5ba99a19c76148e14aa4d917f29 -size 74476 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/MusicSoundClass.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/MusicSoundClass.uasset new file mode 100644 index 0000000..6933388 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/MusicSoundClass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aea51ad4ddbbbe5f4395cb2ffc8fb3d6778bd5da3b2afd7e26f2aa02b48f12a0 +size 1527 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_MasterSoundMix.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_MasterSoundMix.uasset new file mode 100644 index 0000000..ed00718 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_MasterSoundMix.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5dfd71d25b55ff3b9129994fe14f235e96609ece02223f81b7da8b41bd37cfc2 +size 2080 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_MusicSoundMix.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_MusicSoundMix.uasset new file mode 100644 index 0000000..2666565 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_MusicSoundMix.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fb044782dae449765cb83776722115a6b1b2d658918525623a6c021ac9b5dda +size 2067 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_SFXSoundMix.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_SFXSoundMix.uasset new file mode 100644 index 0000000..b772f17 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SCM_SFXSoundMix.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b94bb01284445ad9924b54fa106240ebececea72bea70d4d1b2821cdd68763b9 +size 2053 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SC_MasterSoundClass.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SC_MasterSoundClass.uasset new file mode 100644 index 0000000..6463ddc --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SC_MasterSoundClass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d506474c1045f92ed33a9c1b5f7c72ba9c4904589f899959c4b38021247f607 +size 1731 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SFXSoundClass.uasset b/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SFXSoundClass.uasset new file mode 100644 index 0000000..9182649 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/Audio/SoundClasses/SFXSoundClass.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ed462344cb652036dce27eb4d997c0faf5eaa35d54eaace47019d7d0bf2a2ec +size 1517 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/BP_DynamicLineSpawn.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/BP_DynamicLineSpawn.uasset deleted file mode 100644 index 1d0feab..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/BP_DynamicLineSpawn.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4913fed2fa696d3c3d7e8d5dc250181cf88279ab32e018e2bbc965206a9db204 -size 141396 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/BP_GlobalMusicManager.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/BP_GlobalMusicManager.uasset deleted file mode 100644 index 4f877a1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/BP_GlobalMusicManager.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bddc9a7dbc0928e50e4c2834039c1432696b5e611bed9816aa7a3672ca4cf697 -size 30132 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/BP_HangingLamp.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/BP_HangingLamp.uasset deleted file mode 100644 index 6320f83..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/BP_HangingLamp.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:721942c0157ef8dabb4dfeed35203328ce303eebd2d97b88a6ff79207fec5006 -size 2356 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/BP_VRGameState.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/BP_VRGameState.uasset deleted file mode 100644 index 4face57..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/BP_VRGameState.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f9a8e03eb9b18713b3a7769b581ae00c945d2312764710f73f6389fa0922ad7 -size 21638 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonActorMacros.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonActorMacros.uasset deleted file mode 100644 index 9c4d826..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonActorMacros.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b1e5ac4d9ad48213918194b8de6fbcfb571dfd2736ba88615516cb797aebd652 -size 85979 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset deleted file mode 100644 index 8209e86..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/Functions/CommonFunctions.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b3bef4e28f919f63072f8764779e5f34c2faa1ee9e5864709abf885addefea3 -size 349655 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/Interfaces/BPI_InstanceCalls.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/Interfaces/BPI_InstanceCalls.uasset deleted file mode 100644 index 3ccd560..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/Interfaces/BPI_InstanceCalls.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9698cf717710a739316fa89111c02c68b02560c678938df9519c33a63bab4e7c -size 13682 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/Interfaces/ClosedOverlap.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/Interfaces/ClosedOverlap.uasset deleted file mode 100644 index 814b857..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/Interfaces/ClosedOverlap.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca09bfbfed6263b60b8c2e33c7a0d020d46902da5a6331b21c749b0ff06484f8 -size 11502 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/M_Lamp.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/M_Lamp.uasset deleted file mode 100644 index 9ae137a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/M_Lamp.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa568a43725d6ae525316d921096416102321138683fcb8d80d2c4c113e841f5 -size 1275 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/Navigation/NavLink_AI.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/Navigation/NavLink_AI.uasset deleted file mode 100644 index dbfd60a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/Navigation/NavLink_AI.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:074a36e7ae8ff3f70a0cee08061a30de9be7d7c382058487d63e97f17dea93bb -size 54091 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/MusicSoundClass.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/MusicSoundClass.uasset deleted file mode 100644 index 5bce649..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/MusicSoundClass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf059e1823466451aa7b76bd9bb3151522aed6c45de8a9710fab6256ad29a4fd -size 1524 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_MasterSoundMix.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_MasterSoundMix.uasset deleted file mode 100644 index 32c1a09..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_MasterSoundMix.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f9190d3510b25ffc9f8e5b814552db0d81f3d24a8f5b675a8acf6264f70d187 -size 2077 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_MusicSoundMix.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_MusicSoundMix.uasset deleted file mode 100644 index 0f9fce3..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_MusicSoundMix.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:745bb62be3d9129f29e576a64cf9571a6793dc4125ab9b8f8ecd9de9168f678d -size 2064 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_SFXSoundMix.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_SFXSoundMix.uasset deleted file mode 100644 index ea16f3f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SCM_SFXSoundMix.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a00284d82782db5f7d38277284bd958c3ef5654067c88ee933025205a84b4df6 -size 2050 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SC_MasterSoundClass.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SC_MasterSoundClass.uasset deleted file mode 100644 index 12e44ff..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SC_MasterSoundClass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f705c4de401d530073766c55169f8cc9b043d9de1e8a7248200ec74d444333c -size 1727 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SFXSoundClass.uasset b/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SFXSoundClass.uasset deleted file mode 100644 index c0e9814..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Core/SoundClasses/SFXSoundClass.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86e7a7e2e0293bfa22cec64c971db72d0c8891f696ffc90113573ab399f9b04e -size 1514 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/BP_Portal.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/BP_Portal.uasset deleted file mode 100644 index 20325a3..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/BP_Portal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3e0993a0d14963037767819bf46fea535fba1798ccd39658b76d5f30df65332 -size 2250 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/BP_GasSimulation.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/BP_GasSimulation.uasset deleted file mode 100644 index aaea58f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/BP_GasSimulation.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dcafe50b316766443d3bc3e2e6dc7206a97db00e65206d19d26a33d769264003 -size 184312 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_GasMolecule.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_GasMolecule.uasset deleted file mode 100644 index 24b2cb9..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_GasMolecule.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4b1b55adfa0da546cd8734ac4fd3e9726931a3fd3ffe9cab853ca50db384b01 -size 1195538 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_ViewRecycler_Ashes.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_ViewRecycler_Ashes.uasset deleted file mode 100644 index 924ccdc..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NS_ViewRecycler_Ashes.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bcdf2dd388bfff77f39db3a759e4dc7c1e3d1851b25878265856a0dbc4739143 -size 572705 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NewNiagaraSystem1.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NewNiagaraSystem1.uasset deleted file mode 100644 index 98a7d19..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/Gas_Volume/NewNiagaraSystem1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c649229153e5baa38710c5816c863ef1f8ae8b11172c90af3d9729728de75df -size 376669 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/Ivy.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/Ivy.uasset deleted file mode 100644 index bb09802..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/Ivy.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63012ac61955d4a04e5704c2c111ed2600f822506cbae309384cee42c6e11f27 -size 1253 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/M_Ivy.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/M_Ivy.uasset deleted file mode 100644 index 7cbcc64..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/M_Ivy.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:caf6bfb3cabc50fccc26afb2658ee2fbb5c5c626987e4a2dc8d2fe7adef107f5 -size 1265 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/RVT_LandscapeHole/RVT_HoleHeight.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/RVT_LandscapeHole/RVT_HoleHeight.uasset deleted file mode 100644 index 07ca792..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/RVT_LandscapeHole/RVT_HoleHeight.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1dc7f17230cbdc6d287df8fee4c749b5e4b8f785fbf9b2020d5858ddca422123 -size 1505 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/RVT_LandscapeHole/RVT_HoleMat.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/RVT_LandscapeHole/RVT_HoleMat.uasset deleted file mode 100644 index 9f2fdbb..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/RVT_LandscapeHole/RVT_HoleMat.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:986b943a27d8cc8526b1ddfdbaffad58d8e49be0bbf78acd735a498922a69a17 -size 1540 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/BP_ScifiDoor2.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/BP_ScifiDoor2.uasset deleted file mode 100644 index 42f20e3..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/BP_ScifiDoor2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:033ba4a6176682ccf602958c3d0e50867d125d0e7ee267c586920be661173b57 -size 108665 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/M_ScifiDoor2.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/M_ScifiDoor2.uasset deleted file mode 100644 index 909aea4..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/M_ScifiDoor2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a62df52133c198ab19b5c295377f452367969388f405df995d72ab9d5b7f1aa0 -size 19319 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_DoorLeft_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_DoorLeft_Baked.uasset deleted file mode 100644 index a779928..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_DoorLeft_Baked.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:503bbe6e03538148c933f6babab436117bc510296f5b7a7010786d49d9185aa8 -size 84556 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_DoorRight_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_DoorRight_Baked.uasset deleted file mode 100644 index bed88ac..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_DoorRight_Baked.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3fb721653521e583903e6e408db94f551450df044c47f3afdc5ec7e540e715e -size 129853 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_Frame_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_Frame_Baked.uasset deleted file mode 100644 index 2fc3837..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/SM_Frame_Baked.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d259a8129c362e9168f74347b77774edd466be9ae3772578875152b47beddc91 -size 92203 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_D.uasset deleted file mode 100644 index e5f68fd..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_D.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fea751e7ae48715cfbe982b004149e42e18965086b427fce5b5b598a5208d5a9 -size 12591197 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_MetalRoughEmission.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_MetalRoughEmission.uasset deleted file mode 100644 index 918befa..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_MetalRoughEmission.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d66f07e5e09c82dd011f7caddeeacdd8868ec0770d0703d1bf31e837e7fb4b8d -size 1408401 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_N.uasset deleted file mode 100644 index da04bd8..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/ScifiDoor2/T_ScifiDoor2_N.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0fa2f83d172a5515170de61ebdfbd6b5a0d08a1f7112e3aa851af089b8b0e8d -size 69144684 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Architecture/Wall_400x200.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Architecture/Wall_400x200.uasset index a913f8a..ab2ae06 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Architecture/Wall_400x200.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Architecture/Wall_400x200.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c7ff3e4217e6e84ad3d7720064d81d495c70a564dcd844bae9ddf5fa806ade83 -size 15817 +oid sha256:320c07f0ec58d6459db3db59033835e12c886bd2fa9b672342d78b632fe11b47 +size 15784 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Architecture/Wall_400x300.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Architecture/Wall_400x300.uasset index f2c58b0..f364d82 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Architecture/Wall_400x300.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Architecture/Wall_400x300.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cc9c1094b2ef6e992545e9042f8dc13c171226c3ec2c12d185b217f06b4d2e6f -size 17172 +oid sha256:f724b4b4f7b29074bcaa0eb6a37fb6e5a425ffb4494b6a93cff1429f3bc88c62 +size 14632 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Materials/M_Basic_Wall.uasset b/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Materials/M_Basic_Wall.uasset index 097a230..cdb1333 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Materials/M_Basic_Wall.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/Development/StarterContent/Materials/M_Basic_Wall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67ae7b5db4a19280b5d8f61fc6cf278ad2927f83c9b4bda6bbbe918a58605827 -size 10834 +oid sha256:919c4baee1f3f43cbf9c24f8bdafdd0b9e8a75df33334289fbf54c41df3ead5b +size 10666 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/EMpty/NewWorld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/EMpty/NewWorld.umap deleted file mode 100644 index 387a8d8..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/EMpty/NewWorld.umap +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2384ab119ba0b9620ef9f2d4a6de2af08b0c4ecb190b7d5617f1483e6a73b62d -size 6677 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap deleted file mode 100644 index 065ba4a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Bathrooms.umap +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9c02c5551162f9bbf212899bc129f2714a074995cb78e0d5bd56e4eb7364976 -size 143723 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap index 7544b9a..27bcfc9 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Gameworld.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4d0ad5d2f0a8a953095a3582fd9a576238759f270f998f1f8d88d11bb7f9bab -size 5223816 +oid sha256:c263e95ff8aa91a11032b6bdd5384188c27a09c040e55b1a4a76e1896e27b8e5 +size 606007 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap index 2ac4aed..65f30b4 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Outside_Default.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:363edcee30bbe79ab3d3bd9e7d3e6307e117415fd9291145318f0e5054d4b07b -size 1422041 +oid sha256:90ba846d38a56cf8b77ca644997c5741dd83456bf08920b357ee5f75c96a636e +size 18449 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap index e145a22..c093fd5 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Room_Kitchen.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49252178c08a3d2a1fb90c6fc64832b3b7951c13f00b32060bd57238cb3299cb -size 154114 +oid sha256:4de2b31057968ab2b690cacac28f5da172c4a7d2c46a2d2c254d16b4685cd439 +size 9257 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap index 5698820..cb5e86d 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_SliceGame.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fc4231e5666e43e1a78ff5f3ca555e1f7333ebc74894d9338d3011177405c58 -size 135248 +oid sha256:5d1e8cea61949721884e83f8535599a7b50f1576c1a419eb1104397a7f137ac0 +size 54438 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap deleted file mode 100644 index 7bbc994..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Stream_MachineRoom.umap +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c04d52de49086d88bc45afdac76cfa86d28c2042621f4751678e6869ce13d1e4 -size 25224 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_TestInstancedMolecules.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_TestInstancedMolecules.umap deleted file mode 100644 index d24fc74..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_TestInstancedMolecules.umap +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98f8f88f076bb7a9be683e8c4ff85ac7be4c1075f4d38c2a17595786c0e78987 -size 6767 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap deleted file mode 100644 index 5a4334c..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/Map_Workspace.umap +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ab2684d7a7b92985716722480e685a9ae4cd37b11f03e3f283644f79d03e615 -size 128854 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap index c42946f..9dfc5e1 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/MotionControllerMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01b15fa00fbea596f2c8fafce00d867b39f926d289572eada8deb5a66b708c40 -size 8468527 +oid sha256:c5eab2a9b4100759cd86c10c196e495bb75f6c988867fc600bde368d1e8e269d +size 1616181 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap index 6c95134..5af439a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap +++ b/VIRTUOS_ExpansionPluginTests/Content/Maps/SL_FreezeRoom.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ada1a6252a8be3899d81330cd959410ff27843090204052ac780c4149757b1c3 -size 206649 +oid sha256:7940d7ba3df039310e9a1ded0a08a7de2da0ba67acb281e1439f0cc7228d53fa +size 132180 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/BP_Landscape_HoleCutter.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/BP_Landscape_HoleCutter.uasset deleted file mode 100644 index 9a84d88..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/BP_Landscape_HoleCutter.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08a40b6bf9353bbb813519fcb4c2ec39e902a19c0f1cf5c1db4e69123ddd1c68 -size 44284 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeMaster.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeMaster.uasset deleted file mode 100644 index 64a89e1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeMaster.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73b807adb3612186038be0130fa75b9ba1814b028de17784300d4c9da40eccee -size 62623 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeMaster_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeMaster_Inst.uasset deleted file mode 100644 index 5ef22f3..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeMaster_Inst.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df5372da9f67a7d877e0f2a10e485f730710250301ead314ee26f356e2ec7ed3 -size 16687 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeOpacityMask.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeOpacityMask.uasset deleted file mode 100644 index 35ab30f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/Landscape/M_LandscapeOpacityMask.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c5defcbf707f4092d44f9ee00a15f28bcfae917f3e614bf2bd01cb964ba7cd6 -size 12095 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/MF/AlphaFromStencilValue.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/MF/AlphaFromStencilValue.uasset deleted file mode 100644 index c1def74..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/MF/AlphaFromStencilValue.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21777d2444e323b50443133c31153592a37c9cb631adc531792d31df0cedf8ae -size 11434 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/MF/MF_CreateLayerOnLandscape.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/MF/MF_CreateLayerOnLandscape.uasset deleted file mode 100644 index 4a7509c..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/MF/MF_CreateLayerOnLandscape.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d8d999ca8e127e550cdce2bbef88f5ac6f57d568c3bec26da85ffb081791d91c -size 24958 diff --git a/VIRTUOS_ExpansionPluginTests/Content/Materials/MF/MF_LandscapeMaterialHoleMix.uasset b/VIRTUOS_ExpansionPluginTests/Content/Materials/MF/MF_LandscapeMaterialHoleMix.uasset deleted file mode 100644 index 7363869..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/Materials/MF/MF_LandscapeMaterialHoleMix.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1570061b3549a9ce0c44ef525a25ff9206d1db4f7b93fd085de6ceee23332ffc -size 13836 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset index 6ce827c..3cf6b0b 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/BP_VRInventory.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98be64dc15c3870b5bb4f6ec7c1aefac3075591c92f01677f0117df2d78e6973 -size 735044 +oid sha256:7785080fe0d76a956641907ef88bdc86024ae6e03eceea4fbdcf51e9bce148c1 +size 720137 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/InventoryDataTable.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/InventoryDataTable.uasset index 14a8b77..03da04f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/InventoryDataTable.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/InventoryDataTable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9add24d45b563018361e99c09043d392fc50b9210071e8eab7539f1622fefcae -size 4334 +oid sha256:d70fbd7aa42a7ad373c22e0d0a899128781cfb636b6da4ac5ef65fa2e94b0339 +size 3541 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/ItemDataComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/ItemDataComponent.uasset index 4d5adff..0edc1ab 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/ItemDataComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/Inventory/ItemDataComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:451d9be58bd4cb24d0af8dc7c3770cbd8b538ad82046e97f0ea087bf8d0c3d51 -size 20181 +oid sha256:9bfc8bac5601a68148eeb3de0330debce7f279723a1253dcf82bb08fd0455e70 +size 27410 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/Logo/BP_Logo.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/Logo/BP_Logo.uasset new file mode 100644 index 0000000..7c8f253 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/Logo/BP_Logo.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28df46f41ee60f8492cadbe5f42cb1ebc5f4e52690b0cbb31abafe5e093d3377 +size 66489 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/M_PP_MainMenu.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/M_PP_MainMenu.uasset index c2500b7..254c4ce 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/M_PP_MainMenu.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/M_PP_MainMenu.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:19520f44d982f4c267077dff6f5b96d4111c94f08df1bddbe8654e97943098d9 -size 16022 +oid sha256:08b71e9ec112dc479b18230bb960ea1bd17f83f0b49f27bd3917dda852701263 +size 13298 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Materials/M_ButtonHover_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Materials/M_ButtonHover_Inst.uasset new file mode 100644 index 0000000..425a302 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Materials/M_ButtonHover_Inst.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbc57da2e7613e3e4ee9852114fdc230ba2dd1826b742f6405faf393e18cd107 +size 29401 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Materials/TestWidget.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Materials/TestWidget.uasset new file mode 100644 index 0000000..d320c20 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Materials/TestWidget.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ba18f91e28a6c9a91c8c2d457bb9f5f405ec8a5e37de7bdf0540f582d72e6e3 +size 25782 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_LogoIntro.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_LogoIntro.uasset index 23d36f0..cb62768 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_LogoIntro.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_LogoIntro.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8823e396280d505b8d0234702bc86d9b93d74887761308c1132555bdf5bd231 -size 55064 +oid sha256:ea9ed728ae60d776643ed10ec5e05a9835504782554fb70161be4e7b568ff16a +size 55066 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_MainMenuMusic.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_MainMenuMusic.uasset index 99f3cf9..c4ed1ab 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_MainMenuMusic.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_MainMenuMusic.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ebc81705e9a34a76c19d9a8e563fcd404ee735983d9fa15c18e55450fc0afbda -size 49581 +oid sha256:0aef3c1929f68c301816cbdf0f644c12e62420906134285d3dc5d7bcec9d1931 +size 49583 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIClick.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIClick.uasset index 954947f..31ced3e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIClick.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIClick.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:896ca319bd9822360853a389087489aa6eee91b158b82b69a877d03ac095e1c5 -size 57843 +oid sha256:c3b071419c0749bc25af91e284e21e65adc94113995094aa120fe6624ec370f1 +size 57845 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIConfirm.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIConfirm.uasset index be591b0..081ae67 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIConfirm.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIConfirm.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:728a8352e5db8b948b3c32c77494ee4573c73c3ee4dc6a10bde0e363b4955755 -size 58774 +oid sha256:b1516abde12af29c1c6b4d9a46a84b0621b7948fcce900ac98b9ea96a90e599c +size 58776 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIMove.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIMove.uasset index cd1bf4b..37f87c9 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIMove.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MS_UIMove.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fafde9906f6a61e5c5391b9c0780d5cecb109b9add6d9f585a3ac2c7cf6ba0ed -size 58753 +oid sha256:d6ba80fca27fff55f63364a106c6fba95d496e2c6cd27cb07498c777b4e6d473 +size 58755 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MenuHover.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MenuHover.uasset new file mode 100644 index 0000000..617ea5c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/MenuHover.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf51cf13105bf2ec527e1bfca6045373f1e9e8251e79f4c5248597d580b97736 +size 45510 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/SW_MainMenuMusic.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/SW_MainMenuMusic.uasset index cd71ca1..aeb4a0e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/SW_MainMenuMusic.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/UI_Sound/SW_MainMenuMusic.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddc072404ba0f0ec087408bd6300532ed7f640b81ffde0726cf39763839ba071 -size 37199820 +oid sha256:beee301ed9c21abcdc1f11237c44c07d9765529037ca94975e2558cef1d4b440 +size 37199822 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_AudioSettings.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_AudioSettings.uasset index 93eaf77..aae54a6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_AudioSettings.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_AudioSettings.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee4669637dc3396d0025b0019ac8f4d00bc6d9730b1581ebfb842bc1b148242a -size 281743 +oid sha256:acba767a2010daac4364e0df6cee271537e684f81e2b8015c069c705a1c37298 +size 281602 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_Button.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_Button.uasset index 7f0d698..7e3eae3 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_Button.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_Button.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d03547abf62d1335cc3ae29f048e5e6d8dfd8356e2e32121d9daa474d25b711 -size 232202 +oid sha256:4b0bed14d35353a4cdf20593203c625269eeafc7292d8e67da78a487d3835a25 +size 232603 diff --git a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_Button_StyleMain.uasset b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_Button_StyleMain.uasset index 9eb83ec..5e86ad5 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_Button_StyleMain.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/UI/MainMenu/WB_Button_StyleMain.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35904a1f2a58610d993b6c22af90955d6b6c8bfce3cd1ad3307d895454743daf -size 30781 +oid sha256:b6b805315a87ffd836fc557ea285c3009e8995f1816d4f419315014e080ffbfd +size 29685 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Circle.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Circle.uasset deleted file mode 100644 index 69a4c79..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Circle.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:49bd3247fef2df4e33dd191702031979533bb0880029e84f2699986c78b57703 -size 1247 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Rays.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Rays.uasset deleted file mode 100644 index bca2a23..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/M_Rays.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1b7546f8cebe56b6b67ab54d705d202190218b59f45af82ad0be974eb5c2bb8 -size 1231 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/NPC_VRTemplate.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/NPC_VRTemplate.uasset deleted file mode 100644 index 1f328cc..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/NPC_VRTemplate.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:404fb25177f36a3d99b74588831b64371c7c96d5cb2f424a7ddf65c40e9ed346 -size 2736 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_MenuPointer.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_MenuPointer.uasset deleted file mode 100644 index 846e9b1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_MenuPointer.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc052684268e4399ee0ef2c839a32c24230aac5439a69f35d08624775834726f -size 341531 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_PickupTrace.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_PickupTrace.uasset deleted file mode 100644 index 60cd929..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_PickupTrace.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c735274e73d0ac856b7865e0ecbd4e7fe3d0537542a913e366bffb34678349d4 -size 337936 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_Portal.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_Portal.uasset deleted file mode 100644 index 670ebde..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_Portal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b537fa1fc29300421dc6e9000093d976580207003163afcf39bf74e944900ca7 -size 1267 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_ScanLaser.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_ScanLaser.uasset deleted file mode 100644 index 45b2608..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_ScanLaser.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:50270f45a413bd06272db4cfcaf884d17470a8fc28eff92b3f8b78f348a2c8b3 -size 317927 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_TeleportTrace.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_TeleportTrace.uasset deleted file mode 100644 index 2629ee1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/NS_TeleportTrace.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9fb649507bda0f4ab145259b2cfc6eba3c83cd951cbfb4d8df97555ec12e0172 -size 342384 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Circle.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Circle.uasset deleted file mode 100644 index 7c0c1ae..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Circle.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc7dee41ed1b67841f527bfe01fa7e22a30408d036b023e92b121ac110ee2c22 -size 23945 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Rays.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Rays.uasset deleted file mode 100644 index b8c5edc..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/M_Rays.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb543b54f3bdc0cbc428eecfb1d4e5d9735bf841f2ce959846fb38d1f6a42c24 -size 29040 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/NS_Portal.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/NS_Portal.uasset deleted file mode 100644 index 103e39e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/Portal/NS_Portal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e59b642b3b728e85ecf0cf4ad4a79d07381abe74f12f6622e437f1106b9d6f20 -size 1161615 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/BP_TestProjector.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/BP_TestProjector.uasset deleted file mode 100644 index aea8609..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/BP_TestProjector.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be8fd47de9b5d5fc6e941bc1da191bf171c5410496e2f9fb08b4b6f8bbeec8a9 -size 47579 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MI_Projector.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MI_Projector.uasset deleted file mode 100644 index d410380..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MI_Projector.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c80305cdbf977dc2fdefd39062cbe84113670b2eef3b15bcb239b2d52d400124 -size 22595 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MI_SliceTest.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MI_SliceTest.uasset deleted file mode 100644 index 20feab2..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MI_SliceTest.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac92c72ad8ca07aff256b4d2b76617bf8aafadea26af482a0861e841e1b8a676 -size 10581 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MPC_Projector.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MPC_Projector.uasset deleted file mode 100644 index 1d22a76..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/MPC_Projector.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff89ffca9a9ff569d7b6c3686e20e5da9f58c20b9ae5262d59172892d8532ba2 -size 1645 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Projector.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Projector.uasset deleted file mode 100644 index 1a80116..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Projector.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fdbdb863b110e9f4cef12d86cfc8a0d7e88b646513cf9a9497c99683af3e8d40 -size 33893 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Rays.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Rays.uasset deleted file mode 100644 index cf30dd7..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Rays.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:405ff410436b51e89db03924ca5d8d6a3c84d5fc086f0efd7591dcc9f6171cbe -size 35527 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Rays_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Rays_Inst.uasset deleted file mode 100644 index 1e155a7..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/M_Rays_Inst.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2785de8afd983d35b389c805ee5313133844e814d224eb26fdbfc4ae9d00377b -size 10415 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/NewMolecule_002_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/NewMolecule_002_Bake1_PBR_Diffuse.uasset deleted file mode 100644 index 272a111..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/NewMolecule_002_Bake1_PBR_Diffuse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f06531f6ca332ede086e4b83df959c861039ab39d0cb9544701df0c14fdbff3 -size 73007 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/Nitrate.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/Nitrate.uasset deleted file mode 100644 index ee14a3f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/Nitrate.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe469eef080a5d0d0b3bdffa9877acd21b67261ce41e29011c8489563455e7a8 -size 209486 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/Nitrate_LP.uasset b/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/Nitrate_LP.uasset deleted file mode 100644 index b891675..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VFX/Projector/Nitrate_LP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3598da567d105333e605dfe745a5d315d7ad385400bb60d7b6bf7dc97e95ac6 -size 117344 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset index 232c137..bedd486 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_Trace_Controller.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7efc0ec10b12509a8621b0339971fbc110e2da5e3283f3cf568c72770c48104 -size 1924781 +oid sha256:4d3254d603cc25fd6a8a17513f21e8cf7a9e11bc19b3ed7b376a99848988a104 +size 1811554 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_VRCharacter.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_VRCharacter.uasset index 29ac028..08bb30a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_VRCharacter.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/BP_VRCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:77bad1e3aba29c3d47726b9318f4feb8fefc35908257032b91231216e460ac60 -size 5744225 +oid sha256:acf183c2b61ad51503f1963e934e850b845e78906014de4bd8df31a901291f11 +size 5732534 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/FPS_VRCharacter.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/FPS_VRCharacter.uasset index 4a26f5c..45b78ea 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/FPS_VRCharacter.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/Character/FPS_VRCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:301e151d74612eea67f88102c34a7634bf1e56fb345d58982741d17496bc604b -size 317084 +oid sha256:21316496b3c5cc7393791ed1c89a1ad63f403ad273158d738995c0efffa1171a +size 313254 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Animations/A_MannequinXR_GrabAnimationFist.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Animations/A_MannequinXR_GrabAnimationFist.uasset deleted file mode 100644 index 970c890..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Animations/A_MannequinXR_GrabAnimationFist.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c4ae94cb50ac541aaae78ca7ffa323af87883429e6b7809b6eb351bb7bf86b24 -size 54389 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Animations/GrabAnimation.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Animations/GrabAnimation.uasset index b8068ef..7b5b519 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Animations/GrabAnimation.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Animations/GrabAnimation.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a7146154aac6ba15f90376e90d5776676e592cd6b9a6bc8c3eb9f983206da26 -size 1733 +oid sha256:29d60663acdcf836b1f18af8160e55605eed835f7860998f77bf8c5c64b935e7 +size 18098 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Meshes/A_MannequinXR_TwoFingerGrab.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Meshes/A_MannequinXR_TwoFingerGrab.uasset deleted file mode 100644 index 57494e4..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/GraspingHands/VRHandMeshes/Meshes/A_MannequinXR_TwoFingerGrab.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65e55e048a557609dc32545aa3ef0bb22e1e19f3e8e5d8b46f1ade2fa4932a77 -size 84615 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameInstance.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameInstance.uasset index 6c1dd6f..96df3dc 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameInstance.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameInstance.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d5b1a7385f6f3416ec64cd116d866aa44ee3015f11519701d3dbee7300ca5b4 -size 193126 +oid sha256:16ea5beb0ba037d82116d4e5dbbf441f86b42b9fdf6407d6130a3ce9af6649f1 +size 177065 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameMode.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameMode.uasset index f48e7db..ed10686 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameMode.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Core/VRGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52d6e590826d51c2da4979e456de3c0750a041fdfbb4f583c6580f336275bbf8 -size 28295 +oid sha256:ff2a09974e04b0cb5e29b828479eab8d9eeb50a464db264533519340783ebcf1 +size 26008 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset deleted file mode 100644 index ae30cd5..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/CaptchaButtonComponent.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:71108b7e1e27a8f32592f80525d921d1296ceab41566e330533bb6d6ff38d560 -size 52066 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ColorChangingButtonComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ColorChangingButtonComponent.uasset index 72d55e6..6524f91 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ColorChangingButtonComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Button/ColorChangingButtonComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfcbb8df6038bd3a83d1daffccccbeac026003954415952386371631f6818005 -size 107094 +oid sha256:af77a56053a1badf1a8f74d8b4527cee850749d5efdcac54ae65ed841609599c +size 89749 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DialIndicator/DialComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DialIndicator/DialComponent.uasset index 4073780..d4a89ed 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DialIndicator/DialComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DialIndicator/DialComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:465a827c6bb6bab064184dde18f0ca684328e069180d4a4e8aa124b11b6df84b -size 133051 +oid sha256:8e1a99dd8b3ca2b77246336f1d27da028e603b27eac7f771784f68fe25e3afd2 +size 131681 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/BP_DoorTestFromScratch.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/BP_DoorTestFromScratch.uasset deleted file mode 100644 index fae573d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/BP_DoorTestFromScratch.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3b4e347ddb8cb4fe35023e71d20db43b590d7c988ff8abb59568e52b0fbbdadd -size 72208 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DeadBolt.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DeadBolt.uasset index 736fa0f..f60b36a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DeadBolt.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DeadBolt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cf534fe2215772dc387a298379fc1ba19c4e536784f431a668a97b904da9d32 -size 33023 +oid sha256:d6cf5a73b1099be46fc9a148dfb2763094df9f0b64763d56c0aee985ff0ae85b +size 30756 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DoorActor.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DoorActor.uasset index f06dc6c..6e49353 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DoorActor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Door/DoorActor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2e7265d377b2c0df2ff7f169679da4c43321508cea19d462897d68534a84859b -size 485315 +oid sha256:12cf02437b66faec6ffca53ba49d578e542de0da647ffb77b26eb2efa2c39f87 +size 481494 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/BP_Cabinet.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/BP_Cabinet.uasset index dbf11cb..55167f8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/BP_Cabinet.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/BP_Cabinet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ef0d11ba81d751d5681b1781d3a379e483f358a618084fe3fb6bbc034789649 -size 426404 +oid sha256:764d0cd4b85a5eb6be89dcf98187c9d8418d628c16312c78fdd873cdf65d9cc3 +size 423005 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/MovablesSoundComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/MovablesSoundComponent.uasset index 163c061..ff6a60f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/MovablesSoundComponent.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/FileCabinet/MovablesSoundComponent.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7ebc043bb4b2c3fb97dfb1030725c4aadac9f5e0114da2587d4dbf461d78146f -size 647461 +oid sha256:3ac9821592f5c151bd8949f0c2a296b401e002920b09f36f8947194f9213837f +size 721094 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/Cabinet1.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/Cabinet1.uasset index 15b0331..5bc9b50 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/Cabinet1.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/Cabinet1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6125ceaabe2a042f9f3bbd3da596cab04242802c3797fd52e0c94a6b87d2d296 -size 84302 +oid sha256:8f0087acf45130e43f64ef709573a736d8101152923d61809bb452a7d0798fd1 +size 84647 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/LockerBody.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/LockerBody.uasset index 7cee4f0..f1ff7d2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/LockerBody.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/LockerBody.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a542106e66b321d29bbf627540746bc72fff8da5c386c46e9c4fec6bf942336 -size 114220 +oid sha256:1822d084f6b0f74c9c5db0df0863385829651c6a02a7ee0288687c65b379309c +size 109886 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/M_Locker.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/M_Locker.uasset index bc22426..fd7235e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/M_Locker.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/DrawerBase/Locker/M_Locker.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:746bb79c7a4ce701d92bbb03a489de434f7daab2d315833b1a053b631f46ae2d -size 16333 +oid sha256:5343abd4bee92aca2405ff3a7dc4199556e6bcca0d9e7451efac46e74b118a4f +size 16701 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Lever/NativeLeverActor.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Lever/NativeLeverActor.uasset index 910958c..127358f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Lever/NativeLeverActor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Lever/NativeLeverActor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:afab9cda43f3e3a4cdf04e113374fd1e04ed4c0b026b3dbde0e04da90fc06f22 -size 91311 +oid sha256:3a17a4ef9754e7c8c1b3dd8f963efc63bafe68c8c63f99bb5838b645765851e5 +size 87973 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/M_GripOverlay.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/M_GripOverlay.uasset index 3570a15..8c4427c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/M_GripOverlay.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/M_GripOverlay.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d18d8841f2c9453e82d9a5d3781b6ab00e75eca0c40e0cfa6bae9ede1682a6ec -size 33950 +oid sha256:c2e80b479a197d55c1f34408d02a43b09f420da682ed35c5375bd914ad1cced8 +size 34199 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Potion/PotionActor.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Potion/PotionActor.uasset index e852f64..4a7b6d3 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Potion/PotionActor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Misc/Examples/Potion/PotionActor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6b760a1a46e2e07dd47498a6b5abc7531ee5c0151d7b3f4e33a97cf4a03553f5 -size 330063 +oid sha256:669210a4d77c962cfe3df78cd2c40a1c4dce5aceeee27a9959b1fca2e5c478c4 +size 324065 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset index 16b0992..e28638a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/FPWeapon/Mesh/SK_FPGun_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd9fc0ba8f32ac22023b6f92f3ad99bbb7c0a1cd196e576a7ad328cc8c5a4b85 -size 8902 +oid sha256:3341d663057a271a84a00e1a28615d826c51e56f77587611ccd149e5fee1a73c +size 6626 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset index 0a1ef45..3c6afe6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Guns/GunBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b986db431f559fecce3935bdb2277e9bd5a171434c129327cd2c52ad1bfc133 -size 931066 +oid sha256:85bf8a9ff9978579f3ceb8b437fad4afeefc53161385bcd539bbf2a05d7eb028 +size 917596 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Melee/MeleeBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Melee/MeleeBase.uasset index a40177f..5af74b9 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Melee/MeleeBase.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Grippables/Weapons/Melee/MeleeBase.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ddd81a705d58f32fcfe09bafe8ceab281940ee27faa88afee4241d04d7c263d -size 616408 +oid sha256:99ceda2df79e042ac060b8017faefaba0db88400e8148036cd03eba143798aca +size 628697 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/AlternateGripLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/AlternateGripLeft.uasset new file mode 100644 index 0000000..a3ecb0f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/AlternateGripLeft.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e838ac7a16a9abfbff653a00a2b541db9d5039649b8962d867bd271f673354b +size 1733 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/AlternateGripRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/AlternateGripRight.uasset new file mode 100644 index 0000000..4a50b4b --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/AlternateGripRight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b709af759ede67d0f1be1236ea9d32414abd47c8aecdf0af30d81518712544e5 +size 1742 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/ControllerMovementLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/ControllerMovementLeft.uasset new file mode 100644 index 0000000..7434073 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/ControllerMovementLeft.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efb29e43077a95e58dc4701bac014adaeaa5a6aa59bbfbe67558023152a4b08a +size 1925 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/ControllerMovementRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/ControllerMovementRight.uasset new file mode 100644 index 0000000..6cc857a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/ControllerMovementRight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47cbe9c2325bfce551802aece2a33050ab71b31ad010a0a4c03fed01ebf4403e +size 1934 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/Jump.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/Jump.uasset new file mode 100644 index 0000000..de27f0f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/Jump.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a1a5b728c4a1fb21be95307d7ce48439155eae8ff6b791f877d3309b8a62b29 +size 1645 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/LookUp.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/LookUp.uasset new file mode 100644 index 0000000..dc3e867 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/LookUp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3be15eb111e1907782872e423d45b0b6f441e710d0c144b4fdfbb0b380d1e8ec +size 1810 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/MoveForward.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/MoveForward.uasset new file mode 100644 index 0000000..3e3270d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/MoveForward.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c52c5253dfbb4a1ff7ba50eb675b199b0999f5b704c34a6a4440114763e2426 +size 1857 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/MoveRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/MoveRight.uasset new file mode 100644 index 0000000..d44788b --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/MoveRight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd6d29db7763b629a4e8588db43f677b0cae53855cee720530d918b0339556df +size 1837 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/Turn.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/Turn.uasset new file mode 100644 index 0000000..0a7106f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/FPSActions/Turn.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2cef6554d211f2da6161b97663aeb2369c648f9ede8db34c919575257c025baf +size 1792 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/LaserBeamLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/LaserBeamLeft.uasset new file mode 100644 index 0000000..65cb30a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/LaserBeamLeft.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9197c15df99db7cf86c31af6b948278ddc6d228ed314aa15b97acb41d9009273 +size 1697 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/LaserBeamRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/LaserBeamRight.uasset new file mode 100644 index 0000000..3435283 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/LaserBeamRight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4eb9f86043920401304778a1247f7ccf600cfe2b62c8e78d4b5921d7575b5bf2 +size 1706 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbLeft_X.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbLeft_X.uasset new file mode 100644 index 0000000..76bfaff --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbLeft_X.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9514284ca54c4019335be42544a9c29de3e2ea179616f932b575a8ae927b0fd +size 1972 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbLeft_Y.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbLeft_Y.uasset new file mode 100644 index 0000000..65f005c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbLeft_Y.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4dc37821f7f0f5f745b527f6eb5ef09846a144a745ec9e970e4a54fe35a352c8 +size 1972 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbRight_X.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbRight_X.uasset new file mode 100644 index 0000000..7eb201d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbRight_X.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c809975f9f3d5b164dd94b1c5a13359035a3aa55a1201d28ef694eb8dcca694b +size 1981 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbRight_Y.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbRight_Y.uasset new file mode 100644 index 0000000..4fb4d3f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/MotionControllerThumbRight_Y.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08334d0a62c0064bcbe385e62e42f18fd5394b8de87935dbf191c09b37d0703e +size 1981 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PauseGame.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PauseGame.uasset new file mode 100644 index 0000000..db5c331 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PauseGame.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8636197a7281ca1371cd485ba11273f9fd6b3affcd9931aab6debcd67c3af60 +size 1877 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PrimaryGripLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PrimaryGripLeft.uasset new file mode 100644 index 0000000..0a2ad1a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PrimaryGripLeft.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2118297fb54c03b90d3f600dc2359ae504078a606720a5b02a4504cff322153a +size 1725 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PrimaryGripRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PrimaryGripRight.uasset new file mode 100644 index 0000000..f78e572 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/PrimaryGripRight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45c451a28c509a1f29e80ee9d05df72e40267f376734866cd4c60f6a80ee0e8f +size 1734 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/SpawnInventory.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/SpawnInventory.uasset new file mode 100644 index 0000000..440cefc --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/SpawnInventory.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2097926eb2b821610c7727aba6deb91ecc9b72b4a0fcb9a6e1d809e0ccf87d09 +size 1786 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/TeleportLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/TeleportLeft.uasset new file mode 100644 index 0000000..9177e19 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/TeleportLeft.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a5639edfcc13491b91cc89d033361dbb8b92776c278a871d13ae51837ae9c82 +size 1686 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/TeleportRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/TeleportRight.uasset new file mode 100644 index 0000000..054131e --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/TeleportRight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bca00b14c3c592ae8c8f97963794904c5718f02c62e59161e845b35305c62547 +size 1695 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/UseHeldObjectLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/UseHeldObjectLeft.uasset new file mode 100644 index 0000000..c55059d --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/UseHeldObjectLeft.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de78a3a8cf9cb1ccd1f1a67814856637922e53c76dab8e5675f3f044d985d21d +size 1729 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/UseHeldObjectRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/UseHeldObjectRight.uasset new file mode 100644 index 0000000..f93d245 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/Actions/UseHeldObjectRight.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8fb7e74eb8d0e577d5dd293a3e23bc7d850f43938a0f97ac16c8ba4cdd751863 +size 1738 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/FPSInputConfig.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/FPSInputConfig.uasset new file mode 100644 index 0000000..7320fc5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/FPSInputConfig.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a3dbd80f436cfb88b32ad754672a97aeb7831d9b27f0afd118dbb2e76a902f4 +size 2238 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/FPSInputContext.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/FPSInputContext.uasset new file mode 100644 index 0000000..97f2e4a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/FPSInputContext.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d736f494febc8d56fbc8752af45f9f260547664bbe483db52c40e6960dc817b +size 11478 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/VREInputConfig.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/VREInputConfig.uasset new file mode 100644 index 0000000..e57a916 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/VREInputConfig.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a93b6b73d5169be5db2c22c81bda929bb9a40900382197dac7f10f15ab59b694 +size 2252 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/VREInputMappingContext.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/VREInputMappingContext.uasset new file mode 100644 index 0000000..9cedcbc --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Input/VREInputMappingContext.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87fb0c12b62e3a87846800e80361fd77beb08f18b0f8f96b53a85accf2e19305 +size 60735 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Car/VehicleBP/Sedan/BP_Tractor.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Car/VehicleBP/Sedan/BP_Tractor.uasset index 91b29c7..ef841fc 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Car/VehicleBP/Sedan/BP_Tractor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Car/VehicleBP/Sedan/BP_Tractor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a1174311515a6635c06662e979445aa91707cbb6137db6bb0a8b6a7bd3152446 -size 883099 +oid sha256:3f3ebaf0ea71d5bee576b39db712c1f44ec1b67753a3dde57404ff2288a4a7f0 +size 873996 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Car/VehicleBP/Sedan/Sedan.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Car/VehicleBP/Sedan/Sedan.uasset index 2c9b607..ba6e423 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Car/VehicleBP/Sedan/Sedan.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Car/VehicleBP/Sedan/Sedan.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ba21dda7eca96dc231774e9c4be0fc2d905d0d9f63df9bd5bd6d234c735efb5a -size 894164 +oid sha256:31cd147bfee3f6d24d955f47c929c4c30460f34533ef2858d138dd495a08055b +size 900694 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Misc/Rotator.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Misc/Rotator.uasset index 98d6ff2..8ef4d2a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Misc/Rotator.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Level/Misc/Rotator.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6efd7ef42524cefaf7c8cfde32ae1dfea44755b0707f3b5854dfa2ec4ff61291 -size 53208 +oid sha256:1a73a922a3e8c6651a9338c16fb071fab3620521ee934e0d2ee5117d403aa1a1 +size 50905 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/Misc/Meshes/CubeMaterial.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/Misc/Meshes/CubeMaterial.uasset index 636ef09..0f7734f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/Misc/Meshes/CubeMaterial.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/Misc/Meshes/CubeMaterial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:821b47b596a8504a5ec3575960ad04a3d64776404a01acd292dc6cd062e7fb2f -size 9926 +oid sha256:6dd4694fe989e2d99ce8e2711f4e21f693f637f892a577ad6ed2c85b7cd11222 +size 9758 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset index d838b88..d1dcb35 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/Character/BP_VRCharacter2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:82682e321d37caa568fc83a4f43293abb54c486ee7aaa5f43d3973502cc923e8 -size 5774661 +oid sha256:e9be1536edac86f8f17aa87ec4ffd1c68bf203c782e0831a5020e0d53867e2fb +size 5624872 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny.uasset index 4592c67..f153df6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65bf3075732bf5a60bc54654a6e3e8194971f0939352043e6cf4eb0f7279677a -size 2538 +oid sha256:08b0179a5091be2a981ea1eea0bd433ed4b56e50754d208a843a0239c2bde350 +size 556583 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.bak b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.bak deleted file mode 100644 index aa77080..0000000 Binary files a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.bak and /dev/null differ diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.uasset deleted file mode 100644 index f46f5a8..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspAnimBPManny2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:56e61c5ec305541a0a221ba0c62e322860415ed78337a6eb77644d8794924913 -size 606472 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset index 3c67b68..ada61c7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/GraspingHandManny2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c0a7cf83e4fa2453fd1d3a207c64f04fab17383fc4d4844f70603e6f8e0b027 -size 2549686 +oid sha256:5b8836e2f24974e56fddcc78bf24694f41a57d5699dae728be51ce7c6cc55412 +size 2543406 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/WB_Interaction.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/WB_Interaction.uasset deleted file mode 100644 index 8e58e7a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Core/GraspingHands/WB_Interaction.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:149e7393db6d0fef7fdc45c304459a0e8d3952d656c93cd84d0fb0ba0c525024 -size 55337 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/GripAxisRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/GripAxisRight.uasset deleted file mode 100644 index ef4044f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/GripAxisRight.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39566d6481a9c00f35da9b80cb8a43c44e99880231480fcfec4372bb201e2bd4 -size 1386 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/PauseGame.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/PauseGame.uasset deleted file mode 100644 index 11846e4..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/PauseGame.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08f973fe80234915441ffe2fc7347e963500822f691c0a650c2f0fb1757f7acf -size 1665 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/SpawnInventory.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/SpawnInventory.uasset deleted file mode 100644 index 4bc35e9..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/SpawnInventory.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5099e61259dd696ce5c0f7d433fd4b3975cbfcf77570088e0f21f270fb53f4be -size 1574 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/UseHeldObjectRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/UseHeldObjectRight.uasset index d7c3110..5e905a5 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/UseHeldObjectRight.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/Actions/UseHeldObjectRight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f384e5d18480d18ecdbaf5745058a3d6caba9bb182a58258147e74b57d8bbf0 -size 1569 +oid sha256:0a74fd5d208d06fe519de6ef05f423de3404445aa9450b293d0f301ba67017e5 +size 1795 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/Jump.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/Jump.uasset deleted file mode 100644 index 12a7efd..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/Jump.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8664fa6b1f50d523a3d1832c1bac749ae08b60915d0e8a0fc15bc3d4b0e83cd0 -size 1452 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/LookUp.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/LookUp.uasset deleted file mode 100644 index 434a740..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/LookUp.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:584bd0e0c66a57365cfb881aa3cef0f2309a618501d43a70f7f3e21078289e09 -size 1666 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/MoveForward.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/MoveForward.uasset deleted file mode 100644 index ece8d08..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/MoveForward.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9cef3b773f852276d4f335c37dedf15c9fdeee758017b7ae17864562a62a3d83 -size 1713 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/MoveRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/MoveRight.uasset deleted file mode 100644 index ad6f6de..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/MoveRight.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06421d1572be6bea6b50d44ee592adee4b203108f3e8991af7567cde6a434c92 -size 1693 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/Turn.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/Turn.uasset deleted file mode 100644 index bf250a7..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSActions/Turn.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3bbd1e102e7d778eca59a3d474d39e34d95783ad3deb6d838947f685b3d2c1a7 -size 1648 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSInputConfig.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSInputConfig.uasset deleted file mode 100644 index 4e377cc..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSInputConfig.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78ebb2c98a1802f646a092757c934926c284f9ce70f0b1614e529fd47f9b8530 -size 2078 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSInputContext.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSInputContext.uasset deleted file mode 100644 index 2813664..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/FPSInputContext.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1d109e716664965d2511fadbf52653990b3a30ed0f0a22c058a9fd69915fefc0 -size 9269 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/VREInputConfig.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/VREInputConfig.uasset deleted file mode 100644 index 96aec9a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/VREInputConfig.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e593df7f54e7080cf08715d9c9303f26bd45d34a591b0e4b0653292a87f18dad -size 2092 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/VREInputMappingContext.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/VREInputMappingContext.uasset deleted file mode 100644 index 81abb6c..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRE2/Input/VREInputMappingContext.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f5ec5728c28813a58ca803e3fe08764b1972dc56dc29d7a8e0ff4566d2e32d6 -size 30359 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NPC_VRTemplate.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NPC_VRTemplate.uasset new file mode 100644 index 0000000..5b342b0 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NPC_VRTemplate.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:add4f9d9477ab268973f4e4d665f7cb67fe6115e3cd3e81c37b0782914d7dd65 +size 2952 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_MenuPointer.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_MenuPointer.uasset new file mode 100644 index 0000000..80c2ef1 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_MenuPointer.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca5f9682f145f0d01b5c2f7ffe026e70ed8b490ef4e6e1b3a4e80d58fb16ceb6 +size 354985 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_PickupTrace.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_PickupTrace.uasset new file mode 100644 index 0000000..af5b63c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_PickupTrace.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52bc6ec638f68cdeee8e33ba68c62c713a887b5aa8c1fe85e63cc076b0ce1096 +size 351393 diff --git a/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_TeleportTrace.uasset b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_TeleportTrace.uasset new file mode 100644 index 0000000..94bef93 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/VRE/VRTemplate/VFX/NS_TeleportTrace.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99687995c0ce0a5e62792468e7f69fb5a2110575dc554c4058e1b83e8ed6d793 +size 355837 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BPI_Character.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BPI_Character.uasset index 6c47f54..1c6a4c0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BPI_Character.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BPI_Character.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:030027383ccf9c65f094f6eb64655867e582ff56a2e90a00fbc0685174618d59 +oid sha256:47c57977bdd6b4e1426bf6ef065bcd4411138af6773e8b274f833566cc817995 size 10591 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BP_BaseCharacter.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BP_BaseCharacter.uasset index 9738708..17f210c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BP_BaseCharacter.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/BP_BaseCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:184bce21637afb1cd63d11cc0c39c5a593b62ff7be8a22250611f9fd076e19f9 -size 150999 +oid sha256:cfe7e82bef2758bb70ccbf82671cc0edfa4d0d5a4e0df22c1bd55d17d76de8dd +size 73443 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset index 71ee76e..44a62b7 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/AnimBP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f63fc2d80dca0b2307c75bc7555e801568031ec172983737282e2746a5265bfd -size 580400 +oid sha256:1029e4eed6b4dde09e6b6635c01697c978a805b59bdaeb1d8d83f6d50b489017 +size 284935 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/AM_MoveProjectorUp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/AM_MoveProjectorUp.uasset deleted file mode 100644 index b978b8e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/AM_MoveProjectorUp.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7721db5b339e7ee60d59c937de419e59364da5d18959eaaafe9686c588e25d0e -size 9197 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/AM_OpenTop.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/AM_OpenTop.uasset deleted file mode 100644 index 01cbabb..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/AM_OpenTop.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d94ffe8f360796fcfa1057c2bc95d9833ba009521e96b2c3d0d78af707c4d0ad -size 9153 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Blendspace_Walk_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Blendspace_Walk_Clarice.uasset index d1f4f52..fa64e00 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Blendspace_Walk_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Blendspace_Walk_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b9bd61ffebfed877fa47f260617d7379ba6ec06deac4d029fc9592e3d1c656b4 -size 8213 +oid sha256:dae71e4f110cbf29615d5388c9dcd3a4da4e934f7b6ee7a783224ba77606828e +size 8323 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/ClariceMain_LookUpStatic.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/ClariceMain_LookUpStatic.uasset deleted file mode 100644 index 56b89f4..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/ClariceMain_LookUpStatic.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ab9b585c68dc389a3c5d9d95e4106d34fb24f39896f0e32d6a9a6bc093c24576 -size 39684 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Idle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Idle.uasset index 6467d6f..c84f97c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Idle.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Idle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a8127dd37101cd8ed0cf6b358f295beb2eacadae12e44195e6e0073a1d0457fd -size 151826 +oid sha256:0556f79baba9a642f1e5785c37f468a368df229b4f0da74b925dbbbf83d8c220 +size 144081 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/IdleLookAround.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/IdleLookAround.uasset index 2c483ad..8a47e88 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/IdleLookAround.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/IdleLookAround.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:464595fbb622739fd9d6cd0d3cf3a0424afcf7adb628fd0ae13635b8b8781fc0 -size 153656 +oid sha256:e5c980fabe0a21b0a3cda8d3f10a6d49af9ae5e3626d0ddf5be47adda1023d94 +size 141693 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/IdleLookAround_Montage.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/IdleLookAround_Montage.uasset deleted file mode 100644 index b852c5a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/IdleLookAround_Montage.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9cf970637e84f47f3b3fc6136fb8d7199c8d769d070d8ce96271e8cc403cf5c5 -size 8916 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Idle_LookingUp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Idle_LookingUp.uasset deleted file mode 100644 index c8a1017..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Idle_LookingUp.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3a248474eb607276eb6391d87d83108c538b1ded30417919c90a938b7408bab -size 140742 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/LegsIn.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/LegsIn.uasset index a66cd07..f844caf 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/LegsIn.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/LegsIn.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:426ba1c6c9625250e6476b5d99deaa9ed156b7cad003f79ddf8485675cb75926 -size 147153 +oid sha256:e4f765cba113a81b200496570f0139ad1e63e0e9230e1ee5dd1651d027da9de2 +size 139408 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Lookup.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Lookup.uasset deleted file mode 100644 index be22dcb..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Lookup.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:966e06c2fc6d16157ef58662983ce39e7cfee3b42aa9e2730efa78d4a86e3a80 -size 144582 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/MoveProjectorUp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/MoveProjectorUp.uasset index 1773191..a44ff05 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/MoveProjectorUp.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/MoveProjectorUp.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e872383130afbba1f2d98162b43edf9c86e4c7b19ab6b1e209774360dcc270b7 -size 120366 +oid sha256:ba029fb1ca0d33739444691a79e9b6d46212ba3c611f13f4bc5a7efeab847a5c +size 116479 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenBackdoors.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenBackdoors.uasset index 4488f2b..7005118 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenBackdoors.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenBackdoors.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd0a663d91c8072e1d745b522b15e98193816f0356eadbb096295ffb08d8a8a7 -size 124115 +oid sha256:cd2e9a4842b33bda549613b074678e163e935065df629e3083e6f96532017539 +size 111283 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenBottom.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenBottom.uasset index 12d1c4c..faca246 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenBottom.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenBottom.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad015925fb89a9e367cb7f09243d400427d6cf40ccd1d0d350331725c6e67aef -size 121508 +oid sha256:3d8f89ed144d5338cea788e80d6eb982e83aeedc6da732490a9e6dbe31270629 +size 112524 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenTop.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenTop.uasset index dda12ee..e2e9f09 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenTop.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/OpenTop.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6113125835ddfc2d4350e783e46dfa267eecdfea6095b2224ab24d7ddd4f7ad9 -size 120902 +oid sha256:b7862f482c530b093265a140028def84bf1c7a507fbb0794266fdcc8b36dc8af +size 117010 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RocketOut.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RocketOut.uasset index 2d93b11..74946ef 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RocketOut.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RocketOut.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b14342fa5cd7d8c6febaad5cea1d54e2d1824dc19691604ca3155850dcfe46d1 -size 121493 +oid sha256:9cb47a3dc6174f05e41627c1e30679f6f5e45b4f0ed79b339356a0464f86c84d +size 112511 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeft.uasset deleted file mode 100644 index f39279f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeft.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e28e6766396f7970aace631ba5ff5d8ce3eda781a792ee6eafd47ddeee5dcf4c -size 139222 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeftInPlace.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeftInPlace.uasset deleted file mode 100644 index dd1af26..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeftInPlace.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a5e2db52c2b49134257299e3e413b5d09034d9a0ba0f4733f5d476a2662084f -size 140766 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeftInPlace_Montage.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeftInPlace_Montage.uasset deleted file mode 100644 index 9e8f0be..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateLeftInPlace_Montage.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:50b994221da2d01a23d8143af4bc5458c6f57c2ce9eeebc961c0b155ee07629a -size 9170 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateRightInPlace.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateRightInPlace.uasset deleted file mode 100644 index f0185fc..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateRightInPlace.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8cd52669bbfe66c0dd52bef635aee5fe68849830825c8b93bde3aeadc998dd9d -size 140643 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateRightInPlace_Montage.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateRightInPlace_Montage.uasset deleted file mode 100644 index 42b3f10..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/RotateRightInPlace_Montage.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:83b59ab9224678f0b43283a9e8d58781be5f96fc585e468d2a528de22a08d0c2 -size 9113 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk.uasset index 55d7acb..6fbe112 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b55fdeff60eedd8013ee2641fed2a914f0750e4abba2f1f4ec856d0574b84e97 -size 155920 +oid sha256:f781f55a730d34e0a0cf276fb213f6b05af1c1d5582dc4cdf50f7a469e05e7b8 +size 148173 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01.uasset index afd70b2..d194357 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e8071aa711b58105ae473bd61e80cd42ba728ba9b7e799e4e0cb7e1c278f32ef -size 155988 +oid sha256:e38fd53f59f24360ac23bb9ed4f32c8abfbb5d5303bd656d7de4d8c4252d82d5 +size 147394 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01_LookingUp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01_LookingUp.uasset deleted file mode 100644 index 5a0276f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Animations/Walk_01_LookingUp.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9fdab81899b597b534539b43d4a8366d95e018711c7bdb03aa09a6fb04dd7c8f -size 143308 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset index c6a0f1c..b3aa289 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/BP_Clarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d98d3c8627b57669e267f7edcc300fa5c6addcc3b9c08870de09ca94896577e1 -size 1111196 +oid sha256:23636b9029ace66b88bbebcad08ae0ef88b7cdb38b3b1cbb4ca690616f96b32d +size 357348 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain.uasset index a89d86b..057097c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5230544b51d7d92a054a1790db10b40382ed57f406aca0e4803c67bcc5d4d9a0 -size 2091140 +oid sha256:f5b4e2cb2d675f41b8f7981968e76099fa45ca465dbb54db24ff9ee8c3f4fd35 +size 2073881 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_PhysicsAsset.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_PhysicsAsset.uasset index 4f74be3..3337538 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_PhysicsAsset.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_PhysicsAsset.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec2a333ec10069424e7b6acf1310c433d8dd1f2a2a73fc446b8e4fa32198e958 -size 44336 +oid sha256:8e4513d55fb3e0e3f74c3875697b51ff14ba961508dbcf6a152c649ca1694c97 +size 42292 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset index 976c07d..69ebc44 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClariceMain_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ece7c579905e1820887fe2494516ae28efdf93c21cc7b7785046187c246b8f8e -size 14429 +oid sha256:f7fa2648f0c996f26aac02eed4f122972d2555671b2ed3becffd294beeda4083 +size 13976 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Clarice_BehaviorTree.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Clarice_BehaviorTree.uasset deleted file mode 100644 index 4ffe90e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Clarice_BehaviorTree.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1994623d1f43ec3f7ac6d46cd28222abb10e60b04fcfd94269ec7f503193193c -size 8813 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Clarice_BlackboardData.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Clarice_BlackboardData.uasset deleted file mode 100644 index c6d9ae2..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Clarice_BlackboardData.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:096fc6e44b7c5069b633a34c9fa2e1aa0c573bdbf1c3828b318dc7448f29a315 -size 2472 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClosedOverlap.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClosedOverlap.uasset deleted file mode 100644 index e51b795..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/ClosedOverlap.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:549c44b7a4be8711635829d19382d1a4c2d14bdbc1b8e4efef3b1c67763bf427 -size 2296 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/EClariceVector.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/EClariceVector.uasset deleted file mode 100644 index ed938c2..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/EClariceVector.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cad6ac802e6a7745eef1225be84e2ae771987af364ef74acc9a19ccec6e90549 -size 1900 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/IK_NewIKRig.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/IK_NewIKRig.uasset deleted file mode 100644 index 3515c6f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/IK_NewIKRig.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea837cedd924c9effd719a0872deed0e2f0b6e39a18d4ec5389a1983dfff6fdd -size 37491 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Tasks/BTTask_FollowPlayer.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Tasks/BTTask_FollowPlayer.uasset deleted file mode 100644 index b47a37c..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Tasks/BTTask_FollowPlayer.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0ffc9f456249b4d416a922f23ea052cc022e18f9e7c04f690feab7711b2e954 -size 62799 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Tasks/BTTask_Random.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Tasks/BTTask_Random.uasset deleted file mode 100644 index c423dcf..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/Tasks/BTTask_Random.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:661021ba346b5b034830e675406ab45334ba4a7fe0842ce2d30700cb4ef2213c -size 34728 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/TestLookAtTarget.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/TestLookAtTarget.uasset deleted file mode 100644 index 535c6f2..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Clarice/TestLookAtTarget.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65b065a6a8ced7f622047f229d5f5c35d2f9fd41c33b73bf2629a0f136867937 -size 22788 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset index c1c2d69..6d6350a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/CustomAIController.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d6883d566dc7dd29cfecab0b7f4ee7af476d78419efe0f1ce8ba19e59d01ab9 -size 244241 +oid sha256:a2e180be37a696f52b5bf00c3194f720fc169d80ead564a78a60312bee03474a +size 215383 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset index 1cff97e..b39d01e 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/BP_GilbertThirdPerson.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d27dd371cae2762cc770f3e4bbe2c6fd74dd4d947ab5858b174bd8116a56190 -size 201883 +oid sha256:da996cc89f890b394aac745f0cf1d6abbcc2487f5f123c5c6ffd9157379bd5e0 +size 210177 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__BowDown.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__BowDown.uasset deleted file mode 100644 index eaae60e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__BowDown.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84eb52c4f8d415b231b5e78b7e76629e05eb15d764e071138dc091038fca76cc -size 171085 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__DigOut.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__DigOut.uasset deleted file mode 100644 index 1e1332a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__DigOut.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32421924fd3172071ba1b2b4fe12f104d57dec189d8de6e74c678ca85f640fad -size 183724 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__Idle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__Idle.uasset deleted file mode 100644 index 2e3f2d3..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__Idle.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e8817faf0fbbb43569bb5820fe9609df5df3fadef35b3d94089e9a9f7003c06 -size 220797 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__Jump.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__Jump.uasset deleted file mode 100644 index 57162ea..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__Jump.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09aec0626c0e37ab8ff0a66f8e71078c381f8d407aee8819a57dbfe00428256a -size 138622 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkBackwward.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkBackwward.uasset deleted file mode 100644 index a43b46f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkBackwward.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:812f7cce4de7171c01d4c3c232ac9c2876fc81b48d1d72d7d461e4f3cf1a7739 -size 203823 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkForward.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkForward.uasset deleted file mode 100644 index 4d46a68..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkForward.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac71aefb3a839e2ecf522f7f430cb2e764dd185969e9f409b7165b572a9a732b -size 204607 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkLeft.uasset deleted file mode 100644 index 5a79faa..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkLeft.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0262533a9ac6ff7dbadeceed1fa6613adec35b8db80580e8b70014d9ab3f1c98 -size 199685 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkRight.uasset deleted file mode 100644 index db1480e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Gilbert_Actions__WalkRight.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b1b06f24a611bab4e4780bdd401a3d72260a2f467ce1651e8ce4822c24c488c5 -size 200591 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__BowDown.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__BowDown.uasset index 8f0c54a..2180722 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__BowDown.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__BowDown.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d77abe534975c64ab9f934bb91d1f668ea21cbd9a46f203cffffd9e5a0913e2 -size 168186 +oid sha256:086c6e7c9e79919be3ba2afdde2200617ec5a4f66e5f13523a0ed40486c56bf8 +size 169264 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__DigOut.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__DigOut.uasset index 7d9390d..1bcdfef 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__DigOut.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__DigOut.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9097da5c4d7713b7e89c7b48e8cab84e5aa763574e9e97f50460a92d72ed3b1a -size 179228 +oid sha256:1a9ddfbc8d4702a1676e8b4887f7827e1513600b6f032f87625446648651689c +size 181746 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Idle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Idle.uasset index 9ef57b7..d13e9a6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Idle.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Idle.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65c7fd2e1f41b518840089a80567038203952f7e246653b9be3d37751a78e70c -size 1709 +oid sha256:482e3ffd7858e13ec8884478025abd1c4173e6856d50b2cce3e6a77da9d1af17 +size 213657 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Jump.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Jump.uasset index 8fe6dc9..ae39fa0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Jump.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__Jump.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:64c1382dc15bafe5eb9950c846610d8906b1b0cea939b6b56736740689c66c60 -size 142006 +oid sha256:df97a36de90e1db04aa5ad852738fda3719cfa9ad350347c13fdfaae1990613a +size 136212 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkBackwward.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkBackwward.uasset index be93f3e..ca4f4ec 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkBackwward.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkBackwward.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:117cf82b5d5d8991c7c32226b5dc098931589dec2f4cd9d47dcc59a02f93b51b -size 1781 +oid sha256:76c38fae80c39b08feecdb3bc5a5341466c164d6d80e7dcb0b6e2cd20c42b5da +size 196656 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkForward.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkForward.uasset index fa50e3e..792c306 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkForward.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkForward.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3adfe4830c1ed6d2df89183431e0f9600129eb4caa14063389e5443d04e4710c -size 1763 +oid sha256:0217346f18f4ab8dc407580b80b49267ad1074d323fd0debf497b32bd252a4de +size 195831 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkLeft.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkLeft.uasset index adc5d7f..092afbc 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkLeft.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkLeft.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90e6b1d1778460b8b4acdde592deee9106bcd42ea1ce12e6b2ec200934c84495 -size 1741 +oid sha256:fd853012f614f8f119070d541fd697b6d0838e7eeff64809282123c9a6fd09cb +size 192590 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkRight.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkRight.uasset index 9994439..a187c22 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkRight.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Animations/Test/Gilbert_Actions__WalkRight.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e4b0e3cc2ae4c0c12c8a00a6cdbf68489bba9471f5647dceedf8be1041cf1cf -size 1749 +oid sha256:c60c18ed9e89007c38b010a15d484a747001aca98efe415efe8d683d5facac76 +size 192601 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset index eab5548..5e82818 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BP_Can.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e00562b9c33a6e4d28d089f4e0aa93ce222112ff1262bdeef140e78417d199cd -size 2477 +oid sha256:d2103d37669223d51ed3d07c38948d601a05ff20b512afaf5035c4061eb6a8b9 +size 31157 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BS_Movement.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BS_Movement.uasset index 74e221e..b2af729 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BS_Movement.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/BS_Movement.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6195916ace3ce6e81ae6516cc1d5f9dc5a6eb14dabff83b1f3a221f5af14e286 -size 19143 +oid sha256:31e968578200209ab96559c24288900ce1b111241c9ea4ca160376a720be7352 +size 19502 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/BP_Can.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/BP_Can.uasset deleted file mode 100644 index 225cbfb..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/BP_Can.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f6439709bd820622296772f07aa07dbfa693b470e74496c8a6386de72f48820 -size 39289 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Diffuse.uasset deleted file mode 100644 index b6b5795..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Diffuse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:340d1918bbf1acdbb26e25ed8c100f78bb022022e78b5554d8e58eed78e71a57 -size 4138662 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Metalness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Metalness.uasset deleted file mode 100644 index c9e28c1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Metalness.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2cfd6b240d3e7aa4b1eaac30a6828f2dd5e94f4b8eddd3b159ad32bd213b2953 -size 1200689 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Normal.uasset deleted file mode 100644 index 1d31619..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Normal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2bc12a3bee2b25e05dc42a53f9cc144eedf77921805705f24342db23bbcac470 -size 23131000 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Roughness.uasset deleted file mode 100644 index a590be8..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/Cube_008_Bake1_PBR_Roughness.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c08012318c7cc133f30723c5bc4bac367b1dbf6c5c99da97b86ae9329ae33e89 -size 1547188 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/M_Can.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/M_Can.uasset deleted file mode 100644 index 6a0188f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/M_Can.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e70a2c60bd366594e3a03f7c09883505402ef7bf55d97209b1f4410370d348f -size 18110 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/SM_CanOnly.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/SM_CanOnly.uasset deleted file mode 100644 index bbc2a5f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Can/SM_CanOnly.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e625ddefedc5617eb435955a0ba84fb2153fe6a2c8bf35cf27ee8c3397947d4 -size 448103 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh.uasset new file mode 100644 index 0000000..0b587d2 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fcf1745bf071502376bc3de90a959b4f96ee6e001a5d13f71f2a913e3d79bb3b +size 2409429 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMeshCan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMeshCan.uasset new file mode 100644 index 0000000..9886bea --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMeshCan.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0dc57cb7df5b057c04850dd0adcc2247c279f78c5751475d863ef6ce2903a573 +size 56353 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_PhysicsAsset.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_PhysicsAsset.uasset new file mode 100644 index 0000000..7cc544f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_PhysicsAsset.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8066791f09f41a7f398dc7c4711bdcb8277e3f071c8658f9d8777c2396a6381 +size 54403 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_Skeleton.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_Skeleton.uasset new file mode 100644 index 0000000..96d301a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/GilbertMesh_Skeleton.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c55d3722861500b885e47b78563fb70d2784297bb394cca4601f85008e9eb1fc +size 16301 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Actions__WalkForward.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Actions__WalkForward.uasset deleted file mode 100644 index 726a165..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Actions__WalkForward.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5926db24c959172709029c87db6da83e6c250155db47f7617df0d13a52095c4 -size 1733 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset deleted file mode 100644 index d64174d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_AnimBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96ce6290bad2b7c8d3bb0e290f85f519ed4ff5034f44b6f02bfea5160e3e3127 -size 629003 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_PhysicsAsset.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_PhysicsAsset.uasset deleted file mode 100644 index acb1325..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_PhysicsAsset.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:070ce551153a8d6c0417bb6026b577bf0021cad0e24aba07775d9fd4e0135c59 -size 50249 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton.uasset deleted file mode 100644 index 494ceb5..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a26e418d534b9fad2b67ba9957d2204c019b669a22730246f546d72dd2417d32 -size 16175 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset new file mode 100644 index 0000000..1e1421e --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Gilbert_Skeleton_AnimBlueprint.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cccc0e4562e5cf5e1215ee7cc4fa6be1ae18c92dc3466608769004d8c90b2754 +size 231618 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Grip.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Grip.uasset new file mode 100644 index 0000000..76e8e1a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Grip.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:003f8143d251e7d471f20820112446b33c19526414ec083ba3f231834097552e +size 23313 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/IK_GilbertIKRig.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/IK_GilbertIKRig.uasset deleted file mode 100644 index d8c610c..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/IK_GilbertIKRig.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b347e3ec6826cb54f450e7b18faecafebde04a10ff6208199721b1650633c4f4 -size 39453 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Material_004.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Material_004.uasset new file mode 100644 index 0000000..de452b1 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Material_004.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae1fad0d4ff1c82285d5647be69845737ebc3ba059bc15bf46d00cf79913f289 +size 52698 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/NavLink_AI.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/NavLink_AI.uasset index 8ba9562..1b32865 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/NavLink_AI.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/NavLink_AI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c9bb44f399d3b50145f47cc7baa87adcb4ed6b1022cf6f1b1f660117321c853d -size 2442 +oid sha256:6a37ca39f2f15b92250972760956b7fe26c1ba4340e619f2f1480e4f25677b86 +size 29450 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SK_Gilbert.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SK_Gilbert.uasset deleted file mode 100644 index 23d5b2a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SK_Gilbert.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b621315b91726cf9de10d219dbb22e6c86a154aa2c980252d8d2952eac5406bf -size 2147933 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SM_CanOnly.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SM_CanOnly.uasset deleted file mode 100644 index 4748a0d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/SM_CanOnly.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:df4f66d6746dc22ff7fb5532b7a3a5c8e10679af1b5220a5d1910fc3ab755f07 -size 1571 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Diffuse.uasset deleted file mode 100644 index 1befae4..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Diffuse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3b64b76e149bd225a64a595df1382a77a744bbce17ae68bb216c225d087ddce -size 14079331 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Emission_Strength.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Emission_Strength.uasset deleted file mode 100644 index 08060c6..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Emission_Strength.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5051c1e88a49218311b34cf1b48b7723e9322a85b512ba71750d3e0e4411053 -size 48657 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Metalness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Metalness.uasset deleted file mode 100644 index 45e2ebf..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Metalness.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4667bd28eead9e4ade6789251fddde7bed25cfd1fb08381573d4e49d5e6d34c2 -size 268772 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Normal.uasset deleted file mode 100644 index 4283542..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Normal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0dbd2b152f593879587cd4f2a9ae76bb6ffa035a95e71ede0e5e1cc351a45a62 -size 139775005 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Roughness.uasset deleted file mode 100644 index e8d91a1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Roughness.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cff18b70ead8316f2d4fb003a80c889576808e54f3e2bdb324e7d63d555913f7 -size 7658258 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Transmission.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Transmission.uasset deleted file mode 100644 index 0c2f2a6..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/Cube_007_Bake1_PBR_Transmission.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31d79f2790c52e0fb5bb374dd8a79bc0e80e79cb5ee4fa22d6e9c1221e9950ea -size 16747 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/M_Gilbert_Body.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/M_Gilbert_Body.uasset deleted file mode 100644 index 88cc251..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/Textures/M_Gilbert_Body.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39f29ca38c98edd9f51040f9fad3b8d34ef57d57f47ef760ae918b22c4ca4846 -size 29468 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/WatercanRobot3_Cube_008.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/WatercanRobot3_Cube_008.uasset new file mode 100644 index 0000000..1f086b6 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/WatercanRobot3_Cube_008.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0ff288497361a48a44df6efdcdd33a3d93b708c7852fb67e5780e4d76cbeda7 +size 1087490 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/gloss.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/gloss.uasset new file mode 100644 index 0000000..8d965ca --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/gloss.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48af078e8ab583aca90fcd202b2a9623faef148b147621dc8072ea17ba99cd34 +size 1483811 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/normal.uasset new file mode 100644 index 0000000..1ee4eb5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Characters/Gilbert/NewFolder/normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7879e557937d30961993a8892b0d2e83da85b602e69169ecad0c4bc2b75c8a23 +size 4511544 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_StaffOnly.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_StaffOnly.uasset deleted file mode 100644 index 1d121d2..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_StaffOnly.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eacb8929ab71d9bfe07ff5cc51aa617405bac2acabdeb833c49508ed3058b782 -size 137677 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset deleted file mode 100644 index 1e56113..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStall.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe75c8b1840ac7f9d9fb537d5697805d647b691a4fd238766636c3417539b0bc -size 292800 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStallLarge.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStallLarge.uasset deleted file mode 100644 index 73a5ee0..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/BP_ToiletStallLarge.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c254385314bb0e793656d5a01956788e26f711e44c2936d66d8a0b60191e0fe1 -size 71765 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/BP_BathroomCloset.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/BP_BathroomCloset.uasset deleted file mode 100644 index a5b02d8..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/BP_BathroomCloset.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3e79e50a48ee1d43bb5b833d3ce6d3522ba824ca9867b2331634333f73673b6 -size 46869 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset.uasset deleted file mode 100644 index e1cda90..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3d0fbd3c029ab128740cb1202871a7213344e83d4b7d5fb86002011172405ff -size 14106 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset_D.uasset deleted file mode 100644 index 327f6f3..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset_D.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a3bc9b67a3cc42c5aa772323efd8dab8bde48d960ac7474335e90d6044ae4e2 -size 4261203 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset_M_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset_M_R.uasset deleted file mode 100644 index 1927132..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/M_BathroomCloset_M_R.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ca0c57e84918a319d48bcefdc9434216127760af07076cca188f84dcbd29873 -size 882580 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Body.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Body.uasset deleted file mode 100644 index 8219ae2..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Body.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a462f041328a2e63531785587d6e379bce4b64dec130c8ff7f07da84783ff0fd -size 108422 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Door.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Door.uasset deleted file mode 100644 index ae720ce..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Door.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1444c3af2622d571fe5cce8e304ad6d359c9b246480717b02db28559bde3893c -size 95618 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Drawer.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Drawer.uasset deleted file mode 100644 index 1cb5c47..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Closet/SM_Closet_Drawer.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6de7c101fb909b265ac35f8f259fec6be33f07592fa893ed905345f391d73594 -size 99858 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/BP_Duck.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/BP_Duck.uasset deleted file mode 100644 index d6d360d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/BP_Duck.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c7a9fdddf3abdf576beae401f56219f577daf534e19d62aca52788b927d985c -size 126168 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/M_Duck.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/M_Duck.uasset deleted file mode 100644 index 5e25628..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/M_Duck.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aabd0c81c980d970fd520d27953bd7b7dff5c00d687a8ee7a8e066177a6efa52 -size 64562 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/PHYS_Duck.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/PHYS_Duck.uasset deleted file mode 100644 index 6017170..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/PHYS_Duck.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e354c097fdd5c28e31f631c0a61310a25c16967079ede2bdbff7ee3deb8f6b01 -size 7830 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/SKEL_Duck.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/SKEL_Duck.uasset deleted file mode 100644 index d204f18..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/SKEL_Duck.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9efbde083822ca8f2334b397d6d6da5ac686176320515ebf7de15748cbe86e9b -size 7571 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/SKM_Duck.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/SKM_Duck.uasset deleted file mode 100644 index 10c5a57..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/SKM_Duck.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:024890ac74c37d0ac822389b2953fb96f4cda6f8409524f9ac3279867bd6f5c9 -size 733257 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_N.uasset deleted file mode 100644 index 8822925..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_N.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76ec65e7bdc9c572fed79e292c451f34c68b96fa56d168aeed333fa20949bdb6 -size 11321425 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_R.uasset deleted file mode 100644 index 379b16f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_R.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b2e1fe0570e57695574b4b0800de891ffab2b51bb8edc7ba2ae7295180ccf44 -size 4226917 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_toy_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_toy_D.uasset deleted file mode 100644 index fe82fe8..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Duck/T_rubber_duck_toy_D.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4fa07c7bb81cd360a5e1a9efb17746b266406ea7bd73529aadcc8682291b142 -size 9540000 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/BP_HandicapHandle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/BP_HandicapHandle.uasset deleted file mode 100644 index 38df6e5..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/BP_HandicapHandle.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86272dfe4fec70703d9793f3ca8ffba08a038acec3c560a7880a3d75185b3fc5 -size 36953 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/M_HandicapHandle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/M_HandicapHandle.uasset deleted file mode 100644 index df4ecde..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/M_HandicapHandle.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3b86b066f5be9df9bb418becc087eb440e260dd43d019b59ffdfdf01ee8c90f0 -size 14537 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_D.uasset deleted file mode 100644 index ba85ab3..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_D.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70a7dc91c27de46c9ba5582ea17d4f7d0e2b30c7e0f7828fa1f928fb86cd5d89 -size 78576 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_M_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_M_R.uasset deleted file mode 100644 index 6fd4193..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_M_R.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:02eff0e604a667d0fa91de2b438bd979b3c2e4c5d22ca4107213dd0f324c2333 -size 760836 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_N.uasset deleted file mode 100644 index e914ff3..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/HandcapHandle/T_HandicapHandle_N.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:210a0b2e3437732df1b561a0d65e4b07d349297272ffb2d27fa84a36d340330e -size 17445785 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/BP_MovableBucket.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/BP_MovableBucket.uasset deleted file mode 100644 index abb02e6..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/BP_MovableBucket.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d7bec784b5d2235f4d0e2f72bcda8d0d261a7098fb7307670522d28c0f17ae4 -size 47261 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/BézierCurve_001.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/BézierCurve_001.uasset deleted file mode 100644 index 4aae404..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/BézierCurve_001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d7771437eaf6bbedba6b5deb0aef5fd6f05ec971b42355ec81ed0cf8c0c4789 -size 1689 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/MI_MovableBucket.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/MI_MovableBucket.uasset deleted file mode 100644 index c5b995a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/MI_MovableBucket.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:352c19834d0699ea801bc9d81681b7a0e4d0de90e5f738e44a12b5d1f5b5254b -size 14106 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/M_MovableBucket.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/M_MovableBucket.uasset deleted file mode 100644 index 50990d0..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/M_MovableBucket.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1004f96b3fe4426abfff8f134be6b4e00275d12c9778b9ea1513240e741c3a4f -size 22845 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MOvableBucket.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MOvableBucket.uasset deleted file mode 100644 index 4be8af5..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MOvableBucket.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7973d41628a2993607b0fe08ce4dfb34a78e5028e3720bde6028f94313b8b5cb -size 300638 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MovableBucket_Handle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MovableBucket_Handle.uasset deleted file mode 100644 index 3d08cbe..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MovableBucket_Handle.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14cdfa2e3c2cdce7278f65fc226cf2f54e4baf7815423f74834b292614d8edba -size 128087 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MovableBucket_Whell.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MovableBucket_Whell.uasset deleted file mode 100644 index 820207d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/SM_MovableBucket_Whell.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e38dfc0d95ee5c444cf0d6a5ccc2bcd774198349219b59f774bc5ff1aedba7c3 -size 81463 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_Diffuse.uasset deleted file mode 100644 index 9b3b6d3..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_Diffuse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a30dbfadf9aed53d2a789912d2bff5f74778f569f8b437f16b6140b4162dd05 -size 11317554 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_Normal.uasset deleted file mode 100644 index 868cc9d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_Normal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7533695f1b573750a08ef42db512b601f2bf56522fd73d93c37b5ab59a0b64fa -size 62952811 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_PackedTex.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_PackedTex.uasset deleted file mode 100644 index 73aaf01..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/MovableBuckets/Textures/MergedBake_Bake1_PBR_PackedTex.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d41f38523fbc82c56efa394b34d4c7e7bdf20c87c976003d3b2bed75bd3dc4bd -size 3564271 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/M_PaperDispenser.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/M_PaperDispenser.uasset deleted file mode 100644 index ce4ff7f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/M_PaperDispenser.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f99d1bbe73bde983f6f2e125238daff5f654d057f615bc389100e2903b75115 -size 67146 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Diffuse.uasset deleted file mode 100644 index 6d71bab..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Diffuse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e622be92999647915428b54d6a3476c840773b046c8815db12bbbb96d2e338c -size 1592 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Normal.uasset deleted file mode 100644 index 13a0d50..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Normal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b847f40e81181d573277f10f4cd7d8cf8eaae7e053d9d657162070d52d1c9d07 -size 1587 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Roughness.uasset deleted file mode 100644 index 9fcf509..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Bake1_PBR_Roughness.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:154a4c7233b83e243abefdb9fcd2c324fbb54f05e1c00e09e4047ae68e448df5 -size 1634 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Baked.uasset deleted file mode 100644 index 6538684..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/MergedBake_Baked.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e4a1874566bb330e28d4678fbaab0c27e0244ec352a330b8a7b73cd76916791 -size 1534 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/SM_PaperDispenser_Body.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/SM_PaperDispenser_Body.uasset deleted file mode 100644 index 55bcb0d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/SM_PaperDispenser_Body.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42fcadaaf1e543eaff7fc7d772e9ecb0009fed8ef4fda4ac76682eefa12a42a5 -size 99492 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/SM_PaperDispenser_Lid.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/SM_PaperDispenser_Lid.uasset deleted file mode 100644 index 45d5664..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/SM_PaperDispenser_Lid.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:773b28fe778a31d771742952e3f6e91d175dc5a1cb0d13301f3de1b07ca85197 -size 92961 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_D.uasset deleted file mode 100644 index 414b39f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_D.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a2fd244bb3172850cdbfb95ae75de1374648c1bc0bad3bf45f1475931d318d3 -size 1097742 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_N.uasset deleted file mode 100644 index 62d1564..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_N.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e31840003951bdab377f9839509483df3c0c406459397692141909bd1bb13f0 -size 8332083 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_Roughness.uasset deleted file mode 100644 index fdf1ff3..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/T_PaperTowelDispenser_Roughness.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:752c417aeffac8b19e016cd9c6f2a51221fe6323d4d049f9ca21142dd3f59c7d -size 337813 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_001_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_001_Baked.uasset deleted file mode 100644 index f28a808..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_001_Baked.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ac22609b582b4c9fdd75442a928cdca33b49b8be895ef14c8d2182dc9735cc7 -size 1531 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_Baked.uasset deleted file mode 100644 index 999c477..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/PaperTowelDispenser/model_1_Baked.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e872e79d2f138c8c8eb6cb8380a2593e50b6fe66045d9c4c038fd020ec38b931 -size 1515 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/BP_Plunger.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/BP_Plunger.uasset deleted file mode 100644 index 3ed7527..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/BP_Plunger.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f85e5ab0c954752235022292fba2753a9f2665ceef79c6e2561d2dde361e2943 -size 33756 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/M_Plunger.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/M_Plunger.uasset deleted file mode 100644 index 7dad2bb..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/M_Plunger.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8aadaadb6f8b0764b2391dd9a800513dd3808f8df700c859becb1db1d5821a76 -size 64916 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/PHYS_Plunger.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/PHYS_Plunger.uasset deleted file mode 100644 index 395012e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/PHYS_Plunger.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:647d6cf425dae0148603e657534cc8e94ae655a88d2fda96f7f16186e6d1a035 -size 10327 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/SKEL_Plunger.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/SKEL_Plunger.uasset deleted file mode 100644 index 230b301..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/SKEL_Plunger.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ccc458ad1f369232d97b7424c995da1ed0b5627c1e5ad59c523295084026d6da -size 7222 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/SKM_Plunger.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/SKM_Plunger.uasset deleted file mode 100644 index b7bd4f1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/SKM_Plunger.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:921828978a8e4afa12bfde0feabd413feb291d8d4e3d7d055259cfedcb36b946 -size 536735 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_D.uasset deleted file mode 100644 index 1f34ca6..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_D.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3162fee1570193b0ad937a0fc1bf93867c68f04ec52265ce5fb17e6c3b6d9ddd -size 20387236 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_N.uasset deleted file mode 100644 index 9a070bf..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_N.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:100536bbde9374b757e803ca6e7be91dd6c07dcbadbbb490068712c6ecf0e8d1 -size 50157341 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_R.uasset deleted file mode 100644 index 6e56077..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Plunger/T_Plunger_R.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08ce72fa47d9804daf1cfcfa9b404686c60c43904e7cac3de9028b5e27a9b40b -size 9568757 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/MI_ToiletSink.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/MI_ToiletSink.uasset deleted file mode 100644 index 04fc645..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/MI_ToiletSink.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8edfebc2633d617b736deb98592d5a745e0898b9bd8b8948d889b1eba350fab4 -size 64516 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSink.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSink.uasset deleted file mode 100644 index bd4f41a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSink.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d10c4f2d56a97d1c2b015b5e663c53dc758b79b2a0c9735d0c6869d818a007cc -size 319915 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSinkLever.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSinkLever.uasset deleted file mode 100644 index 0cc42c5..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/SM_ToiletSinkLever.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:702495f47c50447628165ca25bded444c65835157174bfadebf81c0fb722bf06 -size 93306 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/T_ToiletSink_DIffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/T_ToiletSink_DIffuse.uasset deleted file mode 100644 index bc2e8a5..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/T_ToiletSink_DIffuse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f23ee348164da089805eb828d216716cb8adc435d2603fe4ede80b667cd6115 -size 724876 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/T_ToiletSink_MetallicRoughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/T_ToiletSink_MetallicRoughness.uasset deleted file mode 100644 index ea7a11d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Sink/T_ToiletSink_MetallicRoughness.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2feda9d9a9fe93b55d7e377d8402c06cad1d021089106f1cb2d0c5e6d3dd571 -size 574016 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/Cube_002_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/Cube_002_Baked.uasset deleted file mode 100644 index 4687e4f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/Cube_002_Baked.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7cee96c15123414f82d5dad0ce473fde8c9c5236ff107a3f7b8d5c5fb3f1ba5 -size 85732 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/Cylinder_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/Cylinder_Baked.uasset deleted file mode 100644 index 3f37b53..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/Cylinder_Baked.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9d7c8bc4fbc688f86703609f900ff20aee561f762c22e6ee78ef9b54c765a75 -size 98844 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/M_SoapDispenser.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/M_SoapDispenser.uasset deleted file mode 100644 index 1d9119a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/M_SoapDispenser.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc332e5aa45acc03ff0b9dda399014ea01f97129b883788503179580a9d38998 -size 22865 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_Diffuse.uasset deleted file mode 100644 index 438e64e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_Diffuse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5cf06a4392d347d952408d4f5d9f0e12e1c29c237ef63266b0ad14c225fe7325 -size 2000327 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_Normal.uasset deleted file mode 100644 index 49a51bd..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_Normal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33775088d82465a559cdf268306908844d5159a587310ad4e05552800d68b9af -size 1564509 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_RoughnessAlpha.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_RoughnessAlpha.uasset deleted file mode 100644 index 955a504..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/MergedBake_Bake1_PBR_RoughnessAlpha.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a0544fad49f2ec09c01b172a3168da69d7d9a29e91d4c56227f5b5e7c687284 -size 513531 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/NewMaterial.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/NewMaterial.uasset deleted file mode 100644 index 29c70de..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/SoapDispenser/NewMaterial.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ba83be8420ebff1e78c3b07db8079f19d8394d78b1cad11c00b9dd8f351a721 -size 1449 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/MI_Toilet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/MI_Toilet.uasset deleted file mode 100644 index 873b1e6..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/MI_Toilet.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:22db941212bacdc7a43b85aaeab0bfc9ba0717e5c982223e811c3ae6e60776eb -size 66486 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_Toilet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_Toilet.uasset deleted file mode 100644 index d470ca5..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_Toilet.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b2f26009623770beb85d246f75c8161b284e879cbf1d0ae32e71449433fae11 -size 289442 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletLever.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletLever.uasset deleted file mode 100644 index 6288ffb..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletLever.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b149952ac21c949ee64c8b61111477183ec3c63d0bc49e0d5081786c437048c7 -size 82475 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletLid.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletLid.uasset deleted file mode 100644 index 029e529..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletLid.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f8b00e731b08caaab7edd24a9c7192f92eb46b0a64118d71bfd01f263c598c8 -size 126844 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletSeat.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletSeat.uasset deleted file mode 100644 index 7f6297b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/SM_ToiletSeat.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c3dd0fb7e39dcb5051b164ad8e25e00d0c0a0691dc5652cd6fe47dd9a85d6ea -size 113640 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_D.uasset deleted file mode 100644 index 3c55bde..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_D.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3646d23d5874dc5fd97db77b415c06ac0cb777ddc8324416fb28c60856a95277 -size 738607 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_M_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_M_R.uasset deleted file mode 100644 index bdfd486..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_M_R.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7713ef78e97d81da8721c6d76597ba82fa67eb0ee1adbf8a7cfc588047a5127 -size 1002455 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_N.uasset deleted file mode 100644 index ad9811a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/T_Toilet_N.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb3dad9c55193f5015d1837d43e088c7a0db2ea5dfbcdbe2c13f169db2ec8f99 -size 4272167 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet.uasset deleted file mode 100644 index 28a5b20..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ef340549a3a66587cc5c0f1892f8cad28e4920ed90974f40c3f6a39aee1da65 -size 1404 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet2.uasset deleted file mode 100644 index 9322d8e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd9048dadb1dc61eaa6870082c5627e035ceb20acbac1294609579e679af076c -size 1397 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet3.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet3.uasset deleted file mode 100644 index c668c02..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet3.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a4810dcde49822e51f8e529836b294dc0d03565c8b2666855f418d62259fa39 -size 1393 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet5.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet5.uasset deleted file mode 100644 index 3f2f332..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet5.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ce99624c3ca682d84582460127a5f75667d02787b33b73d332da895e8cb5a6a -size 1381 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_BaseColor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_BaseColor.uasset deleted file mode 100644 index 847af6a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_BaseColor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ed19d6e8efeade58e9ea6e0f56368c97a3a89c3bb2f60c6aa49c5c2e7e9697b -size 1428 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_Metallic_png-Toilet_Roughness_png.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_Metallic_png-Toilet_Roughness_png.uasset deleted file mode 100644 index 4c0de1e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_Metallic_png-Toilet_Roughness_png.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92dcdf3331ee35ad606d848a8974aef7b8ffcebe24a8b9e45dcf637eece5a6e7 -size 1556 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_NormalOGL8.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_NormalOGL8.uasset deleted file mode 100644 index 1db7c9e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Toilet/Toilet_NormalOGL8.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b69c37d1719a2b191fde1476d8b1cad41232fc472eaee2d0d1019fe05c920a52 -size 1433 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/BP_ToiletCabinDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/BP_ToiletCabinDoor.uasset deleted file mode 100644 index a973911..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/BP_ToiletCabinDoor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ad08adf74190e015fb72e9a49296cbcc26b8f015fa639bddc3c38c4af4a38505 -size 638462 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/ClosePin.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/ClosePin.uasset deleted file mode 100644 index 37cc7a8..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/ClosePin.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31ff1f0a97216404138989b51b4b558d702a1d356ccae744e9164170e4355884 -size 1410 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DeadLockBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DeadLockBase.uasset deleted file mode 100644 index 8594bb6..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DeadLockBase.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf8806749657653adf348359a1c3512654707442611d1a6ae942f48002fa5df9 -size 1446 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Deadlock.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Deadlock.uasset deleted file mode 100644 index 0528253..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Deadlock.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:50d59afc3a5fad2fb78a609ea564e1b5866f799a02bbdb13d932c77f0f3a7f2c -size 1410 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Door.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Door.uasset deleted file mode 100644 index 5f90fd4..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Door.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb6dc30bf5804dd59e481e74ffd33c01f3d81c246543affa0e57b56c0555d1e3 -size 1398 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset deleted file mode 100644 index c7d4be6..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2ab544e7c0c9c952743705f167d09daa900f4ecbeb8663121c10064564e6ece -size 2552 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2_Back.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2_Back.uasset deleted file mode 100644 index 23b3499..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2_Back.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4c90791cf05c7615d2a5fff6398449e47ca6d840ecb448789041747ffbdd1f5 -size 560221 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2_Test.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2_Test.uasset deleted file mode 100644 index 7cb090c..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/DoorActor2_Test.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d8de0ab506b736c754cf0541986b182e6b5f6c343da5adc3078df423499b94f -size 615356 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Frame.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Frame.uasset deleted file mode 100644 index 01aa956..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Frame.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:123626a993564a69e8340e6be084dd23f40482e14d0c7db561b81460672d1b46 -size 1383 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Handle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Handle.uasset deleted file mode 100644 index b14aad1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Handle.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f017037737a849736656c7cde81bed931e162f538745fb1b878346f495968519 -size 1432 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/HandleBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/HandleBase.uasset deleted file mode 100644 index 202d8c5..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/HandleBase.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb4b09acbee7e515139a319a770f841ffc93cbdd1e17e61fecd67751eee41dab -size 1472 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Indicator.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Indicator.uasset deleted file mode 100644 index ff952e9..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/Indicator.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bcf69810215e5e98017c394eea7f5757c411e2d97acc206df94d18e1d24a165e -size 1459 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/IndicatorBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/IndicatorBase.uasset deleted file mode 100644 index ff7b4c2..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/IndicatorBase.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5fe9fa30f41eb72a4f82a73db273d6115302a4c7bd9b95f31f91a420df290009 -size 1495 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/LockPin.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/LockPin.uasset deleted file mode 100644 index 032dc41..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/LockPin.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0bb5a8bbe5d545bae4c216e2e7d794789ac1fb13a83dbb859339feb2fac1be16 -size 1401 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MI_ToiletDoor_ToiletOnly.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MI_ToiletDoor_ToiletOnly.uasset deleted file mode 100644 index 3091f62..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MI_ToiletDoor_ToiletOnly.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10ff2012ac8ca5aa5faca34c21a757fc966c879b5559689f3e90529f5fe8a6f7 -size 10815 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MI_ToiletDoor_ToiletUrinal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MI_ToiletDoor_ToiletUrinal.uasset deleted file mode 100644 index 7b70463..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MI_ToiletDoor_ToiletUrinal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f3565db57c84a391898a6dc43444e99fba8ad0ab01369aadc69109d6c68c877 -size 10822 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/M_ToiletDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/M_ToiletDoor.uasset deleted file mode 100644 index 5baf634..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/M_ToiletDoor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:908bf37024a6b8d96a1f736f63cea4bfdc8fb6b307e43562d0cb316799462267 -size 64156 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/M_ToiletDoor_WC.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/M_ToiletDoor_WC.uasset deleted file mode 100644 index 31797e1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/M_ToiletDoor_WC.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc625299c6221662d8864fbc19b458d5b056f74948d37fcc602ca4419e1e3b60 -size 7483 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Diffuse.uasset deleted file mode 100644 index 2edc5e1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Diffuse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ee54d0951a4301fbf49571802700f4a3470692bd803f564ef8d407bad6e93fe -size 1520 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset deleted file mode 100644 index e4dcf81..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5426fdcf3ecfd81b7dba551e6573232bcc32f5fc648b60e53724ee41b723b9aa -size 1693 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Normal.uasset deleted file mode 100644 index 6bf8313..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Bake1_PBR_Normal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:459e7e527f569d896e4657913c450cef6c9e1975de3c8d77103b75586d3739d6 -size 1515 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Baked.uasset deleted file mode 100644 index 9270994..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/MergedBake_Baked.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9c8fe54a3f88f4126630866407b6e37813d7e53df3988b8866b896703a5b559 -size 1482 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ClosePin.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ClosePin.uasset deleted file mode 100644 index 1041fb4..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ClosePin.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:81823e00ea2e2ce63010c88d6cacd0a8c58646c7473b094d5ec6614a5f0318b1 -size 74083 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_Deadbolt.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_Deadbolt.uasset deleted file mode 100644 index 2aa07b4..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_Deadbolt.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3cc599f1b000ea84cd3ba0366d6ac0ae911ca355cb3aae97a865d8af826a7276 -size 80791 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_DeadboltBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_DeadboltBase.uasset deleted file mode 100644 index e199f17..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_DeadboltBase.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d50c7625d5b404f54d4109a8a08a672acbdf57e0592c0efa51ff79fb20e9e04 -size 80004 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_Frame.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_Frame.uasset deleted file mode 100644 index 3ef439d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_Frame.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9902d4c7e01ea64e749b9cc47109d0a0937e27749614a5a771e4ccec4da289ba -size 86573 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_LockPin.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_LockPin.uasset deleted file mode 100644 index 00ee619..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_LockPin.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:798493935161944b39d2ff97bb76388ffd323fcdd1eedd42613f6ec69a48dc2f -size 73783 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoor.uasset deleted file mode 100644 index 5d23766..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4f9a79ac2ec36466755e52380a397783f5e4a5bf839dda9b31cb051b3348db7 -size 85329 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorHandle.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorHandle.uasset deleted file mode 100644 index c0f9470..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorHandle.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7770d04832b5f91c6ba3d20810174e5c4c988c9b465bdeb3b69c3e3ea5b83a91 -size 88435 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorIndicator.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorIndicator.uasset deleted file mode 100644 index de3456b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorIndicator.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d77cc6a06b27f2cdc49eff13e0c975254f92135433c5be3403dfa5f10eccb68 -size 80706 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorIndicatorBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorIndicatorBase.uasset deleted file mode 100644 index 9e84717..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToiletDoorIndicatorBase.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a221b0de109b875289eff6e0a4bc179f313302756d22b88ad8734114f3b07f2 -size 85469 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToilletDoorHandleBase.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToilletDoorHandleBase.uasset deleted file mode 100644 index b82ad65..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/SM_ToilletDoorHandleBase.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c3026e5c115e80cc4b8b2ec7cafc70fe25b346976bae0f83e023ac97301e4a9 -size 87653 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D.uasset deleted file mode 100644 index 4396a5d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa6c5dfa95ec7d53432489214e8665ddaae78c6d83c9c0922192203fc0f8e6be -size 1494 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D_ToiletOnly.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D_ToiletOnly.uasset deleted file mode 100644 index 03aeabd..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D_ToiletOnly.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:145dcd221ebc9fcabcdb4ef5d102d0580c0cc3492b8eeabf6336aa1fb68d86ef -size 7655364 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D_ToiletUrinal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D_ToiletUrinal.uasset deleted file mode 100644 index 2d9491d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_D_ToiletUrinal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08af700c51177e1663188462a588441bc9d01520c6e105bd95ccce607dafb1db -size 7623946 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_M_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_M_R.uasset deleted file mode 100644 index 72e0edb..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_M_R.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf970431250f8ce004425afebd65add5a775c30c379685f2a412e45da90893e6 -size 284230 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_N.uasset deleted file mode 100644 index 0e2029f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/T_ToiletDoor_N.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d82641db03b84bc713edf75512cbbfe6eaeb0c72a4a5445739992b82206fa7d -size 78257169 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/ToiletCabinDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/ToiletCabinDoor.uasset deleted file mode 100644 index 0304b87..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletDoor/ToiletCabinDoor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70e387b4863fc5811f8fb943a8825205fdf0f931f43960a695a490e03389063c -size 2607 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/BP_ToiletPaperRoll.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/BP_ToiletPaperRoll.uasset deleted file mode 100644 index ce74fe5..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/BP_ToiletPaperRoll.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1df7d7423c42c84d1e31555a2dbc830fb73760a2b126971ae129d65d94f9a3ae -size 46258 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/M_ToiletPaperRoll.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/M_ToiletPaperRoll.uasset deleted file mode 100644 index b71a5c0..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/M_ToiletPaperRoll.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b40ee8720755f6b69e27234401d3032896f5266ffe118c6087a3a23102c744e3 -size 65223 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/SM_ToiletPaperRoll.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/SM_ToiletPaperRoll.uasset deleted file mode 100644 index 61c52d3..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/SM_ToiletPaperRoll.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e0f0beee9f6f7df97d8c2c8cce8a9fee3d5c2303eacec4a6fc2f32795f8d6d6 -size 95764 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_D.uasset deleted file mode 100644 index 52b6f12..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_D.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74601bf2d5224b82c65de42d1f196c2d9e7890d02dbfcb33191df3c07f81c2e6 -size 23087135 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_N.uasset deleted file mode 100644 index 59218fa..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_N.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7cb4eb25a0aae56dac9a362cd75de0dfafa707c757d3e582152c53358d11088 -size 34021087 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_R.uasset deleted file mode 100644 index 749edff..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/ToiletPaperRoll/T_ToiletPaperRoll_R.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:069ec4b291dfdf59262c36cd55665fa5083dc4e67b18b5f834dd5d7a0671bbce -size 6608663 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset deleted file mode 100644 index a65ca74..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/BP_TrashCan.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d912e8f640c27df661c1432cb2599ab951ae5fd9e6f3c5cb82f9f5cb5c4024b9 -size 149807 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/M_TrashCan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/M_TrashCan.uasset deleted file mode 100644 index fba8363..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/M_TrashCan.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6560d24e3eaa0b0bdd8ecdadcf254a81622f923c789cda4b5d2bd6188af795c7 -size 64177 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Diffuse.uasset deleted file mode 100644 index ff8f5a2..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Diffuse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6a7f3b752a7dd7b65760a35ea2243a4689486e6df6c6ff1e3a0848fadadd26e -size 1504 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset deleted file mode 100644 index 28eea42..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Bake1_PBR_Metalness-MergedBake_Bake1_PBR_Roughness.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0dd0b3fefe7b960fd3856f0a5920520b60a24037802c9f0399b0d93aec11627d -size 1677 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Baked_003.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Baked_003.uasset deleted file mode 100644 index fcd6f4d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/MergedBake_Baked_003.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:248a08a5fa91d08d7929b3ae894a0013a0d7f8d60f3c5078345accce602dc243 -size 1486 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanBody.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanBody.uasset deleted file mode 100644 index 19f4e58..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanBody.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0748713ff3a8aaf1e936b8da8fd90ddb0995e3a60f87a7d8b0117dc3a6d2c853 -size 130625 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanLid.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanLid.uasset deleted file mode 100644 index be66871..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanLid.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a536bbff5abf5f47f0cf3f38c0c24f5887b39a4cf2fbeb3a331a657e1bea3fc -size 134573 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanPedal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanPedal.uasset deleted file mode 100644 index a21fecb..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/SM_TrashCanPedal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ac243840cb989760675fdd801cf65609c7f71f6b730f269d7b4f72df37f0173 -size 75967 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/T_TrashCan_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/T_TrashCan_D.uasset deleted file mode 100644 index 564a15e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/T_TrashCan_D.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:737cb8edb75022b2123ab9042144e82ec53e94c35ac16c3011a71eeeed1e07c4 -size 63195 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/T_TrashCan_M_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/T_TrashCan_M_R.uasset deleted file mode 100644 index bbc4988..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/T_TrashCan_M_R.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:38ebcbba5d528b18e29fe06985fd0cdb810a84870ed17b88294a4ad6115e10cf -size 73921 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_034.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_034.uasset deleted file mode 100644 index 19cf5f2..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_034.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dcb04ac1bb8e7170ea423920664210922e58f45b125c32f64ac20d9bcf139ebe -size 1493 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_035.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_035.uasset deleted file mode 100644 index f87b376..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_035.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5d1699689e9f560efac4bf45d1fab3bd526c3e623fefaaa8ceba413fb5ce76e -size 1489 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_036.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_036.uasset deleted file mode 100644 index 41ed26b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/Trashcan/trash_can_plastic_0_036.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9102af9da577fc328721da2c50cdd88b9fc2f90d7198798899f8d949cc6151f9 -size 1497 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset deleted file mode 100644 index 8ed3506..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/BP_TrashcanWithBag.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:20b336d81747be4f9419415b7e894a222d78f56d3f1c8fe7c753299f8c106730 -size 129949 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/M_TrashcanWithBag.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/M_TrashcanWithBag.uasset deleted file mode 100644 index 1d8b754..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/M_TrashcanWithBag.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d00b329de825ca5c80c721eb5001a51e08954fcae8c6ce41e2772a1da93d15f -size 66002 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/SM_TrashcanWithBag.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/SM_TrashcanWithBag.uasset deleted file mode 100644 index 80966b0..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/SM_TrashcanWithBag.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6fb809e4b766a324df0b39bbfed5aaba0a0f0d099884fdf94510e10e750718f3 -size 162461 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_D.uasset deleted file mode 100644 index beebebc..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_D.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:014292940e96fa0df0bc871b096bd3687ef629edbd0ee25424065a964a3a1908 -size 319009 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_M_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_M_R.uasset deleted file mode 100644 index b901c52..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_M_R.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:26f355ef0642268920a88cdb9e506e6f1192eaf5ee974b956f7f10cefc1f3bac -size 1913292 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_N.uasset deleted file mode 100644 index aa68ff7..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/TrashcanOpenWithBag/T_TrashcanWithBag_N.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:48aea1273a5db8850e405d6b69f4c5faf3175b792c5a0c3202c085cd067ad094 -size 4096494 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/M_VentCover.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/M_VentCover.uasset deleted file mode 100644 index a5960df..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/M_VentCover.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e61096139319b1282a8bcbd819a422789085a9da26b594724cd411a341204386 -size 67529 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/SM_VentCover.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/SM_VentCover.uasset deleted file mode 100644 index 524acbd..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/SM_VentCover.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14d5875a102d14234281dc72b1425a6c9a81c4f7fe3f3f21c9a1f4187ef451a1 -size 94962 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VenCover_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VenCover_N.uasset deleted file mode 100644 index befaa74..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VenCover_N.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1c3a2e19480d998df93516aec2ea9320e1f3195bdad89948077ebedcd17cc0cd -size 3246414 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VentCover_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VentCover_D.uasset deleted file mode 100644 index 5ba4f3a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VentCover_D.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4a68859e8f6958a8dfbf30e4eac66af04ef7e2c4870426f06dcde17d82a2cb0 -size 1356295 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VentCover_M_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VentCover_M_R.uasset deleted file mode 100644 index 7baf58f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/T_VentCover_M_R.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4653d0c108d0d67989a00a2cd202f88cdd25a0e2e2d6ed90787df6d934a0061c -size 666948 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/VentCover.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/VentCover.uasset deleted file mode 100644 index 314a729..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/VentCover.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f5c6a71510808f5ab32db0cdac599e88a6b0be6fb6e4feee82ea3732dd46735 -size 1415 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02-modular_airduct_rectangular_01_vent_02.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02-modular_airduct_rectangular_01_vent_02.uasset deleted file mode 100644 index a39a9ea..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02-modular_airduct_rectangular_01_vent_02.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61378a0b96f6c9e86ebacde1f3fe9bdcc44e1a81f4e1ad50a03afa4ac62e6645 -size 1765 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02.uasset deleted file mode 100644 index fd0fb65..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c766837fff783fd5bc784388f0dbc579ad3a37ff54ab47d11708511872355e22 -size 1558 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_021.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_021.uasset deleted file mode 100644 index 6ab9a86..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_021.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5fc68b71f3bd27834ac4b2d4489c151a7177a62bd51fc36f6342ac92e4fcff33 -size 1567 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02_001_Baked_Baked.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02_001_Baked_Baked.uasset deleted file mode 100644 index f0b6f71..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/VentCover/modular_airduct_rectangular_01_vent_02_001_Baked_Baked.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:468a4219b337ac251ab28fce8e6db09ef0c98e0f89716f3ca747ac6921cac64d -size 1664 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/ABP_WetFloorSign.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/ABP_WetFloorSign.uasset deleted file mode 100644 index 3fc08cb..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/ABP_WetFloorSign.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c8a0bac8e72b4263fa9a453cea999c65b5a2da0b944d54e9646c1f5183844a92 -size 49644 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/BP_WetFloorSign.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/BP_WetFloorSign.uasset deleted file mode 100644 index 7c779b6..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/BP_WetFloorSign.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5b873e33afe28a388a01b740e74ec65fc577a315a6b989f18ca6e99b447e8e1 -size 124398 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/M_WetFloorSign.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/M_WetFloorSign.uasset deleted file mode 100644 index eb01104..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/M_WetFloorSign.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5aac70cb39ae83a091ab2e1097e5e82425116d46d96956b34619d130f5af9c2a -size 15852 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/PHYS_WetFloorSign.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/PHYS_WetFloorSign.uasset deleted file mode 100644 index 50fb549..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/PHYS_WetFloorSign.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5c8a0cc9330bbb0d4bb310c565a21437439ae6e5d464d12e691ba89f9cb6806 -size 12933 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/SKEL_WetFloorSign.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/SKEL_WetFloorSign.uasset deleted file mode 100644 index 6111fb8..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/SKEL_WetFloorSign.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2cd2b8bdbb32ac09b6346f6a65b24e7b5f8c5d1022e31f1e08145b2d0eac8ab9 -size 8264 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/SKM_WetFloorSign.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/SKM_WetFloorSign.uasset deleted file mode 100644 index 6a51c1d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/SKM_WetFloorSign.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:002b7dc2d51d5b8f6f5ea5029469bda56febaa1e25c636b99bcacc15d8759d8e -size 127281 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_D.uasset deleted file mode 100644 index 3b60f1f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_D.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6367175e280dfd147c0aef14c0a0844730fbee73bd8865a01e22ecb6219e5891 -size 373606 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_M_R.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_M_R.uasset deleted file mode 100644 index 1b32c8a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_M_R.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:083cdc77a5bb32fd9a90c21f0d8f4a06e135565174dc13a7237d8c55e8640547 -size 1323627 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_N.uasset deleted file mode 100644 index 6946bad..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Bathroom/WetFloorSign/Textures/T_WetFloorSign_N.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58e63a00ae85aff1372bb2a2478a4196982ccf8066cf22228dc20453cfd74cd8 -size 675551 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset deleted file mode 100644 index b93c99b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/BP_BaseCaptcha.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5efe9705e1f1e2d986af8e1d6feea02bf7e59b6838179d62bb3383184ad773c -size 340587 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha.uasset deleted file mode 100644 index a072b5d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ea6393212d38bb403f3523378a7c0e1b6e11a9b57459c290c2cb0a31cf58585 -size 29196 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha_Inst.uasset deleted file mode 100644 index f415b93..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/M_Captcha_Inst.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73aa038bcb57c3f3583dabd4cf34eee78bd4101b1c3f81ed79ebc0270f6695a3 -size 8621 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/Untitled-1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/Untitled-1.uasset deleted file mode 100644 index 961edbf..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Captchas/Untitled-1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7dcba5ff6c73f919049b9c4e9303e7c1e5627fa5c10b54239c24832b8df46181 -size 956959 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset deleted file mode 100644 index 3760a2b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/BP_Cardboard.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d09d41cf31a87479fecc70055fa9729a6bc6d1d676cc0640557c1f452a8fc087 -size 77858 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/CardboardBox_01.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/CardboardBox_01.uasset deleted file mode 100644 index f1d51e6..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/CardboardBox_01.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8e6f49fe32b33551c12bad3f9a3cd69513e5f3addd10eb3932d747d288a666d -size 82165 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Materials/lambert1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Materials/lambert1.uasset deleted file mode 100644 index 3c71059..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Materials/lambert1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b4d16d170b75937d5eb5dbc1e2c51aabe5ee3c380e1939f80add9f5a47c297f -size 65548 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_baseColor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_baseColor.uasset deleted file mode 100644 index 8ddf371..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_baseColor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d99bedada861e7535b71a2e08dd34cc22a96c19997a4bb3390a6c325b1fc676 -size 3190033 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_metallicRoughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_metallicRoughness.uasset deleted file mode 100644 index eee0625..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_metallicRoughness.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:69b1a5f4a877a1ec5c76a44d5f8d7fa4ece62d5900dd08875de5148e9e9df6c8 -size 2485800 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_normal.uasset deleted file mode 100644 index c105300..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Textures/lambert1_normal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a44e4eb2fcdc78271cda9e755e98c4b76c3d0ea5d9e71477267f777797f8e62 -size 3364415 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Var1/CardboardBox_01_Var1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Var1/CardboardBox_01_Var1.uasset deleted file mode 100644 index 775cd8f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/CardboardBoxes/CardboardBox_01/Var1/CardboardBox_01_Var1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c54857624e8c6fe86867e9b63946b662f83ac5a116b86fbaad9179239fcbd6d1 -size 82540 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Deco/PictureFrame/BP_PictureFrameClarice.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Deco/PictureFrame/BP_PictureFrameClarice.uasset index 9973710..f604563 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Deco/PictureFrame/BP_PictureFrameClarice.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Deco/PictureFrame/BP_PictureFrameClarice.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cbcf250e5f047d05b158291998a0336f80ffa5fe334a7b7aef2edd540fa30381 -size 103271 +oid sha256:144bb53a2b23bdc756971018d2466787d61c81cb3d7f8858eb8ad1d6fb7f211b +size 47060 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset deleted file mode 100644 index 7c3e32a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/BP_CaptchaDoor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:69d4d9f482db7ea1bb883590f35373bc9a9d275156a30eec41deb513e809023f -size 129288 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/M_CaptchaDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/M_CaptchaDoor.uasset deleted file mode 100644 index 95cab08..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/M_CaptchaDoor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1e287bedfaca934fa3984862c03dbc347bb6a1511f65a701c7a097d1aecd3986 -size 16216 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Diffuse.uasset deleted file mode 100644 index d5ba84b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Diffuse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9a843c69ddbcdfd3751c2c6eba86eaa7c3b81857b40bfc2f2964a33b5c1a0ce -size 19640873 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Normal.uasset deleted file mode 100644 index cbe5a4b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_Normal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a566ab3ee58e407ce98c7def0b32eb83ada47aad3b5fd40257d51c6a1071004f -size 64747933 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_PackedTex.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_PackedTex.uasset deleted file mode 100644 index 69ffb70..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/MergedBake_Bake1_PBR_PackedTex.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b46d18072e86d8bec1e3ffe4298d390b886fa729afd031c21b1a64272b82677 -size 16090211 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/NewMaterial.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/NewMaterial.uasset deleted file mode 100644 index 4f7096e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/NewMaterial.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fc85749e5d87c2e87061a1c1dc9e1d6e7b1fad2d00b0f303f3c2c6b0f686bd91 -size 1417 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Displays.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Displays.uasset deleted file mode 100644 index efeeb0a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Displays.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a09a01c5e74a1c2521dac9d68af2519b1f93cd7967c15a82d9a03f0d45069436 -size 87958 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Door.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Door.uasset deleted file mode 100644 index cb58846..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Door.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e74b50a8f07cb48d5b4e50152804a063145fc119b72eff005f5aaa9f3de379f -size 72535 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Frame.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Frame.uasset deleted file mode 100644 index daa9b1d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/SM_Frame.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d23dc77ba98e6e876356c13af7ea6d6619ea0b9142ca3a12013d4ce423a30bc0 -size 80346 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/ScifiDoorButton.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/ScifiDoorButton.uasset deleted file mode 100644 index 54f7f00..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/ScifiDoorButton.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61ad8bcdf99281517a13dd29ef585fb01a40d4ec2d97ef79f1a420eda36601ca -size 73811 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/asd/StaticMeshes/asd.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/asd/StaticMeshes/asd.uasset deleted file mode 100644 index 204bb75..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/asd/StaticMeshes/asd.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e0afb1c8e9d97bb8260c947875ce6528c83f2f85b1e81765c20c1d9634e0a9b -size 61535 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/asd__2_.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/asd__2_.uasset deleted file mode 100644 index 1a22e36..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Doors/asd__2_.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73191cafb72b2e7c4942580e85e4a6b846f5b13e1e5350a82df0e2badea4a3f4 -size 1409 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Generator/BP_Generator.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Generator/BP_Generator.uasset index c716d91..7d187ba 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Generator/BP_Generator.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Generator/BP_Generator.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60071572f670ee4b8a237c196a577737790eeaec6d749e346fbe526212ee3b3a -size 46595 +oid sha256:8b3775c2e5fd2ce7f610fa6612732b551cc0ac839bc7d9e7c4d3a6cee4476148 +size 46325 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset deleted file mode 100644 index 4f8de0a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/BP_NitroScan.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c1b05223147020aaac1528037d68cdcaab7a81214468a7470d169c9d3439f66b -size 240074 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_NitroScan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_NitroScan.uasset deleted file mode 100644 index 7abc6bf..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_NitroScan.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0132f0d2334a9c3d5ee764d2dd521e20b7aa4fc82dd13dc2cf6ada74826c6485 -size 21926 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_NitroScan_Screen.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_NitroScan_Screen.uasset deleted file mode 100644 index 635b566..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_NitroScan_Screen.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edc4d0ef8d649ef4cfcbcfff7f900043b1586fd9bc4229f5c89ad9b55592e8f2 -size 15198 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_PP_Scan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_PP_Scan.uasset deleted file mode 100644 index 53496de..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_PP_Scan.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:897e1185ae3b698e44a6db113da37a32b1e10475c842b32e87240b5a972762d0 -size 44100 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_Scanline.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_Scanline.uasset deleted file mode 100644 index e9b718e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_Scanline.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ba5344a841afad2eedb7d23d8e8686603d7865b40e6e615db857b9e157e5273 -size 27612 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_Scanline_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_Scanline_Inst.uasset deleted file mode 100644 index dd93261..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/M_Scanline_Inst.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c32037bc4c8d5c615c7b44caa4280e3f46458f559bbc0fc23ace7dd742ecf5f -size 17287 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_baseColor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_baseColor.uasset deleted file mode 100644 index 21a5513..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_baseColor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86ca441403280ce518cf529ebc947983b660ed89098b3215530f70ab49c45512 -size 3438981 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_emissive.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_emissive.uasset deleted file mode 100644 index 97395e5..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_emissive.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a491eaf8ca2969d963a5f83bf0365ea28814b6168d27087a9a14d4ae5afa6835 -size 165672 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_metallicRoughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_metallicRoughness.uasset deleted file mode 100644 index f27aab5..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_metallicRoughness.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3116e8ee42c0431b5ba94a6034d756d9ac7e0a310b5568e7f0b4adcd2f03ec3 -size 5424932 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_normal.uasset deleted file mode 100644 index e1826c3..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/DefaultMaterial_normal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:68643ede81ef33be54163e3671063146817c158696902ec6ce82e4030f5ab4ea -size 5799611 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/NitroScan.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/NitroScan.uasset deleted file mode 100644 index 6e33c07..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/NitroScan.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5fa3e04850e3c20e3e2b553146960180f766724c01e0d915efb31cb9abd15d47 -size 56783 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial1.uasset deleted file mode 100644 index 0472f4c..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:42c0e0af14e2b57d4a6387e71cde9e0a6112e0ebf2ccd9ce7dade5e9c84eb06e -size 67242 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_001.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_001.uasset deleted file mode 100644 index b72d66b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_001.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8b1b27fba05f864dc160fdbcf12a3644f1f0d3f10eae8a73064de6831a2b409 -size 74455 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_002.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_002.uasset deleted file mode 100644 index a937516..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_002.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b626ad9a0566e8a12cfdf2781bc1daa20abc6d249ebff58187f868af709b91c2 -size 72493 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_003.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_003.uasset deleted file mode 100644 index 7bec0d4..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_003.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c9ea6c56f6f8365ba3f26e8c84a4dde5f61383c164158126226de803c5768f96 -size 71584 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_004.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_004.uasset deleted file mode 100644 index 42669fb..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_004.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d28e2866460439b10211a8420e31face4f5459e2b8cdcf4dfbc70fa44cbe8c78 -size 69581 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_005.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_005.uasset deleted file mode 100644 index 99ab14a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_005.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a2caed6311995f1bea2038f725bd806afe6b87ca178ca7708776fb99965813d -size 75863 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_006.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_006.uasset deleted file mode 100644 index 261f55d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_006.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a60806ea5563feed082c14956ed13ddc2efc77e91045dd12df911e17b691d419 -size 69490 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_007.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_007.uasset deleted file mode 100644 index 671ca42..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/Mesh/defaultMaterial_007.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f8f2d4e14f2f656656acd0917dfb9d7df9474c8bd4c5eb708898a6b34486a1f -size 268855 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NS_ScanLaser.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NS_ScanLaser.uasset deleted file mode 100644 index 9bcd45d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NS_ScanLaser.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:982cd084209ecd9553adc4ef632d5eb1390924b8c0e3991be946a824c9d78dbb -size 1351 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NitroScan_RenderTarget2D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NitroScan_RenderTarget2D.uasset deleted file mode 100644 index ce517ea..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/NitroScan/NitroScan_RenderTarget2D.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d85dcdccff3baa6d57ca5e71c000bf72eb508b8114f8ef2e5f6167b94401aaa8 -size 4982 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset index 737edb7..690fc74 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Cassette.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3a368ce33994c1d48403c6702ce1c09d37c43cd5e1382b355c7c7d8989d16320 -size 96396 +oid sha256:be5374bdc0c866347ff1065558c16f82aa627ee3310ec81812e475a4f2e325a2 +size 50891 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset index 76b3595..d3da03a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/BP_Recorder.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f4234dac7525dbfafe93f936fdff323d3aba033ab449c0dc2f9996f8511dda9 -size 465240 +oid sha256:817d63d7f4fb2bbe7530b2df0107cc16c8358ab83ca38b5a977ae8c1a245f567 +size 260751 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/lambert2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/lambert2.uasset index cd9e88d..035ac75 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/lambert2.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Electrical/Recorder/lambert2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:685dcfb7b47361e62239072beb6c8f0642df009652acca2e11b987d184a69c10 -size 25061 +oid sha256:56cf73229be96ef550ac8572e63e6e884d3485a76b895abd85d1a2f8abbcfbd4 +size 25346 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/BP_FreezingChamber.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/BP_FreezingChamber.uasset index 36f5b81..fe1c876 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/BP_FreezingChamber.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/BP_FreezingChamber.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a4f9750441040040acf16f0a0012cc37b79fba1f3d510642f62469976e5c119b -size 70464 +oid sha256:142e0b4e2b87118cc699d12f63ba6e9c9a6193959397a03a0b6259bb302b191e +size 40870 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/Material_021.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/Material_021.uasset index ab2ab8a..f782c18 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/Material_021.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/Material_021.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bcab3301b43c02a2728a1cc5054849c94b2aeb679541d34c7226f59b4fa036d7 -size 74303 +oid sha256:b84dca2cbe5146ac7fd0207c863d0afdaa0e0c97170e3edd07af6e4f5c2ac537 +size 73517 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/Tank/M_Tank.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/Tank/M_Tank.uasset index 55613b4..4f7ca03 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/Tank/M_Tank.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/FreezingChamber/Tank/M_Tank.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c8a3118a5bdb923f5a9e6585b22d3d3f65d2200bf447c3c71f7c4ef93c89364b -size 18668 +oid sha256:060c695f4e0d08eab3b73cf37b349ffa853d6b1f596f63e5276111e5ae4ec224 +size 19067 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/BP_LibraryCabinet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/BP_LibraryCabinet.uasset index 8596877..cf94667 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/BP_LibraryCabinet.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/BP_LibraryCabinet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:84fb8b41865ef0ee7a3fa96896cc0b00c714f411d66dffa7de7feeacdde01c1a -size 114470 +oid sha256:107879bebf9f2024316d2bdd00cc979558d935e255c039f8e20fa1bfef0a949e +size 113928 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/MI_LibraryCab.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/MI_LibraryCab.uasset index c59e8d0..8eeb09f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/MI_LibraryCab.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Cabinets/Cabinet_1/MI_LibraryCab.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e5a7dc82132312d38f6b8d3b82da3d98f9977ecaa880bf4120346b0fe6e68a0 -size 25364 +oid sha256:3171c5301373268d78c2a5be30b04559981e9398069bc29a02c84df36b3eaa59 +size 24723 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Chairs/Chair1/painted_wooden_chair_02.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Chairs/Chair1/painted_wooden_chair_02.uasset index ab0f448..c7c65db 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Chairs/Chair1/painted_wooden_chair_02.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Chairs/Chair1/painted_wooden_chair_02.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bbfa33606256d82415e4307709ec66d40805853acf010070907de70efdb41e03 -size 65301 +oid sha256:511e1783556469bdd20aac67909cfd19a9a0eb0b56acdab618ae8b3624f29bf6 +size 63276 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset index aab8616..7e1b998 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/MetalDoor/BP_SliderDoor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ac8d8b42c93cc2b7d7c11a967b134f6b5160fd5ba23aa527c7800cfa31bd2be -size 288742 +oid sha256:6551f28d6cacb11857b3223733f99216655c6b0a0e848fef3ff5a0da4f53f557 +size 280020 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/BP_SlidingDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/BP_SlidingDoor.uasset index 11cd790..1ffe1e6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/BP_SlidingDoor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/BP_SlidingDoor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c41d3513205be2d052c7a1b9e3455ac2a48cce240af3323fc42031594510f4f -size 39205 +oid sha256:d6616cb5de102068f6c6722885fb0ac6e687ef1c4dbf440596ca7d56b764891d +size 39357 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/MI_SlidingDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/MI_SlidingDoor.uasset new file mode 100644 index 0000000..5dcdead --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/MI_SlidingDoor.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83f6daf1bee9a0014e6c09f2f67282d5f6587cd21e522891d104b078e43f7371 +size 15424 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/M_SlidingDoor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/M_SlidingDoor.uasset deleted file mode 100644 index 5c26596..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/M_SlidingDoor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2554aa57ae222edb9267ad1a18f81325c4dc7d7814c7b37b023256b9abe7985 -size 16862 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_Diffuse.uasset index 03b414d..e4e271f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_Diffuse.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_Diffuse.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b944cf74035fb69298bfc29bd44cf91af439ef7b59da189e92cc0a8179f51a5c -size 26718138 +oid sha256:4ace3f897d570b47292e67df0f27a86c32a40e9d805a835f77d321c8d162af9a +size 25253822 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_MetallicRoughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_MetallicRoughness.uasset new file mode 100644 index 0000000..8aaefdf --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_MetallicRoughness.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b756cdda602969353671f4b72d441583b87e867ecdb2aefe418b3519895dfd0 +size 12201623 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_Normal.uasset index 3eab304..d9fe162 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_Normal.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_Normal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b3dc68088acef7e67ac5a74e4d8b96334ccf1ee0c1da8c5bed09dfd44f4a3ba -size 88975053 +oid sha256:d5c243668c1c1b432d7a33af11f8ff650ffb05ced4b5c4c2a0d5a63f9ddc8d62 +size 82134236 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_PackedTex.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_PackedTex.uasset deleted file mode 100644 index 14c7000..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/Obj_SlidingDoor_Bake1_PBR_PackedTex.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f3c99d318fe22186943191482ad9cae326b6777d408e6eecb474b71c2633b85 -size 14557895 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/White_001.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/White_001.uasset new file mode 100644 index 0000000..19fe99e --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/White_001.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3522dc4d0a037518e8ab01d1b3a06ef6931af058eb4fe38ba303567e0c57b924 +size 53412 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/sliding_door.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/sliding_door.uasset index 8da5608..71561de 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/sliding_door.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Doors/SlidingDoorA/sliding_door.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f345aad95f6c224ca7be21f44ee59338b03dff5a482447d807e124948baff7a0 -size 88357 +oid sha256:7dd74cfdb5336f49e5798289692ad9299588b92827f2f76e16b97cd6a30f8520 +size 74013 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset index 6d11365..a965466 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/BP_Kitchen.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b62d4976f9cb36980f2d6104489973277ae70b34979c6928b6d040900367f6d5 -size 226688 +oid sha256:b37894731dbfcea4290ae3e6a224a268b37f800ebcdcd1649a081b51209ba702 +size 229879 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/MI_KitchenAtlas.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/MI_KitchenAtlas.uasset index de58a73..e7dc4ce 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/MI_KitchenAtlas.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/MI_KitchenAtlas.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7eb29496224b2dc2bcf237191aa4ae0479f6fa01097934ce87fd14b6321ecd9 -size 25816 +oid sha256:e709128c36a5f57b3d4290a9a5c58675acf24a6896036f732b01661df63ee0e5 +size 25213 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/Material2_287.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/Material2_287.uasset index 8ecaffb..f6ae0ee 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/Material2_287.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Kitchen/Material2_287.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d2b9560f35bc67215d613bffc235b171a737e6430704a00f9a57230163d7b91 -size 341748 +oid sha256:eeef1d3a94029ed4e161982a4c234151e3a34efa3372f66194a95fdd74b02039 +size 343268 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Tables/Table/BP_RoundedTable.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Tables/Table/BP_RoundedTable.uasset index d3ffeda..e9d9b42 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Tables/Table/BP_RoundedTable.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Furniture/Tables/Table/BP_RoundedTable.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fee5ef683ec953f23a8a86837c9f63b094f237ae39e749ab6bf55b96f097b8e0 -size 36616 +oid sha256:82061b7fecc3cf71c7211f374818cbf54a36a131508c593e6487853d5522b71a +size 33999 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/HandcapHandle/Cylinder_002.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/HandcapHandle/Cylinder_002.uasset deleted file mode 100644 index d2d9e5e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/HandcapHandle/Cylinder_002.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:70367f3f45256679ccd2681550f4b2cd1580872ac47f8fa2430c140227fb6cb0 -size 96068 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/HandcapHandle/HandicapHandle1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/HandcapHandle/HandicapHandle1.uasset deleted file mode 100644 index 97b02ad..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/HandcapHandle/HandicapHandle1.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb6cc1b1dc68c69b6a3182acabd1248cae8ed6f8010378d0460ec18854f0233b -size 86928 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Letters/Letter_1/Letter_01_1_of_1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Letters/Letter_1/Letter_01_1_of_1.uasset index 224d884..bc83a26 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Letters/Letter_1/Letter_01_1_of_1.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Letters/Letter_1/Letter_01_1_of_1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c178d2654ecd50e4ddd74ee2f8734e560ba430965e9e6fcf3839d0e9702ff569 -size 54370 +oid sha256:9e0788c5bf4617fc80cb13236feb78b8b49dae7616931228fabb1454dc8d3ce3 +size 54872 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset deleted file mode 100644 index af8c12a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_OrbComponent.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07023f1cbd02bd8a68549deadde9213d790d51035e4582a1ee45a84565b0b342 -size 22422 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset deleted file mode 100644 index bcae9a2..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_Portal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d145403cf122c79f868d774d6261eb80f9440e7cc0e7d5c9fe384147cc389069 -size 351325 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset deleted file mode 100644 index 5cb9772..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/BP_RiddleComponent.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ab9799b78a73faa61803ed92cb4afb4d3770dd06f826c5a51209ea4f8ed1139 -size 177604 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/M_OverlayLoading.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/M_OverlayLoading.uasset deleted file mode 100644 index 99b96a6..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/M_OverlayLoading.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e2abddea0a443ab4942c12e8dbcbd0fdd659585b79bea9c5d270514ab925f6d7 -size 33869 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/M_OverlayLoading_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/M_OverlayLoading_Inst.uasset deleted file mode 100644 index 1cddbd8..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/M_OverlayLoading_Inst.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6e18e73d9329d8fe4ec1c0a593610e758778dfa2004e43dd4c16a71029357cc -size 9339 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/Portal_1_Loop.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/Portal_1_Loop.uasset deleted file mode 100644 index c5954d3..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Portals/Portal_1_Loop.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b224e30461316e06bee9204e4fa4835a0594c86b0252aae24388869ae5c510ee -size 1341 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/PotionTest/PotionActor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/PotionTest/PotionActor.uasset index bf0d830..7678037 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/PotionTest/PotionActor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/PotionTest/PotionActor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e60d732d7621d985e717656a8c6814222d51e48d35996dcba5ff2d244328a305 -size 293016 +oid sha256:3881eaeb98f38e93c924cab270ad56120a24621c21add4bcf7adc9a47b0d12e9 +size 289242 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Diffuse.uasset deleted file mode 100644 index 1c95ee6..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Diffuse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ca1628ad7eab12731dbab1fcc1faa9f44056ebe89dfda8b46f99517d1b8b361 -size 151172 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Emission_Strength.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Emission_Strength.uasset deleted file mode 100644 index ad9673b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Emission_Strength.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:715cea92a1606ea68a9387f90778adaa09693c18ec01dcaa823c36b99cd3a314 -size 69147 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Metalness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Metalness.uasset deleted file mode 100644 index ce1776b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Metalness.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a82092b04ea7def67c9c35621929cf0aa3d8fccdd32a266e30e32a86014da36b -size 67353 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Roughness.uasset deleted file mode 100644 index 7d21c39..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/Corp_Bake1_PBR_Roughness.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78c7dcefa518dd6951e830fb4b2cddce2f80691a63010cde4536a3ffc291e8e9 -size 76435 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/M_ScifiKatana.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/M_ScifiKatana.uasset deleted file mode 100644 index ce0bb46..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/M_ScifiKatana.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8f7ada62d7b12b2708873dc4340beb0b395b73db1b8b860c6e3322ec3a22357 -size 21437 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/SM_ScifiKatana.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/SM_ScifiKatana.uasset deleted file mode 100644 index 4d849a9..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/SM_ScifiKatana.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:01e48ae8130d21a02fd548588ad85f60cf336c2ecdfc9e3c42bb9f0dd987e523 -size 254242 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/ScifiKatana.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/ScifiKatana.uasset deleted file mode 100644 index ade66fb..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Interactibles/Weapons/SciFiKatana/ScifiKatana.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c488563ad4adff15496b44e03d94b3d8622672cefe5897d88b2fc19fdb6095d6 -size 1623 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_MaterialAtlas.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_MaterialAtlas.uasset index 6032162..42c537a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_MaterialAtlas.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_MaterialAtlas.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:91a9e6be15e5f2d7987470dbd0e57dc9dd4fb7279cc5a01764479715321fbf15 -size 208266 +oid sha256:a2487c83ee7e82d9017643588e11b06f2713ae640be7cacb05c412d7a78d335e +size 204142 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAligned.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAligned.uasset deleted file mode 100644 index 9266805..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAligned.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd6de775a8e2281cacf50445953da4db076f19178c65be4e7b0ea89b68d7f083 -size 29643 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump.uasset index d44d9a7..27354c2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35eee5225458e960c04086601eb12d3711bb0c0d87c0013cb79c999822a3db30 -size 96928 +oid sha256:93163bc9acb6955ed1d446f2e7169f122daa6329ace48b8cb7c2d02b9358d206 +size 96380 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump1.uasset index 218ef0b..a623e11 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump1.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump1.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:619be41cfbd07c368ce2370a55295e15749d21458c365f487e58dae684bebc61 -size 110838 +oid sha256:0f98c09dfba98de220aafb4a7f497ad2cbe9907eb18f77a7fa44e028be5e863c +size 111266 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump1_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump1_Inst.uasset index b848906..499152a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump1_Inst.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Master/M_WorldAlignedBump1_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41aa08c0a9b6b06dd14eab83db3f491cac4772b2a5c037e99480d46fe2800470 -size 18795 +oid sha256:874c7045f7406dc2a6e67b5d8290c277415ff3ea2c22f903c59a12bb5a2b399d +size 17911 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/M_Metal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/M_Metal.uasset deleted file mode 100644 index 8cea99b..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/M_Metal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:118985dbaf05dfbe1667a68fc2630c5d292127aee219705cf9cdcecd16e08930 -size 1373 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/M_RustyMetal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/M_RustyMetal.uasset deleted file mode 100644 index e477ba7..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/M_RustyMetal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d7e3e416d23c70143faf12496dedabdf2778aad8f896600d6a1a37b63fb2dc31 -size 22684 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/NewMaterial.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/NewMaterial.uasset index 58b5983..7e049e2 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/NewMaterial.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Metal/Metal_017/NewMaterial.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5279e66f802745049e486959e1562e67aa9dc96e215c48f276ef0b46ebef118a -size 11218 +oid sha256:41945547b88a2c93a7814490e142153ba08ea8f8ddc02208d2992e7927321138 +size 11706 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Fog.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Fog.uasset index 6a693ac..b096767 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Fog.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Fog.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1986572596dd3dd83aa15fe8b82317814c7715de594976db88827c68317b9125 -size 15277 +oid sha256:11df8c1bdf5ed7ec40cffc9ec5643e731957b05aa06728f4e24d6206466e1ab1 +size 12643 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Fog_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Fog_Inst.uasset index 8272ee8..279db4c 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Fog_Inst.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Fog_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:997d38f83d4e47ba9e136fe712ed82690f5e0b19b968743dd9025a35cca95dad -size 9163 +oid sha256:f76164826eebb8d00c281360409f8aabc4778b5220a08adcf3bc7f7ec9e4096b +size 8102 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Hide.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Hide.uasset deleted file mode 100644 index 827dbd4..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/PostProcess/M_PP_Hide.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b031bd70ab71a02f2f90ad1b5db42af9581446817f4e86a280fee2f2ea705151 -size 6135 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/M_StoneTiles.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/M_StoneTiles.uasset index 1af24f7..fabead6 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/M_StoneTiles.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/M_StoneTiles.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89c92be38d3a5cd330a6d1b4dd26303f2774257f69f9e880b351f33415b0cef7 -size 66310 +oid sha256:85c73714ea07ba39ec913bbbe8f5a1d2ec4064ba9550c8a28fd1d92337bf5c9d +size 66657 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Fllor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Fllor.uasset index 9cd22a2..f3959b4 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Fllor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Fllor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d5ba7d03441bf5542cbf98918a735b6d3ded31b11da1fc950d0288cbafb83b9 -size 1500 +oid sha256:6f4242831ac396c4ba9c0a4eb09c0b66f524194a6d4baa04795185c1ed6be5da +size 18879 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Floor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Floor.uasset deleted file mode 100644 index 36d508f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Floor.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2769ea3bd627f0c4e36949867c468eced391dab279037c3e23a0b80da98d9cb -size 19072 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Wall.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Wall.uasset index d56bab0..388247a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Wall.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/Test_WS_Parallax_Wall.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f0d8ab330ef1a7f4e6bb1cd0307d2c818c6f676d93b02a7dac3b7cdf11af646 -size 16786 +oid sha256:cb72abb04a8207e826d3d686390a81a15166620bdfb7a59740e171e808ada8cc +size 16360 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/tiles_0130_height_4k.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/tiles_0130_height_4k.uasset index 24326a3..8467aa3 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/tiles_0130_height_4k.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/StoneTiles/tiles_0130_height_4k.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e157aa5b532a24ce3db2004f4fcd9df48bff5fe6ff1408816f6048ea80793ac5 -size 9466574 +oid sha256:6f6a6b9b74398b61fe07ada8edd404b009c1e6a05954403dbef12e887692342f +size 9461764 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/MI_WhiteTiles.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/MI_WhiteTiles.uasset deleted file mode 100644 index b5274b4..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/MI_WhiteTiles.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dcca3439d50df69b67c26a8b431779f00f8aa74e7ffc6177dfb30265b2ed023c -size 17852 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Diffuse.uasset deleted file mode 100644 index b9b4482..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Diffuse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a00bd70901d60e1fd52360a65a469663f15e384eae1c2e2007124093ecaceb2 -size 4321656 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Disp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Disp.uasset deleted file mode 100644 index f33aae8..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Disp.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a609995ca8e419822f9f9488271f84fa3f1e6e1f008b13d304f7d974d7f971e -size 3363105 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Normal.uasset deleted file mode 100644 index a747bb6..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Normal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed72b6deb623ffef59955c946fb35dfecbbd7c8b06b0c9a2060b88fbd72dbacd -size 15165842 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Rough.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Rough.uasset deleted file mode 100644 index 24d0d88..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/WhiteTiles/T_WhiteTiles_Rough.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae29dff904be5e647a93c63d66b7d41eb63a808fc6e4c221c882c8347f154403 -size 6847342 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Wood/Wood062/Wood062_4K-PNG_Color_Mat.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Wood/Wood062/Wood062_4K-PNG_Color_Mat.uasset deleted file mode 100644 index 4a7600e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Materials/Wood/Wood062/Wood062_4K-PNG_Color_Mat.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e691f738fa5f43f1c4437d833cc9603845b2cb7c65121a2ef723e6fee2f59dde -size 12355 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/BookShelfLarge/BOoksshlef.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/BookShelfLarge/BOoksshlef.uasset deleted file mode 100644 index 9978cb0..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/BookShelfLarge/BOoksshlef.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17e8c86104abf639af39684268873dd945ca7189c4890e2c1905266629db6a70 -size 89963 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/Shelf01/Shelf_01.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/Shelf01/Shelf_01.uasset index 2f0951b..cd36f79 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/Shelf01/Shelf_01.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/Shelf01/Shelf_01.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2c4d067b4d61941d492b75f0107f16d37e06484ae45674054882b3225ee94cf -size 59130 +oid sha256:ba8db114df8d10c9e0b77e7a98e49db9a3dc785ad61337a5384026a9f13d85eb +size 59581 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/Furniture7.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/Furniture7.uasset deleted file mode 100644 index e5b955c..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/Furniture7.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:201583dc9d05118c8a45af0c10c4ebc44c78c01d220bae79003969c2e2acb2e0 -size 203684 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Diffuse.uasset new file mode 100644 index 0000000..75f5e8a --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2870e9d71d7a1191c0feac3b552a773b003eeabc4bc6518b3b15fd1d541cbd53 +size 29683621 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Mat.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Mat.uasset index da5e6d1..98cf9b0 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Mat.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Mat.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ebc10b3483a0e37e944e26a3f2cc338199a19455207d3e9b09ad28c00dae521 -size 18051 +oid sha256:3f89f8a6050b9aac4cc37fab98bc70c753c7a9c81a45e4e28fbf2ea4cb7c0a34 +size 13513 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Normal.uasset new file mode 100644 index 0000000..b940e80 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Furniture/StorageShelf/MergedBake_StorageShelf_PBR_Normal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0bc10b86fa5b38daf99d60307da5fef65d72b22e6f4bccab73506c8edf1a0cda +size 77890804 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/BP_Light.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/BP_Light.uasset index 657a02b..34aee5a 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/BP_Light.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/BP_Light.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d2344351fb6d7083f9fab50a40333d3937577011bada2db34b5d0e81049283d -size 122424 +oid sha256:3a99acc6bda36a31b8d2aeca93ab2bdf16269648047c19105b97375023d6d20c +size 57855 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/3D_lamp_3-Ean.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/3D_lamp_3-Ean.uasset deleted file mode 100644 index 04aba4d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/3D_lamp_3-Ean.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9533ac68d8a6abafb00a2a6892720f3fe9c6baf2f83e761e38e1ecfdb437ab5 -size 338590 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/3D_lamp_5-Ean.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/3D_lamp_5-Ean.uasset deleted file mode 100644 index 80befce..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/3D_lamp_5-Ean.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf3ee58962a840d79e0e72c3835aec94327717b085c05d93fccd16192b8fef30 -size 79579 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/BP_HangingLamp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/BP_HangingLamp.uasset deleted file mode 100644 index e39b5d4..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/BP_HangingLamp.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87ca83a7f65d8ce424bc1a875062e3a00bbd10ed1e421f28e50179e7979d5467 -size 35815 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/M_Lamp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/M_Lamp.uasset deleted file mode 100644 index 7da27e5..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/HangingLamp/M_Lamp.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66bef455ab67140e5a16e1fe72f8d96e62f878b94630df0fa9e241bf0fc8a107 -size 10769 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/M_RoundCeilingLampBath.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/M_RoundCeilingLampBath.uasset deleted file mode 100644 index 3456113..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/M_RoundCeilingLampBath.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac7ac0b6a2fe341694a35d0f8ae518f48e41a3edeaa0fa76bc873c857a9f1492 -size 20220 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/SM_RoundCeilingLampBath.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/SM_RoundCeilingLampBath.uasset deleted file mode 100644 index 958accb..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/SM_RoundCeilingLampBath.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f17e3a5ead0e45e9e149a198ce5bbb3a7489990ba094f975938b25df41fb93ae -size 102851 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_D.uasset deleted file mode 100644 index c642d49..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_D.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ca1aa980f143f66fbcf380e314c2680c5f2cb218b3d0892e967fcb9cc4f360e -size 795071 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_M_R_E_A.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_M_R_E_A.uasset deleted file mode 100644 index 446c265..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/RoundCeilingLampBath/T_RoundCeilingLampBath_M_R_E_A.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:963e3771f85d4f26be125ec53077234175bae2a709f40bdcf9c618665208981d -size 168807 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp.uasset deleted file mode 100644 index 69271b9..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:661a0303686dda62f040776e4f36a039f5f574ad357bddcd074e1a97a0a7043b -size 28281 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset deleted file mode 100644 index 018a476..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/M_ShipLamp_Inst.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cdfd134e5bc1417a47da7451fbbda244fa1ea8f376d3b4cdc0ca8b0587e1adb2 -size 15009 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_Diffuse.uasset deleted file mode 100644 index 69a4f5c..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_Diffuse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f9542d8e3c2477957640f7cdabfe2e52e45f6f9f1cc7e575b834f49b331ec71 -size 2023837 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_MetallicRoughnessAlpha.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_MetallicRoughnessAlpha.uasset deleted file mode 100644 index 38e04f0..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_MetallicRoughnessAlpha.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9a3bf25e3743f4f819190ee6848d6a209004e9a14efb9e4b913d9f99277c4a7 -size 1855977 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_Normal.uasset deleted file mode 100644 index f8cc746..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/Screws_high_003_Bake1_PBR_Normal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:533d3420fcd0ba4c2dec6433205e3bec6efa08149b1d5dab1ffe959828c5fd76 -size 10241968 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/ShipLamp.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/ShipLamp.uasset deleted file mode 100644 index d2b71a1..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Lights/ShipLamp/ShipLamp.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3494398f935da27b6b7136e8bc8d46202c16f19a60d176f165cfc58b310f7372 -size 261237 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/Ivy.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/Ivy.uasset deleted file mode 100644 index 249903e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/Ivy.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a81745208146fba63a8d4c5c38a1a5e7e767208796525b161059a669527135f -size 118886 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/M_Ivy.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/M_Ivy.uasset deleted file mode 100644 index ee79be9..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/M_Ivy.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ef4278b8b718cf46ee63a9d9750e7f2a1b34306306d05abe24885d91e2864c3a -size 26525 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_D.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_D.uasset deleted file mode 100644 index 544aefd..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_D.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c2f452f4f85e78b586367067a824a68f38e19aa276ebfd2005e8c5fca4760b03 -size 22626009 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_M_R_A.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_M_R_A.uasset deleted file mode 100644 index c3fa42c..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_M_R_A.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f70df02203c8496d40192ee0fb55b9f4a4003642cb0d72e3f1dde893892b7d97 -size 11882747 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_N.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_N.uasset deleted file mode 100644 index d16a0db..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Plants/Ivy/T_Ivy_N.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40417b2094092bc09ec79cd74b8a36deaa9193f5f27b66f43309b2e6b8157dba -size 30844451 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/90Degree-Big.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/90Degree-Big.uasset index 3aeeb2b..569faea 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/90Degree-Big.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/90Degree-Big.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86f2ceeca3ab49263b603b2ce8c877fefccef60fce8f2f33a281cc11e8876af6 -size 97992 +oid sha256:5a1ef84c0c55d6ca61e302692b36320e2355ba12a1134cf450ba1b226570abea +size 78727 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/90Degree-Small.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/90Degree-Small.uasset index d7e2316..fdacd9f 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/90Degree-Small.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/90Degree-Small.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c5cc0dcccb8c9567af8d72ff388f1dc177a53a7dcf6439a2960df30c2c37db6 -size 98499 +oid sha256:264a6a8a08fec9cedec413a0e8882d1761f676711026ee4b313d14bf7afd8f2d +size 79247 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Half-X-Pipe.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Half-X-Pipe.uasset index 7896a9e..60ca9e8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Half-X-Pipe.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Half-X-Pipe.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60ca43360de9e767dce6a5301306ca616835a23b0b8cdb238c01d88f8c48f696 -size 106878 +oid sha256:079ba1a42d6426410cb61206452b9b797c9407e5ca45826ff06c08038079d3ba +size 80676 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe.uasset index 2c72e05..ad9c731 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74886fbb9fadcd8a31264e93300aca8c814bb8c8a525f6069e3d425a0f646b75 -size 85221 +oid sha256:4fbc4920756fb5e4c56956fc06e206fbf1008fa43d09ec6a07910cf50ef0b0b9 +size 62501 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe1.uasset new file mode 100644 index 0000000..faed478 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfc3872304c90875f0e69cc149e8da134035afd4ac79515db1cc4d9be735adb4 +size 72307 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe1_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe1_Inst.uasset new file mode 100644 index 0000000..e9038a2 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe1_Inst.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9510877cbfc30998fff5bbd750391987e59e2ede83adde5f362076288b5553a9 +size 11885 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset index c60faaa..7ae1e05 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b6ad160cb6555d8c0cf733f29eb448a85458cf64a300424a58a49c6bfaf7b10 -size 10425 +oid sha256:00b8295b5a4ea8aa61d8c68b9ff42c6528f8f28801a69e00444e92cfd8619c45 +size 12801 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst1.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst1.uasset new file mode 100644 index 0000000..f92af40 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c07fbf8f30aa737aab7f76c42f03e69b53a1b3aa10c5927c20ab03d3753f574 +size 12744 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst2.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst2.uasset deleted file mode 100644 index 362ad4f..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst2.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:341129f9ab108cd8aaa96d4c50705a4cc6afea6f4efcac99f4eac8a775e568e0 -size 10463 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst_UVBox.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst_UVBox.uasset deleted file mode 100644 index 9822d25..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/M_Pipe_Inst_UVBox.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a0b507de9ea6dcda792deafae7a5ae1c47d00ac8bd100758effa297a5be93a43 -size 12088 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Pipe004_4K-JPG_NormalDX.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Pipe004_4K-JPG_NormalDX.uasset deleted file mode 100644 index d56deb3..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Splines/Pipes/Pipe004_4K-JPG_NormalDX.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b309d334df24596cc5763d48f830fbffaad67dd320b4e033909405cd7416749a -size 6215911 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/M_Gratings.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/M_Gratings.uasset deleted file mode 100644 index 60092c6..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/M_Gratings.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:20ddb4af8554a1792a7f5fbe44f3e5c3e5400b377edfd4b00f65c502a61a9bbd -size 11074 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Freezing_Chamber_Grating.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Freezing_Chamber_Grating.uasset index 9687a93..e025b98 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Freezing_Chamber_Grating.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Freezing_Chamber_Grating.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8616c468331bb5baa0f7c104098b29236385a3a915affb19bbd9cea3184a6cf0 -size 1481 +oid sha256:57da0aeb4f3022459f0a5010e3496f93e9654a909b7d7aa51cd6bae2c2b7ae91 +size 313636 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating2_Square.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating2_Square.uasset index 216f647..8cabc46 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating2_Square.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating2_Square.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:df9d1f6c541b49c3eedb19628cecc30dfcc6cef7739e44f1b62818cdb04c34a2 -size 90033 +oid sha256:ffe8689fa2c12345eb785910e41f663e0b7dcd76a5ae524bae9235daed02aa6f +size 82522 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating_Large.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating_Large.uasset deleted file mode 100644 index 553cf5e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Gratings/SM_Grating_Large.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53022e7c38896817f9850b934a6d459a2957602b5a17cfe5f280556fef0ae272 -size 302266 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Curve_BW_carpet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Curve_BW_carpet.uasset new file mode 100644 index 0000000..55a1f01 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Curve_BW_carpet.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:113595638baf97723d2b0dcec06c2aea05d3d8038d706965bd035af50889da05 +size 4885 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/MI_Carpet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/MI_Carpet.uasset new file mode 100644 index 0000000..a197cb0 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/MI_Carpet.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f702c18a5b179f3aee3f1861379632b1f59ed4442a99c062bb87f22698534b8b +size 16524 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/NewCurveLinearColorAtlas.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/NewCurveLinearColorAtlas.uasset new file mode 100644 index 0000000..8069314 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/NewCurveLinearColorAtlas.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35c58e232f91365d91a5b2d09ae93772f80c255e75cd64f7450cbf3c751bd12a +size 6467 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/NormalMap.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/NormalMap.uasset new file mode 100644 index 0000000..f59c62c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/NormalMap.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef318a1b599feda1747352565237b61ce2d60a1f8f97beabd05a23cbde3351db +size 50538774 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet.uasset index 093291b..f985ff8 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8af7f5e16d707a0078cdb48e35acc40cd1d0c6f0e97f8906eca1b8212aa59fa7 -size 98358 +oid sha256:1fb2899ae954161fb513a82cc8cf13567200a12773fad08c54cc16c1b1cf85fc +size 128972 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet_-_223_x_135_cm.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet_-_223_x_135_cm.uasset new file mode 100644 index 0000000..64df0f8 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/Tekeh_Bukhara_Carpet_-_223_x_135_cm.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82010606d484018daa4dca414ae036621892c2be44c27c0ff6df8fd535cab7cc +size 3478857 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet.uasset index 967e03f..03444b1 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:065d31addbe1defb228c9d346f0d00ac6206478d4260d898b4e42e023cb6d1da -size 62165 +oid sha256:fb91b34e960b33827ea7d25232dd75edcfb49e14af96b763ffcd4349502ce1fe +size 73823 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Diffuse.uasset deleted file mode 100644 index 36a9b79..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Diffuse.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a862c8f597bc27638f12b9551b446060194f0e6a028fd4819bd8d0e42ef668cf -size 3105425 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Mat.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Mat.uasset deleted file mode 100644 index 01a2df8..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Mat.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9355419592f13705bfdb084bc24b8b4bb07a0579dbd172dc3c36108d5db60358 -size 18769 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Normal.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Normal.uasset deleted file mode 100644 index 33365a2..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Normal.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:619f393709d4d1b05deafdfb54421a9ac7be620c04c223706d675d9c144511a2 -size 5331892 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Roughness.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Roughness.uasset deleted file mode 100644 index 90809ee..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/RedRug/carpet_baseColor_Bake1_PBR_Roughness.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7605b423e02832caa119043323c0c88007d51a41b3fc77addb22f3d575d33e02 -size 303782 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/Rug_1/Material_001.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/Rug_1/Material_001.uasset index 53bab7c..d365cab 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/Rug_1/Material_001.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/Rug_1/Material_001.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cf468ec32896a96f03912a256f9ff1082c55d4b94d21b702f3ff37151c8defa -size 58653 +oid sha256:e52d951cea09dd4556fcb3229311d7d6265c1613ca2204dd82fce86fae341c34 +size 58771 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/Rug_1/Rugs.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/Rug_1/Rugs.uasset index ca313e9..5ce0168 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/Rug_1/Rugs.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Stairs/Rugs/Rug_1/Rugs.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a783e7e463a6e1b8a38500ce3fd8e836cfaf11f4d1ba89501b89af8042edccad -size 123358 +oid sha256:92f614fb5218ed5604addc90b1813f67dba64a6e5e7171f207a3e52e5b9962e7 +size 122677 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/BP_Floor.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/BP_Floor.uasset index 9cefb53..9580957 100644 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/BP_Floor.uasset +++ b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/BP_Floor.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22d12ad7d2820d60180812a1516887fe724842fd6a9b24adebf57c1595ab89d7 -size 115630 +oid sha256:efd52af44f0c100ece7fddc1924adc71d3eaf81857943c9f5c1a96e091b015a2 +size 115396 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/SM_Hideout.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/SM_Hideout.uasset deleted file mode 100644 index d52a263..0000000 --- a/VIRTUOS_ExpansionPluginTests/Content/World/Static/Walls/SM_Hideout.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d21312e24b719d52326966ceb13badcabcc2dfa700fa848ef6ddfc5c6d915694 -size 69575 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/BP_TestProjector.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/BP_TestProjector.uasset new file mode 100644 index 0000000..1a70503 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/BP_TestProjector.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdf0feca428f96e0a6e571a1d2f676e86dc477b9124a30220fac574db8ec201b +size 46545 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MPC_Projector.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MPC_Projector.uasset new file mode 100644 index 0000000..8695ea0 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/MPC_Projector.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf859256fe097febcfce587126a47691a6ba7e0146d7ff92edd07621e4a58c03 +size 1883 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector.uasset new file mode 100644 index 0000000..07b7144 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8874d7f21769e477686a3bd76cf4b90ce6d86d0a06aff641f0a14829c5f450eb +size 33871 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector_Inst.uasset new file mode 100644 index 0000000..b7b265c --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Projector_Inst.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b03a3969df24f55ee3188d7578d34a43279ab4a4d2c562a7fed60a6023d2dd7f +size 16695 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Rays.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Rays.uasset new file mode 100644 index 0000000..cbba272 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Rays.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a12f7e0bc6c1463894c3e6bb58bffd62028b8f11fa813c883fc8f98bff23596f +size 35587 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Rays_Inst.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Rays_Inst.uasset new file mode 100644 index 0000000..33dbc85 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/M_Rays_Inst.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:545ae02a9fdd2e402995908827d74b60ee02b29be7869e28540647379fd36027 +size 10671 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/NewMolecule_002_Bake1_PBR_Diffuse.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/NewMolecule_002_Bake1_PBR_Diffuse.uasset new file mode 100644 index 0000000..ec9f4d5 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/NewMolecule_002_Bake1_PBR_Diffuse.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12e317f3e322fd05ea43753357db3f087dac25f4d9286cc361fd6460770d0f6a +size 73245 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/Nitrate.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/Nitrate.uasset new file mode 100644 index 0000000..1a3389f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/Nitrate.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67e8decc224785ca9df8f9e139ed143f8511d3695b6e737f26680bc60badf58f +size 208797 diff --git a/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/Nitrate_LP.uasset b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/Nitrate_LP.uasset new file mode 100644 index 0000000..f192cb1 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Content/World/VFX/Projector/Nitrate_LP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:40986331c45661e60714851262d93355138437fd7fe9370fdb3b57d1de5cec39 +size 117473 diff --git a/VIRTUOS_ExpansionPluginTests/LICENSE.txt b/VIRTUOS_ExpansionPluginTests/LICENSE.txt new file mode 100644 index 0000000..986c999 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/LICENSE.txt @@ -0,0 +1,19 @@ +Copyright Joshua Statzer + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/.gitattributes b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/.gitattributes new file mode 100644 index 0000000..3373152 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/.gitattributes @@ -0,0 +1,2 @@ +* text=auto +*.bat eol=crlf \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/.gitignore b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/.gitignore new file mode 100644 index 0000000..3cdb673 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/.gitignore @@ -0,0 +1,10 @@ + +.hg/ +binaries/ +deriveddatacache/ +.vs/ +build/ +intermediate/ +PACKPLUGIN/ +saved/ +*.orig \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions.uplugin b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/AdvancedSessions.uplugin similarity index 94% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions.uplugin rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/AdvancedSessions.uplugin index 6188c09..7dc2e3a 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions.uplugin +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/AdvancedSessions.uplugin @@ -1,8 +1,8 @@ { "FileVersion": 3, "FriendlyName": "Advanced Sessions", - "Version": 5.7, - "VersionName": "5.7", + "Version": 5.4, + "VersionName": "5.4", "Description": "Adds new blueprint functions to handle more advanced session operations.", "Category": "Advanced Sessions Plugin", "CreatedBy": "Joshua Statzer", diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Config/FilterPlugin.ini b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Config/FilterPlugin.ini similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Config/FilterPlugin.ini rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Config/FilterPlugin.ini diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Resources/Icon128.png b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Resources/Icon128.png similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Resources/Icon128.png rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Resources/Icon128.png diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs similarity index 85% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs index bb02018..a305151 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/AdvancedSessions.Build.cs @@ -5,9 +5,6 @@ public class AdvancedSessions : ModuleRules { public AdvancedSessions(ReadOnlyTargetRules Target) : base(Target) { - DefaultBuildSettings = BuildSettingsVersion.Latest; - IncludeOrderVersion = EngineIncludeOrderVersion.Latest; - PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; //bEnforceIWYU = true; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedExternalUILibrary.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h similarity index 86% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h index a0c0308..be1def9 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsGameInstance.h @@ -44,16 +44,6 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AdvancedVoiceInterface) bool bEnableTalkingStatusDelegate; - // If true we will auto join a session we have accepted in the overlay. - // This can get in the way of Beacon Sessions, you may want to disable it. - UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AdvancedFriendsInterface) - bool bAutoJoinSessionOnAcceptedUserInviteReceived = false; - - // If true we will auto travel to a game session when an invite is received. - // This can get in the way of Beacon Sessions, you may want to disable it. - UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = AdvancedFriendsInterface) - bool bAutoTravelOnAcceptedUserInviteReceived = false; - //virtual void PostLoad() override; virtual void Shutdown() override; virtual void Init() override; @@ -62,13 +52,6 @@ public: FOnSessionInviteReceivedDelegate SessionInviteReceivedDelegate; FDelegateHandle SessionInviteReceivedDelegateHandle; - // custom handle to join directly from steam ui "Join Game" - FDelegateHandle OnJoinSessionCompleteDelegateHandle; - // custom Steam UI Join User function #Self invite# - void OnSessionUserInviteAccepted(const bool bWasSuccessful, const int32 ControllerId, FUniqueNetIdPtr UserId, const FOnlineSessionSearchResult& InviteResult); - // custom Steam UI function to client travel #Self invite# - void OnJoinSessionComplete(FName SessionName, EOnJoinSessionCompleteResult::Type Result); - //const FUniqueNetId& /*UserId*/, const FUniqueNetId& /*FromId*/, const FString& /*AppId*/, const FOnlineSessionSearchResult& /*InviteResult*/ void OnSessionInviteReceivedMaster(const FUniqueNetId & PersonInvited, const FUniqueNetId & PersonInviting, const FString & AppId, const FOnlineSessionSearchResult& SessionToJoin); diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsInterface.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsInterface.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsInterface.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsInterface.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedFriendsLibrary.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedGameSession.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedGameSession.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedGameSession.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedGameSession.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedIdentityLibrary.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessions.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessions.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessions.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessions.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h similarity index 97% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h index d7c53c2..457bcdd 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedSessionsLibrary.h @@ -160,10 +160,6 @@ public: UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|PlayerInfo|PlayerID") static void GetUniqueNetID(APlayerController *PlayerController, FBPUniqueNetId &UniqueNetId); - // Get the unique net id of a network player attached to the given controller - UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|PlayerInfo|PlayerID") - static void GetUniqueNetIdOfSessionOwner(FBlueprintSessionResult SessionResult, FBPUniqueNetId& UniqueNetId); - // Get the unique net id of a network player who is assigned the the given player state UFUNCTION(BlueprintPure, Category = "Online|AdvancedSessions|PlayerInfo|PlayerID") static void GetUniqueNetIDFromPlayerState(APlayerState *PlayerState, FBPUniqueNetId &UniqueNetId); diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AdvancedVoiceLibrary.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AutoLoginUserCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AutoLoginUserCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/AutoLoginUserCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/AutoLoginUserCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/BlueprintDataDefinitions.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/CancelFindSessionsCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h similarity index 90% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h index 448c587..04ae6d1 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/CreateSessionCallbackProxyAdvanced.h @@ -23,14 +23,14 @@ class UCreateSessionCallbackProxyAdvanced : public UOnlineBlueprintCallProxyBase * Creates a session with the default online subsystem with advanced optional inputs, for dedicated servers leave UsePresence as false and set IsDedicatedServer to true. Dedicated servers don't use presence. * @param PublicConnections When doing a 'listen' server, this must be >=2 (ListenServer itself counts as a connection) * @param bUseLAN When you want to play LAN, the level to play on must be loaded with option 'bIsLanMatch' + * @param bUsePresence Must be true for a 'listen' server (Map must be loaded with option 'listen'), false for a 'dedicated' server. * @param bUseLobbiesIfAvailable Used to flag the subsystem to use a lobby api instead of general hosting if the API supports it, generally true on steam for listen servers and false for dedicated - * Must be true for a 'listen' server (Map must be loaded with option 'listen'), false for a 'dedicated' server. * @param bShouldAdvertise Set to true when the OnlineSubsystem should list your server when someone is searching for servers. Otherwise the server is hidden and only join via invite is possible. * @param bUseLobbiesVoiceChatIfAvailable Set to true to setup voice chat lobbies if the API supports it * @param bStartAfterCreate Set to true to start the session after it's created. If false you need to manually call StartSession when ready. */ UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject",AutoCreateRefTerm="ExtraSettings"), Category = "Online|AdvancedSessions") - static UCreateSessionCallbackProxyAdvanced* CreateAdvancedSession(UObject* WorldContextObject, const TArray& ExtraSettings, class APlayerController* PlayerController = NULL, int32 PublicConnections = 100, int32 PrivateConnections = 0, bool bUseLAN = false, bool bAllowInvites = true, bool bIsDedicatedServer = false, /*bool bUsePresence = true,*/ bool bUseLobbiesIfAvailable = true, bool bAllowJoinViaPresence = true, bool bAllowJoinViaPresenceFriendsOnly = false, bool bAntiCheatProtected = false, bool bUsesStats = false, bool bShouldAdvertise = true, bool bUseLobbiesVoiceChatIfAvailable = false, bool bStartAfterCreate = true); + static UCreateSessionCallbackProxyAdvanced* CreateAdvancedSession(UObject* WorldContextObject, const TArray& ExtraSettings, class APlayerController* PlayerController = NULL, int32 PublicConnections = 100, int32 PrivateConnections = 0, bool bUseLAN = false, bool bAllowInvites = true, bool bIsDedicatedServer = false, bool bUsePresence = true, bool bUseLobbiesIfAvailable = true, bool bAllowJoinViaPresence = true, bool bAllowJoinViaPresenceFriendsOnly = false, bool bAntiCheatProtected = false, bool bUsesStats = false, bool bShouldAdvertise = true, bool bUseLobbiesVoiceChatIfAvailable = false, bool bStartAfterCreate = true); // UOnlineBlueprintCallProxyBase interface virtual void Activate() override; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/EndSessionCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/FindFriendSessionCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/FindFriendSessionCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/FindFriendSessionCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/FindFriendSessionCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h similarity index 96% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h index 5d225d8..e610277 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/FindSessionsCallbackProxyAdvanced.h @@ -28,7 +28,7 @@ class UFindSessionsCallbackProxyAdvanced : public UOnlineBlueprintCallProxyBase // Searches for advertised sessions with the default online subsystem and includes an array of filters UFUNCTION(BlueprintCallable, meta = (BlueprintInternalUseOnly = "true", WorldContext = "WorldContextObject", AutoCreateRefTerm="Filters"), Category = "Online|AdvancedSessions") - static UFindSessionsCallbackProxyAdvanced* FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int32 MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray &Filters, bool bEmptyServersOnly = false, bool bNonEmptyServersOnly = false, bool bSecureServersOnly = false, /*bool bSearchLobbies = true,*/ int MinSlotsAvailable = 0); + static UFindSessionsCallbackProxyAdvanced* FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int32 MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray &Filters, bool bEmptyServersOnly = false, bool bNonEmptyServersOnly = false, bool bSecureServersOnly = false, bool bSearchLobbies = true, int MinSlotsAvailable = 0); static bool CompareVariants(const FVariantData &A, const FVariantData &B, EOnlineComparisonOpRedux Comparator); @@ -99,7 +99,7 @@ private: bool bSecureServersOnly; // Search through lobbies - //bool bSearchLobbies; + bool bSearchLobbies; // Min slots requires to search int MinSlotsAvailable; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetFriendsCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/GetRecentPlayersCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetRecentPlayersCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/GetRecentPlayersCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetRecentPlayersCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/GetUserPrivilegeCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/LoginUserCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/LogoutUserCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/OnlineSubSystemHeader.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/OnlineSubSystemHeader.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/OnlineSubSystemHeader.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/OnlineSubSystemHeader.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/SendFriendInviteCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/SendFriendInviteCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/SendFriendInviteCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/SendFriendInviteCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/StartSessionCallbackProxyAdvanced.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/StartSessionCallbackProxyAdvanced.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/StartSessionCallbackProxyAdvanced.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/StartSessionCallbackProxyAdvanced.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h similarity index 89% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h index b45ccf3..afdc181 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Classes/UpdateSessionCallbackProxyAdvanced.h @@ -21,7 +21,7 @@ class UUpdateSessionCallbackProxyAdvanced : public UOnlineBlueprintCallProxyBase // Creates a session with the default online subsystem with advanced optional inputs, you MUST fill in all categories or it will pass in values that you didn't want as default values UFUNCTION(BlueprintCallable, meta=(BlueprintInternalUseOnly = "true", WorldContext="WorldContextObject",AutoCreateRefTerm="ExtraSettings"), Category = "Online|AdvancedSessions") - static UUpdateSessionCallbackProxyAdvanced* UpdateSession(UObject* WorldContextObject, const TArray &ExtraSettings, int32 PublicConnections = 100, int32 PrivateConnections = 0, bool bUseLAN = false, bool bAllowInvites = false, bool bAllowJoinInProgress = false, bool bRefreshOnlineData = true, bool bIsDedicatedServer = false, bool bShouldAdvertise = true, bool bAllowJoinViaPresence = true, bool bAllowJoinViaPresenceFriendsOnly = false); + static UUpdateSessionCallbackProxyAdvanced* UpdateSession(UObject* WorldContextObject, const TArray &ExtraSettings, int32 PublicConnections = 100, int32 PrivateConnections = 0, bool bUseLAN = false, bool bAllowInvites = false, bool bAllowJoinInProgress = false, bool bRefreshOnlineData = true, bool bIsDedicatedServer = false, bool bShouldAdvertise = true); // UOnlineBlueprintCallProxyBase interface virtual void Activate() override; @@ -58,12 +58,6 @@ private: // Allow joining in progress bool bAllowJoinInProgress = true; - // Allow joining in progress - bool bAllowJoinViaPresence = true; - - // Allow joining in progress - bool bAllowJoinViaPresenceFriendsOnly = false; - // Update whether this is a dedicated server or not bool bDedicatedServer = false; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedExternalUILibrary.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp similarity index 79% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp index 8ca29ee..47afb6a 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsGameInstance.cpp @@ -20,61 +20,6 @@ UAdvancedFriendsGameInstance::UAdvancedFriendsGameInstance(const FObjectInitiali { } -void UAdvancedFriendsGameInstance::OnSessionUserInviteAccepted(const bool bWasSuccessful, const int32 ControllerId, FUniqueNetIdPtr UserId, const FOnlineSessionSearchResult& InviteResult) -{ - if (!bAutoJoinSessionOnAcceptedUserInviteReceived) - return; - - IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(GetWorld()); - if (SessionInterface.IsValid()) - { - // Eventually call this?, would need another call back to run through - //SessionInterface->DestroySession(NAME_GameSession); - - SessionInterface->ClearOnJoinSessionCompleteDelegate_Handle(OnJoinSessionCompleteDelegateHandle); - OnJoinSessionCompleteDelegateHandle = SessionInterface->AddOnJoinSessionCompleteDelegate_Handle( - FOnJoinSessionCompleteDelegate::CreateUObject(this, &UAdvancedFriendsGameInstance::OnJoinSessionComplete)); - - // Temp for 5.5, they aren't filling in the struct correctly - if (!InviteResult.Session.SessionSettings.bIsDedicated) - { - FOnlineSessionSearchResult ModResult = InviteResult; - ModResult.Session.SessionSettings.bUsesPresence = true; - ModResult.Session.SessionSettings.bUseLobbiesIfAvailable = true; - SessionInterface->JoinSession(0, NAME_GameSession, ModResult); - } - else - { - SessionInterface->JoinSession(0, NAME_GameSession, InviteResult); - } - } - UE_LOG(AdvancedFriendsInterfaceLog, Log, TEXT("Called Join Session for Steam Friends List UI InviteResults: %s, UserId: %s"), *InviteResult.GetSessionIdStr(), *UserId->ToString()); -} - -void UAdvancedFriendsGameInstance::OnJoinSessionComplete(FName SessionName, EOnJoinSessionCompleteResult::Type Result) -{ - - // If we don't want to auto travel to the session instance then exit out - if (!bAutoTravelOnAcceptedUserInviteReceived) - { - return; - } - - IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(GetWorld()); - if (SessionInterface.IsValid()) - { - FString ConnectInfo; - if (SessionInterface->GetResolvedConnectString(NAME_GameSession, ConnectInfo)) - { - APlayerController* PlayerController = GetFirstLocalPlayerController(); - if (PlayerController) - { - PlayerController->ClientTravel(ConnectInfo, ETravelType::TRAVEL_Absolute); - } - } - } -} - void UAdvancedFriendsGameInstance::Shutdown() { IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(GetWorld()); @@ -89,7 +34,6 @@ void UAdvancedFriendsGameInstance::Shutdown() // Clear all of the delegate handles here SessionInterface->ClearOnSessionUserInviteAcceptedDelegate_Handle(SessionInviteAcceptedDelegateHandle); SessionInterface->ClearOnSessionInviteReceivedDelegate_Handle(SessionInviteReceivedDelegateHandle); - SessionInterface->ClearOnJoinSessionCompleteDelegate_Handle(OnJoinSessionCompleteDelegateHandle); } @@ -136,9 +80,6 @@ void UAdvancedFriendsGameInstance::Init() SessionInviteAcceptedDelegateHandle = SessionInterface->AddOnSessionUserInviteAcceptedDelegate_Handle(SessionInviteAcceptedDelegate); SessionInviteReceivedDelegateHandle = SessionInterface->AddOnSessionInviteReceivedDelegate_Handle(SessionInviteReceivedDelegate); - - // Custom steam join game delegate - SessionInterface->OnSessionUserInviteAcceptedDelegates.AddUObject(this, &UAdvancedFriendsGameInstance::OnSessionUserInviteAccepted); } else { @@ -330,13 +271,6 @@ void UAdvancedFriendsGameInstance::OnSessionInviteReceivedMaster(const FUniqueNe } } - // Temp for 5.5, they aren't filling in the struct correctly - if (!BluePrintResult.OnlineResult.Session.SessionSettings.bIsDedicated) - { - BluePrintResult.OnlineResult.Session.SessionSettings.bUsesPresence = true; - BluePrintResult.OnlineResult.Session.SessionSettings.bUseLobbiesIfAvailable = true; - } - OnSessionInviteReceived(LocalPlayer, PInviting, AppId, BluePrintResult); //IAdvancedFriendsInterface* TheInterface = NULL; @@ -373,13 +307,6 @@ void UAdvancedFriendsGameInstance::OnSessionInviteAcceptedMaster(const bool bWas FBPUniqueNetId PInvited; PInvited.SetUniqueNetId(PersonInvited); - // Temp for 5.5, they aren't filling in the struct correctly - if (!BluePrintResult.OnlineResult.Session.SessionSettings.bIsDedicated) - { - BluePrintResult.OnlineResult.Session.SessionSettings.bUsesPresence = true; - BluePrintResult.OnlineResult.Session.SessionSettings.bUseLobbiesIfAvailable = true; - } - OnSessionInviteAccepted(LocalPlayer,PInvited, BluePrintResult); APlayerController* Player = UGameplayStatics::GetPlayerController(GetWorld(), LocalPlayer); diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsInterface.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsInterface.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsInterface.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsInterface.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp index 6bb7eac..5df1a94 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedFriendsLibrary.cpp @@ -151,9 +151,7 @@ void UAdvancedFriendsLibrary::GetFriend(APlayerController *PlayerController, con Friend.PresenceInfo.bIsPlaying = pres.bIsPlaying; Friend.PresenceInfo.bIsPlayingThisGame = pres.bIsPlayingThisGame; Friend.PresenceInfo.PresenceState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); - // #TODO: Check back in on this in shipping, epic is missing the UTF8_TO_TCHAR call on converting this and its making an invalid string - // OnlineFriendPresenceInterfaceSteam has the issue //Friend.PresenceInfo.StatusString = pres.Status.StatusStr; } } @@ -268,7 +266,6 @@ void UAdvancedFriendsLibrary::GetStoredFriendsList(APlayerController *PlayerCont BPF.PresenceInfo.bIsPlaying = pres.bIsPlaying; BPF.PresenceInfo.PresenceState = ((EBPOnlinePresenceState)((int32)pres.Status.State)); // #TODO: Check back in on this in shipping, epic is missing the UTF8_TO_TCHAR call on converting this and its making an invalid string - // OnlineFriendPresenceInterfaceSteam has the issue //BPF.PresenceInfo.StatusString = pres.Status.StatusStr; BPF.PresenceInfo.bIsJoinable = pres.bIsJoinable; BPF.PresenceInfo.bIsPlayingThisGame = pres.bIsPlayingThisGame; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedIdentityLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedIdentityLibrary.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedIdentityLibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedIdentityLibrary.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessions.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessions.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessions.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessions.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp index dfb6fd7..a5453d1 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedSessionsLibrary.cpp @@ -451,17 +451,6 @@ void UAdvancedSessionsLibrary::GetUniqueNetID(APlayerController *PlayerControlle } } -void UAdvancedSessionsLibrary::GetUniqueNetIdOfSessionOwner(FBlueprintSessionResult SessionResult, FBPUniqueNetId& UniqueNetId) -{ - FBPUniqueNetId ReturnID; - if (SessionResult.OnlineResult.IsValid()) - { - ReturnID.SetUniqueNetId(SessionResult.OnlineResult.Session.OwningUserId); - } - - UniqueNetId = ReturnID; -} - void UAdvancedSessionsLibrary::GetUniqueNetIDFromPlayerState(APlayerState *PlayerState, FBPUniqueNetId &UniqueNetId) { if (!PlayerState) diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedVoiceLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedVoiceLibrary.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedVoiceLibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AdvancedVoiceLibrary.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp index d61f902..9046773 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/AutoLoginUserCallbackProxy.cpp @@ -83,8 +83,6 @@ void UAutoLoginUserCallbackProxy::OnCompleted(int32 LocalUserNum, bool bWasSucce { OnFailure.Broadcast(); } - - return; } OnFailure.Broadcast(); diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/CancelFindSessionsCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp similarity index 94% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp index 6b07bf1..1ff10c1 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/CreateSessionCallbackProxyAdvanced.cpp @@ -13,7 +13,7 @@ UCreateSessionCallbackProxyAdvanced::UCreateSessionCallbackProxyAdvanced(const F { } -UCreateSessionCallbackProxyAdvanced* UCreateSessionCallbackProxyAdvanced::CreateAdvancedSession(UObject* WorldContextObject, const TArray& ExtraSettings, class APlayerController* PlayerController, int32 PublicConnections, int32 PrivateConnections, bool bUseLAN, bool bAllowInvites, bool bIsDedicatedServer, /*bool bUsePresence,*/ bool bUseLobbiesIfAvailable, bool bAllowJoinViaPresence, bool bAllowJoinViaPresenceFriendsOnly, bool bAntiCheatProtected, bool bUsesStats, bool bShouldAdvertise, bool bUseLobbiesVoiceChatIfAvailable, bool bStartAfterCreate) +UCreateSessionCallbackProxyAdvanced* UCreateSessionCallbackProxyAdvanced::CreateAdvancedSession(UObject* WorldContextObject, const TArray& ExtraSettings, class APlayerController* PlayerController, int32 PublicConnections, int32 PrivateConnections, bool bUseLAN, bool bAllowInvites, bool bIsDedicatedServer, bool bUsePresence, bool bUseLobbiesIfAvailable, bool bAllowJoinViaPresence, bool bAllowJoinViaPresenceFriendsOnly, bool bAntiCheatProtected, bool bUsesStats, bool bShouldAdvertise, bool bUseLobbiesVoiceChatIfAvailable, bool bStartAfterCreate) { UCreateSessionCallbackProxyAdvanced* Proxy = NewObject(); Proxy->PlayerControllerWeakPtr = PlayerController; @@ -24,7 +24,7 @@ UCreateSessionCallbackProxyAdvanced* UCreateSessionCallbackProxyAdvanced::Create Proxy->bAllowInvites = bAllowInvites; Proxy->ExtraSettings = ExtraSettings; Proxy->bDedicatedServer = bIsDedicatedServer; - /*Proxy->bUsePresence = bUsePresence;*/ + Proxy->bUsePresence = bUsePresence; Proxy->bUseLobbiesIfAvailable = bUseLobbiesIfAvailable; Proxy->bAllowJoinViaPresence = bAllowJoinViaPresence; Proxy->bAllowJoinViaPresenceFriendsOnly = bAllowJoinViaPresenceFriendsOnly; @@ -61,13 +61,13 @@ void UCreateSessionCallbackProxyAdvanced::Activate() if (bDedicatedServer) { - Settings.bUseLobbiesIfAvailable = false; Settings.bUsesPresence = false; + Settings.bUseLobbiesIfAvailable = false; } else { + Settings.bUsesPresence = bUsePresence; Settings.bUseLobbiesIfAvailable = bUseLobbiesIfAvailable; - Settings.bUsesPresence = bUseLobbiesIfAvailable; } Settings.bUseLobbiesVoiceChatIfAvailable = bUseLobbiesIfAvailable ? bUseLobbiesVoiceChatIfAvailable : false; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/EndSessionCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp similarity index 92% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp index 719bed9..019255c 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindFriendSessionCallbackProxy.cpp @@ -102,14 +102,6 @@ void UFindFriendSessionCallbackProxy::OnFindFriendSessionCompleted(int32 LocalPl { FBlueprintSessionResult BSesh; BSesh.OnlineResult = Sesh; - - // Temp for 5.5, force the values if epic isn't setting them, lobbies should always have these true - if (!BSesh.OnlineResult.Session.SessionSettings.bIsDedicated) - { - BSesh.OnlineResult.Session.SessionSettings.bUseLobbiesIfAvailable = true; - BSesh.OnlineResult.Session.SessionSettings.bUsesPresence = true; - } - Result.Add(BSesh); } } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp similarity index 94% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp index e031688..dc0dc4b 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/FindSessionsCallbackProxyAdvanced.cpp @@ -16,7 +16,7 @@ UFindSessionsCallbackProxyAdvanced::UFindSessionsCallbackProxyAdvanced(const FOb bIsOnSecondSearch = false; } -UFindSessionsCallbackProxyAdvanced* UFindSessionsCallbackProxyAdvanced::FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray &Filters, bool bEmptyServersOnly, bool bNonEmptyServersOnly, bool bSecureServersOnly, /*bool bSearchLobbies,*/ int MinSlotsAvailable) +UFindSessionsCallbackProxyAdvanced* UFindSessionsCallbackProxyAdvanced::FindSessionsAdvanced(UObject* WorldContextObject, class APlayerController* PlayerController, int MaxResults, bool bUseLAN, EBPServerPresenceSearchType ServerTypeToSearch, const TArray &Filters, bool bEmptyServersOnly, bool bNonEmptyServersOnly, bool bSecureServersOnly, bool bSearchLobbies, int MinSlotsAvailable) { UFindSessionsCallbackProxyAdvanced* Proxy = NewObject(); Proxy->PlayerControllerWeakPtr = PlayerController; @@ -28,7 +28,7 @@ UFindSessionsCallbackProxyAdvanced* UFindSessionsCallbackProxyAdvanced::FindSess Proxy->bEmptyServersOnly = bEmptyServersOnly, Proxy->bNonEmptyServersOnly = bNonEmptyServersOnly; Proxy->bSecureServersOnly = bSecureServersOnly; - //Proxy->bSearchLobbies = bSearchLobbies; + Proxy->bSearchLobbies = bSearchLobbies; Proxy->MinSlotsAvailable = MinSlotsAvailable; return Proxy; } @@ -86,6 +86,7 @@ void UFindSessionsCallbackProxyAdvanced::Activate() /** #define SEARCH_SWITCH_SELECTION_METHOD FName(TEXT("SWITCHSELECTIONMETHOD"))*/ /** Whether to use lobbies vs sessions */ /** #define SEARCH_LOBBIES FName(TEXT("LOBBYSEARCH"))*/ + if (bEmptyServersOnly) tem.Set(SEARCH_EMPTY_SERVERS_ONLY, true, EOnlineComparisonOp::Equals); @@ -113,9 +114,9 @@ void UFindSessionsCallbackProxyAdvanced::Activate() case EBPServerPresenceSearchType::ClientServersOnly: { - //tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals); + tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals); - //if (bSearchLobbies)// && !IOnlineSubsystem::DoesInstanceExist("STEAM")) + if (bSearchLobbies && !IOnlineSubsystem::DoesInstanceExist("STEAM")) tem.Set(SEARCH_LOBBIES, true, EOnlineComparisonOp::Equals); } break; @@ -139,9 +140,9 @@ void UFindSessionsCallbackProxyAdvanced::Activate() FOnlineSearchSettingsEx DedicatedOnly = tem; - //tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals); + tem.Set(SEARCH_PRESENCE, true, EOnlineComparisonOp::Equals); - //if (bSearchLobbies)// && !IOnlineSubsystem::DoesInstanceExist("STEAM")) + if (bSearchLobbies && !IOnlineSubsystem::DoesInstanceExist("STEAM")) tem.Set(SEARCH_LOBBIES, true, EOnlineComparisonOp::Equals); //DedicatedOnly.Set(SEARCH_DEDICATED_ONLY, true, EOnlineComparisonOp::Equals); @@ -224,14 +225,6 @@ void UFindSessionsCallbackProxyAdvanced::OnCompleted(bool bSuccess) FBlueprintSessionResult BPResult; BPResult.OnlineResult = Result; - - // Temp for 5.5, force the values if epic isn't setting them, lobbies should always have these true - if (ServerSearchType != EBPServerPresenceSearchType::DedicatedServersOnly ) - { - BPResult.OnlineResult.Session.SessionSettings.bUseLobbiesIfAvailable = true; - BPResult.OnlineResult.Session.SessionSettings.bUsesPresence = true; - } - SessionSearchResults.AddUnique(BPResult); } if (!bRunSecondSearch) diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/GetFriendsCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetFriendsCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/GetFriendsCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetFriendsCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/GetRecentPlayersCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetRecentPlayersCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/GetRecentPlayersCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetRecentPlayersCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/GetUserPrivilegeCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetUserPrivilegeCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/GetUserPrivilegeCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/GetUserPrivilegeCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/LoginUserCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/LogoutUserCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/LogoutUserCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/LogoutUserCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/LogoutUserCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/SendFriendInviteCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/StartSessionCallbackProxyAdvanced.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/StartSessionCallbackProxyAdvanced.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/StartSessionCallbackProxyAdvanced.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/StartSessionCallbackProxyAdvanced.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp similarity index 92% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp index c105aa6..31aa9d9 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSessions/Source/AdvancedSessions/Private/UpdateSessionCallbackProxyAdvanced.cpp @@ -12,7 +12,7 @@ UUpdateSessionCallbackProxyAdvanced::UUpdateSessionCallbackProxyAdvanced(const F { } -UUpdateSessionCallbackProxyAdvanced* UUpdateSessionCallbackProxyAdvanced::UpdateSession(UObject* WorldContextObject, const TArray &ExtraSettings, int32 PublicConnections, int32 PrivateConnections, bool bUseLAN, bool bAllowInvites, bool bAllowJoinInProgress, bool bRefreshOnlineData, bool bIsDedicatedServer, bool bShouldAdvertise, bool bAllowJoinViaPresence, bool bAllowJoinViaPresenceFriendsOnly) +UUpdateSessionCallbackProxyAdvanced* UUpdateSessionCallbackProxyAdvanced::UpdateSession(UObject* WorldContextObject, const TArray &ExtraSettings, int32 PublicConnections, int32 PrivateConnections, bool bUseLAN, bool bAllowInvites, bool bAllowJoinInProgress, bool bRefreshOnlineData, bool bIsDedicatedServer, bool bShouldAdvertise) { UUpdateSessionCallbackProxyAdvanced* Proxy = NewObject(); Proxy->NumPublicConnections = PublicConnections; @@ -25,8 +25,6 @@ UUpdateSessionCallbackProxyAdvanced* UUpdateSessionCallbackProxyAdvanced::Update Proxy->bAllowJoinInProgress = bAllowJoinInProgress; Proxy->bDedicatedServer = bIsDedicatedServer; Proxy->bShouldAdvertise = bShouldAdvertise; - Proxy->bAllowJoinViaPresence = bAllowJoinViaPresence; - Proxy->bAllowJoinViaPresenceFriendsOnly = bAllowJoinViaPresenceFriendsOnly; return Proxy; } @@ -67,14 +65,11 @@ void UUpdateSessionCallbackProxyAdvanced::Activate() Settings->bAllowJoinInProgress = bAllowJoinInProgress; Settings->bIsLANMatch = bUseLAN; //Settings->bUsesPresence = true; + //Settings->bAllowJoinViaPresence = true; Settings->bAllowInvites = bAllowInvites; Settings->bAllowJoinInProgress = bAllowJoinInProgress; Settings->bIsDedicated = bDedicatedServer; - // Added in 5.6 - Settings->bAllowJoinViaPresence = bAllowJoinViaPresence; - Settings->bAllowJoinViaPresenceFriendsOnly = bAllowJoinViaPresenceFriendsOnly; - FOnlineSessionSetting * fSetting = NULL; FOnlineSessionSetting ExtraSetting; for (int i = 0; i < ExtraSettings.Num(); i++) diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/AdvancedSteamSessions.uplugin b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/AdvancedSteamSessions.uplugin similarity index 90% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/AdvancedSteamSessions.uplugin rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/AdvancedSteamSessions.uplugin index 71adae0..307c51e 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/AdvancedSteamSessions.uplugin +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/AdvancedSteamSessions.uplugin @@ -2,8 +2,8 @@ "FileVersion" : 3, "FriendlyName" : "Advanced Steam Sessions", - "Version" : 5.7, - "VersionName": "5.7", + "Version" : 5.4, + "VersionName": "5.4", "Description" : "Adds new blueprint functions to handle more advanced session operations in Steam. REQUIRES ADVANCED SESSIONS", "Category" : "Advanced Sessions Plugin", "CreatedBy" : "Joshua Statzer", @@ -14,7 +14,7 @@ { "Name": "AdvancedSteamSessions", "Type": "RunTime", - "LoadingPhase": "PostDefault" + "LoadingPhase": "Default" } ], "Plugins": [ diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Config/FilterPlugin.ini b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Config/FilterPlugin.ini similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Config/FilterPlugin.ini rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Config/FilterPlugin.ini diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Resources/Icon128.png b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Resources/Icon128.png similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Resources/Icon128.png rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Resources/Icon128.png diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs similarity index 85% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs index db55501..6a4c768 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/AdvancedSteamSessions.Build.cs @@ -5,9 +5,6 @@ public class AdvancedSteamSessions : ModuleRules { public AdvancedSteamSessions(ReadOnlyTargetRules Target) : base(Target) { - DefaultBuildSettings = BuildSettingsVersion.Latest; - IncludeOrderVersion = EngineIncludeOrderVersion.Latest; - PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; //bEnforceIWYU = true; @@ -19,7 +16,6 @@ public class AdvancedSteamSessions : ModuleRules if ((Target.Platform == UnrealTargetPlatform.Win64) || (Target.Platform == UnrealTargetPlatform.Linux) || (Target.Platform == UnrealTargetPlatform.Mac)) { PublicDependencyModuleNames.AddRange(new string[] { "SteamShared", "Steamworks", "OnlineSubsystemSteam" }); - AddEngineThirdPartyPrivateStaticDependencies(Target, "Steamworks"); //PublicIncludePaths.AddRange(new string[] { "../Plugins/Online/OnlineSubsystemSteam/Source/Private" });// This is dumb but it isn't very open } } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h index a0a7b8e..83de461 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamFriendsLibrary.h @@ -42,7 +42,7 @@ MSVC_PRAGMA(warning(pop)) #endif // USING_CODE_ANALYSIS #include -//#include +#include //#include #pragma pop_macro("ARRAY_COUNT") @@ -337,8 +337,8 @@ public: static bool RequestSteamFriendInfo(const FBPUniqueNetId UniqueNetId, bool bRequireNameOnly = false); // Opens the steam overlay to go to the specified user dialog - UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|SteamAPI", meta = (WorldContext = "WorldContextObject")) - static bool OpenSteamUserOverlay(UObject* WorldContextObject, const FBPUniqueNetId UniqueNetId, ESteamUserOverlayType DialogType); + UFUNCTION(BlueprintCallable, Category = "Online|AdvancedFriends|SteamAPI") + static bool OpenSteamUserOverlay(const FBPUniqueNetId UniqueNetId, ESteamUserOverlayType DialogType); // Returns if the steam overlay is currently active (this can return false during initial overlay hooking) UFUNCTION(BlueprintPure, Category = "Online|AdvancedFriends|SteamAPI") diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamSessions.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamSessions.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamSessions.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamSessions.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/AdvancedSteamWorkshopLibrary.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h similarity index 70% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h index 7b6948c..7b8641a 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamNotificationsSubsystem.h @@ -38,27 +38,14 @@ public: void Initialize(USteamNotificationsSubsystem* MyParent) { ParentSubsystem = MyParent; - -#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED - OnExternalUITriggeredCallback.Register(this, &USteamNotificationsSubsystem::cSteamEventsStore::OnExternalUITriggered); -#endif - } - - void UnInitialize(USteamNotificationsSubsystem* MyParent) - { -#if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED - OnExternalUITriggeredCallback.Unregister(); -#endif } #if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED - cSteamEventsStore() - {} - //: - /*OnExternalUITriggeredCallback(this, &cSteamEventsStore::OnExternalUITriggered) + cSteamEventsStore() : + OnExternalUITriggeredCallback(this, &cSteamEventsStore::OnExternalUITriggered) { - }*/ + } #else //cSteamEventsStore() //{ @@ -70,8 +57,7 @@ public: private: #if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED - //STEAM_CALLBACK(cSteamEventsStore, OnExternalUITriggered, GameOverlayActivated_t, OnExternalUITriggeredCallback); - STEAM_CALLBACK_MANUAL(cSteamEventsStore, OnExternalUITriggered, GameOverlayActivated_t, OnExternalUITriggeredCallback); + STEAM_CALLBACK(cSteamEventsStore, OnExternalUITriggered, GameOverlayActivated_t, OnExternalUITriggeredCallback); #endif }; @@ -86,7 +72,7 @@ public: /** Implement this for deinitialization of instances of the system */ virtual void Deinitialize() override { - MyEvents.UnInitialize(this); + } }; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamRequestGroupOfficersCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Classes/SteamWSRequestUGCDetailsCallbackProxy.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp similarity index 93% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp index ea38621..85340e4 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamFriendsLibrary.cpp @@ -1,11 +1,6 @@ // Fill out your copyright notice in the Description page of Project Settings. #include "AdvancedSteamFriendsLibrary.h" #include "OnlineSubSystemHeader.h" -#include "OnlineSubsystemTypes.h" -#include "Engine/Texture.h" -#include "Engine/Texture2D.h" -#include "TextureResource.h" -#include "PixelFormat.h" //General Log DEFINE_LOG_CATEGORY(AdvancedSteamFriendsLog); @@ -238,7 +233,7 @@ bool UAdvancedSteamFriendsLibrary::RequestSteamFriendInfo(const FBPUniqueNetId U } -bool UAdvancedSteamFriendsLibrary::OpenSteamUserOverlay(UObject* WorldContextObject,const FBPUniqueNetId UniqueNetId, ESteamUserOverlayType DialogType) +bool UAdvancedSteamFriendsLibrary::OpenSteamUserOverlay(const FBPUniqueNetId UniqueNetId, ESteamUserOverlayType DialogType) { #if (PLATFORM_WINDOWS || PLATFORM_MAC || PLATFORM_LINUX) && STEAM_SDK_INSTALLED if (!UniqueNetId.IsValid() || !UniqueNetId.UniqueNetId->IsValid() || UniqueNetId.UniqueNetId->GetType() != STEAM_SUBSYSTEM) @@ -249,24 +244,13 @@ bool UAdvancedSteamFriendsLibrary::OpenSteamUserOverlay(UObject* WorldContextObj if (SteamAPI_Init()) { + uint64 id = *((uint64*)UniqueNetId.UniqueNetId->GetBytes()); if (DialogType == ESteamUserOverlayType::invitetolobby) { - UWorld* const World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::LogAndReturnNull); - IOnlineSessionPtr SessionInterface = Online::GetSessionInterface(World); - if (SessionInterface.IsValid()) - { - FNamedOnlineSession* CurrentSession = SessionInterface->GetNamedSession(NAME_GameSession); - - if (CurrentSession && CurrentSession->SessionInfo->GetSessionId().IsValid()) - { - uint64 id = *((uint64*)CurrentSession->SessionInfo->GetSessionId().GetBytes()); - SteamFriends()->ActivateGameOverlayInviteDialog(id); - } - } + SteamFriends()->ActivateGameOverlayInviteDialog(id); } else { - uint64 id = *((uint64*)UniqueNetId.UniqueNetId->GetBytes()); FString DialogName = EnumToString("ESteamUserOverlayType", (uint8)DialogType); SteamFriends()->ActivateGameOverlayToUser(TCHAR_TO_ANSI(*DialogName), id); } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamSessions.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamSessions.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamSessions.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamSessions.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamWorkshopLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamWorkshopLibrary.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamWorkshopLibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/AdvancedSteamWorkshopLibrary.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamRequestGroupOfficersCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/AdvancedSteamSessions/Source/AdvancedSteamSessions/Private/SteamWSRequestUGCDetailsCallbackProxy.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/LICENSE.txt b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/LICENSE.txt new file mode 100644 index 0000000..986c999 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/LICENSE.txt @@ -0,0 +1,19 @@ +Copyright Joshua Statzer + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/README.md b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/README.md new file mode 100644 index 0000000..c83724b --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/AdvancedSessions/README.md @@ -0,0 +1,7 @@ +### How do I use it? ### + +**KantanDocGen Automatic Documentation ([KantanDocGen](http://kantandev.com/free/kantan-doc-gen))** + +**[AdvancedSessions](https://vreue4.com/generated-node-documentation?section=advanced-sessions-plugin)** + +**[AdvancedSteamSessions](https://vreue4.com/generated-node-documentation?section=advanced-steam-sessions-plugin)** diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/Serializers/FBPXRSkeletalRepContainerNetSerializer.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/Serializers/FBPXRSkeletalRepContainerNetSerializer.cpp deleted file mode 100644 index f2d0688..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/Serializers/FBPXRSkeletalRepContainerNetSerializer.cpp +++ /dev/null @@ -1,340 +0,0 @@ -#include "Serializers/FBPXRSkeletalRepContainerNetSerializer.h" -#include "Iris/Serialization/NetSerializerDelegates.h" -#include "Iris/Serialization/NetSerializers.h" -#include "Iris/Serialization/PackedVectorNetSerializers.h" -#include "Iris/ReplicationState/PropertyNetSerializerInfoRegistry.h" -#include "Iris/ReplicationState/ReplicationStateDescriptorBuilder.h" - -#include "OpenXRHandPoseComponent.h" - - -namespace UE::Net -{ - - // ----------------------------------------------------------------------------- - // Iris serializer for FBPXRSkeletalRepContainer - // ----------------------------------------------------------------------------- - struct FBPXRSkeletalRepContainerNetSerializer - { - inline static const FVectorNetQuantize100NetSerializerConfig Quantize100SerializerConfig; - - inline static const FNetSerializerConfig* VectorNetQuantizeNetSerializerConfig = &Quantize100SerializerConfig; - inline static const FNetSerializer* VectorNetQuantizeNetSerializer; - - class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates - { - public: - virtual ~FNetSerializerRegistryDelegates(); - - void InitNetSerializer() - { - FBPXRSkeletalRepContainerNetSerializer::VectorNetQuantizeNetSerializer = &UE_NET_GET_SERIALIZER(FVectorNetQuantize100NetSerializer); - } - - private: - virtual void OnPreFreezeNetSerializerRegistry() override; - //virtual void OnPostFreezeNetSerializerRegistry() override; - }; - - inline static FBPXRSkeletalRepContainerNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; - - - /** Version is required. */ - static constexpr uint32 Version = 0; - - struct alignas(8) FSkeletalTransformQuantizedData - { - uint64 Position[4]; // We don't need to store double for tracked device positions, but their forwarded serializer uses it - uint16 Rotation[3]; - }; - - struct alignas(8) FBPXRSkeletalRepContainerQuantizedData - { - uint8 TargetHand; - uint8 bAllowDeformingMesh; - uint8 bEnableUE4HandRepSavings; - - uint16 ElementCount; - FSkeletalTransformQuantizedData SkeletalTransforms[EHandKeypointCount]; - // List of array data, we know the max elements so we can statically set it to that - // Technically should be -6 since we dont use some but im going to future proof it a bit here - }; - - typedef FBPXRSkeletalRepContainer SourceType; - typedef FBPXRSkeletalRepContainerQuantizedData QuantizedType; - typedef FBPXRSkeletalRepContainerNetSerializerConfig ConfigType; - inline static const ConfigType DefaultConfig; - - /** Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. */ - static constexpr bool bUseDefaultDelta = true; - - // Not using delta as this struct is sent on a timer and not changed incrementally - - - static constexpr uint32 ElementSizeBytes = sizeof(FSkeletalTransformQuantizedData); - - // Called to create a "quantized snapshot" of the struct - static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) - { - // Actually do the real quantization step here next instead of just in serialize, will save on memory overall - const SourceType& Source = *reinterpret_cast(Args.Source); - QuantizedType& Target = *reinterpret_cast(Args.Target); - - Target.TargetHand = (uint8)Source.TargetHand; - Target.bAllowDeformingMesh = Source.bAllowDeformingMesh ? 1 : 0; - Target.bEnableUE4HandRepSavings = Source.bEnableUE4HandRepSavings ? 1 : 0; - - // Free data if non null - Target.ElementCount = 0; - - const uint32 Num = Source.SkeletalTransforms.Num(); - Target.ElementCount = static_cast(Num); - - if (Num > 0) - { - FRotator TargetRot; - FVector TargetLoc; - for (uint16 i = 0; i < Num; ++i) - { - TargetRot = Source.SkeletalTransforms[i].Rotator(); - TargetLoc = Source.SkeletalTransforms[i].GetLocation(); - - Target.SkeletalTransforms[i].Rotation[0] = FRotator::CompressAxisToShort(TargetRot.Pitch); - Target.SkeletalTransforms[i].Rotation[1] = FRotator::CompressAxisToShort(TargetRot.Yaw); - Target.SkeletalTransforms[i].Rotation[2] = FRotator::CompressAxisToShort(TargetRot.Roll); - - const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; - const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; - - FNetQuantizeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&TargetLoc); - MemberArgs.Target = NetSerializerValuePointer(&Target.SkeletalTransforms[i].Position[0]); - Serializer->Quantize(Context, MemberArgs); - } - } - } - - // Called to apply the quantized snapshot back to gameplay memory - static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - SourceType& Target = *reinterpret_cast(Args.Target); - - Target.TargetHand = (EVRSkeletalHandIndex)Source.TargetHand; - Target.bAllowDeformingMesh = Source.bAllowDeformingMesh != 0; - Target.bEnableUE4HandRepSavings = Source.bEnableUE4HandRepSavings != 0; - - const uint16 Count = Source.ElementCount; - Target.SkeletalTransforms.Reset(); - if (Count > 0) - { - Target.SkeletalTransforms.AddUninitialized(Count); - - const FSkeletalTransformQuantizedData* Data = Source.SkeletalTransforms; - FRotator TargetRot; - FVector TargetLoc; - for (int i = 0; i < Count; ++i) - { - TargetRot.Pitch = FRotator::DecompressAxisFromShort(Data[i].Rotation[0]); - TargetRot.Yaw = FRotator::DecompressAxisFromShort(Data[i].Rotation[1]); - TargetRot.Roll = FRotator::DecompressAxisFromShort(Data[i].Rotation[2]); - TargetRot.Normalize(); - - const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; - const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; - - FNetDequantizeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&TargetLoc); - MemberArgs.Target = NetSerializerValuePointer(&Data[i].Position[0]); - Serializer->Dequantize(Context, MemberArgs); - - Target.SkeletalTransforms[i].SetComponents(TargetRot.Quaternion(), TargetLoc, FVector(1.0f)); - } - } - } - - // Serialize into bitstream - static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); - - // write header bytes (small fields) — do as bytes for compactness - Writer->WriteBits(Source.TargetHand, 8); - Writer->WriteBits(Source.bAllowDeformingMesh, 1); - Writer->WriteBits(Source.bEnableUE4HandRepSavings, 1); - - int32 BoneCountAdjustment = 6 + (Source.bEnableUE4HandRepSavings != 0 ? 4 : 0); - uint8 TransformCount = EHandKeypointCount - BoneCountAdjustment; - - bool bHasValidData = Source.ElementCount >= TransformCount; - - Writer->WriteBits(bHasValidData, 1); - - if (bHasValidData) - { - // write element count (16 bits) - uint32 ElemCount = Source.ElementCount; - - if (ElemCount < 1) - { - // Write nothing - ElemCount = 0; - } - - Writer->WriteBits(ElemCount, 16); - - const FSkeletalTransformQuantizedData* Data = Source.SkeletalTransforms; - for (uint16 i = 0; i < ElemCount; ++i) - { - if (Source.bAllowDeformingMesh) - { - const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; - const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; - - FNetSerializeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Data[i].Position[0]); - Serializer->Serialize(Context, MemberArgs); - } - - Writer->WriteBits(Data[i].Rotation[0], 16); - Writer->WriteBits(Data[i].Rotation[1], 16); - Writer->WriteBits(Data[i].Rotation[2], 16); - } - } - } - - // Deserialize from bitstream - static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) - { - QuantizedType& Target = *reinterpret_cast(Args.Target); - FNetBitStreamReader* Reader = Context.GetBitStreamReader(); - - // write header bytes (small fields) — do as bytes for compactness - - Target.TargetHand = Reader->ReadBits(8); - Target.bAllowDeformingMesh = Reader->ReadBits(1); - Target.bEnableUE4HandRepSavings = Reader->ReadBits(1); - - int32 BoneCountAdjustment = 6 + (Target.bEnableUE4HandRepSavings != 0 ? 4 : 0); - uint8 TransformCount = EHandKeypointCount - BoneCountAdjustment; - - bool bHasValidData = Reader->ReadBits(1) != 0; - - if (bHasValidData) - { - // write element count (16 bits) - uint32 ElemCount = Reader->ReadBits(16); - - Target.ElementCount = static_cast(ElemCount); - - if (ElemCount > 0) - { - FSkeletalTransformQuantizedData* Data = Target.SkeletalTransforms; - for (uint16 i = 0; i < ElemCount; ++i) - { - if (Target.bAllowDeformingMesh) - { - const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; - const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; - - FNetDeserializeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Target = NetSerializerValuePointer(&Data[i].Position[0]); - Serializer->Deserialize(Context, MemberArgs); - } - - Data[i].Rotation[0] = Reader->ReadBits(16); - Data[i].Rotation[1] = Reader->ReadBits(16); - Data[i].Rotation[2] = Reader->ReadBits(16); - } - } - } - } - - - // Compare two instances to see if they differ - static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) - { - if (Args.bStateIsQuantized) - { - const QuantizedType& QuantizedValue0 = *reinterpret_cast(Args.Source0); - const QuantizedType& QuantizedValue1 = *reinterpret_cast(Args.Source1); - return FPlatformMemory::Memcmp(&QuantizedValue0, &QuantizedValue1, sizeof(QuantizedType)) == 0; - } - else - { - const SourceType& L = *reinterpret_cast(Args.Source0); - const SourceType& R = *reinterpret_cast(Args.Source1); - - - if (L.bAllowDeformingMesh != R.bAllowDeformingMesh) return false; - if (L.bEnableUE4HandRepSavings != R.bEnableUE4HandRepSavings) return false; - if (L.SkeletalTransforms.Num() != R.SkeletalTransforms.Num()) return false; - - // Using L num is valid as we already checked if they are the same count - return FPlatformMemory::Memcmp(L.SkeletalTransforms.GetData(), R.SkeletalTransforms.GetData(), sizeof(FTransform) * L.SkeletalTransforms.Num()) == 0; - } - } - - static void Apply(FNetSerializationContext& Context, const FNetApplyArgs& Args) - { - const SourceType& Source = *reinterpret_cast(Args.Source); - SourceType& Target = *reinterpret_cast(Args.Target); - - Target.bAllowDeformingMesh = Source.bAllowDeformingMesh; - Target.bEnableUE4HandRepSavings = Source.bEnableUE4HandRepSavings; - Target.TargetHand = Source.TargetHand; - - // Copys it over with new allocations - Target.SkeletalTransforms = Source.SkeletalTransforms; - } - - static void CloneDynamicState(FNetSerializationContext& Context, const FNetCloneDynamicStateArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - QuantizedType& Target = *reinterpret_cast(Args.Target); - - // copy small fields - Target.TargetHand = Source.TargetHand; - Target.bAllowDeformingMesh = Source.bAllowDeformingMesh; - Target.bEnableUE4HandRepSavings = Source.bEnableUE4HandRepSavings; - - // copy elements - Target.ElementCount = Source.ElementCount; - - const uint32 Count = Target.ElementCount; - if (Count > 0) - { - const SIZE_T Bytes = SIZE_T(Count) * ElementSizeBytes; - FMemory::Memcpy(Target.SkeletalTransforms, Source.SkeletalTransforms, Bytes); - } - } - - static void FreeDynamicState(FNetSerializationContext& Context, const FNetFreeDynamicStateArgs& Args) - { - QuantizedType& Target = *reinterpret_cast(Args.Source); - Target.ElementCount = 0; - } - }; - - - static const FName PropertyNetSerializerRegistry_NAME_BPXRSkeletalRepContainer("BPXRSkeletalRepContainer"); - UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPXRSkeletalRepContainer, FBPXRSkeletalRepContainerNetSerializer); - - FBPXRSkeletalRepContainerNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() - { - UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPXRSkeletalRepContainer); - } - - void FBPXRSkeletalRepContainerNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() - { - InitNetSerializer(); - UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPXRSkeletalRepContainer); - } - - UE_NET_IMPLEMENT_SERIALIZER(FBPXRSkeletalRepContainerNetSerializer); -} diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/Serializers/FBPXRSkeletalRepContainerNetSerializer.h b/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/Serializers/FBPXRSkeletalRepContainerNetSerializer.h deleted file mode 100644 index 69d281a..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/Serializers/FBPXRSkeletalRepContainerNetSerializer.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "Iris/Serialization/NetSerializer.h" -#include "FBPXRSkeletalRepContainerNetSerializer.generated.h" - -USTRUCT() -struct FBPXRSkeletalRepContainerNetSerializerConfig : public FNetSerializerConfig -{ - GENERATED_BODY() -}; - -namespace UE::Net -{ - UE_NET_DECLARE_SERIALIZER(FBPXRSkeletalRepContainerNetSerializer, OPENXREXPANSIONPLUGIN_API); - -} \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/SPUD b/VIRTUOS_ExpansionPluginTests/Plugins/SPUD index 57c25ee..968fe10 160000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/SPUD +++ b/VIRTUOS_ExpansionPluginTests/Plugins/SPUD @@ -1 +1 @@ -Subproject commit 57c25ee516342f3a4140ca52eb9025580a4f2fd8 +Subproject commit 968fe10c9f08859c64ea88768d5216140fc340d9 diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/StevesUEHelpers b/VIRTUOS_ExpansionPluginTests/Plugins/StevesUEHelpers deleted file mode 160000 index 5fe193d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/StevesUEHelpers +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5fe193da6208fbd9626559a66e332c5642496ab3 diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/.gitattributes b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/.gitattributes new file mode 100644 index 0000000..3373152 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/.gitattributes @@ -0,0 +1,2 @@ +* text=auto +*.bat eol=crlf \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/.gitignore b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/.gitignore new file mode 100644 index 0000000..3cdb673 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/.gitignore @@ -0,0 +1,10 @@ + +.hg/ +binaries/ +deriveddatacache/ +.vs/ +build/ +intermediate/ +PACKPLUGIN/ +saved/ +*.orig \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/LICENSE.txt b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/LICENSE.txt new file mode 100644 index 0000000..986c999 --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/LICENSE.txt @@ -0,0 +1,19 @@ +Copyright Joshua Statzer + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Config/FilterPlugin.ini b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Config/FilterPlugin.ini similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Config/FilterPlugin.ini rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Config/FilterPlugin.ini diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/OpenXRExpansionPlugin.uplugin b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/OpenXRExpansionPlugin.uplugin similarity index 95% rename from VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/OpenXRExpansionPlugin.uplugin rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/OpenXRExpansionPlugin.uplugin index 2fa6a31..f04ed51 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/OpenXRExpansionPlugin.uplugin +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/OpenXRExpansionPlugin.uplugin @@ -1,7 +1,7 @@ { "FileVersion": 3, - "Version": 5.7, - "VersionName": "5.7", + "Version": 5.5, + "VersionName": "5.5", "FriendlyName": "OpenXRExpansionPlugin", "Description": "An set of utility functions for OpenXR", "Category": "Virtual Reality", diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Resources/Icon128.png b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Resources/Icon128.png similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Resources/Icon128.png rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Resources/Icon128.png diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/OpenXRExpansionEditor.Build.cs b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/OpenXRExpansionEditor.Build.cs similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/OpenXRExpansionEditor.Build.cs rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/OpenXRExpansionEditor.Build.cs diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Private/AnimGraphNode_ApplyOpenXRHandPose.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Private/AnimGraphNode_ApplyOpenXRHandPose.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Private/AnimGraphNode_ApplyOpenXRHandPose.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Private/AnimGraphNode_ApplyOpenXRHandPose.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Private/OpenXRExpansionEditor.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Private/OpenXRExpansionEditor.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Private/OpenXRExpansionEditor.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Private/OpenXRExpansionEditor.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Public/AnimGraphNode_ApplyOpenXRHandPose.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Public/AnimGraphNode_ApplyOpenXRHandPose.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Public/AnimGraphNode_ApplyOpenXRHandPose.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Public/AnimGraphNode_ApplyOpenXRHandPose.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Public/OpenXRExpansionEditor.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Public/OpenXRExpansionEditor.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Public/OpenXRExpansionEditor.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionEditor/Public/OpenXRExpansionEditor.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/OpenXRExpansionPlugin.Build.cs b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/OpenXRExpansionPlugin.Build.cs similarity index 91% rename from VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/OpenXRExpansionPlugin.Build.cs rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/OpenXRExpansionPlugin.Build.cs index 41989fe..e7a0b33 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/OpenXRExpansionPlugin.Build.cs +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/OpenXRExpansionPlugin.Build.cs @@ -10,10 +10,6 @@ namespace UnrealBuildTool.Rules public OpenXRExpansionPlugin(ReadOnlyTargetRules Target) : base(Target) { - PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; - DefaultBuildSettings = BuildSettingsVersion.Latest; - IncludeOrderVersion = EngineIncludeOrderVersion.Latest; - SetupIrisSupport(Target); PublicDependencyModuleNames.AddRange( diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/AnimNode_ApplyOpenXRHandPose.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/AnimNode_ApplyOpenXRHandPose.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/AnimNode_ApplyOpenXRHandPose.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/AnimNode_ApplyOpenXRHandPose.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionFunctionLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionFunctionLibrary.cpp similarity index 86% rename from VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionFunctionLibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionFunctionLibrary.cpp index 604cf71..89c9aa1 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionFunctionLibrary.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionFunctionLibrary.cpp @@ -163,40 +163,34 @@ void UOpenXRExpansionFunctionLibrary::GetXRMotionControllerType(FString& Trackin bool UOpenXRExpansionFunctionLibrary::GetOpenXRHandPose(FBPOpenXRActionSkeletalData& HandPoseContainer, UOpenXRHandPoseComponent* HandPoseComponent, bool bGetMockUpPose) { - FXRHandTrackingState HandTrackingData; - FXRMotionControllerState MotionControllerData; + FXRMotionControllerData MotionControllerData; if (bGetMockUpPose) { - // #TODO 5.7 TEST THIS - UHeadMountedDisplayFunctionLibrary::GetMotionControllerState((UObject*)HandPoseComponent, EXRSpaceType::UnrealWorldSpace, HandPoseContainer.TargetHand == EVRSkeletalHandIndex::EActionHandIndex_Left ? EControllerHand::Left : EControllerHand::Right, HandPoseContainer.PoseType, MotionControllerData); - GetMockUpControllerData(HandTrackingData,MotionControllerData, HandPoseContainer); + GetMockUpControllerData(MotionControllerData, HandPoseContainer); return true; } - UHeadMountedDisplayFunctionLibrary::GetHandTrackingState((UObject*)HandPoseComponent, EXRSpaceType::UnrealWorldSpace, HandPoseContainer.TargetHand == EVRSkeletalHandIndex::EActionHandIndex_Left ? EControllerHand::Left : EControllerHand::Right, HandTrackingData); + UHeadMountedDisplayFunctionLibrary::GetMotionControllerData((UObject*)HandPoseComponent, HandPoseContainer.TargetHand == EVRSkeletalHandIndex::EActionHandIndex_Left ? EControllerHand::Left : EControllerHand::Right, MotionControllerData); - if (HandTrackingData.bValid) + if (MotionControllerData.bValid) { - HandPoseContainer.SkeletalTransforms.Empty(HandTrackingData.HandKeyLocations.Num()); + HandPoseContainer.SkeletalTransforms.Empty(MotionControllerData.HandKeyPositions.Num()); FTransform ParentTrans = FTransform::Identity; - - // #TODO: 5.7 Preview!! - // Might need to restore all of this, have to test with vive - /*if (MotionControllerData.DeviceVisualType == EXRVisualType::Controller) + if (MotionControllerData.DeviceVisualType == EXRVisualType::Controller) { ParentTrans = FTransform(MotionControllerData.GripRotation, MotionControllerData.GripPosition, FVector(1.f)); } - else // EXRVisualType::Hand visual type*/ + else // EXRVisualType::Hand visual type { - ParentTrans = FTransform(HandTrackingData.HandKeyRotations[(uint8)EHandKeypoint::Palm], HandTrackingData.HandKeyLocations[(uint8)EHandKeypoint::Palm], FVector(1.f)); + ParentTrans = FTransform(MotionControllerData.HandKeyRotations[(uint8)EHandKeypoint::Palm], MotionControllerData.HandKeyPositions[(uint8)EHandKeypoint::Palm], FVector(1.f)); } - for (int i = 0; i < HandTrackingData.HandKeyLocations.Num(); ++i) + for (int i = 0; i < MotionControllerData.HandKeyPositions.Num(); ++i) { // Convert to component space, we convert then to parent space later when applying it - HandPoseContainer.SkeletalTransforms.Add(FTransform(HandTrackingData.HandKeyRotations[i].GetNormalized(), HandTrackingData.HandKeyLocations[i], FVector(1.f)).GetRelativeTransform(ParentTrans)); + HandPoseContainer.SkeletalTransforms.Add(FTransform(MotionControllerData.HandKeyRotations[i].GetNormalized(), MotionControllerData.HandKeyPositions[i], FVector(1.f)).GetRelativeTransform(ParentTrans)); } //if (bGetCurlValues) @@ -239,33 +233,31 @@ bool UOpenXRExpansionFunctionLibrary::GetOpenXRFingerCurlValuesForHand( float& RingCurl, float& PinkyCurl) { - FXRHandTrackingState HandTrackingData; - UHeadMountedDisplayFunctionLibrary::GetHandTrackingState(WorldContextObject, EXRSpaceType::UnrealWorldSpace, TargetHand, HandTrackingData); + FXRMotionControllerData MotionControllerData; + UHeadMountedDisplayFunctionLibrary::GetMotionControllerData(WorldContextObject, TargetHand, MotionControllerData); // Fail if the count is too low - if (HandTrackingData.HandKeyLocations.Num() < EHandKeypointCount) + if (MotionControllerData.HandKeyPositions.Num() < EHandKeypointCount) return false; FTransform ParentTrans = FTransform::Identity; - // #TODO: 5.7 - // TEST THIS and restore if we need too - /*if (MotionControllerData.DeviceVisualType == EXRVisualType::Controller) + if (MotionControllerData.DeviceVisualType == EXRVisualType::Controller) { ParentTrans = FTransform(MotionControllerData.GripRotation, MotionControllerData.GripPosition, FVector(1.f)); } - else // EXRVisualType::Hand visual type*/ + else // EXRVisualType::Hand visual type { - ParentTrans = FTransform(HandTrackingData.HandKeyRotations[(uint8)EHandKeypoint::Palm], HandTrackingData.HandKeyLocations[(uint8)EHandKeypoint::Palm], FVector(1.f)); + ParentTrans = FTransform(MotionControllerData.HandKeyRotations[(uint8)EHandKeypoint::Palm], MotionControllerData.HandKeyPositions[(uint8)EHandKeypoint::Palm], FVector(1.f)); } TArray TransformArray; - TransformArray.AddUninitialized(HandTrackingData.HandKeyLocations.Num()); + TransformArray.AddUninitialized(MotionControllerData.HandKeyPositions.Num()); - for (int i = 0; i < HandTrackingData.HandKeyLocations.Num(); ++i) + for (int i = 0; i < MotionControllerData.HandKeyPositions.Num(); ++i) { // Convert to component space, we convert then to parent space later when applying it - TransformArray[i] = FTransform(HandTrackingData.HandKeyRotations[i].GetNormalized(), HandTrackingData.HandKeyLocations[i], FVector(1.f)).GetRelativeTransform(ParentTrans); + TransformArray[i] = FTransform(MotionControllerData.HandKeyRotations[i].GetNormalized(), MotionControllerData.HandKeyPositions[i], FVector(1.f)).GetRelativeTransform(ParentTrans); } ThumbCurl = GetCurlValueForBoneRoot(TransformArray, EHandKeypoint::ThumbMetacarpal); @@ -444,7 +436,7 @@ void UOpenXRExpansionFunctionLibrary::ConvertHandTransformsSpaceAndBack(TArray HandPositionsClosed = { // Closed palm - Left @@ -569,9 +561,9 @@ void UOpenXRExpansionFunctionLibrary::GetMockUpControllerData(FXRHandTrackingSta FVector(-1019.778f,-479.842f,203.819f) }; - HandTrackingData.HandKeyLocations = /*SkeletalMappingData.TargetHand != EVRSkeletalHandIndex::EActionHandIndex_Left ? HandPositionsOpen : */HandPositionsClosed; + MotionControllerData.HandKeyPositions = /*SkeletalMappingData.TargetHand != EVRSkeletalHandIndex::EActionHandIndex_Left ? HandPositionsOpen : */HandPositionsClosed; - /*if (SkeletalMappingData.TargetHand != EVRSkeletalHandIndex::EActionHandIndex_Left) + if (SkeletalMappingData.TargetHand != EVRSkeletalHandIndex::EActionHandIndex_Left) { MotionControllerData.GripPosition = FVector(-1018.305f, -478.019f, 209.872f); MotionControllerData.GripRotation = FQuat(-0.116352126f, 0.039430488f, -0.757644236f, 0.641001403f); @@ -580,15 +572,15 @@ void UOpenXRExpansionFunctionLibrary::GetMockUpControllerData(FXRHandTrackingSta { MotionControllerData.GripPosition = FVector(-1202.619f, -521.077f, 283.076f); MotionControllerData.GripRotation = FQuat(0.040843058f, 0.116659224f, 0.980030060f, -0.155767411f); - }*/ + } + + MotionControllerData.DeviceName = TEXT("OpenXR"); - HandTrackingData.DeviceName = TEXT("OpenXR"); - SkeletalMappingData.SkeletalTransforms.Empty(SkeletalMappingData.SkeletalTransforms.Num()); - FTransform ParentTrans = FTransform(MotionControllerData.GripUnrealSpaceRotation, MotionControllerData.GripUnrealSpaceLocation, FVector(1.f)); - for (int i = 0; i < HandTrackingData.HandKeyLocations.Num(); i++) + FTransform ParentTrans = FTransform(MotionControllerData.GripRotation, MotionControllerData.GripPosition, FVector(1.f)); + for (int i = 0; i < MotionControllerData.HandKeyPositions.Num(); i++) { - SkeletalMappingData.SkeletalTransforms.Add(FTransform(HandTrackingData.HandKeyRotations[i], HandTrackingData.HandKeyLocations[i], FVector(1.f)).GetRelativeTransform(ParentTrans)); + SkeletalMappingData.SkeletalTransforms.Add(FTransform(MotionControllerData.HandKeyRotations[i], MotionControllerData.HandKeyPositions[i], FVector(1.f)).GetRelativeTransform(ParentTrans)); } SkeletalMappingData.bHasValidData = (SkeletalMappingData.SkeletalTransforms.Num() == EHandKeypointCount); diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionPlugin.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionPlugin.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionPlugin.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRExpansionPlugin.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRHandPoseComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRHandPoseComponent.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRHandPoseComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Private/OpenXRHandPoseComponent.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/AnimNode_ApplyOpenXRHandPose.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/AnimNode_ApplyOpenXRHandPose.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/AnimNode_ApplyOpenXRHandPose.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/AnimNode_ApplyOpenXRHandPose.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionFunctionLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionFunctionLibrary.h similarity index 94% rename from VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionFunctionLibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionFunctionLibrary.h index 9caacc3..dbac085 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionFunctionLibrary.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionFunctionLibrary.h @@ -93,7 +93,7 @@ public: static void ConvertHandTransformsSpaceAndBack(TArray& OutTransforms, const TArray& WorldTransforms); UFUNCTION(BlueprintCallable, Category = "VRExpansionFunctions|OpenXR", meta = (bIgnoreSelf = "true")) - static void GetMockUpControllerData(FXRHandTrackingState& HandTrackingData,FXRMotionControllerState& MotionControllerData, FBPOpenXRActionSkeletalData& SkeletalMappingData, bool bOpenHand = false); + static void GetMockUpControllerData(FXRMotionControllerData& MotionControllerData, FBPOpenXRActionSkeletalData& SkeletalMappingData, bool bOpenHand = false); // Get a list of all currently tracked devices and their types, index in the array is their device index // Returns failed if the openXR query failed (no interaction profile yet or openXR is not running) diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionPlugin.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionPlugin.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionPlugin.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionPlugin.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionTypes.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionTypes.h similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionTypes.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionTypes.h index 232de96..c064148 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionTypes.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRExpansionTypes.h @@ -4,7 +4,6 @@ #include "CoreMinimal.h" #include "UObject/ObjectMacros.h" #include "Kismet/BlueprintFunctionLibrary.h" -#include "HeadMountedDisplayTypes.h" #include "Animation/BoneReference.h" #include "UObject/Object.h" #include "Engine/EngineTypes.h" @@ -98,10 +97,6 @@ public: UPROPERTY(EditAnywhere, NotReplicated, BlueprintReadWrite, Category = Default) EVRSkeletalHandIndex TargetHand; - // Used to select the type of pose to retrieve from OpenXR, default is grip but you will want to use Palm when using the palm source for motion controller - UPROPERTY(EditAnywhere, NotReplicated, BlueprintReadWrite, Category = Default) - EXRControllerPoseType PoseType; - // A world scale override that will replace the engines current value and force into the tracked data if non zero UPROPERTY(EditAnywhere, NotReplicated, BlueprintReadWrite, Category = Default) float WorldScaleOverride; @@ -149,7 +144,6 @@ public: bMirrorLeftRight = false; bEnableUE4HandRepSavings = false; TargetHand = EVRSkeletalHandIndex::EActionHandIndex_Right; - PoseType = EXRControllerPoseType::Grip; bHasValidData = false; LastHandGestureIndex = INDEX_NONE; LastHandGesture = NAME_None; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRHandPoseComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRHandPoseComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRHandPoseComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/OpenXRExpansionPlugin/Source/OpenXRExpansionPlugin/Public/OpenXRHandPoseComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/README.md b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/README.md new file mode 100644 index 0000000..fa9c46f --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/README.md @@ -0,0 +1,48 @@ +UE Forums Thread +https://forums.unrealengine.com/development-discussion/vr-ar-development/89050-vr-openvr-expansion-plugin + +Example Template Project +https://github.com/mordentral/VRExpPluginExample + +Website: +www.vreue4.com + +*** + +### Use Of This Plugin ### + +This Plugin is intended to add additional functionality to Open/SteamVR/(All VR now) in UE4. + +### Plugin Website ### +[VREUE4.com](https://vreue4.com) + +### How do I install it? ### + +https://vreue4.com/documentation?section=installation + +**Guides for migrating between different engine versions of the plugin:** + +View the patch notes at www.vreue4.com for migration guides as well. + +**Option 1:** + +Go to www.vreue4.com and downloaded the pre-built binary version for the engine version you are using (not updated with every daily change, only weekly or with large patches). + +Install it into your ProjectName/Plugins Directory (Engine level hasn't worked since 4.25 or so when it stopped letting me reference other plugins when compiling for that). + +**Option 2 (More up to date - preferred if possible):** + +* Clone Or Download Zip and extract this repository to a folder named "VRExpansionPlugin" in your "ProjectName/Plugins" directory, create this directory if it is missing. + +* Add the VRExpansionPlugin to your projects PublicDependencyModuleNames in the projects build.cs if you have c++ code included. + +* IF you do not have c++ code, use the Add New button in the editor and add a blank c++ class to your project. + +* Open up the generated project .SLN file and build the project from the build menu. + +You need to have visual studio installed and follow the UE4 setup guide for it: https://docs.unrealengine.com/latest/INT/Programming/Development/VisualStudioSetup/ + +### How do I use it? ### +### How do I VR? ### + +The template project contains use examples of most of the features of the plugin as well as locomotion modes, interaction methods, and basic multiplayer. diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPAdvGripPhysicsSettingsNetSerializer.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPAdvGripPhysicsSettingsNetSerializer.cpp deleted file mode 100644 index 1f16c07..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPAdvGripPhysicsSettingsNetSerializer.cpp +++ /dev/null @@ -1,258 +0,0 @@ -#include "Serializers/FBPAdvGripPhysicsSettingsNetSerializer.h" -#include "Serializers/SerializerHelpers.h" -#include "Iris/Serialization/NetSerializerDelegates.h" -#include "Iris/Serialization/NetSerializers.h" -#include "Iris/ReplicationState/PropertyNetSerializerInfoRegistry.h" -#include "Iris/ReplicationState/ReplicationStateDescriptorBuilder.h" - - -namespace UE::Net -{ - - // ----------------------------------------------------------------------------- - // Iris serializer for FBPAdvGripPhysicsSettings - // ----------------------------------------------------------------------------- - struct FBPAdvGripPhysicsSettingsNetSerializer - { - - class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates - { - public: - virtual ~FNetSerializerRegistryDelegates(); - - private: - virtual void OnPreFreezeNetSerializerRegistry() override; - //virtual void OnPostFreezeNetSerializerRegistry() override; - }; - - inline static FBPAdvGripPhysicsSettingsNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; - - - /** Version is required. */ - static constexpr uint32 Version = 0; - - struct FQuantizedData - { - uint32 bUsePhysicsSettings : 1; - uint32 PhysicsConstraintType : 1; // This only has two elements - uint32 PhysicsGripLocationSettings : 3; // This only has five states - uint32 bTurnOffGravityDuringGrip : 1; - uint32 bSkipSettingSimulating : 1; - uint32 bUseCustomAngularValues : 1; - uint32 Reserved : 25; // pad out to full 32 bits - - // Quantized ranges (0–512 with ~0.01 precision) - uint32 LinearMaxForceCoefficient; - uint32 AngularMaxForceCoefficient; - - float AngularStiffness; - float AngularDamping; - }; - - typedef FBPAdvGripPhysicsSettings SourceType; - typedef FQuantizedData QuantizedType; - typedef FBPAdvGripPhysicsSettingsNetSerializerConfig ConfigType; - inline static const ConfigType DefaultConfig; - - /** Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. */ - static constexpr bool bUseDefaultDelta = true; - // Not doing delta, the majority of the time a single bit (bool) controls the serialization of the entirity - - - /** - * Optional. Same as Serialize but where an acked previous state is provided for bitpacking purposes. - * This is implemented by default to do same value optimization, at the cost of a bit. If implemented - * then DeserializeDelta is required. - */ - /*static void SerializeDelta(FNetSerializationContext&, const FNetSerializeDeltaArgs&) - { - - }*/ - - /** - * Optional. Same as Deserialize but where an acked previous state is provided for bitpacking purposes. - * This is implemented by default to do same value optimization, at the cost of a bit. If implemented - * then SerializeDelta is required. - */ - /*static void DeserializeDelta(FNetSerializationContext&, const FNetDeserializeDeltaArgs&) - { - - }*/ - - // Called to create a "quantized snapshot" of the struct - static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) - { - - // Actually do the real quantization step here next instead of just in serialize, will save on memory overall - const SourceType& Source = *reinterpret_cast(Args.Source); - QuantizedType& Target = *reinterpret_cast(Args.Target); - - // Copy flags - Target.bUsePhysicsSettings = Source.bUsePhysicsSettings; - - if (Target.bUsePhysicsSettings) - { - Target.PhysicsConstraintType = (uint32)Source.PhysicsConstraintType; - Target.PhysicsGripLocationSettings = (uint32)Source.PhysicsGripLocationSettings; - - Target.bTurnOffGravityDuringGrip = Source.bTurnOffGravityDuringGrip; - Target.bSkipSettingSimulating = Source.bSkipSettingSimulating; - - // Quantize forces - Target.LinearMaxForceCoefficient = GetCompressedFloat<512, 17>(Source.LinearMaxForceCoefficient); - Target.AngularMaxForceCoefficient = GetCompressedFloat<512, 17>(Source.AngularMaxForceCoefficient); - - Target.bUseCustomAngularValues = Source.bUseCustomAngularValues; - - if (Target.bUseCustomAngularValues) - { - // Copy angular floats as-is - Target.AngularStiffness = Source.AngularStiffness; - Target.AngularDamping = Source.AngularDamping; - } - } - } - - // Called to apply the quantized snapshot back to gameplay memory - static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - SourceType& Target = *reinterpret_cast(Args.Target); - - Target.bUsePhysicsSettings = Source.bUsePhysicsSettings != 0; - - if (Source.bUsePhysicsSettings) - { - Target.AngularDamping = Source.AngularDamping; - Target.AngularStiffness = Source.AngularStiffness; - Target.bSkipSettingSimulating = Source.bSkipSettingSimulating != 0; - Target.bTurnOffGravityDuringGrip = Source.bTurnOffGravityDuringGrip != 0; - - - Target.PhysicsConstraintType = (EPhysicsGripConstraintType)Source.PhysicsConstraintType; - Target.PhysicsGripLocationSettings = (EPhysicsGripCOMType)Source.PhysicsGripLocationSettings; - - Target.bUseCustomAngularValues = Source.bUseCustomAngularValues != 0; - - if (Target.bUseCustomAngularValues) - { - Target.AngularMaxForceCoefficient = GetDecompressedFloat<512, 17>(Source.AngularMaxForceCoefficient); - Target.LinearMaxForceCoefficient = GetDecompressedFloat<512, 17>(Source.LinearMaxForceCoefficient); - } - } - } - - // Serialize into bitstream - static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); - - Writer->WriteBool(Source.bUsePhysicsSettings); - - if (Source.bUsePhysicsSettings) - { - Writer->WriteBits(static_cast(Source.PhysicsGripLocationSettings), 3); - Writer->WriteBits(static_cast(Source.PhysicsConstraintType), 1); - Writer->WriteBool(Source.bTurnOffGravityDuringGrip); - Writer->WriteBool(Source.bSkipSettingSimulating); - - // Compressed floats - Writer->WriteBits(Source.LinearMaxForceCoefficient, 17); - Writer->WriteBits(Source.AngularMaxForceCoefficient, 17); - - Writer->WriteBool(Source.bUseCustomAngularValues); - if (Source.bUseCustomAngularValues) - { - Writer->WriteBits(Source.AngularStiffness, 32); - Writer->WriteBits(Source.AngularDamping, 32); - } - } - } - - // Deserialize from bitstream - static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) - { - QuantizedType& Target = *reinterpret_cast(Args.Target); - FNetBitStreamReader* Reader = Context.GetBitStreamReader(); - - Target.bUsePhysicsSettings = Reader->ReadBool(); - - if (Target.bUsePhysicsSettings) - { - Target.PhysicsGripLocationSettings = Reader->ReadBits(3); - Target.PhysicsConstraintType = Reader->ReadBits(1); - Target.bTurnOffGravityDuringGrip = Reader->ReadBool(); - Target.bSkipSettingSimulating = Reader->ReadBool(); - - // Decompress floats - Target.LinearMaxForceCoefficient = Reader->ReadBits(17); - Target.AngularMaxForceCoefficient = Reader->ReadBits(17); - - Target.bUseCustomAngularValues = Reader->ReadBool(); - if (Target.bUseCustomAngularValues) - { - Target.AngularStiffness = Reader->ReadBits(32); - Target.AngularDamping = Reader->ReadBits(32); - } - } - } - - // Compare two instances to see if they differ - static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) - { - if (Args.bStateIsQuantized) - { - const QuantizedType& QuantizedValue0 = *reinterpret_cast(Args.Source0); - const QuantizedType& QuantizedValue1 = *reinterpret_cast(Args.Source1); - return FPlatformMemory::Memcmp(&QuantizedValue0, &QuantizedValue1, sizeof(QuantizedType)) == 0; - } - else - { - const SourceType& L = *reinterpret_cast(Args.Source0); - const SourceType& R = *reinterpret_cast(Args.Source1); - - if (L.bUsePhysicsSettings != R.bUsePhysicsSettings) return false; - if (!L.bUsePhysicsSettings) return true; - - if (L.PhysicsGripLocationSettings != R.PhysicsGripLocationSettings) return false; - if (L.PhysicsConstraintType != R.PhysicsConstraintType) return false; - if (L.bTurnOffGravityDuringGrip != R.bTurnOffGravityDuringGrip) return false; - if (L.bSkipSettingSimulating != R.bSkipSettingSimulating) return false; - - if (!FMath::IsNearlyEqual(L.LinearMaxForceCoefficient, R.LinearMaxForceCoefficient)) return false; - if (!FMath::IsNearlyEqual(L.AngularMaxForceCoefficient, R.AngularMaxForceCoefficient)) return false; - - if (L.bUseCustomAngularValues != R.bUseCustomAngularValues) return false; - - if (L.bUseCustomAngularValues) - { - if (!FMath::IsNearlyEqual(L.AngularStiffness, R.AngularStiffness)) return false; - if (!FMath::IsNearlyEqual(L.AngularDamping, R.AngularDamping)) return false; - } - - return true; - } - } - }; - - - static const FName PropertyNetSerializerRegistry_NAME_BPAdvGripPhysicsSettings("BPAdvGripPhysicsSettings"); - UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPAdvGripPhysicsSettings, FBPAdvGripPhysicsSettingsNetSerializer); - - FBPAdvGripPhysicsSettingsNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() - { - UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPAdvGripPhysicsSettings); - } - - void FBPAdvGripPhysicsSettingsNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() - { - UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPAdvGripPhysicsSettings); - } - - /*void FBPAdvGripPhysicsSettingsNetSerializer::FNetSerializerRegistryDelegates::OnPostFreezeNetSerializerRegistry() - { - }*/ - - UE_NET_IMPLEMENT_SERIALIZER(FBPAdvGripPhysicsSettingsNetSerializer); -} diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPSecondaryGripInfoNetSerializer.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPSecondaryGripInfoNetSerializer.cpp deleted file mode 100644 index acd5c09..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPSecondaryGripInfoNetSerializer.cpp +++ /dev/null @@ -1,423 +0,0 @@ -#include "Serializers/FBPSecondaryGripInfoNetSerializer.h" -#include "Serializers/SerializerHelpers.h" -#include "Iris/Serialization/NetSerializerDelegates.h" -#include "Iris/Serialization/NetSerializers.h" -#include "Iris/ReplicationState/PropertyNetSerializerInfoRegistry.h" -#include "Iris/ReplicationState/ReplicationStateDescriptorBuilder.h" -#include "Serializers/FTransformNetQuantizeNetSerializer.h" - - -namespace UE::Net -{ - - // ----------------------------------------------------------------------------- - // Iris serializer for FBPSecondaryGripInfo - // ----------------------------------------------------------------------------- - struct FBPSecondaryGripInfoNetSerializer - { - inline static const FVectorNetQuantize100NetSerializerConfig FTransformQuantizeSerializerConfig; - inline static const FObjectPtrNetSerializerConfig ObjectPtrNetSerializerConfig; - inline static const FNameNetSerializerConfig NameNetSerializerConfig; - - inline static const FNetSerializerConfig* FTransformQuantizeSerializerConfigPtr = &FTransformQuantizeSerializerConfig; - inline static const FNetSerializer* FTransformQuantizeNetSerializerPtr; - - inline static const FNetSerializerConfig* FObjectPtrSerializerConfigPtr = &ObjectPtrNetSerializerConfig; - inline static const FNetSerializer* FObjectPtrNetSerializerPtr; - - inline static const FNetSerializerConfig* FNameSerializerConfigPtr = &NameNetSerializerConfig; - inline static const FNetSerializer* FNameNetSerializerPtr; - - - - class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates - { - public: - virtual ~FNetSerializerRegistryDelegates(); - - void InitNetSerializer() - { - FBPSecondaryGripInfoNetSerializer::FTransformQuantizeNetSerializerPtr = &UE_NET_GET_SERIALIZER(FTransformNetQuantizeNetSerializer); - FBPSecondaryGripInfoNetSerializer::FObjectPtrNetSerializerPtr = &UE_NET_GET_SERIALIZER(FObjectPtrNetSerializer); - FBPSecondaryGripInfoNetSerializer::FNameNetSerializerPtr = &UE_NET_GET_SERIALIZER(FNameNetSerializer); - } - - private: - virtual void OnPreFreezeNetSerializerRegistry() override; - //virtual void OnPostFreezeNetSerializerRegistry() override; - }; - - inline static FBPSecondaryGripInfoNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; - - /** Version is required. */ - static constexpr uint32 Version = 0; - - struct alignas(8) FQuantizedData - { - uint8 bHasSecondaryAttachment; - FObjectNetSerializerQuantizedReferenceStorage SecondaryAttachment; - FTransformNetQuantizeQuantizedData SecondaryRelativeTransform; - - uint8 bIsSlotGrip; - - alignas(8) uint8 SecondarySlotName[GetNameNetSerializerSafeQuantizedSize()]; - - uint16 LerpToRate; - - // Not Replicated - // SecondaryGripDistance - //EGripLerpState GripLerpState; - //float curLerp; - //FVector LastRelativeLocation; - }; - - typedef FBPSecondaryGripInfo SourceType; - typedef FQuantizedData QuantizedType; - typedef FBPSecondaryGripInfoNetSerializerConfig ConfigType; - inline static const ConfigType DefaultConfig; - - // TODO: This is actually a struct that could use some delta serialization implementations. - /** Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. */ - static constexpr bool bUseDefaultDelta = true; - static constexpr bool bHasDynamicState = true; - //static constexpr bool bHasCustomNetReference = true; - - // Called to create a "quantized snapshot" of the struct - static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) - { - // Actually do the real quantization step here next instead of just in serialize, will save on memory overall - const SourceType& Source = *reinterpret_cast(Args.Source); - QuantizedType& Target = *reinterpret_cast(Args.Target); - - Target.bHasSecondaryAttachment = Source.bHasSecondaryAttachment ? 1 : 0; - - if (Target.bHasSecondaryAttachment) - { - // ObjectPtr - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - //Target.SecondaryAttachment - FNetQuantizeArgs MemberArgsObj = Args; - MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - MemberArgsObj.Source = NetSerializerValuePointer(&Source.SecondaryAttachment); - MemberArgsObj.Target = NetSerializerValuePointer(&Target.SecondaryAttachment); - ObjSerializer->Quantize(Context, MemberArgsObj); - - - // Transform - const FNetSerializer* TransformSerializer = FTransformQuantizeNetSerializerPtr; - const FNetSerializerConfig* TransformSerializerConfig = FTransformQuantizeSerializerConfigPtr; - - //SecondaryRelativeTransform - FNetQuantizeArgs MemberArgsTransform = Args; - MemberArgsTransform.NetSerializerConfig = NetSerializerConfigParam(TransformSerializerConfig); - MemberArgsTransform.Source = NetSerializerValuePointer(&Source.SecondaryRelativeTransform); - MemberArgsTransform.Target = NetSerializerValuePointer(&Target.SecondaryRelativeTransform); - TransformSerializer->Quantize(Context, MemberArgsTransform); - - Target.bIsSlotGrip = Source.bIsSlotGrip ? 1 : 0; - - // FName - const FNetSerializer* NameSerializer = FNameNetSerializerPtr; - const FNetSerializerConfig* NameSerializerConfig = FNameSerializerConfigPtr; - - //SecondarySlotName - FNetQuantizeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(NameSerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.SecondarySlotName); - MemberArgs.Target = NetSerializerValuePointer(&Target.SecondarySlotName); - NameSerializer->Quantize(Context, MemberArgs); - } - - // This is 0.0 - 16.0, using compression to get it smaller, 4 bits = max 16 + 1 bit for sign and 7 bits precision for 128 / full 2 digit precision - Target.LerpToRate = GetCompressedFloat<16, 12>(Source.LerpToRate); - } - - // Called to apply the quantized snapshot back to gameplay memory - static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - SourceType& Target = *reinterpret_cast(Args.Target); - - Target.bHasSecondaryAttachment = Source.bHasSecondaryAttachment != 0; - - if (Target.bHasSecondaryAttachment) - { - // ObjectPtr - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - //Target.SecondaryAttachment - FNetDequantizeArgs MemberArgsObj = Args; - MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - MemberArgsObj.Source = NetSerializerValuePointer(&Source.SecondaryAttachment); - MemberArgsObj.Target = NetSerializerValuePointer(&Target.SecondaryAttachment); - ObjSerializer->Dequantize(Context, MemberArgsObj); - - - // Transform - const FNetSerializer* TransformSerializer = FTransformQuantizeNetSerializerPtr; - const FNetSerializerConfig* TransformSerializerConfig = FTransformQuantizeSerializerConfigPtr; - - //SecondaryRelativeTransform - FNetDequantizeArgs MemberArgsTransform = Args; - MemberArgsTransform.NetSerializerConfig = NetSerializerConfigParam(TransformSerializerConfig); - MemberArgsTransform.Source = NetSerializerValuePointer(&Source.SecondaryRelativeTransform); - MemberArgsTransform.Target = NetSerializerValuePointer(&Target.SecondaryRelativeTransform); - TransformSerializer->Dequantize(Context, MemberArgsTransform); - - Target.bIsSlotGrip = Source.bIsSlotGrip != 0; - - // FName - const FNetSerializer* NameSerializer = FNameNetSerializerPtr; - const FNetSerializerConfig* NameSerializerConfig = FNameSerializerConfigPtr; - - //SecondarySlotName - FNetDequantizeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(NameSerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.SecondarySlotName); - MemberArgs.Target = NetSerializerValuePointer(&Target.SecondarySlotName); - NameSerializer->Dequantize(Context, MemberArgs); - } - - // This is 0.0 - 16.0, using compression to get it smaller, 4 bits = max 16 + 1 bit for sign and 7 bits precision for 128 / full 2 digit precision - Target.LerpToRate = GetDecompressedFloat<16, 12>(Source.LerpToRate); - } - - // Serialize into bitstream - static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); - - Writer->WriteBits(static_cast(Source.bHasSecondaryAttachment), 1); - - if (Source.bHasSecondaryAttachment != 0) - { - // ObjectPtr - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - //Target.SecondaryAttachment - FNetSerializeArgs MemberArgsObj = Args; - MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - MemberArgsObj.Source = NetSerializerValuePointer(&Source.SecondaryAttachment); - ObjSerializer->Serialize(Context, MemberArgsObj); - - - // Transform - const FNetSerializer* TransformSerializer = FTransformQuantizeNetSerializerPtr; - const FNetSerializerConfig* TransformSerializerConfig = FTransformQuantizeSerializerConfigPtr; - - //SecondaryRelativeTransform - FNetSerializeArgs MemberArgsTransform = Args; - MemberArgsTransform.NetSerializerConfig = NetSerializerConfigParam(TransformSerializerConfig); - MemberArgsTransform.Source = NetSerializerValuePointer(&Source.SecondaryRelativeTransform); - TransformSerializer->Serialize(Context, MemberArgsTransform); - - Writer->WriteBits(static_cast(Source.bIsSlotGrip), 1); - - // FName - const FNetSerializer* NameSerializer = FNameNetSerializerPtr; - const FNetSerializerConfig* NameSerializerConfig = FNameSerializerConfigPtr; - - //SecondarySlotName - FNetSerializeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(NameSerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.SecondarySlotName); - NameSerializer->Serialize(Context, MemberArgs); - } - - // This is 0.0 - 16.0, using compression to get it smaller, 4 bits = max 16 + 1 bit for sign and 7 bits precision for 128 / full 2 digit precision - Writer->WriteBits(static_cast(Source.LerpToRate), 12); - } - - // Deserialize from bitstream - static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) - { - QuantizedType& Target = *reinterpret_cast(Args.Target); - FNetBitStreamReader* Reader = Context.GetBitStreamReader(); - - Target.bHasSecondaryAttachment = Reader->ReadBits(1); - - if (Target.bHasSecondaryAttachment != 0) - { - // ObjectPtr - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - //Target.SecondaryAttachment - FNetDeserializeArgs MemberArgsObj = Args; - MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - MemberArgsObj.Target = NetSerializerValuePointer(&Target.SecondaryAttachment); - ObjSerializer->Deserialize(Context, MemberArgsObj); - - - // Transform - const FNetSerializer* TransformSerializer = FTransformQuantizeNetSerializerPtr; - const FNetSerializerConfig* TransformSerializerConfig = FTransformQuantizeSerializerConfigPtr; - - //SecondaryRelativeTransform - FNetDeserializeArgs MemberArgsTransform = Args; - MemberArgsTransform.NetSerializerConfig = NetSerializerConfigParam(TransformSerializerConfig); - MemberArgsTransform.Target = NetSerializerValuePointer(&Target.SecondaryRelativeTransform); - TransformSerializer->Deserialize(Context, MemberArgsTransform); - - Target.bIsSlotGrip = Reader->ReadBits(1); - - // FName - const FNetSerializer* NameSerializer = FNameNetSerializerPtr; - const FNetSerializerConfig* NameSerializerConfig = FNameSerializerConfigPtr; - - //SecondarySlotName - FNetDeserializeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(NameSerializerConfig); - MemberArgs.Target = NetSerializerValuePointer(&Target.SecondarySlotName); - NameSerializer->Deserialize(Context, MemberArgs); - } - - // This is 0.0 - 16.0, using compression to get it smaller, 4 bits = max 16 + 1 bit for sign and 7 bits precision for 128 / full 2 digit precision - Target.LerpToRate = Reader->ReadBits(12); - } - - // Compare two instances to see if they differ - static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) - { - if (Args.bStateIsQuantized) - { - const QuantizedType& QuantizedValue0 = *reinterpret_cast(Args.Source0); - const QuantizedType& QuantizedValue1 = *reinterpret_cast(Args.Source1); - return FPlatformMemory::Memcmp(&QuantizedValue0, &QuantizedValue1, sizeof(QuantizedType)) == 0; - } - else - { - const SourceType& L = *reinterpret_cast(Args.Source0); - const SourceType& R = *reinterpret_cast(Args.Source1); - - if (L.bHasSecondaryAttachment != R.bHasSecondaryAttachment) return false; - - if (L.bHasSecondaryAttachment) - { - if (L.SecondaryAttachment != R.SecondaryAttachment) return false; - if (!L.SecondaryRelativeTransform.Equals(R.SecondaryRelativeTransform)) return false; - if (L.bIsSlotGrip != R.bIsSlotGrip) return false; - if (L.SecondarySlotName != R.SecondarySlotName) return false; - } - - if (L.LerpToRate != R.LerpToRate) return false; - - return true; - } - } - - static void CloneDynamicState(FNetSerializationContext& Context, const FNetCloneDynamicStateArgs& Args) - { - const QuantizedType* Source = reinterpret_cast(Args.Source); - QuantizedType& Target = *reinterpret_cast(Args.Target); - - const FNetSerializer* NameSerializer = FNameNetSerializerPtr; - const FNetSerializerConfig* NameSerializerConfig = FNameSerializerConfigPtr; - - FNetCloneDynamicStateArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(NameSerializerConfig); - MemberArgs.Target = NetSerializerValuePointer(&Target.SecondarySlotName); - MemberArgs.Source = NetSerializerValuePointer(&Source->SecondarySlotName); - NameSerializer->CloneDynamicState(Context, MemberArgs); - - - - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - FNetCloneDynamicStateArgs ObjMemberArgs = Args; - ObjMemberArgs.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - ObjMemberArgs.Target = NetSerializerValuePointer(&Target.SecondaryAttachment); - ObjMemberArgs.Source = NetSerializerValuePointer(&Source->SecondaryAttachment); - ObjSerializer->CloneDynamicState(Context, MemberArgs); - } - - static void FreeDynamicState(FNetSerializationContext& Context, const FNetFreeDynamicStateArgs& Args) - { - QuantizedType& Source = *reinterpret_cast(Args.Source); - - const FNetSerializer* NameSerializer = FNameNetSerializerPtr; - const FNetSerializerConfig* NameSerializerConfig = FNameSerializerConfigPtr; - - FNetFreeDynamicStateArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(NameSerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.SecondarySlotName); - NameSerializer->FreeDynamicState(Context, MemberArgs); - - - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - FNetFreeDynamicStateArgs ObjMemberArgs = Args; - ObjMemberArgs.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - ObjMemberArgs.Source = NetSerializerValuePointer(&Source.SecondaryAttachment); - ObjSerializer->FreeDynamicState(Context, MemberArgs); - } - - static void Apply(FNetSerializationContext&, const FNetApplyArgs& Args) - { - const SourceType& Source = *reinterpret_cast(Args.Source); - SourceType& Target = *reinterpret_cast(Args.Target); - - Target.bHasSecondaryAttachment = Source.bHasSecondaryAttachment; - - if (Target.bHasSecondaryAttachment) - { - Target.SecondaryAttachment = Source.SecondaryAttachment; - Target.SecondaryRelativeTransform = Source.SecondaryRelativeTransform; - Target.bIsSlotGrip = Source.bIsSlotGrip; - Target.SecondarySlotName = Source.SecondarySlotName; - } - else - { - // Clear non repped values - Target.SecondaryAttachment = nullptr; - Target.SecondaryRelativeTransform = FTransform::Identity; - Target.bIsSlotGrip = false; - Target.SecondarySlotName = NAME_None; - } - - Target.LerpToRate = Source.LerpToRate; - - // Not Replicated - // SecondaryGripDistance - //EGripLerpState GripLerpState; - //float curLerp; - //FVector LastRelativeLocation; - } - - /*static void CollectNetReferences(FNetSerializationContext& Context, const FNetCollectReferencesArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - FNetCollectReferencesArgs CollectNetReferencesArgs = Args; - CollectNetReferencesArgs.NetSerializerConfig = FObjectPtrSerializerConfigPtr; - CollectNetReferencesArgs.Source = NetSerializerValuePointer(&Source.SecondaryAttachment); - ObjSerializer->CollectNetReferences(Context, CollectNetReferencesArgs); - }*/ - }; - - - static const FName PropertyNetSerializerRegistry_NAME_BPSecondaryGripInfo("BPSecondaryGripInfo"); - UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPSecondaryGripInfo, FBPSecondaryGripInfoNetSerializer); - - FBPSecondaryGripInfoNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() - { - UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPSecondaryGripInfo); - } - - void FBPSecondaryGripInfoNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() - { - InitNetSerializer(); - UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPSecondaryGripInfo); - } - - UE_NET_IMPLEMENT_SERIALIZER(FBPSecondaryGripInfoNetSerializer); -} diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPVRComponentPosRepNetSerializer.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPVRComponentPosRepNetSerializer.cpp deleted file mode 100644 index 0543b4c..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FBPVRComponentPosRepNetSerializer.cpp +++ /dev/null @@ -1,277 +0,0 @@ -#include "Serializers/FBPVRComponentPosRepNetSerializer.h" -#include "Serializers/SerializerHelpers.h" -#include "Iris/Serialization/NetSerializerDelegates.h" -#include "Iris/Serialization/NetSerializers.h" -#include "Iris/Serialization/PackedVectorNetSerializers.h" -#include "Iris/ReplicationState/PropertyNetSerializerInfoRegistry.h" -#include "Iris/ReplicationState/ReplicationStateDescriptorBuilder.h" - - -namespace UE::Net -{ - - // ----------------------------------------------------------------------------- - // Iris serializer for FBPVRComponentPosRep - // ----------------------------------------------------------------------------- - struct FBPVRComponentPosRepNetSerializer - { - - inline static const FVectorNetQuantize10NetSerializerConfig Quantize10SerializerConfig; - inline static const FVectorNetQuantize100NetSerializerConfig Quantize100SerializerConfig; - - inline static const FNetSerializerConfig* VectorNetQuantizeNetSerializerConfigs[2] = { &Quantize10SerializerConfig, &Quantize100SerializerConfig}; - inline static const FNetSerializer* VectorNetQuantizeNetSerializers[2] = {}; - - - class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates - { - public: - virtual ~FNetSerializerRegistryDelegates(); - - void InitNetSerializer() - { - FBPVRComponentPosRepNetSerializer::VectorNetQuantizeNetSerializers[0] = &UE_NET_GET_SERIALIZER(FVectorNetQuantize10NetSerializer); - FBPVRComponentPosRepNetSerializer::VectorNetQuantizeNetSerializers[1] = &UE_NET_GET_SERIALIZER(FVectorNetQuantize100NetSerializer); - } - - private: - virtual void OnPreFreezeNetSerializerRegistry() override; - //virtual void OnPostFreezeNetSerializerRegistry() override; - }; - - inline static FBPVRComponentPosRepNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; - - - /** Version is required. */ - static constexpr uint32 Version = 0; - - struct alignas(8) FQuantizedData - { - uint64 Position[4]; // We don't need to store double for tracked device positions, but their forwarded serializer uses it - uint16 Rotation[3]; - - uint8 QuantizationLevel : 1; - uint8 RotationQuantizationLevel : 1; - }; - - typedef FBPVRComponentPosRep SourceType; - typedef FQuantizedData QuantizedType; - typedef FBPVRComponentPosRepNetSerializerConfig ConfigType; - inline static const ConfigType DefaultConfig; - - /** Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. */ - static constexpr bool bUseDefaultDelta = true; - // Not doing delta, the majority of the time a single bit (bool) controls the serialization of the entirity - - /** - * Optional. Same as Serialize but where an acked previous state is provided for bitpacking purposes. - * This is implemented by default to do same value optimization, at the cost of a bit. If implemented - * then DeserializeDelta is required. - */ - /*static void SerializeDelta(FNetSerializationContext&, const FNetSerializeDeltaArgs&) - { - - }*/ - - /** - * Optional. Same as Deserialize but where an acked previous state is provided for bitpacking purposes. - * This is implemented by default to do same value optimization, at the cost of a bit. If implemented - * then SerializeDelta is required. - */ - /*static void DeserializeDelta(FNetSerializationContext&, const FNetDeserializeDeltaArgs&) - { - - }*/ - - // Called to create a "quantized snapshot" of the struct - static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) - { - // Actually do the real quantization step here next instead of just in serialize, will save on memory overall - const SourceType& Source = *reinterpret_cast(Args.Source); - QuantizedType& Target = *reinterpret_cast(Args.Target); - - Target.QuantizationLevel = (uint8)Source.QuantizationLevel; - Target.RotationQuantizationLevel = (uint8)Source.RotationQuantizationLevel; - - const FNetSerializer* Serializer = VectorNetQuantizeNetSerializers[Target.QuantizationLevel] ; - const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfigs[Target.QuantizationLevel] ; - - FNetQuantizeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.Position); - MemberArgs.Target = NetSerializerValuePointer(&Target.Position[0]); - Serializer->Quantize(Context, MemberArgs); - - // Manually quantize these - switch (Source.RotationQuantizationLevel) - { - case EVRRotationQuantization::RoundTo10Bits: - { - Target.Rotation[0] = FBPVRComponentPosRep::CompressAxisTo10BitShort(Source.Rotation.Pitch); - Target.Rotation[1] = FBPVRComponentPosRep::CompressAxisTo10BitShort(Source.Rotation.Yaw); - Target.Rotation[2] = FBPVRComponentPosRep::CompressAxisTo10BitShort(Source.Rotation.Roll); - }break; - - case EVRRotationQuantization::RoundToShort: - { - Target.Rotation[0] = FRotator::CompressAxisToShort(Source.Rotation.Pitch); - Target.Rotation[1] = FRotator::CompressAxisToShort(Source.Rotation.Yaw); - Target.Rotation[2] = FRotator::CompressAxisToShort(Source.Rotation.Roll); - }break; - } - } - - // Called to apply the quantized snapshot back to gameplay memory - static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - SourceType& Target = *reinterpret_cast(Args.Target); - - Target.QuantizationLevel = (EVRVectorQuantization)Source.QuantizationLevel; - Target.RotationQuantizationLevel = (EVRRotationQuantization)Source.RotationQuantizationLevel; - - const FNetSerializer* Serializer = VectorNetQuantizeNetSerializers[Source.QuantizationLevel]; - const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfigs[Source.QuantizationLevel]; - - FNetDequantizeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.Position[0]); - MemberArgs.Target = NetSerializerValuePointer(&Target.Position); - Serializer->Dequantize(Context, MemberArgs); - - // Manually quantize these - switch (Target.RotationQuantizationLevel) - { - case EVRRotationQuantization::RoundTo10Bits: - { - Target.Rotation.Pitch = FBPVRComponentPosRep::DecompressAxisFrom10BitShort(Source.Rotation[0]); - Target.Rotation.Yaw = FBPVRComponentPosRep::DecompressAxisFrom10BitShort(Source.Rotation[1]); - Target.Rotation.Roll = FBPVRComponentPosRep::DecompressAxisFrom10BitShort(Source.Rotation[2]); - }break; - - case EVRRotationQuantization::RoundToShort: - { - Target.Rotation.Pitch = FRotator::DecompressAxisFromShort(Source.Rotation[0]); - Target.Rotation.Yaw = FRotator::DecompressAxisFromShort(Source.Rotation[1]); - Target.Rotation.Roll = FRotator::DecompressAxisFromShort(Source.Rotation[2]); - }break; - } - } - - // Serialize into bitstream - static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); - - Writer->WriteBits(static_cast(Source.QuantizationLevel), 1); - Writer->WriteBits(static_cast(Source.RotationQuantizationLevel), 1); - - const FNetSerializer* Serializer = VectorNetQuantizeNetSerializers[Source.QuantizationLevel] ; - const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfigs[Source.QuantizationLevel]; - - FNetSerializeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.Position[0]); - Serializer->Serialize(Context, MemberArgs); - - switch ((EVRRotationQuantization)Source.RotationQuantizationLevel) - { - case EVRRotationQuantization::RoundTo10Bits: - { - Writer->WriteBits(static_cast(Source.Rotation[0]), 10); - Writer->WriteBits(static_cast(Source.Rotation[1]), 10); - Writer->WriteBits(static_cast(Source.Rotation[2]), 10); - }break; - - case EVRRotationQuantization::RoundToShort: - { - Writer->WriteBits(static_cast(Source.Rotation[0]), 16); - Writer->WriteBits(static_cast(Source.Rotation[1]), 16); - Writer->WriteBits(static_cast(Source.Rotation[2]), 16); - }break; - } - - } - - // Deserialize from bitstream - static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) - { - QuantizedType& Target = *reinterpret_cast(Args.Target); - FNetBitStreamReader* Reader = Context.GetBitStreamReader(); - - Target.QuantizationLevel = Reader->ReadBits(1); - Target.RotationQuantizationLevel = Reader->ReadBits(1); - - const FNetSerializer* Serializer = VectorNetQuantizeNetSerializers[Target.QuantizationLevel] ; - const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfigs[Target.QuantizationLevel]; - - FNetDeserializeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Target = NetSerializerValuePointer(&Target.Position[0]); - Serializer->Deserialize(Context, MemberArgs); - - switch ((EVRRotationQuantization)Target.RotationQuantizationLevel) - { - case EVRRotationQuantization::RoundTo10Bits: - { - Target.Rotation[0] = Reader->ReadBits(10); - Target.Rotation[1] = Reader->ReadBits(10); - Target.Rotation[2] = Reader->ReadBits(10); - }break; - - case EVRRotationQuantization::RoundToShort: - { - Target.Rotation[0] = Reader->ReadBits(16); - Target.Rotation[1] = Reader->ReadBits(16); - Target.Rotation[2] = Reader->ReadBits(16); - }break; - } - } - - // Compare two instances to see if they differ - static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) - { - if (Args.bStateIsQuantized) - { - const QuantizedType& QuantizedValue0 = *reinterpret_cast(Args.Source0); - const QuantizedType& QuantizedValue1 = *reinterpret_cast(Args.Source1); - return FPlatformMemory::Memcmp(&QuantizedValue0, &QuantizedValue1, sizeof(QuantizedType)) == 0; - } - else - { - const SourceType& L = *reinterpret_cast(Args.Source0); - const SourceType& R = *reinterpret_cast(Args.Source1); - - if (L.QuantizationLevel != R.QuantizationLevel) return false; - if (L.RotationQuantizationLevel != R.RotationQuantizationLevel) return false; - - if (!L.Position.Equals(R.Position)) return false; - if (!L.Rotation.Equals(R.Rotation)) return false; - - return true; - } - } - }; - - - static const FName PropertyNetSerializerRegistry_NAME_BPVRComponentPosRep("BPVRComponentPosRep"); - UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPVRComponentPosRep, FBPVRComponentPosRepNetSerializer); - - FBPVRComponentPosRepNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() - { - UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPVRComponentPosRep); - } - - void FBPVRComponentPosRepNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() - { - InitNetSerializer(); - UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPVRComponentPosRep); - } - - /*void FBPVRComponentPosRepNetSerializer::FNetSerializerRegistryDelegates::OnPostFreezeNetSerializerRegistry() - { - }*/ - - UE_NET_IMPLEMENT_SERIALIZER(FBPVRComponentPosRepNetSerializer); -} diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FRepMovementVRNetSerializer.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FRepMovementVRNetSerializer.cpp deleted file mode 100644 index 9d5261e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FRepMovementVRNetSerializer.cpp +++ /dev/null @@ -1,402 +0,0 @@ -#include "Serializers/FRepMovementVRNetSerializer.h" -#include "Serializers/SerializerHelpers.h" -#include "Iris/Serialization/NetSerializerDelegates.h" -#include "Iris/Serialization/NetSerializers.h" -#include "Iris/Serialization/PackedVectorNetSerializers.h" -#include "Iris/ReplicationState/PropertyNetSerializerInfoRegistry.h" -#include "Iris/ReplicationState/ReplicationStateDescriptorBuilder.h" - -#include "VRBaseCharacter.h" -#include "RepMovementNetSerializer.h" - - -namespace UE::Net -{ - - // ----------------------------------------------------------------------------- - // Iris serializer for FRepMovementVRCharacter - // ----------------------------------------------------------------------------- - struct FRepMovementVRCharacterNetSerializer - { - inline static const FVectorNetQuantize100NetSerializerConfig Quantize100SerializerConfig; - inline static const FRepMovementNetSerializerConfig RepMovementPtrNetSerializerConfig; - - inline static const FNetSerializerConfig* VectorNetQuantizeNetSerializerConfig = &Quantize100SerializerConfig; - inline static const FNetSerializer* VectorNetQuantizeNetSerializer; - - inline static const FNetSerializerConfig* FRepMovementNetSerializerConfig = &RepMovementPtrNetSerializerConfig; - inline static const FNetSerializer* FRepMovementNetSerializer; - - class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates - { - public: - virtual ~FNetSerializerRegistryDelegates(); - - void InitNetSerializer() - { - FRepMovementVRCharacterNetSerializer::VectorNetQuantizeNetSerializer = &UE_NET_GET_SERIALIZER(FVectorNetQuantize100NetSerializer); - FRepMovementVRCharacterNetSerializer::FRepMovementNetSerializer = &UE_NET_GET_SERIALIZER(FRepMovementNetSerializer); - } - - private: - virtual void OnPreFreezeNetSerializerRegistry() override; - //virtual void OnPostFreezeNetSerializerRegistry() override; - }; - - inline static FRepMovementVRCharacterNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; - - - /** Version is required. */ - static constexpr uint32 Version = 0; - - // TODO: Keep up to date with the source struct - // Copy of the rep movement quant data struct, needs to be kept up to date with engine changes - struct FRepMovementQuantizedDataCopy - { - uint64 AngularVelocity[4]; - uint64 LinearVelocity[4]; - uint64 Location[4]; - uint16 Rotation[4]; - uint64 Acceleration[4]; - int32 ServerFrame; - int32 ServerPhysicsHandle; - - uint16 Flags : 4; - uint16 VelocityQuantizationLevel : 2; - uint16 LocationQuantizationLevel : 2; - uint16 RotationQuantizationLevel : 1; - uint16 RepAcceleration : 1; - uint16 Unused : 6; - uint16 Padding[3]; - }; - - struct alignas(8) FRepMovementVRCharacterQuantizedData - { - uint8 bJustTeleported; - uint8 bJustTeleportedGrips; - uint8 bPausedTracking; - uint64 PausedTrackingLoc[4]; - uint16 PausedTrackingRot; - - // Not Replicated, is stored as a reference - //FObjectNetSerializerQuantizedReferenceStorage Owner; - - FRepMovementQuantizedDataCopy RepMovementData; - }; - - typedef FRepMovementVRCharacter SourceType; - typedef FRepMovementVRCharacterQuantizedData QuantizedType; - typedef FRepMovementVRCharacterNetSerializerConfig ConfigType; - inline static const ConfigType DefaultConfig; - - /** Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. */ - static constexpr bool bUseDefaultDelta = true; - - // Should likely handle delta custom eventually - - // Called to create a "quantized snapshot" of the struct - static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) - { - // Actually do the real quantization step here next instead of just in serialize, will save on memory overall - const SourceType& Source = *reinterpret_cast(Args.Source); - QuantizedType& Target = *reinterpret_cast(Args.Target); - - Target.bJustTeleported = Source.bJustTeleported ? 1 : 0; - Target.bJustTeleportedGrips = Source.bJustTeleportedGrips ? 1 : 0; - - Target.bPausedTracking = Source.bPausedTracking ? 1 : 0; - - if (Source.bPausedTracking) - { - const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; - const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; - - FNetQuantizeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.PausedTrackingLoc); - MemberArgs.Target = NetSerializerValuePointer(&Target.PausedTrackingLoc[0]); - Serializer->Quantize(Context, MemberArgs); - - Target.PausedTrackingRot = FRotator::CompressAxisToShort(Source.PausedTrackingRot); - } - - // FRepMovementQuantizedDataCopy RepMovementData; - const FNetSerializer* Serializer = FRepMovementNetSerializer; - const FNetSerializerConfig* SerializerConfig = FRepMovementNetSerializerConfig; - - FNetQuantizeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source); - MemberArgs.Target = NetSerializerValuePointer(&Target.RepMovementData); - Serializer->Quantize(Context, MemberArgs); - } - - // Called to apply the quantized snapshot back to gameplay memory - static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - SourceType& Target = *reinterpret_cast(Args.Target); - - Target.bJustTeleported = Source.bJustTeleported != 0; - Target.bJustTeleportedGrips = Source.bJustTeleportedGrips != 0; - - Target.bPausedTracking = Source.bPausedTracking != 0; - - if (Target.bPausedTracking) - { - const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; - const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; - - FNetDequantizeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.PausedTrackingLoc[0]); - MemberArgs.Target = NetSerializerValuePointer(&Target.PausedTrackingLoc); - Serializer->Dequantize(Context, MemberArgs); - - Target.PausedTrackingRot = FRotator::DecompressAxisFromShort(Source.PausedTrackingRot); - } - - // FRepMovementQuantizedDataCopy RepMovementData; - const FNetSerializer* Serializer = FRepMovementNetSerializer; - const FNetSerializerConfig* SerializerConfig = FRepMovementNetSerializerConfig; - - FNetDequantizeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.RepMovementData); - MemberArgs.Target = NetSerializerValuePointer(&Target); - Serializer->Dequantize(Context, MemberArgs); - } - - // Serialize into bitstream - static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); - - Writer->WriteBits(static_cast(Source.bJustTeleported), 1); - Writer->WriteBits(static_cast(Source.bJustTeleportedGrips), 1); - - Writer->WriteBits(static_cast(Source.bPausedTracking), 1); - - if (Source.bPausedTracking != 0) - { - const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; - const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; - - FNetSerializeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.PausedTrackingLoc[0]); - Serializer->Serialize(Context, MemberArgs); - - Writer->WriteBits(static_cast(Source.PausedTrackingRot), 16); - } - - // FRepMovementQuantizedDataCopy RepMovementData; - const FNetSerializer* Serializer = FRepMovementNetSerializer; - const FNetSerializerConfig* SerializerConfig = FRepMovementNetSerializerConfig; - - FNetSerializeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.RepMovementData); - Serializer->Serialize(Context, MemberArgs); - } - - // Deserialize from bitstream - static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) - { - QuantizedType& Target = *reinterpret_cast(Args.Target); - FNetBitStreamReader* Reader = Context.GetBitStreamReader(); - - Target.bJustTeleported = Reader->ReadBits(1); - Target.bJustTeleportedGrips = Reader->ReadBits(1); - - Target.bPausedTracking = Reader->ReadBits(1); - - if (Target.bPausedTracking != 0) - { - const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; - const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; - - FNetDeserializeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Target = NetSerializerValuePointer(&Target.PausedTrackingLoc[0]); - Serializer->Deserialize(Context, MemberArgs); - - Target.PausedTrackingRot = Reader->ReadBits(16); - } - - // FRepMovementQuantizedDataCopy RepMovementData; - const FNetSerializer* Serializer = FRepMovementNetSerializer; - const FNetSerializerConfig* SerializerConfig = FRepMovementNetSerializerConfig; - - FNetDeserializeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Target = NetSerializerValuePointer(&Target.RepMovementData); - Serializer->Deserialize(Context, MemberArgs); - } - - static void SerializeDelta(FNetSerializationContext& Context, const FNetSerializeDeltaArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); - - Writer->WriteBits(static_cast(Source.bJustTeleported), 1); - Writer->WriteBits(static_cast(Source.bJustTeleportedGrips), 1); - - Writer->WriteBits(static_cast(Source.bPausedTracking), 1); - - if (Source.bPausedTracking != 0) - { - const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; - const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; - - FNetSerializeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.PausedTrackingLoc[0]); - Serializer->Serialize(Context, MemberArgs); - - Writer->WriteBits(static_cast(Source.PausedTrackingRot), 16); - } - - // FRepMovementQuantizedDataCopy RepMovementData; - const FNetSerializer* Serializer = FRepMovementNetSerializer; - const FNetSerializerConfig* SerializerConfig = FRepMovementNetSerializerConfig; - - FNetSerializeDeltaArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.RepMovementData); - Serializer->SerializeDelta(Context, MemberArgs); - - } - - static void DeserializeDelta(FNetSerializationContext& Context, const FNetDeserializeDeltaArgs& Args) - { - QuantizedType& Target = *reinterpret_cast(Args.Target); - FNetBitStreamReader* Reader = Context.GetBitStreamReader(); - - Target.bJustTeleported = Reader->ReadBits(1); - Target.bJustTeleportedGrips = Reader->ReadBits(1); - - Target.bPausedTracking = Reader->ReadBits(1); - - if (Target.bPausedTracking != 0) - { - const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; - const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; - - FNetDeserializeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Target = NetSerializerValuePointer(&Target.PausedTrackingLoc[0]); - Serializer->Deserialize(Context, MemberArgs); - - Target.PausedTrackingRot = Reader->ReadBits(16); - } - - // FRepMovementQuantizedDataCopy RepMovementData; - const FNetSerializer* Serializer = FRepMovementNetSerializer; - const FNetSerializerConfig* SerializerConfig = FRepMovementNetSerializerConfig; - - FNetDeserializeDeltaArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Target = NetSerializerValuePointer(&Target.RepMovementData); - Serializer->DeserializeDelta(Context, MemberArgs); - } - - // Compare two instances to see if they differ - static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) - { - if (Args.bStateIsQuantized) - { - const QuantizedType& QuantizedValue0 = *reinterpret_cast(Args.Source0); - const QuantizedType& QuantizedValue1 = *reinterpret_cast(Args.Source1); - return FPlatformMemory::Memcmp(&QuantizedValue0, &QuantizedValue1, sizeof(QuantizedType)) == 0; - } - else - { - const SourceType& L = *reinterpret_cast(Args.Source0); - const SourceType& R = *reinterpret_cast(Args.Source1); - - if (L.bJustTeleported != R.bJustTeleported) return false; - if (L.bJustTeleportedGrips != R.bJustTeleportedGrips) return false; - if (L.bPausedTracking != R.bPausedTracking) return false; - - if (L.bPausedTracking) - { - if (!L.PausedTrackingLoc.Equals(R.PausedTrackingLoc)) return false; - if (!FMath::IsNearlyEqual(L.PausedTrackingRot, R.PausedTrackingRot)) return false; - } - - const FNetSerializer* Serializer = FRepMovementNetSerializer; - const FNetSerializerConfig* SerializerConfig = FRepMovementNetSerializerConfig; - - FNetIsEqualArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source0 = NetSerializerValuePointer(&L); - MemberArgs.Source1 = NetSerializerValuePointer(&R); - return Serializer->IsEqual(Context, MemberArgs); - } - } - - static bool Validate(FNetSerializationContext& Context, const FNetValidateArgs& Args) - { - const SourceType& Source = *reinterpret_cast(Args.Source); - - const FNetSerializer* Serializer = FRepMovementNetSerializer; - const FNetSerializerConfig* SerializerConfig = FRepMovementNetSerializerConfig; - - FNetValidateArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source); - return Serializer->Validate(Context, MemberArgs); - } - - static void Apply(FNetSerializationContext& Context, const FNetApplyArgs& Args) - { - const SourceType& Source = *reinterpret_cast(Args.Source); - SourceType& Target = *reinterpret_cast(Args.Target); - - - Target.bJustTeleported = Source.bJustTeleported; - Target.bJustTeleportedGrips = Source.bJustTeleportedGrips; - - Target.bPausedTracking = Source.bPausedTracking; - - if (Target.bPausedTracking) - { - Target.PausedTrackingLoc = Source.PausedTrackingLoc; - Target.PausedTrackingRot = Source.PausedTrackingRot; - } - else - { - Target.PausedTrackingLoc = FVector::ZeroVector; - Target.PausedTrackingRot = 0.0f; - } - - const FNetSerializer* Serializer = FRepMovementNetSerializer; - const FNetSerializerConfig* SerializerConfig = FRepMovementNetSerializerConfig; - - FNetApplyArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source); - MemberArgs.Target = NetSerializerValuePointer(&Target); - Serializer->Apply(Context, MemberArgs); - } - }; - - - static const FName PropertyNetSerializerRegistry_NAME_RepMovementVRCharacter("RepMovementVRCharacter"); - UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_RepMovementVRCharacter, FRepMovementVRCharacterNetSerializer); - - FRepMovementVRCharacterNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() - { - UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_RepMovementVRCharacter); - } - - void FRepMovementVRCharacterNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() - { - InitNetSerializer(); - UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_RepMovementVRCharacter); - } - - UE_NET_IMPLEMENT_SERIALIZER(FRepMovementVRCharacterNetSerializer); -} diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FTransformNetQuantizeNetSerializer.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FTransformNetQuantizeNetSerializer.cpp deleted file mode 100644 index 9da40bd..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Serializers/FTransformNetQuantizeNetSerializer.cpp +++ /dev/null @@ -1,250 +0,0 @@ -#include "Serializers/FTransformNetQuantizeNetSerializer.h" -#include "Serializers/SerializerHelpers.h" -#include "Iris/Serialization/NetSerializerDelegates.h" -#include "Iris/Serialization/NetSerializers.h" -#include "Iris/Serialization/PackedVectorNetSerializers.h" -#include "Iris/ReplicationState/PropertyNetSerializerInfoRegistry.h" -#include "Iris/ReplicationState/ReplicationStateDescriptorBuilder.h" - -#include "VRBPDatatypes.h" - - -namespace UE::Net -{ - - // ----------------------------------------------------------------------------- - // Iris serializer for FTransformNetQuantize - // ----------------------------------------------------------------------------- - struct FTransformNetQuantizeNetSerializer - { - inline static const FVectorNetQuantize100NetSerializerConfig Quantize100SerializerConfig; - - inline static const FNetSerializerConfig* VectorNetQuantizeNetSerializerConfig = &Quantize100SerializerConfig; - inline static const FNetSerializer* VectorNetQuantizeNetSerializer; - - - class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates - { - public: - virtual ~FNetSerializerRegistryDelegates(); - - void InitNetSerializer() - { - FTransformNetQuantizeNetSerializer::VectorNetQuantizeNetSerializer = &UE_NET_GET_SERIALIZER(FVectorNetQuantize100NetSerializer); - } - - private: - virtual void OnPreFreezeNetSerializerRegistry() override; - //virtual void OnPostFreezeNetSerializerRegistry() override; - }; - - inline static FTransformNetQuantizeNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; - - - /** Version is required. */ - static constexpr uint32 Version = 0; - - /*struct alignas(8) FQuantizedData - { - uint64 Position[4]; // We don't need to store double for tracked device positions, but their forwarded serializer uses it - uint16 Rotation[3]; - uint64 Scale[4]; // We don't need to store double for tracked device positions, but their forwarded serializer uses it - uint8 UseHighPrecision : 1; - };*/ - - typedef FTransform_NetQuantize SourceType; - typedef FTransformNetQuantizeQuantizedData QuantizedType; - typedef FTransformNetQuantizeNetSerializerConfig ConfigType; - inline static const ConfigType DefaultConfig; - - /** Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. */ - static constexpr bool bUseDefaultDelta = true; - - // Should likely handle delta custom eventually - - // Called to create a "quantized snapshot" of the struct - static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) - { - // Actually do the real quantization step here next instead of just in serialize, will save on memory overall - const SourceType& Source = *reinterpret_cast(Args.Source); - QuantizedType& Target = *reinterpret_cast(Args.Target); - - static const auto CVarRepHighPrecisionTransforms = IConsoleManager::Get().FindConsoleVariable(TEXT("vrexp.RepHighPrecisionTransforms")); - bool bUseHighPrecision = CVarRepHighPrecisionTransforms->GetBool(); - Target.UseHighPrecision = bUseHighPrecision; - - FVector rTranslation = Source.GetTranslation(); - FVector rScale3D = Source.GetScale3D(); - FRotator rRotation = Source.Rotator(); - - if (bUseHighPrecision) - { - Target.Position[0] = rTranslation.X; - Target.Position[1] = rTranslation.Y; - Target.Position[2] = rTranslation.Z; - - Target.Scale[0] = rScale3D.X; - Target.Scale[1] = rScale3D.Y; - Target.Scale[2] = rScale3D.Z; - - Target.Rotation[0] = FRotator::CompressAxisToShort(rRotation.Pitch); - Target.Rotation[1] = FRotator::CompressAxisToShort(rRotation.Yaw); - Target.Rotation[2] = FRotator::CompressAxisToShort(rRotation.Roll); - } - else - { - const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; - const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; - - FNetQuantizeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&rTranslation); - MemberArgs.Target = NetSerializerValuePointer(&Target.Position[0]); - Serializer->Quantize(Context, MemberArgs); - - MemberArgs.Source = NetSerializerValuePointer(&rScale3D); - MemberArgs.Target = NetSerializerValuePointer(&Target.Scale[0]); - Serializer->Quantize(Context, MemberArgs); - - Target.Rotation[0] = FRotator::CompressAxisToShort(rRotation.Pitch); - Target.Rotation[1] = FRotator::CompressAxisToShort(rRotation.Yaw); - Target.Rotation[2] = FRotator::CompressAxisToShort(rRotation.Roll); - } - } - - // Called to apply the quantized snapshot back to gameplay memory - static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - SourceType& Target = *reinterpret_cast(Args.Target); - - bool bUseHighPrecision = Source.UseHighPrecision != 0; - - FVector rTranslation; - FVector rScale3D; - FRotator rRotation; - - if (bUseHighPrecision) - { - rTranslation.X = Source.Position[0]; - rTranslation.Y = Source.Position[1]; - rTranslation.Z = Source.Position[2]; - - rScale3D.X = Source.Scale[0]; - rScale3D.Y = Source.Scale[1]; - rScale3D.Z = Source.Scale[2]; - - rRotation.Pitch = FRotator::DecompressAxisFromShort(Source.Rotation[0]); - rRotation.Yaw = FRotator::DecompressAxisFromShort(Source.Rotation[1]); - rRotation.Roll = FRotator::DecompressAxisFromShort(Source.Rotation[2]); - } - else - { - const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; - const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; - - FNetDequantizeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.Position[0]); - MemberArgs.Target = NetSerializerValuePointer(&rTranslation); - Serializer->Dequantize(Context, MemberArgs); - - MemberArgs.Source = NetSerializerValuePointer(&Source.Scale[0]); - MemberArgs.Target = NetSerializerValuePointer(&rScale3D); - Serializer->Dequantize(Context, MemberArgs); - - rRotation.Pitch = FRotator::DecompressAxisFromShort(Source.Rotation[0]); - rRotation.Yaw = FRotator::DecompressAxisFromShort(Source.Rotation[1]); - rRotation.Roll = FRotator::DecompressAxisFromShort(Source.Rotation[2]); - } - - Target.SetComponents(rRotation.Quaternion(), rTranslation, rScale3D); - Target.NormalizeRotation(); - } - - // Serialize into bitstream - static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); - - Writer->WriteBits(static_cast(Source.UseHighPrecision), 1); - - const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; - const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; - - FNetSerializeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.Position[0]); - Serializer->Serialize(Context, MemberArgs); - - MemberArgs.Source = NetSerializerValuePointer(&Source.Scale[0]); - Serializer->Serialize(Context, MemberArgs); - - Writer->WriteBits(static_cast(Source.Rotation[0]), 16); - Writer->WriteBits(static_cast(Source.Rotation[1]), 16); - Writer->WriteBits(static_cast(Source.Rotation[2]), 16); - } - - // Deserialize from bitstream - static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) - { - QuantizedType& Target = *reinterpret_cast(Args.Target); - FNetBitStreamReader* Reader = Context.GetBitStreamReader(); - - Target.UseHighPrecision = Reader->ReadBits(1) != 0; - - const FNetSerializer* Serializer = VectorNetQuantizeNetSerializer; - const FNetSerializerConfig* SerializerConfig = VectorNetQuantizeNetSerializerConfig; - - FNetDeserializeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Target = NetSerializerValuePointer(&Target.Position[0]); - Serializer->Deserialize(Context, MemberArgs); - - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Target = NetSerializerValuePointer(&Target.Scale[0]); - Serializer->Deserialize(Context, MemberArgs); - - Target.Rotation[0] = Reader->ReadBits(16); - Target.Rotation[1] = Reader->ReadBits(16); - Target.Rotation[2] = Reader->ReadBits(16); - } - - // Compare two instances to see if they differ - static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) - { - if (Args.bStateIsQuantized) - { - const QuantizedType& QuantizedValue0 = *reinterpret_cast(Args.Source0); - const QuantizedType& QuantizedValue1 = *reinterpret_cast(Args.Source1); - return FPlatformMemory::Memcmp(&QuantizedValue0, &QuantizedValue1, sizeof(QuantizedType)) == 0; - } - else - { - const SourceType& L = *reinterpret_cast(Args.Source0); - const SourceType& R = *reinterpret_cast(Args.Source1); - - if (!L.Equals(R)) return false; - return true; - } - } - }; - - - static const FName PropertyNetSerializerRegistry_NAME_TransformNetQuantize("Transform_NetQuantize"); - UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_TransformNetQuantize, FTransformNetQuantizeNetSerializer); - - FTransformNetQuantizeNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() - { - UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_TransformNetQuantize); - } - - void FTransformNetQuantizeNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() - { - InitNetSerializer(); - UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_TransformNetQuantize); - } - - UE_NET_IMPLEMENT_SERIALIZER(FTransformNetQuantizeNetSerializer); -} diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPAdvGripPhysicsSettingsNetSerializer.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPAdvGripPhysicsSettingsNetSerializer.h deleted file mode 100644 index 5808874..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPAdvGripPhysicsSettingsNetSerializer.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "Iris/Serialization/NetSerializer.h" -#include "VRBPDatatypes.h" - -#include "FBPAdvGripPhysicsSettingsNetSerializer.generated.h" - -USTRUCT() -struct FBPAdvGripPhysicsSettingsNetSerializerConfig : public FNetSerializerConfig -{ - GENERATED_BODY() -}; - -namespace UE::Net -{ - UE_NET_DECLARE_SERIALIZER(FBPAdvGripPhysicsSettingsNetSerializer, VREXPANSIONPLUGIN_API); -} \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPSecondaryGripInfoNetSerializer.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPSecondaryGripInfoNetSerializer.h deleted file mode 100644 index 2d43145..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPSecondaryGripInfoNetSerializer.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "Iris/Serialization/NetSerializer.h" -#include "VRBPDatatypes.h" - -#include "FBPSecondaryGripInfoNetSerializer.generated.h" - -USTRUCT() -struct FBPSecondaryGripInfoNetSerializerConfig : public FNetSerializerConfig -{ - GENERATED_BODY() -}; - -namespace UE::Net -{ - UE_NET_DECLARE_SERIALIZER(FBPSecondaryGripInfoNetSerializer, VREXPANSIONPLUGIN_API); -} \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPVRComponentPosRepNetSerializer.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPVRComponentPosRepNetSerializer.h deleted file mode 100644 index a009509..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FBPVRComponentPosRepNetSerializer.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "Iris/Serialization/NetSerializer.h" -#include "VRBPDatatypes.h" - -#include "FBPVRComponentPosRepNetSerializer.generated.h" - -USTRUCT() -struct FBPVRComponentPosRepNetSerializerConfig : public FNetSerializerConfig -{ - GENERATED_BODY() -}; - -namespace UE::Net -{ - UE_NET_DECLARE_SERIALIZER(FBPVRComponentPosRepNetSerializer, VREXPANSIONPLUGIN_API); -} \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FRepMovementVRNetSerializer.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FRepMovementVRNetSerializer.h deleted file mode 100644 index 35b001e..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FRepMovementVRNetSerializer.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "Iris/Serialization/NetSerializer.h" - -#include "FRepMovementVRNetSerializer.generated.h" - -USTRUCT() -struct FRepMovementVRCharacterNetSerializerConfig : public FNetSerializerConfig -{ - GENERATED_BODY() -}; - -namespace UE::Net -{ - UE_NET_DECLARE_SERIALIZER(FRepMovementVRCharacterNetSerializer, VREXPANSIONPLUGIN_API); - -} \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FTransformNetQuantizeNetSerializer.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FTransformNetQuantizeNetSerializer.h deleted file mode 100644 index 58f6a4d..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/FTransformNetQuantizeNetSerializer.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include "Iris/Serialization/NetSerializer.h" -#include "VRBPDatatypes.h" - -#include "FTransformNetQuantizeNetSerializer.generated.h" - -USTRUCT() -struct FTransformNetQuantizeNetSerializerConfig : public FNetSerializerConfig -{ - GENERATED_BODY() -}; - -namespace UE::Net -{ - UE_NET_DECLARE_SERIALIZER(FTransformNetQuantizeNetSerializer, VREXPANSIONPLUGIN_API); - - - struct alignas(8) FTransformNetQuantizeQuantizedData - { - uint64 Position[4]; // We don't need to store double for tracked device positions, but their forwarded serializer uses it - uint16 Rotation[3]; - uint64 Scale[4]; // We don't need to store double for tracked device positions, but their forwarded serializer uses it - uint8 UseHighPrecision : 1; - }; -} \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/SerializerHelpers.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/SerializerHelpers.h deleted file mode 100644 index 2fdebcf..0000000 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Serializers/SerializerHelpers.h +++ /dev/null @@ -1,144 +0,0 @@ -#pragma once - -#include "CoreMinimal.h" -#include "Engine/NetSerialization.h" - -// Helpers for Iris serialization - - - - -namespace UE::Net -{ - // ----------------------------------------------------------------------------- - // Fixed-compression helpers for 0–MaxValue floats with BitCount precision - // Epic doesn't have per float compression helpers yet for Iris serializers - // ----------------------------------------------------------------------------- - - // Based on Epics FixedCompressionFloat functions for std archives - - template - uint32 GetCompressedFloat(const float Value) - { - using Details = TFixedCompressedFloatDetails; - - bool clamp = false; - int64 ScaledValue; - if (MaxValue > Details::MaxBitValue) - { - // We have to scale this down - const float Scale = float(Details::MaxBitValue) / MaxValue; - ScaledValue = FMath::TruncToInt(Scale * Value); - } - else - { - // We will scale up to get extra precision. But keep is a whole number preserve whole values - constexpr int32 Scale = Details::MaxBitValue / MaxValue; - ScaledValue = FMath::RoundToInt(Scale * Value); - } - - uint32 Delta = static_cast(ScaledValue + Details::Bias); - - if (Delta > Details::MaxDelta) - { - clamp = true; - Delta = static_cast(Delta) > 0 ? Details::MaxDelta : 0; - } - - return Delta; - } - - template - float GetDecompressedFloat(uint32 Delta) - { - using Details = TFixedCompressedFloatDetails; - - float Value = 0.0f; - - float UnscaledValue = static_cast(static_cast(Delta) - Details::Bias); - - if constexpr (MaxValue > Details::MaxBitValue) - { - // We have to scale down, scale needs to be a float: - constexpr float InvScale = MaxValue / (float)Details::MaxBitValue; - Value = UnscaledValue * InvScale; - } - else - { - constexpr int32 Scale = Details::MaxBitValue / MaxValue; - constexpr float InvScale = float(1) / (float)Scale; - - Value = UnscaledValue * InvScale; - } - - return Value; - } - - template - bool WritePackedIrisFloat2(float X, float Y, FNetBitStreamWriter* Ar) // Note Value is intended to not be a reference since we are scaling it before serializing! - { - FVector2D Value(X, Y); - - // Scale vector by quant factor first - Value[0] *= ScaleFactor; - Value[1] *= ScaleFactor; - - float MinV = -1073741824.0f; - float MaxV = 1073741760.0f; - - // Some platforms have RoundToInt implementations that essentially reduces the allowed inputs to 2^31. - const FVector2D ClampedValue = FVector2D(FMath::Clamp(Value.X, MinV, MaxV), FMath::Clamp(Value.Y, MinV, MaxV)); - bool bClamp = ClampedValue != Value; - - // Do basically FVector::SerializeCompressed - int32 IntX = FMath::RoundToInt(ClampedValue.X); - int32 IntY = FMath::RoundToInt(ClampedValue.Y); - - uint32 Bits = FMath::Clamp(FMath::CeilLogTwo(1 + FMath::Max(FMath::Abs(IntX), FMath::Abs(IntY))), 1, MaxBitsPerComponent) - 1; - - // Serialize how many bits each component will have - Ar->WriteBits(Bits, MaxBitsPerComponent); - //Ar.SerializeInt(Bits, MaxBitsPerComponent); - - int32 Bias = 1 << (Bits + 1); - uint32 Max = 1 << (Bits + 2); - uint32 DX = IntX + Bias; - uint32 DY = IntY + Bias; - - if (DX >= Max) { bClamp = true; DX = static_cast(DX) > 0 ? Max - 1 : 0; } - if (DY >= Max) { bClamp = true; DY = static_cast(DY) > 0 ? Max - 1 : 0; } - - Ar->WriteBits(DX, Max); - Ar->WriteBits(DY, Max); - - return !bClamp; - } - - template - bool ReadPackedIrisFloat2(float &X, float &Y, FNetBitStreamReader* Ar) - { - uint32 Bits = 0; - - // Serialize how many bits each component will have - Bits = Ar->ReadBits(MaxBitsPerComponent); - //Ar.SerializeInt(Bits, MaxBitsPerComponent); - - int32 Bias = 1 << (Bits + 1); - uint32 Max = 1 << (Bits + 2); - uint32 DX = 0; - uint32 DY = 0; - - DX = Ar->ReadBits(Max); - DY = Ar->ReadBits(Max); - //Ar.SerializeInt(DX, Max); - //Ar.SerializeInt(DY, Max); - - - float fact = (float)ScaleFactor; - - X = (float)(static_cast(DX) - Bias) / fact; - Y = (float)(static_cast(DY) - Bias) / fact; - - return true; - } -} \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Config/FilterPlugin.ini b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Config/FilterPlugin.ini similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Config/FilterPlugin.ini rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Config/FilterPlugin.ini diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Resources/Icon128.png b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Resources/Icon128.png similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Resources/Icon128.png rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Resources/Icon128.png diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Private/HandSocketComponentDetails.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Private/HandSocketComponentDetails.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Private/HandSocketComponentDetails.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Private/HandSocketComponentDetails.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Private/HandSocketVisualizer.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Private/HandSocketVisualizer.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Private/HandSocketVisualizer.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Private/HandSocketVisualizer.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Private/VRExpansionEditor.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Private/VRExpansionEditor.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Private/VRExpansionEditor.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Private/VRExpansionEditor.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Private/VRGlobalSettingsDetails.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Private/VRGlobalSettingsDetails.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Private/VRGlobalSettingsDetails.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Private/VRGlobalSettingsDetails.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Public/HandSocketComponentDetails.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Public/HandSocketComponentDetails.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Public/HandSocketComponentDetails.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Public/HandSocketComponentDetails.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Public/HandSocketVisualizer.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Public/HandSocketVisualizer.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Public/HandSocketVisualizer.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Public/HandSocketVisualizer.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Public/VRExpansionEditor.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Public/VRExpansionEditor.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Public/VRExpansionEditor.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Public/VRExpansionEditor.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Public/VRGlobalSettingsDetails.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Public/VRGlobalSettingsDetails.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/Public/VRGlobalSettingsDetails.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/Public/VRGlobalSettingsDetails.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/VRExpansionEditor.Build.cs b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/VRExpansionEditor.Build.cs similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionEditor/VRExpansionEditor.Build.cs rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionEditor/VRExpansionEditor.Build.cs diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/CharacterMovementCompTypes.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/CharacterMovementCompTypes.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/CharacterMovementCompTypes.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/CharacterMovementCompTypes.cpp index dce0cc3..300790d 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/CharacterMovementCompTypes.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/CharacterMovementCompTypes.cpp @@ -373,11 +373,6 @@ bool FVRCharacterNetworkMoveData::Serialize(UCharacterMovementComponent& Charact { bRepRollAndPitch = (Roll != 0 || Pitch != 0); } - else - { - bool bCanRepRollAndPitch = (CharacterOwner && (CharacterOwner->bUseControllerRotationRoll || CharacterOwner->bUseControllerRotationPitch)); - bRepRollAndPitch = bCanRepRollAndPitch && (Roll != 0 || Pitch != 0); - } } else { diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripMotionControllerComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripMotionControllerComponent.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripMotionControllerComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripMotionControllerComponent.cpp index bc22d09..6f56a1a 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripMotionControllerComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripMotionControllerComponent.cpp @@ -19,7 +19,6 @@ #include "UObject/UObjectGlobals.h" // for FindObject<> #include "IXRTrackingSystem.h" #include "IXRSystemAssets.h" -#include "SceneView.h" #include "DrawDebugHelpers.h" #include "TimerManager.h" #include "VRBaseCharacter.h" @@ -250,7 +249,7 @@ void UGripMotionControllerComponent::RegisterEndPhysicsTick(bool bRegister) void UGripMotionControllerComponent::EndPhysicsTickComponent(FGripComponentEndPhysicsTickFunction& ThisTickFunction) { - if (!IsValidChecked(this)) + if (!IsValid(this)) return; // Now check if we should turn off any post physics ticking @@ -1257,55 +1256,6 @@ void UGripMotionControllerComponent::SetGripStiffnessAndDamping( } } -void UGripMotionControllerComponent::SetGripAdvancedGripSettings( - const FBPActorGripInformation& Grip, - EBPVRResultSwitch& Result, - uint8 GripPriority, - bool bSetOwnerOnGrip, - bool bDisallowLerping, - bool bDisallowSettingPositionOnClientAuthDrop -) -{ - Result = EBPVRResultSwitch::OnFailed; - int fIndex = GrippedObjects.Find(Grip); - - if (fIndex != INDEX_NONE) - { - GrippedObjects[fIndex].AdvancedGripSettings.GripPriority = GripPriority; - GrippedObjects[fIndex].AdvancedGripSettings.bSetOwnerOnGrip = bSetOwnerOnGrip; - GrippedObjects[fIndex].AdvancedGripSettings.bDisallowLerping = bDisallowLerping; - GrippedObjects[fIndex].AdvancedGripSettings.bDisallowSettingPositionOnClientAuthDrop = bDisallowSettingPositionOnClientAuthDrop; - - DIRTY_GRIPPED_OBJECTS(); - - Result = EBPVRResultSwitch::OnSucceeded; - } - else - { - fIndex = LocallyGrippedObjects.Find(Grip); - - if (fIndex != INDEX_NONE) - { - GrippedObjects[fIndex].AdvancedGripSettings.GripPriority = GripPriority; - GrippedObjects[fIndex].AdvancedGripSettings.bSetOwnerOnGrip = bSetOwnerOnGrip; - GrippedObjects[fIndex].AdvancedGripSettings.bDisallowLerping = bDisallowLerping; - GrippedObjects[fIndex].AdvancedGripSettings.bDisallowSettingPositionOnClientAuthDrop = bDisallowSettingPositionOnClientAuthDrop; - - if (IsLocallyControlled() && !IsServer() && !IsTornOff() && LocallyGrippedObjects[fIndex].GripMovementReplicationSetting == EGripMovementReplicationSettings::ClientSide_Authoritive) - { - FBPActorGripInformation GripInfo = LocallyGrippedObjects[fIndex]; - Server_NotifyLocalGripAddedOrChanged(GripInfo); - } - - DIRTY_LOCALLY_GRIPPED_OBJECTS(); - - Result = EBPVRResultSwitch::OnSucceeded; - } - } - - -} - FTransform UGripMotionControllerComponent::CreateGripRelativeAdditionTransform_BP( const FBPActorGripInformation &GripToSample, const FTransform & AdditionTransform, @@ -4360,7 +4310,7 @@ bool UGripMotionControllerComponent::TeleportMoveGrippedActor(AActor * GrippedAc FBPActorGripInformation * GripInfo = LocallyGrippedObjects.FindByKey(GrippedActorToMove); if (!GripInfo) - GripInfo = GrippedObjects.FindByKey(GrippedActorToMove); + GrippedObjects.FindByKey(GrippedActorToMove); if (GripInfo) { @@ -4377,7 +4327,7 @@ bool UGripMotionControllerComponent::TeleportMoveGrippedComponent(UPrimitiveComp FBPActorGripInformation * GripInfo = LocallyGrippedObjects.FindByKey(ComponentToMove); if (!GripInfo) - GripInfo = GrippedObjects.FindByKey(ComponentToMove); + GrippedObjects.FindByKey(ComponentToMove); if (GripInfo) { @@ -6067,7 +6017,7 @@ void UGripMotionControllerComponent::CleanUpBadPhysicsHandles() { FBPActorGripInformation * GripInfo = LocallyGrippedObjects.FindByKey(PhysicsGrips[g].GripID); if(!GripInfo) - GripInfo = GrippedObjects.FindByKey(PhysicsGrips[g].GripID); + GrippedObjects.FindByKey(PhysicsGrips[g].GripID); if (!GripInfo) { @@ -6206,48 +6156,44 @@ bool UGripMotionControllerComponent::DestroyPhysicsHandle(const FBPActorGripInfo return true; } - if (IsValid(Grip.GrippedObject)) + UPrimitiveComponent *root = Grip.GetGrippedComponent(); + AActor * pActor = Grip.GetGrippedActor(); + + if (!root && pActor) + root = Cast(pActor->GetRootComponent()); + + if (root) { - - UPrimitiveComponent* root = Grip.GetGrippedComponent(); - AActor* pActor = Grip.GetGrippedActor(); - - if (!root && pActor) - root = Cast(pActor->GetRootComponent()); - - if (root) + if (FBodyInstance * rBodyInstance = root->GetBodyInstance(Grip.GrippedBoneName)) { - if (FBodyInstance* rBodyInstance = root->GetBodyInstance(Grip.GrippedBoneName)) + // #TODO: Should this be done on drop instead? + // Remove event registration + if (!bSkipUnregistering) { - // #TODO: Should this be done on drop instead? - // Remove event registration - if (!bSkipUnregistering) + if (rBodyInstance->OnRecalculatedMassProperties().IsBoundToObject(this)) { - if (rBodyInstance->OnRecalculatedMassProperties().IsBoundToObject(this)) - { - rBodyInstance->OnRecalculatedMassProperties().RemoveAll(this); - } + rBodyInstance->OnRecalculatedMassProperties().RemoveAll(this); + } + } + + if (HandleInfo->bSetCOM) + { + // Reset center of mass to zero + // Get our original values + FVector vel = rBodyInstance->GetUnrealWorldVelocity(); + FVector aVel = rBodyInstance->GetUnrealWorldAngularVelocityInRadians(); + FVector originalCOM = rBodyInstance->GetCOMPosition(); + + if (rBodyInstance->IsValidBodyInstance() && rBodyInstance->BodySetup.IsValid()) + { + rBodyInstance->UpdateMassProperties(); } - if (HandleInfo->bSetCOM) + if (rBodyInstance->IsInstanceSimulatingPhysics()) { - // Reset center of mass to zero - // Get our original values - FVector vel = rBodyInstance->GetUnrealWorldVelocity(); - FVector aVel = rBodyInstance->GetUnrealWorldAngularVelocityInRadians(); - FVector originalCOM = rBodyInstance->GetCOMPosition(); - - if (rBodyInstance->IsValidBodyInstance() && rBodyInstance->BodySetup.IsValid()) - { - rBodyInstance->UpdateMassProperties(); - } - - if (rBodyInstance->IsInstanceSimulatingPhysics()) - { - // Offset the linear velocity by the new COM position and set it - vel += FVector::CrossProduct(aVel, rBodyInstance->GetCOMPosition() - originalCOM); - rBodyInstance->SetLinearVelocity(vel, false); - } + // Offset the linear velocity by the new COM position and set it + vel += FVector::CrossProduct(aVel, rBodyInstance->GetCOMPosition() - originalCOM); + rBodyInstance->SetLinearVelocity(vel, false); } } } @@ -7278,15 +7224,8 @@ void UGripMotionControllerComponent::ApplyTrackingParameters(FVector& OriginalPo if (IsValid(AttachChar) && !AttachChar->bRetainRoomscale) { - if (AttachChar->VRMovementReference && AttachChar->VRMovementReference->GetReplicatedMovementMode() == EVRConjoinedMovementModes::C_VRMOVE_Seated) - { - - } - else - { - FRotator StoredCameraRotOffset = UVRExpansionFunctionLibrary::GetHMDPureYaw_I(curRot.Rotator()); - LastLocationForLateUpdate += StoredCameraRotOffset.RotateVector(FVector(AttachChar->VRRootReference->VRCapsuleOffset.X, AttachChar->VRRootReference->VRCapsuleOffset.Y, 0.0f)); - } + FRotator StoredCameraRotOffset = UVRExpansionFunctionLibrary::GetHMDPureYaw_I(curRot.Rotator()); + LastLocationForLateUpdate += StoredCameraRotOffset.RotateVector(FVector(AttachChar->VRRootReference->VRCapsuleOffset.X, AttachChar->VRRootReference->VRCapsuleOffset.Y, 0.0f)); } } } @@ -7299,15 +7238,8 @@ void UGripMotionControllerComponent::ApplyTrackingParameters(FVector& OriginalPo if (!AttachChar->bRetainRoomscale && IsLocallyControlled()) { - if (AttachChar->VRMovementReference && AttachChar->VRMovementReference->GetReplicatedMovementMode() == EVRConjoinedMovementModes::C_VRMOVE_Seated) - { - - } - else - { - FRotator StoredCameraRotOffset = UVRExpansionFunctionLibrary::GetHMDPureYaw_I(AttachChar->VRReplicatedCamera->GetRelativeRotation()); - LastLocationForLateUpdate += StoredCameraRotOffset.RotateVector(FVector(AttachChar->VRRootReference->VRCapsuleOffset.X, AttachChar->VRRootReference->VRCapsuleOffset.Y, 0.0f)); - } + FRotator StoredCameraRotOffset = UVRExpansionFunctionLibrary::GetHMDPureYaw_I(AttachChar->VRReplicatedCamera->GetRelativeRotation()); + LastLocationForLateUpdate += StoredCameraRotOffset.RotateVector(FVector(AttachChar->VRRootReference->VRCapsuleOffset.X, AttachChar->VRRootReference->VRCapsuleOffset.Y, 0.0f)); } } } @@ -8025,17 +7957,7 @@ void UGripMotionControllerComponent::Server_NotifyLocalGripRemoved_Implementatio { if (IsValid(DroppingActor) && TransformAtDrop.IsValid()) { - bool bSkipSetTransform = false; - if (DroppingActor->GetClass()->ImplementsInterface(UVRGripInterface::StaticClass())) - { - FBPAdvGripSettings AdvSettings = IVRGripInterface::Execute_AdvancedGripSettings(DroppingActor); - bSkipSetTransform = AdvSettings.bDisallowSettingPositionOnClientAuthDrop; - } - - if (!bSkipSetTransform) - { - DroppingActor->SetActorTransform(TransformAtDrop, false, nullptr, ETeleportType::None); - } + DroppingActor->SetActorTransform(TransformAtDrop, false, nullptr, ETeleportType::None); } } }break; @@ -8045,17 +7967,7 @@ void UGripMotionControllerComponent::Server_NotifyLocalGripRemoved_Implementatio { if (IsValid(DroppingComp) && TransformAtDrop.IsValid()) { - bool bSkipSetTransform = false; - if (DroppingComp->GetClass()->ImplementsInterface(UVRGripInterface::StaticClass())) - { - FBPAdvGripSettings AdvSettings = IVRGripInterface::Execute_AdvancedGripSettings(DroppingComp); - bSkipSetTransform = AdvSettings.bDisallowSettingPositionOnClientAuthDrop; - } - - if (!bSkipSetTransform) - { - DroppingComp->SetWorldTransform(TransformAtDrop, false, nullptr, ETeleportType::None); - } + DroppingComp->SetWorldTransform(TransformAtDrop, false, nullptr, ETeleportType::None); } } }break; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Default.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Default.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Default.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Default.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_GunTools.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_GunTools.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_GunTools.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_GunTools.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_InteractibleSettings.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_InteractibleSettings.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_InteractibleSettings.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_InteractibleSettings.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_LerpToHand.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_LerpToHand.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_LerpToHand.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_LerpToHand.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Melee.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Melee.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Melee.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Melee.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Physics.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Physics.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Physics.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/GS_Physics.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/VRGripScriptBase.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/VRGripScriptBase.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/VRGripScriptBase.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/GripScripts/VRGripScriptBase.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableActor.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableActor.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableActor.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableActor.cpp index 205e30e..2fcaeff 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableActor.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableActor.cpp @@ -50,7 +50,7 @@ AGrippableActor::AGrippableActor(const FObjectInitializer& ObjectInitializer) // #TODO we can register them maybe in the future // Don't use the replicated list, use our custom replication instead - bReplicateUsingRegisteredSubObjectList = true; + bReplicateUsingRegisteredSubObjectList = false; // Setting a minimum of every 3rd frame (VR 90fps) for replication consideration // Otherwise we will get some massive slow downs if the replication is allowed to hit the 2 per second minimum default @@ -756,6 +756,22 @@ void AGrippableActor::BeginDestroy() GripLogicScripts.Empty(); } +void AGrippableActor::GetSubobjectsWithStableNamesForNetworking(TArray& ObjList) +{ + Super::GetSubobjectsWithStableNamesForNetworking(ObjList); + + if (bReplicateGripScripts) + { + for (int32 i = 0; i < GripLogicScripts.Num(); ++i) + { + if (UObject* SubObject = GripLogicScripts[i]) + { + ObjList.Add(SubObject); + } + } + } +} + ///////////////////////////////////////////////// //- Push networking getter / setter functions ///////////////////////////////////////////////// diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableBoxComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableBoxComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableBoxComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableBoxComponent.cpp index 0a77bbb..ec8f05d 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableBoxComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableBoxComponent.cpp @@ -44,7 +44,7 @@ UGrippableBoxComponent::UGrippableBoxComponent(const FObjectInitializer& ObjectI // #TODO we can register them maybe in the future // Don't use the replicated list, use our custom replication instead - bReplicateUsingRegisteredSubObjectList = true; + bReplicateUsingRegisteredSubObjectList = false; } void UGrippableBoxComponent::GetLifetimeReplicatedProps(TArray< class FLifetimeProperty > & OutLifetimeProps) const diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCapsuleComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCapsuleComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCapsuleComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCapsuleComponent.cpp index 937a80c..9178cb5 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCapsuleComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCapsuleComponent.cpp @@ -40,7 +40,7 @@ UGrippableCapsuleComponent::UGrippableCapsuleComponent(const FObjectInitializer& // #TODO we can register them maybe in the future // Don't use the replicated list, use our custom replication instead - bReplicateUsingRegisteredSubObjectList = true; + bReplicateUsingRegisteredSubObjectList = false; } void UGrippableCapsuleComponent::GetLifetimeReplicatedProps(TArray< class FLifetimeProperty > & OutLifetimeProps) const diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCharacter.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCharacter.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCharacter.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableCharacter.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableDataTypes.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableDataTypes.cpp similarity index 84% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableDataTypes.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableDataTypes.cpp index 3fc573e..c6be104 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableDataTypes.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableDataTypes.cpp @@ -5,7 +5,8 @@ #include "GameFramework/Actor.h" -/*bool FRepAttachmentWithWeld::NetSerialize(FArchive& Ar, class UPackageMap* Map, bool& bOutSuccess) + +bool FRepAttachmentWithWeld::NetSerialize(FArchive& Ar, class UPackageMap* Map, bool& bOutSuccess) { // Our additional weld bit is here Ar.SerializeBits(&bIsWelded, 1); @@ -16,9 +17,9 @@ Ar << AttachSocket; Ar << AttachComponent; return true; -}*/ +} FRepAttachmentWithWeld::FRepAttachmentWithWeld() { bIsWelded = false; -} +} \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippablePhysicsReplication.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippablePhysicsReplication.cpp similarity index 82% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippablePhysicsReplication.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippablePhysicsReplication.cpp index 3c8abb9..1f34a92 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippablePhysicsReplication.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippablePhysicsReplication.cpp @@ -10,7 +10,6 @@ #include "CoreMinimal.h" #include "PhysicsEngine/BodyInstance.h" -#include "PhysicsReplicationLOD.h" #include "Components/PrimitiveComponent.h" #include "Components/SkeletalMeshComponent.h" #include "UObject/ObjectMacros.h" @@ -44,13 +43,6 @@ namespace VRPhysicsReplicationStatics // Hacky work around for them not exporting these.... #if WITH_EDITOR - -namespace RenderInterpolationCVars -{ - bool bRenderInterpDebugDrawResimTrigger = false; - float RenderInterpDebugDrawResimBoxScale = 1.0f; -} - namespace PhysicsReplicationCVars { int32 SkipSkeletalRepOptimization = 1; @@ -59,9 +51,6 @@ namespace PhysicsReplicationCVars #endif int32 EnableDefaultReplication = 0; - int32 DebugDrawShowRepMode = 0; - float DebugDrawLifeTime = 3.0f; - namespace DefaultReplicationCVars { @@ -72,8 +61,6 @@ namespace PhysicsReplicationCVars namespace ResimulationCVars { - //extern bool bApplyPredictiveInterpolationWhenBehindServer; - bool bRuntimeCorrectionEnabled = false; bool bRuntimeVelocityCorrection = false; bool bRuntimeCorrectConnectedBodies = true; @@ -82,29 +69,18 @@ namespace PhysicsReplicationCVars float VelStabilityMultiplier = 0.5f; float AngVelStabilityMultiplier = 0.5f; bool bDrawDebug = false; - float LogOutOfBoundsTimeLimit = 5.0f; // Inside of NetworkPhysicsComponent - UPDATE AS CHANGE int32 RedundantInputs = 2; - int32 RedundantRemoteInputs = 1; int32 RedundantStates = 0; bool bAllowRewindToClosestState = true; bool bCompareStateToTriggerRewind = false; - bool bCompareStateToTriggerRewindIncludeSimProxies = false; bool bCompareInputToTriggerRewind = false; bool bEnableUnreliableFlow = true; bool bEnableReliableFlow = false; - - bool bTriggerResimOnInputReceive = false; - bool bApplyInputDecayOverSetTime = false; - float InputDecaySetTime = 0.15f; - bool bApplyDataInsteadOfMergeData = false; bool bAllowInputExtrapolation = true; bool bValidateDataOnGameThread = false; - bool bApplySimProxyStateAtRuntime = false; - bool bApplySimProxyInputAtRuntime = true; - bool bApplyPredictiveInterpolationWhenBehindServer = true; } namespace PredictiveInterpolationCVars @@ -153,9 +129,6 @@ namespace PhysicsReplicationCVars float DrawDebugZOffset = 50.0f; float SleepSecondsClearTarget = 15.0f; int32 TargetTickAlignmentClampMultiplier = 2; - int32 TeleportDetectionEnabled = 1; - float TeleportDetectionMinDistance = 200.0f; - float TeleportDetectionVelocityMultiplier = 1.3f; } } @@ -400,13 +373,13 @@ void FPhysicsReplicationVR::RemoveReplicatedTarget(UPrimitiveComponent* Componen { // Skip all of the custom logic if we aren't the server - /*if (const UWorld* World = GetOwningWorld()) + if (const UWorld* World = GetOwningWorld()) { if (World->GetNetMode() == ENetMode::NM_Client) { return FPhysicsReplication::RemoveReplicatedTarget(Component); } - }*/ + } if (Component == nullptr) { @@ -549,13 +522,12 @@ bool FPhysicsReplicationVR::ApplyRigidBodyState(float DeltaSeconds, FBodyInstanc bool bCorrectConnectedBodiesFriction = CVarCorrectConnectedBodiesFriction->GetBool(); // Assign per-actor settings from NetworkPhysicSettingsComponent if this actor has one - if (SettingsCurrent.IsValid()) + if (SettingsCurrent.Get()) { - const FNetworkPhysicsSettingsData& SettingsData = SettingsCurrent.Pin()->GetSettings(); - MaxLinearHardSnapDistance = SettingsData.DefaultReplicationSettings.GetMaxLinearHardSnapDistance(MaxLinearHardSnapDistance); - bHardsnapLegacyInPT = SettingsData.DefaultReplicationSettings.GetHardsnapDefaultLegacyInPT(); - bCorrectConnectedBodies = SettingsData.DefaultReplicationSettings.GetCorrectConnectedBodies(); - bCorrectConnectedBodiesFriction = SettingsData.DefaultReplicationSettings.GetCorrectConnectedBodiesFriction(); + MaxLinearHardSnapDistance = SettingsCurrent.Get()->DefaultReplicationSettings.GetMaxLinearHardSnapDistance(MaxLinearHardSnapDistance); + bHardsnapLegacyInPT = SettingsCurrent.Get()->DefaultReplicationSettings.GetHardsnapDefaultLegacyInPT(); + bCorrectConnectedBodies = SettingsCurrent.Get()->DefaultReplicationSettings.GetCorrectConnectedBodies(); + bCorrectConnectedBodiesFriction = SettingsCurrent.Get()->DefaultReplicationSettings.GetCorrectConnectedBodiesFriction(); } // Get Current state @@ -687,7 +659,7 @@ bool FPhysicsReplicationVR::ApplyRigidBodyState(float DeltaSeconds, FBodyInstanc { if (bHardsnapLegacyInPT) { - if (Chaos::FSingleParticlePhysicsProxy* Proxy = static_cast(BI->GetPhysicsActor())) + if (Chaos::FSingleParticlePhysicsProxy* Proxy = static_cast(BI->GetPhysicsActorHandle())) { if (Chaos::FPBDRigidsSolver* Solver = Proxy->GetSolver()) { @@ -743,7 +715,7 @@ bool FPhysicsReplicationVR::ApplyRigidBodyState(float DeltaSeconds, FBodyInstanc AsyncInputData.TargetState = NewState; AsyncInputData.TargetState.Position = IdealWorldTM.GetLocation(); AsyncInputData.TargetState.Quaternion = IdealWorldTM.GetRotation(); - AsyncInputData.Proxy = static_cast(BI->GetPhysicsActor()); + AsyncInputData.Proxy = static_cast(BI->GetPhysicsActorHandle()); AsyncInputData.ErrorCorrection = { ErrorCorrection.LinearVelocityCoefficient, ErrorCorrection.AngularVelocityCoefficient, ErrorCorrection.PositionLerp, ErrorCorrection.AngleLerp }; AsyncInputData.LatencyOneWay = PingSeconds; @@ -774,7 +746,7 @@ bool FPhysicsReplicationVR::ApplyRigidBodyState(float DeltaSeconds, FBodyInstanc { FColor Color = FColor::White; static const auto CVarNetCorrectionLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.NetCorrectionLifetime")); - DrawDebugDirectionalArrow(OwningWorld, CurrentState.Position, TargetPos, 5.0f, Color, false, CVarNetCorrectionLifetime->GetFloat(), 0, 1.5f); + DrawDebugDirectionalArrow(OwningWorld, CurrentState.Position, TargetPos, 5.0f, Color, true, CVarNetCorrectionLifetime->GetFloat(), 0, 1.5f); #if 0 //todo: do we show this in async mode? DrawDebugFloatHistory(*OwningWorld, PhysicsTarget.ErrorHistory, NewPos + FVector(0.0f, 0.0f, 100.0f), FVector2D(100.0f, 50.0f), FColor::White); @@ -819,12 +791,6 @@ void FPhysicsReplicationVR::OnTick(float DeltaSeconds, TMap InSettings) +void FPhysicsReplicationAsyncVR::RegisterSettings(Chaos::FConstPhysicsObjectHandle PhysicsObject, FNetworkPhysicsSettingsAsync InSettings) { if (PhysicsObject != nullptr) { - TWeakPtr& Settings = ObjectToSettings.FindOrAdd(PhysicsObject); + FNetworkPhysicsSettingsAsync& Settings = ObjectToSettings.FindOrAdd(PhysicsObject); Settings = InSettings; } } void FPhysicsReplicationAsyncVR::FetchObjectSettings(Chaos::FConstPhysicsObjectHandle PhysicsObject) { - TWeakPtr* CustomSettings = ObjectToSettings.Find(PhysicsObject); - SettingsCurrent = (CustomSettings && (*CustomSettings).IsValid()) ? *(*CustomSettings).Pin().Get() : SettingsDefault; + FNetworkPhysicsSettingsAsync* CustomSettings = ObjectToSettings.Find(PhysicsObject); + SettingsCurrent = (CustomSettings != nullptr) ? *CustomSettings : SettingsDefault; } void FPhysicsReplicationAsyncVR::OnPostInitialize_Internal() { - Chaos::FPBDRigidsSolver& RigidsSolver = GetSolver()->CastChecked(); - RigidsSolver.SetPhysicsReplication_Internal(this); - //Chaos::FPBDRigidsSolver* RigidsSolver = static_cast(GetSolver()); + Chaos::FPBDRigidsSolver* RigidsSolver = static_cast(GetSolver()); - /*if (ensure(RigidsSolver)) + if (ensure(RigidsSolver)) { // This doesn't even do anything currently, nothing gets it #TODO: CHECK BACK ON THIS //RigidsSolver->SetPhysicsReplication(this); - }*/ + } } void FPhysicsReplicationAsyncVR::OnPreSimulate_Internal() @@ -1085,36 +1049,35 @@ void FPhysicsReplicationAsyncVR::OnPreSimulate_Internal() return; } - Chaos::FPBDRigidsSolver* RigidsSolver = static_cast(GetSolver()); - check(RigidsSolver); - - ResimErrorLogTimer += RigidsSolver->GetAsyncDeltaTime(); - - // Early out if this is a resim frame - Chaos::FRewindData* RewindData = RigidsSolver->GetRewindData(); - const bool bRewindDataExist = RewindData != nullptr; - if (bRewindDataExist && RewindData->IsResim()) - { - //static const auto CVarPostResimWaitForUpdate = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.PostResimWaitForUpdate")); - // TODO, Handle the transition from post-resim to interpolation better (disabled by default, resim vs replication interaction is handled via FPhysicsReplicationAsync::CacheResimInteractions) - if (SettingsCurrent.PredictiveInterpolationSettings.GetPostResimWaitForUpdate() && RewindData->IsFinalResim()) - { - for (auto Itr = ObjectToTarget.CreateIterator(); Itr; ++Itr) - { - FReplicatedPhysicsTargetAsync& Target = Itr.Value(); - - // If final resim frame, mark interpolated targets as waiting for up to date data from the server. - if (Target.RepMode == EPhysicsReplicationMode::PredictiveInterpolation) - { - Target.SetWaiting(RigidsSolver->GetCurrentFrame() + Target.FrameOffset, Target.RepModeOverride); - } - } - } - return; - } - if (const FPhysicsReplicationAsyncInput* AsyncInput = GetConsumerInput_Internal()) { + Chaos::FPBDRigidsSolver* RigidsSolver = static_cast(GetSolver()); + check(RigidsSolver); + + // Early out if this is a resim frame + Chaos::FRewindData* RewindData = RigidsSolver->GetRewindData(); + const bool bRewindDataExist = RewindData != nullptr; + if (bRewindDataExist && RewindData->IsResim()) + { + // TODO, Handle the transition from post-resim to interpolation better (disabled by default, resim vs replication interaction is handled via FPhysicsReplicationAsync::CacheResimInteractions) + static const auto CVarPostResimWaitForUpdate = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.PostResimWaitForUpdate")); + if (CVarPostResimWaitForUpdate->GetBool() && RewindData->IsFinalResim()) + { + for (auto Itr = ObjectToTarget.CreateIterator(); Itr; ++Itr) + { + FReplicatedPhysicsTargetAsync& Target = Itr.Value(); + + // If final resim frame, mark interpolated targets as waiting for up to date data from the server. + if (Target.RepMode == EPhysicsReplicationMode::PredictiveInterpolation) + { + Target.SetWaiting(RigidsSolver->GetCurrentFrame() + Target.FrameOffset, Target.RepModeOverride); + } + } + } + + return; + } + // Update async targets with target input for (const FPhysicsRepAsyncInputData& Input : AsyncInput->InputData) { @@ -1137,27 +1100,15 @@ void FPhysicsReplicationAsyncVR::OnPreSimulate_Internal() UpdateRewindDataTarget(Input); UpdateAsyncTarget(Input, RigidsSolver); - - DebugDrawReplicationMode(Input); - - // Deprecated, legacy BodyInstance flow for Default Replication - if (Input.Proxy != nullptr) - { - Chaos::FSingleParticlePhysicsProxy* Proxy = Input.Proxy; - Chaos::FRigidBodyHandle_Internal* Handle = Proxy->GetPhysicsThreadAPI(); - - const FPhysicsRepErrorCorrectionData& UsedErrorCorrection = Input.ErrorCorrection.IsSet() ? Input.ErrorCorrection.GetValue() : AsyncInput->ErrorCorrection; - DefaultReplication_DEPRECATED(Handle, Input, GetDeltaTime_Internal(), UsedErrorCorrection); - } } - } - if (Chaos::FPBDRigidsSolver::IsNetworkPhysicsPredictionEnabled()) - { - CacheResimInteractions(); - } + if (Chaos::FPBDRigidsSolver::IsNetworkPhysicsPredictionEnabled()) + { + CacheResimInteractions(); + } - ApplyTargetStatesAsync(GetDeltaTime_Internal()); + ApplyTargetStatesAsync(GetDeltaTime_Internal(), AsyncInput->ErrorCorrection, AsyncInput->InputData); + } } FReplicatedPhysicsTargetAsync* FPhysicsReplicationAsyncVR::AddObjectToReplication(Chaos::FConstPhysicsObjectHandle PhysicsObject) @@ -1225,7 +1176,7 @@ void FPhysicsReplicationAsyncVR::UpdateRewindDataTarget(const FPhysicsRepAsyncIn { // Cache all target states inside RewindData const int32 LocalFrame = Input.ServerFrame - *Input.FrameOffset; - RewindData->SetTargetStateAtFrame(*Handle, LocalFrame, Chaos::FFrameAndPhase::EParticleHistoryPhase::PrePushData, + RewindData->SetTargetStateAtFrame(*Handle, LocalFrame, Chaos::FFrameAndPhase::EParticleHistoryPhase::PostPushData, Input.TargetState.Position, Input.TargetState.Quaternion, Input.TargetState.LinVel, FMath::DegreesToRadians(Input.TargetState.AngVel), (Input.TargetState.Flags & ERigidBodyFlags::Sleeping)); } @@ -1250,7 +1201,6 @@ void FPhysicsReplicationAsyncVR::UpdateAsyncTarget(const FPhysicsRepAsyncInputDa Target->PrevLinVel = Input.TargetState.LinVel; Target->RepModeOverride = Input.RepMode; } - check(Target); /** Target Update Description * @param Input = incoming state target for replication. @@ -1297,9 +1247,6 @@ void FPhysicsReplicationAsyncVR::UpdateAsyncTarget(const FPhysicsRepAsyncInputDa // Set if the target is allowed to be altered after this update Target->bAllowTargetAltering = !(Target->TargetState.Flags & ERigidBodyFlags::Sleeping) && !(Input.TargetState.Flags & ERigidBodyFlags::Sleeping); - // Cache previous linear velocity - const FVector PrevLinVel = Target->TargetState.LinVel; - // Set Target->ReceiveInterval from either SendInterval or the number of physics ticks between receiving input states if (SendInterval > 0) { @@ -1312,7 +1259,11 @@ void FPhysicsReplicationAsyncVR::UpdateAsyncTarget(const FPhysicsRepAsyncInputDa } // Update target from input and reset properties - Target->ServerFrame = Input.ServerFrame; + PRAGMA_DISABLE_DEPRECATION_WARNINGS + Target->PrevServerFrame = Target->bWaiting ? Input.ServerFrame : Target->ServerFrame; // DEPRECATED UE5.4 + Target->PrevReceiveFrame = (Target->ReceiveFrame == INDEX_NONE) ? (RigidsSolver->GetCurrentFrame() - 1) : Target->ReceiveFrame; // DEPRECATED UE5.4 + PRAGMA_ENABLE_DEPRECATION_WARNINGS + Target->ServerFrame = Input.ServerFrame; Target->ReceiveFrame = CurrentFrame; Target->TargetState = Input.TargetState; Target->RepMode = Input.RepMode; @@ -1323,13 +1274,7 @@ void FPhysicsReplicationAsyncVR::UpdateAsyncTarget(const FPhysicsRepAsyncInputDa // Update waiting state Target->UpdateWaiting(Input.ServerFrame); - // Apply full Replication LOD on received target - ApplyPhysicsReplicationLOD(Input.PhysicsObject, *Target, EPhysicsReplicationLODFlags::LODFlag_All); - - // Check if target is valid to use for resimulation and perform actions if not - CheckTargetResimValidity(*Target); - - if (Target->RepMode == EPhysicsReplicationMode::PredictiveInterpolation) + if (Input.RepMode == EPhysicsReplicationMode::PredictiveInterpolation) { #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST) @@ -1339,13 +1284,16 @@ void FPhysicsReplicationAsyncVR::UpdateAsyncTarget(const FPhysicsRepAsyncInputDa const FVector Offset = FVector(0.0f, 0.0f, 50.0f); // Port this? //const FVector Offset = FVector(0.0f, 0.0f, PhysicsReplicationCVars::PredictiveInterpolationCVars::DrawDebugZOffset); - static const auto CVarNetCorrectionLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Net.DebugDraw.LifeTime")); + + static const auto CVarNetCorrectionLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.NetCorrectionLifetime")); Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(Input.TargetState.Position + Offset, FVector(15.0f, 15.0f, 15.0f), Input.TargetState.Quaternion, FColor::MakeRandomSeededColor(Input.ServerFrame), false, CVarNetCorrectionLifetime->GetFloat(), 0, 1.0f); } #endif - // TickCount is 0 by default at this point and when LOD is used, TickCount will be 0 if no LOD alignment was performed, in this case perform the normal target alignment - if (Target->TickCount == 0) + // Cache the position we received this target at, Predictive Interpolation will alter the target state but use this as the source position for reconciliation. + Target->PrevPosTarget = Input.TargetState.Position; + Target->PrevRotTarget = Input.TargetState.Quaternion; + { /** Target Alignment Feature * With variable network conditions state inputs from the server can arrive both later or earlier than expected. @@ -1383,34 +1331,6 @@ void FPhysicsReplicationAsyncVR::UpdateAsyncTarget(const FPhysicsRepAsyncInputDa } } } - - static const auto CVarTeleportDetectionEnabled = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.TeleportDetection.Enabled")); - // Teleport detection, we don't have specific data that tells us a teleport has happened on the server, so try to detect it by examining the previous and next state - if (CVarTeleportDetectionEnabled->GetBool() == 1 && !bFirstTarget && SendInterval > 0 && RigidsSolver->IsUsingFixedDt()) - { - const FVector PosOffset = (Input.TargetState.Position - Target->PrevPosTarget); - static const auto CVarTeleportDetectionMinDistance = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.TeleportDetection.MinDistance")); - if (PosOffset.SizeSquared() > (CVarTeleportDetectionMinDistance->GetFloat() * CVarTeleportDetectionMinDistance->GetFloat())) - { - const FVector Velocity = Input.TargetState.LinVel.SizeSquared() > PrevLinVel.SizeSquared() ? Input.TargetState.LinVel : PrevLinVel; - const float DeltaSeconds = (SendInterval * RigidsSolver->GetAsyncDeltaTime()); - static const auto CVarTeleportDetectionVelocityMultiplier = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.TeleportDetection.VelocityMultiplier")); - const float PossibleDistanceSquared = (Velocity * (DeltaSeconds * CVarTeleportDetectionVelocityMultiplier->GetFloat())).SizeSquared(); - - if (PossibleDistanceSquared < PosOffset.SizeSquared()) - { - // A teleport has most likely happened, set accumulated error seconds to above limit for hard snapping - // TODO: Don't piggyback on AccumulatedErrorSeconds (potentially implement ERigidBodyFlags::Teleported) - - static const auto CVarErrorAcumulationSeconds = IConsoleManager::Get().FindConsoleVariable(TEXT("p.ErrorAccumulationSeconds")); - Target->AccumulatedErrorSeconds = CVarErrorAcumulationSeconds->GetFloat() + 1.0f; - } - } - } - - // Cache the position we received this target at, Predictive Interpolation will alter the target state but use this as the source position for reconciliation. - Target->PrevPosTarget = Input.TargetState.Position; - Target->PrevRotTarget = Input.TargetState.Quaternion; } } @@ -1424,14 +1344,6 @@ void FPhysicsReplicationAsyncVR::CacheResimInteractions() static const auto CVarResimDisableReplicationOnInteraction = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.Resim.DisableReplicationOnInteraction")); if (!CVarResimDisableReplicationOnInteraction->GetBool()) { - ParticlesInResimIslands.Empty(); - return; - } - - if (UsePhysicsReplicationLOD()) - { - // This will be handled by the LOD system - ParticlesInResimIslands.Empty(); return; } @@ -1441,12 +1353,9 @@ void FPhysicsReplicationAsyncVR::CacheResimInteractions() return; } - ResimIslands.Reset(); - ResimIslandsParticles.Reset(); - ParticlesInResimIslands.Reset(); - + ParticlesInResimIslands.Empty(FMath::CeilToInt(static_cast(ParticlesInResimIslands.Num()) * 0.9f)); Chaos::Private::FPBDIslandManager& IslandManager = RigidsSolver->GetEvolution()->GetIslandManager(); - Chaos::FReadPhysicsObjectInterface_Internal Interface = Chaos::FPhysicsObjectInternalInterface::GetRead(); + Chaos::FWritePhysicsObjectInterface_Internal Interface = Chaos::FPhysicsObjectInternalInterface::GetWrite(); for (auto Itr = ObjectToTarget.CreateIterator(); Itr; ++Itr) { FReplicatedPhysicsTargetAsync& Target = Itr.Value(); @@ -1456,9 +1365,7 @@ void FPhysicsReplicationAsyncVR::CacheResimInteractions() if (Chaos::FGeometryParticleHandle* Handle = Interface.GetParticle(POHandle)) { // Get a list of particles from the same island as a resim particle is in, i.e. particles interacting with a resim particle - IslandManager.FindParticleIslands(Handle, OUT ResimIslands); - IslandManager.FindParticlesInIslands(ResimIslands, OUT ResimIslandsParticles); - for (const Chaos::FGeometryParticleHandle* InteractParticle : ResimIslandsParticles) + for (const Chaos::FGeometryParticleHandle* InteractParticle : IslandManager.FindParticlesInIslands(IslandManager.FindParticleIslands(Handle))) { ParticlesInResimIslands.Add(InteractParticle->GetHandleIdx()); } @@ -1467,172 +1374,66 @@ void FPhysicsReplicationAsyncVR::CacheResimInteractions() } } -void FPhysicsReplicationAsyncVR::ApplyTargetStatesAsync(const float DeltaSeconds) +void FPhysicsReplicationAsyncVR::ApplyTargetStatesAsync(const float DeltaSeconds, const FPhysicsRepErrorCorrectionData& ErrorCorrection, const TArray& InputData) { using namespace Chaos; - /** Helper function to remove replicated target*/ - auto RemoveTargetHelper = [this](TMap::TIterator Itr, FGeometryParticleHandle* Handle) + // Deprecated, legacy BodyInstance flow + for (const FPhysicsRepAsyncInputData& Input : InputData) + { + if (Input.Proxy != nullptr) { - if (Handle) - { - ReplicatedParticleIDs.Remove(Handle->ParticleID()); - } - Itr.RemoveCurrent(); - }; + Chaos::FSingleParticlePhysicsProxy* Proxy = Input.Proxy; + Chaos::FRigidBodyHandle_Internal* Handle = Proxy->GetPhysicsThreadAPI(); + + const FPhysicsRepErrorCorrectionData& UsedErrorCorrection = Input.ErrorCorrection.IsSet() ? Input.ErrorCorrection.GetValue() : ErrorCorrection; + DefaultReplication_DEPRECATED(Handle, Input, DeltaSeconds, UsedErrorCorrection); + } + } // PhysicsObject flow Chaos::FWritePhysicsObjectInterface_Internal Interface = Chaos::FPhysicsObjectInternalInterface::GetWrite(); - for (TMap::TIterator Itr = ObjectToTarget.CreateIterator(); Itr; ++Itr) + for (auto Itr = ObjectToTarget.CreateIterator(); Itr; ++Itr) { bool bRemoveItr = true; // Remove current cached replication target unless replication logic tells us to store it for next tick + FParticleID ParticleID; Chaos::FConstPhysicsObjectHandle& POHandle = Itr.Key(); - FGeometryParticleHandle* Handle = Interface.GetParticle(POHandle); - if (!Handle) + if (FGeometryParticleHandle* Handle = Interface.GetParticle(POHandle)) { - RemoveTargetHelper(Itr, nullptr); - continue; + FReplicatedPhysicsTargetAsync& Target = Itr.Value(); + + + if (FPBDRigidParticleHandle* RigidHandle = Handle->CastToRigidParticle()) + { + ParticleID = RigidHandle->ParticleID(); + + // Cache custom settings for this object if there are any + FetchObjectSettings(POHandle); + + const EPhysicsReplicationMode RepMode = Target.IsWaiting() ? Target.RepModeOverride : Target.RepMode; + switch (RepMode) + { + case EPhysicsReplicationMode::Default: + bRemoveItr = DefaultReplication(RigidHandle, Target, DeltaSeconds); + break; + + case EPhysicsReplicationMode::PredictiveInterpolation: + bRemoveItr = PredictiveInterpolation(RigidHandle, Target, DeltaSeconds); + break; + + case EPhysicsReplicationMode::Resimulation: + bRemoveItr = ResimulationReplication(RigidHandle, Target, DeltaSeconds); + break; + } + Target.TickCount++; + } } - FPBDRigidParticleHandle* RigidHandle = Handle->CastToRigidParticle(); - if (!RigidHandle) - { - RemoveTargetHelper(Itr, Handle); - continue; - } - - FReplicatedPhysicsTargetAsync& Target = Itr.Value(); - - // Cache custom settings for this object if there are any - FetchObjectSettings(POHandle); - - // Apply limited Replication LOD - ApplyPhysicsReplicationLOD(POHandle, Target, EPhysicsReplicationLODFlags::LODFlag_IslandCheck); - - const EPhysicsReplicationMode RepMode = Target.IsWaiting() ? Target.RepModeOverride : Target.RepMode; - switch (RepMode) - { - case EPhysicsReplicationMode::Default: - bRemoveItr = DefaultReplication(RigidHandle, Target, DeltaSeconds); - break; - - case EPhysicsReplicationMode::PredictiveInterpolation: - bRemoveItr = PredictiveInterpolation(RigidHandle, Target, DeltaSeconds); - break; - - case EPhysicsReplicationMode::Resimulation: - bRemoveItr = ResimulationReplication(RigidHandle, Target, DeltaSeconds); - break; - } - Target.TickCount++; - if (bRemoveItr) { - RemoveTargetHelper(Itr, RigidHandle); - - } - } -} - -void FPhysicsReplicationAsyncVR::CheckTargetResimValidity(FReplicatedPhysicsTargetAsync& Target) -{ - if (Target.RepMode != EPhysicsReplicationMode::Resimulation) - { - return; - } - - Chaos::FPBDRigidsSolver* RigidsSolver = static_cast(GetSolver()); - if (RigidsSolver == nullptr) - { - return; - } - - Chaos::FRewindData* RewindData = RigidsSolver->GetRewindData(); - if (RewindData == nullptr) - { - return; - } - - const int32 LocalFrame = Target.ServerFrame - Target.FrameOffset; - if (!RewindData->IsFrameWithinRewindHistory(LocalFrame)) - { - - static const auto CVarResimApplyPredictiveInterpolationWhenBehindServer = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.Resim.ApplyPredictiveInterpolationWhenBehindServer")); - - if (LocalFrame < RewindData->GetEarliestFrame_Internal()) - { - // Client is far ahead of the server, switch over to Predictive Interpolation since it can't use incoming target states from the server to perform resimulations with - - Target.RepMode = EPhysicsReplicationMode::PredictiveInterpolation; - } - else if (CVarResimApplyPredictiveInterpolationWhenBehindServer->GetBool()) - { - /** NOTE: If the server is ahead of the client we receive target states for frames we have not yet simulated on the client, target states are stored in FRewindData still though. - * If PhysicsReplicationCVars::ResimulationCVars::bApplyPredictiveInterpolationWhenBehindServer is true switch over to using PredictiveInterpolation temporarily. - * else FRewindData::CompareTargetsToLastFrame will check for already cached targets to resim with when the server has simulated the corresponding frame */ - - Target.RepMode = EPhysicsReplicationMode::PredictiveInterpolation; - } - - if (ResimOutOfBoundsCounter == 0) - { - UE_LOG(LogPhysics, Warning, TEXT("FPhysicsReplication DESYNCED - received target frame (%d) out of rewind data bounds (%d, %d) - %s - Target will use %s") - , LocalFrame, RewindData->GetEarliestFrame_Internal(), RewindData->CurrentFrame() - , (LocalFrame < RewindData->GetEarliestFrame_Internal()) - ? TEXT("Client is far ahead of the server, server might be dropping frames.") - : TEXT("Client is behind the server, client might be dropping frames."), *UEnum::GetValueAsString(Target.RepMode)); - } - - ResimOutOfBoundsCounter++; - ResimErrorLogTimer = 0; - } - else - { - static const auto CVarLogOutOfBoundsTimeLimit = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.Resim.LogOutOfBoundsTimeLimit")); - - if (ResimOutOfBoundsCounter > 0 && ResimErrorLogTimer > CVarLogOutOfBoundsTimeLimit->GetFloat()) - { - UE_LOG(LogPhysics, Log, TEXT("FPhysicsReplication IN-SYNC - Received targets have now been within rewind data bounds again for at least %f seconds"), ResimErrorLogTimer); - - ResimOutOfBoundsCounter = 0; - } - } -} - -void FPhysicsReplicationAsyncVR::ApplyPhysicsReplicationLOD(Chaos::FConstPhysicsObjectHandle PhysicsObjectHandle, FReplicatedPhysicsTargetAsync& Target, const uint32 LODFLags) -{ - Chaos::FPBDRigidsSolver& RigidsSolver = GetSolver()->CastChecked(); - - IPhysicsReplicationLODAsync* PhysRepLod = RigidsSolver.GetPhysicsReplicationLOD_Internal(); - if (!PhysRepLod || !PhysRepLod->IsEnabled()) - { - return; - } - - FPhysicsRepLodData* LodData = PhysRepLod->GetLODData_Internal(PhysicsObjectHandle, LODFLags); - if (LodData && LodData->DataAssigned) - { - // Apply recommended replication mode - Target.RepMode = LodData->ReplicationMode; - - if (Target.RepMode == EPhysicsReplicationMode::PredictiveInterpolation) - { - const bool bShouldSleep = (Target.TargetState.Flags & ERigidBodyFlags::Sleeping) != 0; - int32 TargetClientFrame = (Target.ServerFrame - Target.FrameOffset); - - // If we use Predicitve Interpolation and we should not sleep and the aligned frame from LOD is ahead of the target, perform LOD aligment extrapolation - if (!bShouldSleep && LodData->AlignedFrame > TargetClientFrame) - { - // Calculate how far to forward predict and extrapolate target by that amount - const int32 FullPredictionFrames = RigidsSolver.GetCurrentFrame() - TargetClientFrame; - const float FullPredictionTime = (FullPredictionFrames * GetDeltaTime_Internal()); - const float AlignedPredictionTime = FullPredictionTime - LodData->AlignedTime; - FPhysicsReplicationAsyncVR::ExtrapolateTarget(Target, AlignedPredictionTime); - - // Update tick count based on LOD alignment - Target.TickCount = LodData->AlignedFrame - TargetClientFrame; - } + ReplicatedParticleIDs.Remove(ParticleID); + Itr.RemoveCurrent(); } } } @@ -1974,6 +1775,11 @@ bool FPhysicsReplicationAsyncVR::PredictiveInterpolation(Chaos::FPBDRigidParticl return true; } + if (Target.IsWaiting()) + { + return false; + } + Chaos::FPBDRigidsSolver* RigidsSolver = static_cast(GetSolver()); if (RigidsSolver == nullptr) { @@ -1997,8 +1803,8 @@ bool FPhysicsReplicationAsyncVR::PredictiveInterpolation(Chaos::FPBDRigidParticl const FVector Offset = FVector(0.0f, 0.0f, 50.0f); const FVector StartPos = Target.TargetState.Position + Offset; const int32 SizeMultiplier = FMath::Clamp(Target.TickCount, -4, 30); - static const auto CVarDebugdrawLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Net.DebugDraw.LifeTime")); - Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(StartPos, FVector(5.0f + SizeMultiplier * 0.75f, 5.0f + SizeMultiplier * 0.75f, 5.0f + SizeMultiplier * 0.75f), Target.TargetState.Quaternion, FColor::MakeRandomSeededColor(Target.ServerFrame), false, CVarDebugdrawLifetime->GetFloat(), 0, 1.0f); + static const auto CVarNetCorrectionLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.NetCorrectionLifetime")); + Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(StartPos, FVector(5.0f + SizeMultiplier * 0.75f, 5.0f + SizeMultiplier * 0.75f, 5.0f + SizeMultiplier * 0.75f), Target.TargetState.Quaternion, FColor::MakeRandomSeededColor(Target.ServerFrame), false, CVarNetCorrectionLifetime->GetFloat(), 0, 1.0f); } #endif @@ -2058,11 +1864,6 @@ bool FPhysicsReplicationAsyncVR::PredictiveInterpolation(Chaos::FPBDRigidParticl return bClearTarget; }; - // If waiting on an up to date state, early out but allow target clearing since we might not receive a new state if target is already set to sleep for example - if (Target.IsWaiting()) - { - return EndReplicationHelper(Target, true); - } static const auto CVarEarlyOutWithVelocity = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.EarlyOutWithVelocity")); static const auto CVarEarlyOutDistanceSqr = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.EarlyOutDistanceSqr")); @@ -2108,41 +1909,8 @@ bool FPhysicsReplicationAsyncVR::PredictiveInterpolation(Chaos::FPBDRigidParticl const FVector TargetLinVel = FVector(Target.TargetState.LinVel); const FVector TargetAngVel = FVector(FMath::DegreesToRadians(Target.TargetState.AngVel)); // Radians - /** --- Reconciliation --- */ - static const auto CVarKinematicHardSnap = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.KinematicHardSnap")); - static const auto CVarErrorAccumulationSeconds = IConsoleManager::Get().FindConsoleVariable(TEXT("p.ErrorAccumulationSeconds")); - static const auto CVarAlwaysHardSnap = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.AlwaysHardSnap")); - const bool bHardSnap = (!bCanSimulate && CVarKinematicHardSnap->GetBool()) - || Target.AccumulatedErrorSeconds > CVarErrorAccumulationSeconds->GetFloat() - || CVarAlwaysHardSnap->GetBool(); - - if (bHardSnap) - { - Target.AccumulatedErrorSeconds = 0.0f; - - if (Handle->IsKinematic()) - { - // Set a FKinematicTarget to hard snap kinematic object - const Chaos::FKinematicTarget KinTarget = Chaos::FKinematicTarget::MakePositionTarget(Target.PrevPosTarget, Target.PrevRotTarget); // Uses EKinematicTargetMode::Position - RigidsSolver->GetEvolution()->SetParticleKinematicTarget(Handle, KinTarget); - } - else - { - // Set XRVW to hard snap dynamic object and force recalculation of friction - const bool bCorrectConnectedBodies = SettingsCurrent.PredictiveInterpolationSettings.GetCorrectConnectedBodies(); - RigidsSolver->GetEvolution()->ApplyParticleTransformCorrection(Handle, Target.PrevPosTarget, Target.PrevRotTarget, bCorrectConnectedBodies, /*bInRecalculateFrictionOnConnectedBodies*/ true, ReplicatedParticleIDs); - Handle->SetV(TargetLinVel); - Handle->SetW(TargetAngVel); - } - - // Cache data for next replication - Target.PrevLinVel = FVector(Target.TargetState.LinVel); - - // End replication and go to sleep if that's requested - return EndReplicationHelper(Target, true); - } - - /** If target velocities are low enough, check the traveled direction and distance from previous frame and compare with replicated linear velocity. + /** --- Reconciliation --- + * If target velocities are low enough, check the traveled direction and distance from previous frame and compare with replicated linear velocity. * If the object isn't moving enough along the replicated velocity it's considered stuck and needs reconciliation. * SoftSnap is performed each tick while there is a registered error, if enough time pass HardSnap forces the object into the correct state. */ static const auto CVarVelocityBased = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.VelocityBased")); @@ -2151,7 +1919,7 @@ bool FPhysicsReplicationAsyncVR::PredictiveInterpolation(Chaos::FPBDRigidParticl static const auto CVarDisableErrorVelocityLimits = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.DisableErrorVelocityLimits")); static const auto CVarErrorAccLinVelMaxLimit = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.ErrorAccLinVelMaxLimit")); static const auto CVarErrorAccAngVelMaxLimit = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.ErrorAccAngVelMaxLimit")); - if ( CVarDisableErrorVelocityLimits->GetBool() || + if (CVarDisableErrorVelocityLimits->GetBool() || (TargetLinVel.Size() < CVarErrorAccLinVelMaxLimit->GetFloat() && TargetAngVel.Size() < CVarErrorAccAngVelMaxLimit->GetFloat())) { const FVector PrevDiff = CurrentState.Position - Target.PrevPos; @@ -2184,8 +1952,43 @@ bool FPhysicsReplicationAsyncVR::PredictiveInterpolation(Chaos::FPBDRigidParticl { bSoftSnap = false; } - - if (Handle->IsKinematic()) // Smooth Kinematic Replication + + static const auto CVarErrorAccumulationSeconds = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.ErrorAccumulationSeconds")); + static const auto CVarAlwaysHardSnap = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.AlwaysHardSnap")); + static const auto CVarKinematicHardSnap = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.KinematicHardSnap")); + + const bool bHardSnap = (!bCanSimulate && CVarKinematicHardSnap->GetBool()) + || Target.AccumulatedErrorSeconds > CVarErrorAccumulationSeconds->GetFloat() + || CVarAlwaysHardSnap->GetBool(); + + if (bHardSnap) + { + Target.AccumulatedErrorSeconds = 0.0f; + + if (Handle->IsKinematic()) + { + // Set a FKinematicTarget to hard snap kinematic object + const Chaos::FKinematicTarget KinTarget = Chaos::FKinematicTarget::MakePositionTarget(Target.PrevPosTarget, Target.PrevRotTarget); // Uses EKinematicTargetMode::Position + RigidsSolver->GetEvolution()->SetParticleKinematicTarget(Handle, KinTarget); + } + else + { + // Set XRVW to hard snap dynamic object and force recalculation of friction + const bool bCorrectConnectedBodies = SettingsCurrent.PredictiveInterpolationSettings.GetCorrectConnectedBodies(); + RigidsSolver->GetEvolution()->ApplyParticleTransformCorrection(Handle, Target.PrevPosTarget, Target.PrevRotTarget, bCorrectConnectedBodies, /*bInRecalculateFrictionOnConnectedBodies*/ true, ReplicatedParticleIDs); + + + Handle->SetV(TargetLinVel); + Handle->SetW(TargetAngVel); + } + + // Cache data for next replication + Target.PrevLinVel = FVector(Target.TargetState.LinVel); + + // End replication and go to sleep if that's requested + return EndReplicationHelper(Target, true); + } + else if (Handle->IsKinematic()) // Smooth Kinematic Replication { static const auto CVarKinematicPrediction = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.PredictiveInterpolation.KinematicPrediction")); const bool bKinematicPrediction = CVarKinematicPrediction->GetBool(); @@ -2232,8 +2035,8 @@ bool FPhysicsReplicationAsyncVR::PredictiveInterpolation(Chaos::FPBDRigidParticl const FVector Offset = FVector(0.0f, 0.0f, CVarDrawDebugZOffset->GetFloat()); const FVector Pos = KinTargetPos + Offset; const int32 SizeMultiplier = FMath::Clamp(Target.TickCount, -4, 30); - static const auto CVarDebugdrawLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Net.DebugDraw.LifeTime")); - Chaos::FDebugDrawQueue::GetInstance().DrawDebugSphere(Pos, 3.0f + SizeMultiplier * 0.75f, 8, FColor::MakeRandomSeededColor(Target.ServerFrame), false, CVarDebugdrawLifetime->GetFloat(), 0, 1.0f); + static const auto CVarNetCorrectionLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.NetCorrectionLifetime")); + Chaos::FDebugDrawQueue::GetInstance().DrawDebugSphere(Pos, 3.0f + SizeMultiplier * 0.75f, 8, FColor::MakeRandomSeededColor(Target.ServerFrame), false, CVarNetCorrectionLifetime->GetFloat(), 0, 1.0f); } #endif } @@ -2411,12 +2214,7 @@ bool FPhysicsReplicationAsyncVR::PredictiveInterpolation(Chaos::FPBDRigidParticl void FPhysicsReplicationAsyncVR::ExtrapolateTarget(FReplicatedPhysicsTargetAsync& Target, const int32 ExtrapolateFrames, const float DeltaSeconds) { const float ExtrapolationTime = DeltaSeconds * static_cast(ExtrapolateFrames); - FPhysicsReplicationAsyncVR::ExtrapolateTarget(Target, ExtrapolationTime); -} -/** Static function to extrapolate a target for N Seconds */ -void FPhysicsReplicationAsyncVR::ExtrapolateTarget(FReplicatedPhysicsTargetAsync& Target, const float ExtrapolationTime) -{ // Extrapolate target position Target.TargetState.Position = Target.TargetState.Position + Target.TargetState.LinVel * ExtrapolationTime; @@ -2444,22 +2242,22 @@ bool FPhysicsReplicationAsyncVR::ResimulationReplication(Chaos::FPBDRigidParticl return true; } - if (Target.ServerFrame <= 0) - { - return true; - } - const int32 LocalFrame = Target.ServerFrame - Target.FrameOffset; - if (!RewindData->IsFrameWithinRewindHistory(LocalFrame)) + if (LocalFrame >= RewindData->CurrentFrame() || LocalFrame < RewindData->GetEarliestFrame_Internal()) { + if (LocalFrame > 0 && (RewindData->CurrentFrame() - RewindData->GetEarliestFrame_Internal()) == RewindData->Capacity()) + { + UE_LOG(LogPhysics, Warning, TEXT("FPhysicsReplication::ResimulationReplication target frame (%d) out of rewind data bounds (%d,%d)"), + LocalFrame, RewindData->GetEarliestFrame_Internal(), RewindData->CurrentFrame()); + } return true; } const bool bShouldSleep = (Target.TargetState.Flags & ERigidBodyFlags::Sleeping) != 0; bool bClearTarget = true; - static constexpr Chaos::FFrameAndPhase::EParticleHistoryPhase RewindPhase = Chaos::FFrameAndPhase::EParticleHistoryPhase::PrePushData; + static constexpr Chaos::FFrameAndPhase::EParticleHistoryPhase RewindPhase = Chaos::FFrameAndPhase::EParticleHistoryPhase::PostPushData; // Get state from locally cached history for frame corresponding to received data const Chaos::FGeometryParticleState PastState = RewindData->GetPastStateAtFrame(*Handle, LocalFrame, RewindPhase); @@ -2471,24 +2269,11 @@ bool FPhysicsReplicationAsyncVR::ResimulationReplication(Chaos::FPBDRigidParticl const bool bCompareW = Chaos::FPhysicsSolverBase::GetResimulationErrorAngularVelocityThresholdEnabled() || SettingsCurrent.ResimulationSettings.bOverrideResimulationErrorAngularVelocityThreshold; bool bShouldTriggerResim = false; -#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST) - // Debugging - FColor DebugColor = FColor::Black; - bool bResimV = false; - bool bResimW = false; -#endif - // Check for positional discrepancy in Distance between client and server if (bCompareX) { const float ResimPositionErrorThreshold = SettingsCurrent.ResimulationSettings.GetResimulationErrorPositionThreshold(Chaos::FPhysicsSolverBase::GetResimulationErrorPositionThreshold()); bShouldTriggerResim = Chaos::FRewindData::CheckVectorThreshold(Target.TargetState.Position, PastState.GetX(), ResimPositionErrorThreshold); -#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST) - if (bShouldTriggerResim) - { - DebugColor = FColor::Orange; - } -#endif } // Check for linear velocity discrepancy in Distance / s between client and server @@ -2496,25 +2281,13 @@ bool FPhysicsReplicationAsyncVR::ResimulationReplication(Chaos::FPBDRigidParticl { const float ResimLinVelocityErrorThreshold = SettingsCurrent.ResimulationSettings.GetResimulationErrorLinearVelocityThreshold(Chaos::FPhysicsSolverBase::GetResimulationErrorLinearVelocityThreshold()); bShouldTriggerResim = Chaos::FRewindData::CheckVectorThreshold(Target.TargetState.LinVel, PastState.GetV(), ResimLinVelocityErrorThreshold); -#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST) - if (bShouldTriggerResim) - { - bResimV = true; - } -#endif } // Check for angular velocity discrepancy in Degrees / s between client and server if (!bShouldTriggerResim && bCompareW) { const float ResimAngVelocityErrorThreshold = SettingsCurrent.ResimulationSettings.GetResimulationErrorAngularVelocityThreshold(Chaos::FPhysicsSolverBase::GetResimulationErrorAngularVelocityThreshold()); - bShouldTriggerResim = Chaos::FRewindData::CheckVectorThreshold(Target.TargetState.AngVel, FMath::RadiansToDegrees(PastState.GetW()), ResimAngVelocityErrorThreshold); -#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST) - if (bShouldTriggerResim) - { - bResimW = true; - } -#endif + bShouldTriggerResim = Chaos::FRewindData::CheckVectorThreshold(FMath::DegreesToRadians(Target.TargetState.AngVel), PastState.GetW(), ResimAngVelocityErrorThreshold); } // Check for rotational discrepancy in Degrees between client and server @@ -2522,12 +2295,6 @@ bool FPhysicsReplicationAsyncVR::ResimulationReplication(Chaos::FPBDRigidParticl { const float ResimRotationErrorThreshold = SettingsCurrent.ResimulationSettings.GetResimulationErrorRotationThreshold(Chaos::FPhysicsSolverBase::GetResimulationErrorRotationThreshold()); bShouldTriggerResim = Chaos::FRewindData::CheckQuaternionThreshold(Target.TargetState.Quaternion, PastState.GetR(), ResimRotationErrorThreshold); -#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST) - if (bShouldTriggerResim) - { - DebugColor = FColor::Magenta; - } -#endif } @@ -2544,54 +2311,16 @@ bool FPhysicsReplicationAsyncVR::ResimulationReplication(Chaos::FPBDRigidParticl } static const auto CVarResimDrawDebug = IConsoleManager::Get().FindConsoleVariable(TEXT("np2.Resim.DrawDebug")); - static const auto CVarRenderInterpDebugDrawResimTrigger = IConsoleManager::Get().FindConsoleVariable(TEXT("p.RenderInterp.DebugDraw.ResimTrigger")); - static const auto CVarRenderInterpDebugDrawResimBoxScale = IConsoleManager::Get().FindConsoleVariable(TEXT("p.RenderInterp.DebugDraw.ResimBoxScale")); - if (CVarResimDrawDebug->GetBool() || CVarRenderInterpDebugDrawResimTrigger->GetBool()) + if (CVarResimDrawDebug->GetBool()) { - if (bShouldTriggerResim) - { - FVector Box = CVarRenderInterpDebugDrawResimTrigger->GetBool() ? FVector(6, 3, 2) : FVector(40, 20, 10); - Box *= CVarRenderInterpDebugDrawResimBoxScale->GetFloat(); - const float DrawThickness = (CVarRenderInterpDebugDrawResimTrigger->GetBool() ? 0.5f : 1.5f) * CVarRenderInterpDebugDrawResimBoxScale->GetFloat(); + static constexpr float BoxSize = 5.0f; + const float ColorLerp = bShouldTriggerResim ? 1.0f : 0.0f; + const FColor DebugColor = FLinearColor::LerpUsingHSV(FLinearColor::Green, FLinearColor::Red, ColorLerp).ToFColor(false); - - static const auto CVarDebugdrawLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Net.DebugDraw.LifeTime")); - if (CVarRenderInterpDebugDrawResimTrigger->GetBool()) // Resim debug draw extension for render interpolation - { - Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(PastState.GetX(), Box, PastState.GetR(), FColor::White, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); - Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(Target.TargetState.Position, Box, Target.TargetState.Quaternion, DebugColor, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); - - Chaos::FDebugDrawQueue::GetInstance().DrawDebugDirectionalArrow(Handle->GetX(), PastState.GetX(), 5.0f, FColor::White, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); - Chaos::FDebugDrawQueue::GetInstance().DrawDebugDirectionalArrow(PastState.GetX(), Target.TargetState.Position, 5.0f, FColor::Black, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); - - if (bResimV) - { - const FVector DiffV = Target.TargetState.LinVel - PastState.GetV(); - Chaos::FDebugDrawQueue::GetInstance().DrawDebugDirectionalArrow(Target.TargetState.Position, Target.TargetState.Position + DiffV, 5.0f, FColor::Orange, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); - } - if (bResimW) - { - const FVector DiffW = Target.TargetState.AngVel - FMath::RadiansToDegrees(PastState.GetW()); - Chaos::FDebugDrawQueue::GetInstance().DrawDebugDirectionalArrow(Target.TargetState.Position + DiffW, Target.TargetState.Position, 5.0f, FColor::Magenta, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); - } - } - else // Resim trigger debug draw - { - Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(Handle->GetX(), Box, PastState.GetR(), FColor::White, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); - Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(Handle->GetX() + (Target.TargetState.Position - PastState.GetX()), Box, Target.TargetState.Quaternion, DebugColor, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); - - if (bResimV) - { - const FVector DiffV = Target.TargetState.LinVel - PastState.GetV(); - Chaos::FDebugDrawQueue::GetInstance().DrawDebugDirectionalArrow(Handle->GetX(), Handle->GetX() + DiffV, 5.0f, FColor::Orange, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); - } - if (bResimW) - { - const FVector DiffW = Target.TargetState.AngVel - FMath::RadiansToDegrees(PastState.GetW()); - Chaos::FDebugDrawQueue::GetInstance().DrawDebugDirectionalArrow(Handle->GetX() + DiffW, Handle->GetX(), 5.0f, FColor::Magenta, false, CVarDebugdrawLifetime->GetFloat(), 0, DrawThickness); - } - } - } + static const auto CVarNetCorrectionLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.NetCorrectionLifetime")); + Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(Target.TargetState.Position, FVector(BoxSize, BoxSize, BoxSize), Target.TargetState.Quaternion, FColor::Orange, true, CVarNetCorrectionLifetime->GetFloat(), 0, 1.0f); + Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(PastState.GetX(), FVector(6, 6, 6), PastState.GetR(), DebugColor, true, CVarNetCorrectionLifetime->GetFloat(), 0, 1.0f); + Chaos::FDebugDrawQueue::GetInstance().DrawDebugDirectionalArrow(PastState.GetX(), Target.TargetState.Position, 5.0f, FColor::MakeRandomSeededColor(LocalFrame), true, CVarNetCorrectionLifetime->GetFloat(), 0, 0.5f); } #endif @@ -2603,8 +2332,12 @@ bool FPhysicsReplicationAsyncVR::ResimulationReplication(Chaos::FPBDRigidParticl if (bShouldTriggerResim && Target.TickCount == 0 && LocalFrame > RewindData->GetBlockedResimFrame()) { - // Request resimulation - RewindData->RequestResimulation(LocalFrame, Handle); + // Trigger resimulation + RigidsSolver->GetEvolution()->GetIslandManager().SetParticleResimFrame(Handle, LocalFrame); + + int32 ResimFrame = RewindData->GetResimFrame(); + ResimFrame = (ResimFrame == INDEX_NONE) ? LocalFrame : FMath::Min(ResimFrame, LocalFrame); + RewindData->SetResimFrame(ResimFrame); } else if (SettingsCurrent.ResimulationSettings.GetRuntimeCorrectionEnabled()) { @@ -2648,8 +2381,8 @@ bool FPhysicsReplicationAsyncVR::ResimulationReplication(Chaos::FPBDRigidParticl #if !(UE_BUILD_SHIPPING || UE_BUILD_TEST) if (CVarResimDrawDebug->GetBool()) { - static const auto CVarDebugdrawLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Net.DebugDraw.LifeTime")); - Chaos::FDebugDrawQueue::GetInstance().DrawDebugDirectionalArrow(Handle->GetX(), CorrectedX, 5.0f, FColor::MakeRandomSeededColor(LocalFrame), true, CVarDebugdrawLifetime->GetFloat(), 0, 0.5f); + static const auto CVarNetCorrectionLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.NetCorrectionLifetime")); + Chaos::FDebugDrawQueue::GetInstance().DrawDebugDirectionalArrow(Handle->GetX(), CorrectedX, 5.0f, FColor::MakeRandomSeededColor(LocalFrame), true, CVarNetCorrectionLifetime->GetFloat(), 0, 0.5f); } #endif // Apply correction to position and rotation @@ -2673,90 +2406,14 @@ bool FPhysicsReplicationAsyncVR::ResimulationReplication(Chaos::FPBDRigidParticl RigidsSolver->GetEvolution()->ApplySleepOnConnectedParticles(Handle); } } - else if (Target.IsWaiting()) - { - // Don't clear the target if we are waiting for a specific target frame and not sleeping - bClearTarget = false; - } - return bClearTarget; } -void FPhysicsReplicationAsyncVR::DebugDrawReplicationMode(const FPhysicsRepAsyncInputData& Input) -{ -#if !(UE_BUILD_SHIPPING || UE_BUILD_TEST) - - static const auto CVarDebugDrawShowRepMode = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Net.DebugDraw.ShowRepMode")); - if (!CVarDebugDrawShowRepMode->GetBool()) - { - return; - } - - if (Input.PhysicsObject == nullptr && Input.Proxy == nullptr) - { - return; - } - - FColor DebugColor = FColor::White; - FVector BoxExtent = FVector(10.0f, 10.0f, 10.0f); - FQuat Rotation = FQuat::Identity; - - if (Input.PhysicsObject) - { - if (FReplicatedPhysicsTargetAsync* Target = ObjectToTarget.Find(Input.PhysicsObject)) - { - Chaos::FReadPhysicsObjectInterface_Internal Interface = Chaos::FPhysicsObjectInternalInterface::GetRead(); - if (Chaos::FGeometryParticleHandle* Handle = Interface.GetParticle(Input.PhysicsObject)) - { - BoxExtent = Handle->LocalBounds().Extents() * 0.5f; - Rotation = Handle->GetR(); - } - - const EPhysicsReplicationMode RepMode = Target->IsWaiting() ? Target->RepModeOverride : Target->RepMode; - switch (RepMode) - { - case EPhysicsReplicationMode::PredictiveInterpolation: - DebugColor = FColor::Yellow; - break; - case EPhysicsReplicationMode::Resimulation: - DebugColor = FColor::Red; - break; - case EPhysicsReplicationMode::Default: - default: - DebugColor = FColor::Cyan; - break; - } - } - } - else if (Input.Proxy != nullptr) - { - // Legacy Default physics replication - - Chaos::FSingleParticlePhysicsProxy* Proxy = Input.Proxy; - Chaos::FRigidBodyHandle_Internal* Handle = Proxy->GetPhysicsThreadAPI(); - - Rotation = Handle->GetR(); - DebugColor = FColor::Green; - } - - static const auto CVarDebugdrawLifetime = IConsoleManager::Get().FindConsoleVariable(TEXT("p.Net.DebugDraw.LifeTime")); - Chaos::FDebugDrawQueue::GetInstance().DrawDebugBox(Input.TargetState.Position, BoxExtent, Rotation, DebugColor, false, CVarDebugdrawLifetime->GetFloat(), 0, 1.0f); -#endif -} - FName FPhysicsReplicationAsyncVR::GetFNameForStatId() const { const static FLazyName StaticName("FPhysicsReplicationAsyncCallback"); return StaticName; } -bool FPhysicsReplicationAsyncVR::UsePhysicsReplicationLOD() -{ - Chaos::FPBDRigidsSolver& RigidsSolver = GetSolver()->CastChecked(); - - IPhysicsReplicationLODAsync* PhysRepLod = RigidsSolver.GetPhysicsReplicationLOD_Internal(); - return PhysRepLod && PhysRepLod->IsEnabled(); -} - #pragma endregion // FPhysicsReplicationAsync \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshActor.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshActor.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshActor.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshActor.cpp index 50f32d9..5e39bc3 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshActor.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshActor.cpp @@ -152,7 +152,7 @@ AGrippableSkeletalMeshActor::AGrippableSkeletalMeshActor(const FObjectInitialize // #TODO we can register them maybe in the future // Don't use the replicated list, use our custom replication instead - bReplicateUsingRegisteredSubObjectList = true; + bReplicateUsingRegisteredSubObjectList = false; bAllowIgnoringAttachOnOwner = true; @@ -857,6 +857,22 @@ void AGrippableSkeletalMeshActor::BeginDestroy() GripLogicScripts.Empty(); } +void AGrippableSkeletalMeshActor::GetSubobjectsWithStableNamesForNetworking(TArray& ObjList) +{ + Super::GetSubobjectsWithStableNamesForNetworking(ObjList); + + if (bReplicateGripScripts) + { + for (int32 i = 0; i < GripLogicScripts.Num(); ++i) + { + if (UObject* SubObject = GripLogicScripts[i]) + { + ObjList.Add(SubObject); + } + } + } +} + ///////////////////////////////////////////////// //- Push networking getter / setter functions ///////////////////////////////////////////////// diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshComponent.cpp index 1ac491b..78f3fcd 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSkeletalMeshComponent.cpp @@ -41,7 +41,7 @@ UGrippableSkeletalMeshComponent::UGrippableSkeletalMeshComponent(const FObjectIn // #TODO we can register them maybe in the future // Don't use the replicated list, use our custom replication instead - bReplicateUsingRegisteredSubObjectList = true; + bReplicateUsingRegisteredSubObjectList = false; } void UGrippableSkeletalMeshComponent::GetLifetimeReplicatedProps(TArray< class FLifetimeProperty > & OutLifetimeProps) const diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSphereComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSphereComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSphereComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSphereComponent.cpp index 4f6fca9..6fca280 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSphereComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableSphereComponent.cpp @@ -40,7 +40,7 @@ UGrippableSphereComponent::UGrippableSphereComponent(const FObjectInitializer& O // #TODO we can register them maybe in the future // Don't use the replicated list, use our custom replication instead - bReplicateUsingRegisteredSubObjectList = true; + bReplicateUsingRegisteredSubObjectList = false; } void UGrippableSphereComponent::GetLifetimeReplicatedProps(TArray< class FLifetimeProperty > & OutLifetimeProps) const diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshActor.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshActor.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshActor.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshActor.cpp index 111bca7..2379ac3 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshActor.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshActor.cpp @@ -97,7 +97,7 @@ AGrippableStaticMeshActor::AGrippableStaticMeshActor(const FObjectInitializer& O // #TODO we can register them maybe in the future // Don't use the replicated list, use our custom replication instead - bReplicateUsingRegisteredSubObjectList = true; + bReplicateUsingRegisteredSubObjectList = false; bAllowIgnoringAttachOnOwner = true; @@ -725,11 +725,11 @@ void AGrippableStaticMeshActor::OnRep_ReplicatedMovement() return; } - /*if (VRGripInterfaceSettings.HoldingControllers.Num() > 0) + if (VRGripInterfaceSettings.HoldingControllers.Num() > 0) { ShouldWeSkipAttachmentReplication(); int gg = 0; - }*/ + } Super::OnRep_ReplicatedMovement(); } @@ -801,6 +801,22 @@ void AGrippableStaticMeshActor::BeginDestroy() GripLogicScripts.Empty(); } +void AGrippableStaticMeshActor::GetSubobjectsWithStableNamesForNetworking(TArray& ObjList) +{ + Super::GetSubobjectsWithStableNamesForNetworking(ObjList); + + if (bReplicateGripScripts) + { + for (int32 i = 0; i < GripLogicScripts.Num(); ++i) + { + if (UObject* SubObject = GripLogicScripts[i]) + { + ObjList.Add(SubObject); + } + } + } +} + ///////////////////////////////////////////////// //- Push networking getter / setter functions ///////////////////////////////////////////////// diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshComponent.cpp index 5a25a56..1f6b0bc 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/GrippableStaticMeshComponent.cpp @@ -39,7 +39,7 @@ UGrippableStaticMeshComponent::UGrippableStaticMeshComponent(const FObjectInitia // #TODO we can register them maybe in the future // Don't use the replicated list, use our custom replication instead - bReplicateUsingRegisteredSubObjectList = true; + bReplicateUsingRegisteredSubObjectList = false; } void UGrippableStaticMeshComponent::GetLifetimeReplicatedProps(TArray< class FLifetimeProperty > & OutLifetimeProps) const diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp similarity index 97% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp index dc3cbc4..91a775c 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Grippables/HandSocketComponent.cpp @@ -206,8 +206,7 @@ bool UHandSocketComponent::GetAnimationSequenceAsPoseSnapShot(UAnimSequence* InA const FReferenceSkeleton& RefSkeleton = (TargetMesh) ? TargetMesh->GetSkinnedAsset()->GetRefSkeleton() : InAnimationSequence->GetSkeleton()->GetReferenceSkeleton(); FTransform LocalTransform; - //const TArray& TrackMap = InAnimationSequence->GetCompressedTrackToSkeletonMapTable(); - const TArray& TrackMap = InAnimationSequence->GetCompressedData().Get().CompressedTrackToSkeletonMapTable; + const TArray& TrackMap = InAnimationSequence->GetCompressedTrackToSkeletonMapTable(); int32 TrackIndex = INDEX_NONE; OutPoseSnapShot.LocalTransforms.Reserve(OutPoseSnapShot.BoneNames.Num()); @@ -238,9 +237,8 @@ bool UHandSocketComponent::GetAnimationSequenceAsPoseSnapShot(UAnimSequence* InA if (TrackIndex != INDEX_NONE && (!bSkipRootBone || TrackIndex != 0)) { - //double TrackLocation = 0.0f; - // FAnimExtraContext default is fine, its a zero track location - InAnimationSequence->GetBoneTransform(LocalTransform, FSkeletonPoseBoneIndex(TrackMap[TrackIndex].BoneTreeIndex), FAnimExtractContext(), false); + double TrackLocation = 0.0f; + InAnimationSequence->GetBoneTransform(LocalTransform, FSkeletonPoseBoneIndex(TrackMap[TrackIndex].BoneTreeIndex), TrackLocation, false); } else { @@ -319,7 +317,7 @@ bool UHandSocketComponent::GetBlendedPoseSnapShot(FPoseSnapshot& PoseSnapShot, U const FReferenceSkeleton& RefSkeleton = (TargetMesh) ? TargetMesh->GetSkinnedAsset()->GetRefSkeleton() : HandTargetAnimation->GetSkeleton()->GetReferenceSkeleton(); FTransform LocalTransform; - const TArray& TrackMap = HandTargetAnimation->GetCompressedData().Get().CompressedTrackToSkeletonMapTable; + const TArray& TrackMap = HandTargetAnimation->GetCompressedTrackToSkeletonMapTable(); int32 TrackIndex = INDEX_NONE; for (int32 BoneNameIndex = 0; BoneNameIndex < PoseSnapShot.BoneNames.Num(); ++BoneNameIndex) @@ -347,9 +345,8 @@ bool UHandSocketComponent::GetBlendedPoseSnapShot(FPoseSnapshot& PoseSnapShot, U if (TrackIndex != INDEX_NONE && (!bSkipRootBone || TrackIndex != 0)) { - //double TrackLocation = 0.0f; - // FAnimExtraContext default is fine, its a zero track location - HandTargetAnimation->GetBoneTransform(LocalTransform, FSkeletonPoseBoneIndex(TrackMap[TrackIndex].BoneTreeIndex), FAnimExtractContext(), false); + double TrackLocation = 0.0f; + HandTargetAnimation->GetBoneTransform(LocalTransform, FSkeletonPoseBoneIndex(TrackMap[TrackIndex].BoneTreeIndex), TrackLocation, false); } else { @@ -612,7 +609,7 @@ FTransform UHandSocketComponent::GetBoneTransformAtTime(UAnimSequence* MyAnimSeq if (const IAnimationDataModel* AnimModel = AnimController.GetModel()) { - const TArray& TrackMap = MyAnimSequence->GetCompressedData().Get().CompressedTrackToSkeletonMapTable; + const TArray& TrackMap = MyAnimSequence->GetCompressedTrackToSkeletonMapTable(); int32 TrackIndex = INDEX_NONE; if (BoneIdx != INDEX_NONE && BoneIdx < TrackMap.Num() && TrackMap[BoneIdx].BoneTreeIndex == BoneIdx) @@ -638,9 +635,7 @@ FTransform UHandSocketComponent::GetBoneTransformAtTime(UAnimSequence* MyAnimSeq FSkeletonPoseBoneIndex BoneIndex(TrackMap[TrackIndex].BoneTreeIndex); if (BoneIndex.IsValid()) { - FAnimExtractContext NewContext; - NewContext.CurrentTime = tracklen; - MyAnimSequence->GetBoneTransform(BoneTransform, BoneIndex, /*AnimTime*/ NewContext, bUseRawDataOnly); + MyAnimSequence->GetBoneTransform(BoneTransform, BoneIndex, /*AnimTime*/ tracklen, bUseRawDataOnly); return BoneTransform; } } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRButtonComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRButtonComponent.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRButtonComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRButtonComponent.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRDialComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRDialComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRDialComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRDialComponent.cpp index 739365a..d6ec172 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRDialComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRDialComponent.cpp @@ -399,9 +399,7 @@ void UVRDialComponent::GetGripStiffnessAndDamping_Implementation(float &GripStif FBPAdvGripSettings UVRDialComponent::AdvancedGripSettings_Implementation() { - FBPAdvGripSettings GripSettings(GripPriority); - GripSettings.bDisallowSettingPositionOnClientAuthDrop = true; - return GripSettings; + return FBPAdvGripSettings(GripPriority); } float UVRDialComponent::GripBreakDistance_Implementation() diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRInteractibleFunctionLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRInteractibleFunctionLibrary.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRInteractibleFunctionLibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRInteractibleFunctionLibrary.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRLeverComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRLeverComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRLeverComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRLeverComponent.cpp index 2dfff7e..44ca29f 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRLeverComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRLeverComponent.cpp @@ -541,9 +541,7 @@ void UVRLeverComponent::GetGripStiffnessAndDamping_Implementation(float &GripSti FBPAdvGripSettings UVRLeverComponent::AdvancedGripSettings_Implementation() { - FBPAdvGripSettings GripSettings(GripPriority); - GripSettings.bDisallowSettingPositionOnClientAuthDrop = true; - return GripSettings; + return FBPAdvGripSettings(GripPriority); } float UVRLeverComponent::GripBreakDistance_Implementation() diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRMountComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRMountComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRMountComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRMountComponent.cpp index 3dde8ee..115e95a 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRMountComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRMountComponent.cpp @@ -514,9 +514,7 @@ void UVRMountComponent::GetGripStiffnessAndDamping_Implementation(float &GripSti FBPAdvGripSettings UVRMountComponent::AdvancedGripSettings_Implementation() { - FBPAdvGripSettings GripSettings(GripPriority); - GripSettings.bDisallowSettingPositionOnClientAuthDrop = true; - return GripSettings; + return FBPAdvGripSettings(GripPriority); } float UVRMountComponent::GripBreakDistance_Implementation() diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRSliderComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRSliderComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRSliderComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRSliderComponent.cpp index 0e6d8a3..acc881d 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRSliderComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Interactibles/VRSliderComponent.cpp @@ -644,9 +644,7 @@ void UVRSliderComponent::GetGripStiffnessAndDamping_Implementation(float &GripSt FBPAdvGripSettings UVRSliderComponent::AdvancedGripSettings_Implementation() { - FBPAdvGripSettings GripSettings(GripPriority); - GripSettings.bDisallowSettingPositionOnClientAuthDrop = true; - return GripSettings; + return FBPAdvGripSettings(GripPriority); } float UVRSliderComponent::GripBreakDistance_Implementation() diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/BucketUpdateSubsystem.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/BucketUpdateSubsystem.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/BucketUpdateSubsystem.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/BucketUpdateSubsystem.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/CollisionIgnoreSubsystem.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/CollisionIgnoreSubsystem.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/CollisionIgnoreSubsystem.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/CollisionIgnoreSubsystem.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/OptionalRepSkeletalMeshActor.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/OptionalRepSkeletalMeshActor.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/OptionalRepSkeletalMeshActor.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/OptionalRepSkeletalMeshActor.cpp index 199c9f0..be833e5 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/OptionalRepSkeletalMeshActor.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/OptionalRepSkeletalMeshActor.cpp @@ -561,7 +561,6 @@ void UInversePhysicsSkeletalMeshComponent::RegisterEndPhysicsTick(bool bRegister // For testing if the engine fix is live yet or not //return Super::RegisterEndPhysicsTick(bRegister); - if (bRegister != EndPhysicsTickFunctionVR.IsTickFunctionRegistered()) { if (bRegister) diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRAIPerceptionOverrides.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRAIPerceptionOverrides.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRAIPerceptionOverrides.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRAIPerceptionOverrides.cpp index 28a69c0..0e932b3 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRAIPerceptionOverrides.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRAIPerceptionOverrides.cpp @@ -1117,7 +1117,7 @@ void UAISense_Sight_VR::RemoveAllQueriesByListener(const FPerceptionListener& Li SCOPE_CYCLE_COUNTER(STAT_AI_Sense_Sight_RemoveByListener); UE_MT_SCOPED_WRITE_ACCESS(QueriesListAccessDetector); - const FPerceptionListenerID ListenerId = Listener.GetListenerID(); + const uint32 ListenerId = Listener.GetListenerID(); auto RemoveQuery = [&ListenerId, &OnRemoveFunc](TArray& SightQueries, const int32 QueryIndex)->EReverseForEachResult { @@ -1185,7 +1185,7 @@ void UAISense_Sight_VR::RemoveAllQueriesToTarget_Internal(const FAISightTargetVR void UAISense_Sight_VR::OnListenerForgetsActor(const FPerceptionListener& Listener, AActor& ActorToForget) { - const FPerceptionListenerID ListenerId = Listener.GetListenerID(); + const uint32 ListenerId = Listener.GetListenerID(); const uint32 TargetId = ActorToForget.GetUniqueID(); auto ForgetPreviousResult = [&ListenerId, &TargetId](FAISightQueryVR& SightQuery)->EForEachResult @@ -1212,7 +1212,7 @@ void UAISense_Sight_VR::OnListenerForgetsAll(const FPerceptionListener& Listener { UE_MT_SCOPED_WRITE_ACCESS(QueriesListAccessDetector); - const FPerceptionListenerID ListenerId = Listener.GetListenerID(); + const uint32 ListenerId = Listener.GetListenerID(); auto ForgetPreviousResult = [&ListenerId](FAISightQueryVR& SightQuery)->EForEachResult { diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VREPhysicalAnimationComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VREPhysicalAnimationComponent.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VREPhysicalAnimationComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VREPhysicalAnimationComponent.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRFullScreenUserWidget.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRFullScreenUserWidget.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRFullScreenUserWidget.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRFullScreenUserWidget.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRGameViewportClient.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRGameViewportClient.cpp similarity index 86% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRGameViewportClient.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRGameViewportClient.cpp index 5fffb61..44d9e5a 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRGameViewportClient.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRGameViewportClient.cpp @@ -103,7 +103,7 @@ bool UVRGameViewportClient::InputKey(const FInputKeyEventArgs& EventArgs) } } -bool UVRGameViewportClient::InputAxis(const FInputKeyEventArgs& Args) +bool UVRGameViewportClient::InputAxis(FViewport* tViewport, FInputDeviceId InputDevice, FKey Key, float Delta, float DeltaTime, int32 NumSamples, bool bGamepad) { // Remap the old int32 ControllerId value to the new InputDeviceId IPlatformInputDeviceMapper& DeviceMapper = IPlatformInputDeviceMapper::Get(); @@ -111,8 +111,8 @@ bool UVRGameViewportClient::InputAxis(const FInputKeyEventArgs& Args) const int32 NumLocalPlayers = World->GetGameInstance()->GetNumLocalPlayers(); // Early out if a gamepad or not a mouse event (vr controller) or ignoring input or is default setup / no GEngine - if (((!Args.Key.IsMouseButton() && !Args.IsGamepad()) || (Args.IsGamepad() && !IsValidGamePadKey(Args.Key))) || NumLocalPlayers < 2 || GameInputMethod == EVRGameInputMethod::GameInput_Default || IgnoreInput()) - return Super::InputAxis(Args); + if (((!Key.IsMouseButton() && !bGamepad) || (bGamepad && !IsValidGamePadKey(Key))) || NumLocalPlayers < 2 || GameInputMethod == EVRGameInputMethod::GameInput_Default || IgnoreInput()) + return Super::InputAxis(tViewport, InputDevice, Key, Delta, DeltaTime, NumSamples, bGamepad); if (GameInputMethod == EVRGameInputMethod::GameInput_KeyboardAndMouseToPlayer2) { @@ -123,9 +123,7 @@ bool UVRGameViewportClient::InputAxis(const FInputKeyEventArgs& Args) FInputDeviceId DeviceId = INPUTDEVICEID_NONE; DeviceMapper.RemapControllerIdToPlatformUserAndDevice(ControllerId, UserId, DeviceId); - FInputKeyEventArgs NewArgs = Args; - NewArgs.InputDevice = DeviceId; - return Super::InputAxis(NewArgs); + return Super::InputAxis(tViewport, DeviceId, Key, Delta, DeltaTime, NumSamples, bGamepad); } else // Shared keyboard and mouse { @@ -136,9 +134,7 @@ bool UVRGameViewportClient::InputAxis(const FInputKeyEventArgs& Args) FInputDeviceId DeviceId = INPUTDEVICEID_NONE; DeviceMapper.RemapControllerIdToPlatformUserAndDevice(i, UserId, DeviceId); - FInputKeyEventArgs NewArgs = Args; - NewArgs.InputDevice = DeviceId; - bRetVal = Super::InputAxis(NewArgs) || bRetVal; + bRetVal = Super::InputAxis(tViewport, DeviceId, Key, Delta, DeltaTime, NumSamples, bGamepad) || bRetVal; } return bRetVal; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRLogComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRLogComponent.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRLogComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRLogComponent.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRPlayerStart.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRPlayerStart.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRPlayerStart.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRPlayerStart.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRRenderTargetManager.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRRenderTargetManager.cpp similarity index 65% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRRenderTargetManager.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRRenderTargetManager.cpp index f1bdf5b..fbe5a35 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRRenderTargetManager.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Misc/VRRenderTargetManager.cpp @@ -25,19 +25,6 @@ #include "Materials/Material.h" #include "Net/UnrealNetwork.h" -// Iris -#include "Serializers/SerializerHelpers.h" -#include "Iris/Serialization/ObjectNetSerializer.h" -#include "Iris/Core/NetObjectReference.h" -#include "Iris/Serialization/NetSerializerDelegates.h" -#include "Iris/Serialization/NetSerializers.h" -#include "Iris/ReplicationState/PropertyNetSerializerInfoRegistry.h" -#include "Iris/ReplicationState/ReplicationStateDescriptorBuilder.h" -#include "Templates/IsPODType.h" - -#include "Iris/Serialization/SoftObjectNetSerializers.h" -#include "Iris/Serialization/NetSerializerArrayStorage.h" - namespace RLE_Funcs { enum RLE_Flags @@ -462,7 +449,7 @@ void ARenderTargetReplicationProxy::SendInitMessage() void ARenderTargetReplicationProxy::SendNextDataBlob() { - if (!IsValidChecked(this) || !this->GetOwner() || !IsValid(this->GetOwner())) + if (!IsValid(this) || !this->GetOwner() || !IsValid(this->GetOwner())) { TextureStore.Reset(); TextureStore.PackedData.Empty(); @@ -1754,6 +1741,7 @@ bool FRenderManagerOperation::NetSerialize(FArchive& Ar, class UPackageMap* Map, { bOutSuccess = true; + Ar.SerializeIntPacked(OwnerID); Ar.SerializeBits(&OperationType, 3); @@ -1825,725 +1813,3 @@ bool FRenderManagerOperation::NetSerialize(FArchive& Ar, class UPackageMap* Map, return bOutSuccess; } - -// SERIALIZER SETUP FOR IRIS -namespace UE::Net -{ - struct alignas(8) FQuantizedRenderTargetTextureStoreData - { - uint32 Width; - uint32 Height; - uint32 bIsZipped; - - // I don't think people are going to go over the 512 default generally, and def shouldn't hit 2048 - // We'll accept the slightly larger memory usage as this isn't a common operation - //static constexpr uint32 MaxBlobStorage = 2048; - //, AllocationPolicies::TInlinedElementAllocationPolicy - typedef FNetSerializerArrayStorage DataStorage; - DataStorage Data; - }; -} - -template <> struct TIsPODType { enum { Value = true }; }; - -namespace UE::Net -{ - - // ----------------------------------------------------------------------------- - // Iris serializer for FBPVRReplicatedTextureStore - // ----------------------------------------------------------------------------- - struct FBPVRReplicatedTextureStoreNetSerializer - { - // Version is required. - static constexpr uint32 Version = 0; - - //Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. - static constexpr bool bUseDefaultDelta = true; - // Not doing delta, the majority of the time a single bit (bool) controls the serialization of the entirity - - static constexpr bool bHasDynamicState = true; - - class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates - { - public: - virtual ~FNetSerializerRegistryDelegates(); - - private: - virtual void OnPreFreezeNetSerializerRegistry() override; - //virtual void OnPostFreezeNetSerializerRegistry() override; - }; - - inline static FBPVRReplicatedTextureStoreNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; - - typedef FBPVRReplicatedTextureStore SourceType; - typedef FQuantizedRenderTargetTextureStoreData QuantizedType; - typedef FBPVRReplicatedTextureStoreSerializerConfig ConfigType; - inline static const ConfigType DefaultConfig; - - // Called to create a "quantized snapshot" of the struct - static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) - { - // Actually do the real quantization step here next instead of just in serialize, will save on memory overall - const SourceType& Source = *reinterpret_cast(Args.Source); - QuantizedType& Target = *reinterpret_cast(Args.Target); - - Target.bIsZipped = Source.bIsZipped ? 1 : 0; - Target.Width = Source.Width; - Target.Height = Source.Height; - - Target.Data.AdjustSize(Context, Source.PackedData.Num()); - - if (Target.Data.Num() > 0) - { - FMemory::Memcpy(Target.Data.GetData(), Source.PackedData.GetData(), Target.Data.Num()); - } - } - - // Called to apply the quantized snapshot back to gameplay memory - static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - SourceType& Target = *reinterpret_cast(Args.Target); - - Target.bIsZipped = Source.bIsZipped != 0; - Target.Width = Source.Width; - Target.Height = Source.Height; - - //Target.Size = Source.PackedData.Num(); - Target.PackedData.Reset(Source.Data.Num()); - - if (Source.Data.Num() > 0) - { - Target.PackedData.AddUninitialized(Source.Data.Num()); - FMemory::Memcpy(Target.PackedData.GetData(), Source.Data.GetData(), Source.Data.Num()); - } - } - - // Serialize into bitstream - static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); - - Writer->WriteBits(Source.bIsZipped, 1); - Writer->WriteBits(Source.Width, 32); - Writer->WriteBits(Source.Height, 32); - - // Write array size first - uint32 Size = Source.Data.Num(); - Writer->WriteBits(Size, 32); - - if (Size > 0) - { - Writer->WriteBitStream((uint32*)Source.Data.GetData(), 0, Source.Data.Num() * 8); - } - } - - // Deserialize from bitstream - static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) - { - QuantizedType& Target = *reinterpret_cast(Args.Target); - FNetBitStreamReader* Reader = Context.GetBitStreamReader(); - - Target.bIsZipped = Reader->ReadBits(1); - Target.Width = Reader->ReadBits(32); - Target.Height = Reader->ReadBits(32); - - uint32 Size = Reader->ReadBits(32); - Target.Data.AdjustSize(Context, Size); - - if (Size > 0) - { - Reader->ReadBitStream((uint32*)Target.Data.GetData(), Target.Data.Num() * 8); - } - } - - // Compare two instances to see if they differ - static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) - { - // This struct is never stored, it is only packed and sent once to catch a client up - return false; - } - - static void CloneDynamicState(FNetSerializationContext& Context, const FNetCloneDynamicStateArgs& Args) - { - const QuantizedType* Source = reinterpret_cast(Args.Source); - QuantizedType* Target = reinterpret_cast(Args.Target); - - // copy small fields - Target->bIsZipped = Source->bIsZipped; - Target->Width = Source->Width; - Target->Height = Source->Height; - - Target->Data.Clone(Context, Source->Data); - } - - static void FreeDynamicState(FNetSerializationContext& Context, const FNetFreeDynamicStateArgs& Args) - { - QuantizedType& Target = *reinterpret_cast(Args.Source); - Target.Data.Free(Context); - } - }; -} - -namespace UE::Net -{ - - struct alignas(8) FQuantizedTriData - { - uint16 P1[2]; - uint16 P2[2]; - uint16 P3[2]; - }; - - // TODO check on this if it changes over time..... - // Really needs to be a macro for getting struct sizes outside of the private files.... - struct FQuantizedSoftObjectRef - { - alignas(8) uint8 Storage[64]; // Iris’ FSoftObjectNetSerializerQuantizedType is 48 bytes - // Keeping some overhead - }; - - struct alignas(8) FQuantizedRenderManagerOperationData - { - uint32 OwnerID; - uint8 OperationType; - uint32 Color; - uint16 P1[2]; - uint16 P2[2]; - uint32 Thickness; - - typedef FNetSerializerArrayStorage TriStorage; - TriStorage Tris; - - //String data - FQuantizedSoftObjectRef Texture; - FQuantizedSoftObjectRef Material; - }; -} - -template <> struct TIsPODType { enum { Value = true }; }; - -namespace UE::Net -{ - - // ----------------------------------------------------------------------------- - // Iris serializer for FRenderManagerOperation - // ----------------------------------------------------------------------------- - struct FRenderManagerOperationNetSerializer - { - inline static const FSoftObjectNetSerializerConfig ObjectPtrNetSerializerConfig; - - inline static const FNetSerializerConfig* FObjectPtrSerializerConfigPtr = &ObjectPtrNetSerializerConfig; - inline static const FNetSerializer* FObjectPtrNetSerializerPtr; - - // Version is required. - static constexpr uint32 Version = 0; - - //Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. - static constexpr bool bUseDefaultDelta = true; - // Not doing delta, the majority of the time a single bit (bool) controls the serialization of the entirity - - static constexpr bool bHasDynamicState = true; - - class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates - { - public: - virtual ~FNetSerializerRegistryDelegates(); - - void InitNetSerializer() - { - FRenderManagerOperationNetSerializer::FObjectPtrNetSerializerPtr = &UE_NET_GET_SERIALIZER(FSoftObjectNetSerializer); - } - - private: - virtual void OnPreFreezeNetSerializerRegistry() override; - //virtual void OnPostFreezeNetSerializerRegistry() override; - }; - - inline static FRenderManagerOperationNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; - - typedef FRenderManagerOperation SourceType; - typedef FQuantizedRenderManagerOperationData QuantizedType; - typedef FRenderManagerOperationSerializerConfig ConfigType; - inline static const ConfigType DefaultConfig; - - // Called to create a "quantized snapshot" of the struct - static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) - { - // Actually do the real quantization step here next instead of just in serialize, will save on memory overall - const SourceType& Source = *reinterpret_cast(Args.Source); - QuantizedType& Target = *reinterpret_cast(Args.Target); - - Target.OwnerID = Source.OwnerID; - Target.OperationType = (uint8)Source.OperationType; - - - switch ((ERenderManagerOperationType)Source.OperationType) - { - case ERenderManagerOperationType::Op_LineDraw: - { - // Color - uint8* ColorPtr = ((uint8*)&Target.Color); - ColorPtr[0] = Source.Color.R; - ColorPtr[1] = Source.Color.G; - ColorPtr[2] = Source.Color.B; - ColorPtr[3] = Source.Color.A; - - // Thickness - Target.Thickness = Source.Thickness; - - //P 1 1, 20 - //P 2 2, 20 - Target.P1[0] = (uint16)GetCompressedFloat<10000, 16>(Source.P1.X); - Target.P1[1] = (uint16)GetCompressedFloat<10000, 16>(Source.P1.Y); - Target.P2[0] = (uint16)GetCompressedFloat<10000, 16>(Source.P2.X); - Target.P2[1] = (uint16)GetCompressedFloat<10000, 16>(Source.P2.Y); - - }break; - - case ERenderManagerOperationType::Op_TexDraw: - { - // Texture - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - //Target.Texture - FNetQuantizeArgs MemberArgsObj = Args; - MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - MemberArgsObj.Source = NetSerializerValuePointer(&Source.Texture); - MemberArgsObj.Target = NetSerializerValuePointer(&Target.Texture); - ObjSerializer->Quantize(Context, MemberArgsObj); - - // P1 1, 20 - Target.P1[0] = (uint16)GetCompressedFloat<10000, 16>(Source.P1.X); - Target.P1[1] = (uint16)GetCompressedFloat<10000, 16>(Source.P1.Y); - - }break; - - case ERenderManagerOperationType::Op_TriDraw: - { - // Color - uint8* ColorPtr = ((uint8*)&Target.Color); - ColorPtr[0] = Source.Color.R; - ColorPtr[1] = Source.Color.G; - ColorPtr[2] = Source.Color.B; - ColorPtr[3] = Source.Color.A; - - // Material - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - //Target.Material - FNetQuantizeArgs MemberArgsObj = Args; - MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - MemberArgsObj.Source = NetSerializerValuePointer(&Source.Material); - MemberArgsObj.Target = NetSerializerValuePointer(&Target.Material); - ObjSerializer->Quantize(Context, MemberArgsObj); - - // Tris - Target.Tris.AdjustSize(Context, Source.Tris.Num()); - FQuantizedTriData* TargetTriData = Target.Tris.GetData(); - - if (Target.Tris.Num() > 0) - { - for (uint32 i = 0; i < Target.Tris.Num(); ++i) - { - TargetTriData[i].P1[0] = (uint16)GetCompressedFloat<10000, 16>(Source.Tris[i].P1.X); - TargetTriData[i].P1[1] = (uint16)GetCompressedFloat<10000, 16>(Source.Tris[i].P1.Y); - TargetTriData[i].P2[0] = (uint16)GetCompressedFloat<10000, 16>(Source.Tris[i].P2.X); - TargetTriData[i].P2[1] = (uint16)GetCompressedFloat<10000, 16>(Source.Tris[i].P2.Y); - TargetTriData[i].P3[0] = (uint16)GetCompressedFloat<10000, 16>(Source.Tris[i].P3.X); - TargetTriData[i].P3[1] = (uint16)GetCompressedFloat<10000, 16>(Source.Tris[i].P3.Y); - } - } - - }break; - } - } - - // Called to apply the quantized snapshot back to gameplay memory - static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - SourceType& Target = *reinterpret_cast(Args.Target); - - Target.OwnerID = Source.OwnerID; - Target.OperationType = (ERenderManagerOperationType)Source.OperationType; - - - switch ((ERenderManagerOperationType)Source.OperationType) - { - case ERenderManagerOperationType::Op_LineDraw: - { - // Color - uint8* ColorPtr = ((uint8*)&Source.Color); - Target.Color.R = ColorPtr[0]; - Target.Color.G = ColorPtr[1]; - Target.Color.B = ColorPtr[2]; - Target.Color.A = ColorPtr[3]; - - // Thickness - Target.Thickness = Source.Thickness; - - //P 1 1, 20 - //P 2 2, 20 - Target.P1.X = GetDecompressedFloat<10000, 16>(Source.P1[0]); - Target.P1.Y = GetDecompressedFloat<10000, 16>(Source.P1[1]); - - Target.P2.X = GetDecompressedFloat<10000, 16>(Source.P2[0]); - Target.P2.Y = GetDecompressedFloat<10000, 16>(Source.P2[1]); - - }break; - - case ERenderManagerOperationType::Op_TexDraw: - { - // Texture - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - //Target.Texture - FNetDequantizeArgs MemberArgsObj = Args; - MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - MemberArgsObj.Source = NetSerializerValuePointer(&Source.Texture); - MemberArgsObj.Target = NetSerializerValuePointer(&Target.Texture); - ObjSerializer->Dequantize(Context, MemberArgsObj); - - // P1 1, 20 - Target.P1.X = GetDecompressedFloat<10000, 16>(Source.P1[0]); - Target.P1.Y = GetDecompressedFloat<10000, 16>(Source.P1[1]); - - }break; - - case ERenderManagerOperationType::Op_TriDraw: - { - // Color - uint8* ColorPtr = ((uint8*)&Source.Color); - Target.Color.R = ColorPtr[0]; - Target.Color.G = ColorPtr[1]; - Target.Color.B = ColorPtr[2]; - Target.Color.A = ColorPtr[3]; - - // Material - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - //Target.Material - FNetDequantizeArgs MemberArgsObj = Args; - MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - MemberArgsObj.Source = NetSerializerValuePointer(&Source.Material); - MemberArgsObj.Target = NetSerializerValuePointer(&Target.Material); - ObjSerializer->Dequantize(Context, MemberArgsObj); - - // Tris - Target.Tris.Reset(Source.Tris.Num()); - Target.Tris.AddUninitialized(Source.Tris.Num()); - - const FQuantizedTriData* SourceTriData = Source.Tris.GetData(); - - if (Target.Tris.Num() > 0) - { - for (int32 i = 0; i < Target.Tris.Num(); ++i) - { - Target.Tris[i].P1.X = GetDecompressedFloat<10000, 16>(SourceTriData[i].P1[0]); - Target.Tris[i].P1.Y = GetDecompressedFloat<10000, 16>(SourceTriData[i].P1[1]); - Target.Tris[i].P2.X = GetDecompressedFloat<10000, 16>(SourceTriData[i].P2[0]); - Target.Tris[i].P2.Y = GetDecompressedFloat<10000, 16>(SourceTriData[i].P2[1]); - Target.Tris[i].P3.X = GetDecompressedFloat<10000, 16>(SourceTriData[i].P3[0]); - Target.Tris[i].P3.Y = GetDecompressedFloat<10000, 16>(SourceTriData[i].P3[1]); - } - } - - }break; - } - } - - // Serialize into bitstream - static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); - - Writer->WriteBits(Source.OwnerID, 32); - Writer->WriteBits(Source.OperationType, 8); - - switch ((ERenderManagerOperationType)Source.OperationType) - { - case ERenderManagerOperationType::Op_LineDraw: - { - // Color - Writer->WriteBits(Source.Color, 32); - - // Thickness - Writer->WriteBits(Source.Thickness, 32); - - //P 1 1, 20 - //P 2 2, 20 - if (Writer->WriteBool(Source.P1[0] != 0)) {Writer->WriteBits(Source.P1[0], 16);} - if (Writer->WriteBool(Source.P1[1] != 0)) { Writer->WriteBits(Source.P1[1], 16);} - if (Writer->WriteBool(Source.P2[0] != 0)) { Writer->WriteBits(Source.P2[0], 16);} - if (Writer->WriteBool(Source.P2[1] != 0)) { Writer->WriteBits(Source.P2[1], 16);} - - }break; - - case ERenderManagerOperationType::Op_TexDraw: - { - // Texture - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - //Target.Texture - FNetSerializeArgs MemberArgsObj = Args; - MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - MemberArgsObj.Source = NetSerializerValuePointer(&Source.Texture); - ObjSerializer->Serialize(Context, MemberArgsObj); - - // P1 1, 20 - if (Writer->WriteBool(Source.P1[0] != 0)) { Writer->WriteBits(Source.P1[0], 16); } - if (Writer->WriteBool(Source.P1[1] != 0)) { Writer->WriteBits(Source.P1[1], 16); } - - }break; - - case ERenderManagerOperationType::Op_TriDraw: - { - // Color - Writer->WriteBits(Source.Color, 32); - - // Material - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - //Target.Material - FNetSerializeArgs MemberArgsObj = Args; - MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - MemberArgsObj.Source = NetSerializerValuePointer(&Source.Material); - ObjSerializer->Serialize(Context, MemberArgsObj); - - // Tris - const FQuantizedTriData* TargetTriData = Source.Tris.GetData(); - - uint32 TriSize = Source.Tris.Num(); - Writer->WriteBits(TriSize, 32); - - if (Source.Tris.Num() > 0) - { - for (uint32 i = 0; i < Source.Tris.Num(); ++i) - { - Writer->WriteBits(TargetTriData[i].P1[0], 16); - Writer->WriteBits(TargetTriData[i].P1[1], 16); - Writer->WriteBits(TargetTriData[i].P2[0], 16); - Writer->WriteBits(TargetTriData[i].P2[1], 16); - Writer->WriteBits(TargetTriData[i].P3[0], 16); - Writer->WriteBits(TargetTriData[i].P3[1], 16); - } - //Writer->WriteBitStream((uint32*)TargetTriData, 0, (Source.Tris.Num() * sizeof(FQuantizedTriData)) * 8); - } - - }break; - } - } - - // Deserialize from bitstream - static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) - { - QuantizedType& Target = *reinterpret_cast(Args.Target); - FNetBitStreamReader* Reader = Context.GetBitStreamReader(); - - Target.OwnerID = Reader->ReadBits(32); - Target.OperationType = Reader->ReadBits(8); - - - switch ((ERenderManagerOperationType)Target.OperationType) - { - case ERenderManagerOperationType::Op_LineDraw: - { - // Color - Target.Color = Reader->ReadBits(32); - - // Thickness - Target.Thickness = Reader->ReadBits(32); - - //P 1 1, 20 - //P 2 2, 20 - Target.P1[0] = Reader->ReadBool() ? Reader->ReadBits(16) : 0; - Target.P1[1] = Reader->ReadBool() ? Reader->ReadBits(16) : 0; - Target.P2[0] = Reader->ReadBool() ? Reader->ReadBits(16) : 0; - Target.P2[1] = Reader->ReadBool() ? Reader->ReadBits(16) : 0; - - }break; - - case ERenderManagerOperationType::Op_TexDraw: - { - // Texture - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - //Target.Texture - FNetDeserializeArgs MemberArgsObj = Args; - MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - MemberArgsObj.Target = NetSerializerValuePointer(&Target.Texture); - ObjSerializer->Deserialize(Context, MemberArgsObj); - - // P1 1, 20 - Target.P1[0] = Reader->ReadBool() ? Reader->ReadBits(16) : 0; - Target.P1[1] = Reader->ReadBool() ? Reader->ReadBits(16) : 0; - - }break; - - case ERenderManagerOperationType::Op_TriDraw: - { - // Color - Target.Color = Reader->ReadBits(32); - - // Material - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - //Target.Material - FNetDeserializeArgs MemberArgsObj = Args; - MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - MemberArgsObj.Target = NetSerializerValuePointer(&Target.Material); - ObjSerializer->Deserialize(Context, MemberArgsObj); - - // Tris - uint32 TriSize = Reader->ReadBits(32); - Target.Tris.AdjustSize(Context, TriSize); - - FQuantizedTriData* TargetTriData = Target.Tris.GetData(); - - if (Target.Tris.Num() > 0) - { - for (uint32 i = 0; i < TriSize; ++i) - { - TargetTriData[i].P1[0] = Reader->ReadBits(16); - TargetTriData[i].P1[1] = Reader->ReadBits(16); - TargetTriData[i].P2[0] = Reader->ReadBits(16); - TargetTriData[i].P2[1] = Reader->ReadBits(16); - TargetTriData[i].P3[0] = Reader->ReadBits(16); - TargetTriData[i].P3[1] = Reader->ReadBits(16); - } - //Reader->ReadBitStream((uint32*)&TargetTriData, (TriSize * sizeof(FQuantizedTriData)) * 8); - } - }break; - } - } - - // Compare two instances to see if they differ - static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) - { - // This struct is never stored, it is only packed and sent once to catch a client up - return false; - } - - static void CloneDynamicState(FNetSerializationContext& Context, const FNetCloneDynamicStateArgs& Args) - { - const QuantizedType* Source = reinterpret_cast(Args.Source); - QuantizedType* Target = reinterpret_cast(Args.Target); - - Target->OwnerID = Source->OwnerID; - Target->OperationType = Source->OperationType; - - - switch ((ERenderManagerOperationType)Target->OperationType) - { - case ERenderManagerOperationType::Op_LineDraw: - { - // Color - Target->Color = Source->Color; - - // Thickness - Target->Thickness = Source->Thickness; - - //P 1 1, 20 - //P 2 2, 20 - Target->P1[0] = Source->P1[0]; - Target->P1[1] = Source->P1[1]; - Target->P2[0] = Source->P2[0]; - Target->P2[1] = Source->P2[1]; - - }break; - - case ERenderManagerOperationType::Op_TexDraw: - { - // Texture - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - FNetCloneDynamicStateArgs ObjMemberArgs = Args; - ObjMemberArgs.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - ObjMemberArgs.Target = NetSerializerValuePointer(&Target->Texture); - ObjMemberArgs.Source = NetSerializerValuePointer(&Source->Texture); - ObjSerializer->CloneDynamicState(Context, ObjMemberArgs); - - // P1 1, 20 - Target->P1[0] = Source->P1[0]; - Target->P1[1] = Source->P1[1]; - - }break; - - case ERenderManagerOperationType::Op_TriDraw: - { - // Color - Target->Color = Source->Color; - - // Material - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - FNetCloneDynamicStateArgs ObjMemberArgs = Args; - ObjMemberArgs.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - ObjMemberArgs.Target = NetSerializerValuePointer(&Target->Material); - ObjMemberArgs.Source = NetSerializerValuePointer(&Source->Material); - ObjSerializer->CloneDynamicState(Context, ObjMemberArgs); - - // Tris - Target->Tris.Clone(Context, Source->Tris); - - }break; - } - } - - static void FreeDynamicState(FNetSerializationContext& Context, const FNetFreeDynamicStateArgs& Args) - { - QuantizedType& Target = *reinterpret_cast(Args.Source); - Target.Tris.Free(Context); - } - }; - - - static const FName PropertyNetSerializerRegistry_NAME_BPVRReplicatedTextureStore("BPVRReplicatedTextureStore"); - UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPVRReplicatedTextureStore, FBPVRReplicatedTextureStoreNetSerializer); - - FBPVRReplicatedTextureStoreNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() - { - UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPVRReplicatedTextureStore); - } - - void FBPVRReplicatedTextureStoreNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() - { - UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_BPVRReplicatedTextureStore); - } - - - UE_NET_IMPLEMENT_SERIALIZER(FBPVRReplicatedTextureStoreNetSerializer); - - - - static const FName PropertyNetSerializerRegistry_NAME_RenderManagerOperation("RenderManagerOperation"); - UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_RenderManagerOperation, FRenderManagerOperationNetSerializer); - - FRenderManagerOperationNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() - { - UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_RenderManagerOperation); - } - - void FRenderManagerOperationNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() - { - InitNetSerializer(); - - UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_RenderManagerOperation); - } - - - UE_NET_IMPLEMENT_SERIALIZER(FRenderManagerOperationNetSerializer); -} diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Mover/VRMoverComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Mover/VRMoverComponent.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Mover/VRMoverComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Mover/VRMoverComponent.cpp index 8bba3c3..d9abaa8 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Mover/VRMoverComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/Mover/VRMoverComponent.cpp @@ -29,7 +29,7 @@ FLayeredMove_VRMovement::FLayeredMove_VRMovement() DurationMs = -1.0f; } -bool FLayeredMove_VRMovement::IsFinished(double CurrentSimTimeMs) const +bool FLayeredMove_VRMovement::IsFinished(float CurrentSimTimeMs) const { // We never end the VR velocity injection return false; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ParentRelativeAttachmentComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ParentRelativeAttachmentComponent.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ParentRelativeAttachmentComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ParentRelativeAttachmentComponent.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ReplicatedVRCameraComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ReplicatedVRCameraComponent.cpp similarity index 97% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ReplicatedVRCameraComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ReplicatedVRCameraComponent.cpp index bbdecb1..346d4ec 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ReplicatedVRCameraComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/ReplicatedVRCameraComponent.cpp @@ -210,7 +210,7 @@ void UReplicatedVRCameraComponent::UpdateTracking(float DeltaTime) FRotator StoredCameraRotOffset = FRotator::ZeroRotator; if (AttachChar->VRMovementReference && AttachChar->VRMovementReference->GetReplicatedMovementMode() == EVRConjoinedMovementModes::C_VRMOVE_Seated) { - //StoredCameraRotOffset = AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); + AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); } else { @@ -250,7 +250,7 @@ void UReplicatedVRCameraComponent::RunNetworkedSmoothing(float DeltaTime) FRotator StoredCameraRotOffset = FRotator::ZeroRotator; if (AttachChar->VRMovementReference && AttachChar->VRMovementReference->GetReplicatedMovementMode() == EVRConjoinedMovementModes::C_VRMOVE_Seated) { - //StoredCameraRotOffset = AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); + AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); } else { @@ -480,12 +480,12 @@ void UReplicatedVRCameraComponent::HandleXRCamera(float DeltaTime) //FRotator OffsetRotator = if (AttachChar->VRMovementReference && AttachChar->VRMovementReference->GetReplicatedMovementMode() != EVRConjoinedMovementModes::C_VRMOVE_Seated) { - //AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); + AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); FRotator StoredCameraRotOffset = FRotator::ZeroRotator; if (AttachChar->VRMovementReference->GetReplicatedMovementMode() == EVRConjoinedMovementModes::C_VRMOVE_Seated) { - //StoredCameraRotOffset = AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); + AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); } else { @@ -536,7 +536,7 @@ void UReplicatedVRCameraComponent::OnRep_ReplicatedCameraTransform() FRotator StoredCameraRotOffset = FRotator::ZeroRotator; if (AttachChar->VRMovementReference && AttachChar->VRMovementReference->GetReplicatedMovementMode() == EVRConjoinedMovementModes::C_VRMOVE_Seated) { - //StoredCameraRotOffset = AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); + AttachChar->SeatInformation.InitialRelCameraTransform.Rotator(); } else { diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRAIController.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRAIController.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRAIController.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRAIController.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBPDatatypes.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBPDatatypes.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBPDatatypes.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBPDatatypes.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacter.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacter.cpp similarity index 71% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacter.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacter.cpp index 381319d..13d7a03 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacter.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacter.cpp @@ -16,16 +16,6 @@ #include "XRMotionControllerBase.h" #include "NavFilters/NavigationQueryFilter.h" #include "Misc/EngineNetworkCustomVersion.h" - - -#include "Serializers/SerializerHelpers.h" -#include "Iris/Serialization/NetSerializerDelegates.h" -#include "Iris/Serialization/NetSerializers.h" -#include "Iris/Serialization/PackedVectorNetSerializers.h" -#include "Iris/ReplicationState/PropertyNetSerializerInfoRegistry.h" -#include "Serializers/FTransformNetQuantizeNetSerializer.h" -//#include "Iris/ReplicationState/ReplicationStateDescriptorBuilder.h" - //#include "Runtime/Engine/Private/EnginePrivate.h" #if WITH_PUSH_MODEL @@ -195,7 +185,7 @@ void AVRBaseCharacter::PostInitializeComponents() Super::PostInitializeComponents(); - if (IsValidChecked(this)) + if (IsValid(this)) { if (NetSmoother) { @@ -1364,441 +1354,4 @@ bool FRepMovementVRCharacter::NetSerialize(FArchive& Ar, class UPackageMap* Map, } return true; -} - - -// IRIS NET SERIALIZERS - -namespace UE::Net -{ - - // ----------------------------------------------------------------------------- - // Iris serializer for FVRReplicatedCapsuleHeight - // ----------------------------------------------------------------------------- - struct FVRReplicatedCapsuleHeightNetSerializer - { - - class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates - { - public: - virtual ~FNetSerializerRegistryDelegates(); - - private: - virtual void OnPreFreezeNetSerializerRegistry() override; - //virtual void OnPostFreezeNetSerializerRegistry() override; - }; - - inline static FVRReplicatedCapsuleHeightNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; - - - /** Version is required. */ - static constexpr uint32 Version = 0; - - struct alignas(8) FQuantizedData - { - uint32 CompressedFloat; - }; - - typedef FVRReplicatedCapsuleHeight SourceType; - typedef FQuantizedData QuantizedType; - typedef FVRReplicatedCapsuleHeightNetSerializerConfig ConfigType; - inline static const ConfigType DefaultConfig; - - /** Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. */ - static constexpr bool bUseDefaultDelta = true; - // Not doing delta, the majority of the time a single bit (bool) controls the serialization of the entirity - - // Called to create a "quantized snapshot" of the struct - static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) - { - // Actually do the real quantization step here next instead of just in serialize, will save on memory overall - const SourceType& Source = *reinterpret_cast(Args.Source); - QuantizedType& Target = *reinterpret_cast(Args.Target); - - Target.CompressedFloat = GetCompressedFloat<1024, 18>(Source.CapsuleHeight); - } - - // Called to apply the quantized snapshot back to gameplay memory - static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - SourceType& Target = *reinterpret_cast(Args.Target); - - Target.CapsuleHeight = GetDecompressedFloat<1024, 18>(Source.CompressedFloat); - } - - // Serialize into bitstream - static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); - - Writer->WriteBits(static_cast(Source.CompressedFloat), 18); - - } - - // Deserialize from bitstream - static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) - { - QuantizedType& Target = *reinterpret_cast(Args.Target); - FNetBitStreamReader* Reader = Context.GetBitStreamReader(); - - Target.CompressedFloat = Reader->ReadBits(18); - } - - // Compare two instances to see if they differ - static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) - { - if (Args.bStateIsQuantized) - { - const QuantizedType& QuantizedValue0 = *reinterpret_cast(Args.Source0); - const QuantizedType& QuantizedValue1 = *reinterpret_cast(Args.Source1); - return FPlatformMemory::Memcmp(&QuantizedValue0, &QuantizedValue1, sizeof(QuantizedType)) == 0; - } - else - { - const SourceType& L = *reinterpret_cast(Args.Source0); - const SourceType& R = *reinterpret_cast(Args.Source1); - - return FMath::IsNearlyEqual(L.CapsuleHeight, R.CapsuleHeight); - } - } - }; - - - static const FName PropertyNetSerializerRegistry_NAME_FVRReplicatedCapsuleHeight("VRReplicatedCapsuleHeight"); - UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_FVRReplicatedCapsuleHeight, FVRReplicatedCapsuleHeightNetSerializer); - - FVRReplicatedCapsuleHeightNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() - { - UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_FVRReplicatedCapsuleHeight); - } - - void FVRReplicatedCapsuleHeightNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() - { - UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_FVRReplicatedCapsuleHeight); - } - - UE_NET_IMPLEMENT_SERIALIZER(FVRReplicatedCapsuleHeightNetSerializer); - - - // ----------------------------------------------------------------------------- -// Iris serializer for FVRSeatedCharacterInfo -// ----------------------------------------------------------------------------- - struct FVRSeatedCharacterInfoNetSerializer - { - inline static const FVectorNetQuantize100NetSerializerConfig FTransformQuantizeSerializerConfig; - inline static const FObjectPtrNetSerializerConfig ObjectPtrNetSerializerConfig; - - inline static const FNetSerializerConfig* FTransformQuantizeSerializerConfigPtr = &FTransformQuantizeSerializerConfig; - inline static const FNetSerializer* FTransformQuantizeNetSerializerPtr; - - inline static const FNetSerializerConfig* FObjectPtrSerializerConfigPtr = &ObjectPtrNetSerializerConfig; - inline static const FNetSerializer* FObjectPtrNetSerializerPtr; - - class FNetSerializerRegistryDelegates final : private UE::Net::FNetSerializerRegistryDelegates - { - public: - virtual ~FNetSerializerRegistryDelegates(); - - void InitNetSerializer() - { - FVRSeatedCharacterInfoNetSerializer::FTransformQuantizeNetSerializerPtr = &UE_NET_GET_SERIALIZER(FTransformNetQuantizeNetSerializer); - FVRSeatedCharacterInfoNetSerializer::FObjectPtrNetSerializerPtr = &UE_NET_GET_SERIALIZER(FObjectPtrNetSerializer); - } - - private: - virtual void OnPreFreezeNetSerializerRegistry() override; - //virtual void OnPostFreezeNetSerializerRegistry() override; - }; - - inline static FVRSeatedCharacterInfoNetSerializer::FNetSerializerRegistryDelegates NetSerializerRegistryDelegates; - - - // Version is required. - static constexpr uint32 Version = 0; - - struct alignas(8) FQuantizedData - { - uint8 bSitting : 1; - uint8 bZeroToHead : 1; - - FTransformNetQuantizeQuantizedData StoredTargetTransform; - FObjectNetSerializerQuantizedReferenceStorage SeatParent; - uint8 PostSeatedMovementMode; - - // Only if bSitting is true - FTransformNetQuantizeQuantizedData InitialRelCameraTransform; - uint32 AllowedRadius; // Flt 256, 16 - uint32 AllowedRadiusThreshold; // Flt 256, 16 - - //uint8 bIsOverThreshold : 1; // Not Replicated - //uint32 CurrentThresholdScaler; // Not Replicated - }; - - typedef FVRSeatedCharacterInfo SourceType; - typedef FQuantizedData QuantizedType; - typedef FVRSeatedCharacterInfoNetSerializerConfig ConfigType; - inline static const ConfigType DefaultConfig; - - // Set to false when a same value delta compression method is undesirable, for example when the serializer only writes a single bit for the state. - static constexpr bool bUseDefaultDelta = true; - // TODO: This is actually a struct that could use some delta serialization implementations. - - // Called to create a "quantized snapshot" of the struct - static void Quantize(FNetSerializationContext& Context, const FNetQuantizeArgs& Args) - { - // Actually do the real quantization step here next instead of just in serialize, will save on memory overall - const SourceType& Source = *reinterpret_cast(Args.Source); - QuantizedType& Target = *reinterpret_cast(Args.Target); - - Target.bSitting = Source.bSitting; - Target.bZeroToHead = Source.bZeroToHead; - - const FNetSerializer* Serializer = FTransformQuantizeNetSerializerPtr; - const FNetSerializerConfig* SerializerConfig = FTransformQuantizeSerializerConfigPtr; - - //FTransformNetQuantizeQuantizedData StoredTargetTransform; - FNetQuantizeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.StoredTargetTransform); - MemberArgs.Target = NetSerializerValuePointer(&Target.StoredTargetTransform); - Serializer->Quantize(Context, MemberArgs); - - - // Only if bSitting is true - //FTransformNetQuantizeQuantizedData InitialRelCameraTransform; - //uint32 AllowedRadius; // Flt 256, 16 - //uint32 AllowedRadiusThreshold; // Flt 256, 16 - - if (Source.bSitting) - { - // Initial relative transform doesn't need to be touched or set if not bsitting - MemberArgs.Source = NetSerializerValuePointer(&Source.InitialRelCameraTransform); - MemberArgs.Target = NetSerializerValuePointer(&Target.InitialRelCameraTransform); - Serializer->Quantize(Context, MemberArgs); - - Target.AllowedRadius = GetCompressedFloat<256,16>(Source.AllowedRadius); - Target.AllowedRadiusThreshold = GetCompressedFloat<256, 16>(Source.AllowedRadiusThreshold); - } - - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - //FObjectNetSerializerQuantizedReferenceStorage SeatParent; - FNetQuantizeArgs MemberArgsObj = Args; - MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - MemberArgsObj.Source = NetSerializerValuePointer(&Source.SeatParent); - MemberArgsObj.Target = NetSerializerValuePointer(&Target.SeatParent); - ObjSerializer->Quantize(Context, MemberArgsObj); - - // Store full 8 bits - Target.PostSeatedMovementMode = (uint8)Source.PostSeatedMovementMode; - } - - // Called to apply the quantized snapshot back to gameplay memory - static void Dequantize(FNetSerializationContext& Context, const FNetDequantizeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - SourceType& Target = *reinterpret_cast(Args.Target); - - Target.bSitting = Source.bSitting != 0; - Target.bZeroToHead = Source.bZeroToHead != 0; - - const FNetSerializer* Serializer = FTransformQuantizeNetSerializerPtr; - const FNetSerializerConfig* SerializerConfig = FTransformQuantizeSerializerConfigPtr; - - //FTransformNetQuantizeQuantizedData StoredTargetTransform; - FNetDequantizeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.StoredTargetTransform); - MemberArgs.Target = NetSerializerValuePointer(&Target.StoredTargetTransform); - Serializer->Dequantize(Context, MemberArgs); - - - // Only if bSitting is true - //FTransformNetQuantizeQuantizedData InitialRelCameraTransform; - //uint32 AllowedRadius; // Flt 256, 16 - //uint32 AllowedRadiusThreshold; // Flt 256, 16 - - if (Target.bSitting != 0) - { - // Initial relative transform doesn't need to be touched or set if not bsitting - MemberArgs.Source = NetSerializerValuePointer(&Source.InitialRelCameraTransform); - MemberArgs.Target = NetSerializerValuePointer(&Target.InitialRelCameraTransform); - Serializer->Dequantize(Context, MemberArgs); - - Target.AllowedRadius = GetDecompressedFloat<256, 16>(Source.AllowedRadius); - Target.AllowedRadiusThreshold = GetDecompressedFloat<256, 16>(Source.AllowedRadiusThreshold); - } - - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - //FObjectNetSerializerQuantizedReferenceStorage SeatParent; - FNetDequantizeArgs MemberArgsObj = Args; - MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - MemberArgsObj.Source = NetSerializerValuePointer(&Source.SeatParent); - MemberArgsObj.Target = NetSerializerValuePointer(&Target.SeatParent); - ObjSerializer->Dequantize(Context, MemberArgsObj); - - // Store full 8 bits - Target.PostSeatedMovementMode = (EVRConjoinedMovementModes)Source.PostSeatedMovementMode; - } - - // Serialize into bitstream - static void Serialize(FNetSerializationContext& Context, const FNetSerializeArgs& Args) - { - const QuantizedType& Source = *reinterpret_cast(Args.Source); - FNetBitStreamWriter* Writer = Context.GetBitStreamWriter(); - - Writer->WriteBits(static_cast(Source.bSitting), 1); - Writer->WriteBits(static_cast(Source.bZeroToHead), 1); - - const FNetSerializer* Serializer = FTransformQuantizeNetSerializerPtr; - const FNetSerializerConfig* SerializerConfig = FTransformQuantizeSerializerConfigPtr; - - //FTransformNetQuantizeQuantizedData StoredTargetTransform; - FNetSerializeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.StoredTargetTransform); - Serializer->Serialize(Context, MemberArgs); - - - if (Source.bSitting != 0) - { - // Initial relative transform doesn't need to be touched or set if not bsitting - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Source = NetSerializerValuePointer(&Source.InitialRelCameraTransform); - Serializer->Serialize(Context, MemberArgs); - - Writer->WriteBits(static_cast(Source.AllowedRadius), 16); - Writer->WriteBits(static_cast(Source.AllowedRadiusThreshold), 16); - } - - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - //FObjectNetSerializerQuantizedReferenceStorage SeatParent; - FNetSerializeArgs MemberArgsObj = Args; - MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - MemberArgsObj.Source = NetSerializerValuePointer(&Source.SeatParent); - ObjSerializer->Serialize(Context, MemberArgsObj); - - Writer->WriteBits(static_cast(Source.PostSeatedMovementMode), 8); - } - - // Deserialize from bitstream - static void Deserialize(FNetSerializationContext& Context, const FNetDeserializeArgs& Args) - { - QuantizedType& Target = *reinterpret_cast(Args.Target); - FNetBitStreamReader* Reader = Context.GetBitStreamReader(); - - Target.bSitting = Reader->ReadBits(1) != 0; - Target.bZeroToHead = Reader->ReadBits(1) != 0; - - const FNetSerializer* Serializer = FTransformQuantizeNetSerializerPtr; - const FNetSerializerConfig* SerializerConfig = FTransformQuantizeSerializerConfigPtr; - - //FTransformNetQuantizeQuantizedData StoredTargetTransform; - FNetDeserializeArgs MemberArgs = Args; - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Target = NetSerializerValuePointer(&Target.StoredTargetTransform); - Serializer->Deserialize(Context, MemberArgs); - - - if (Target.bSitting != 0) - { - // Initial relative transform doesn't need to be touched or set if not bsitting - MemberArgs.NetSerializerConfig = NetSerializerConfigParam(SerializerConfig); - MemberArgs.Target = NetSerializerValuePointer(&Target.InitialRelCameraTransform); - Serializer->Deserialize(Context, MemberArgs); - - Target.AllowedRadius = Reader->ReadBits(16); - Target.AllowedRadiusThreshold = Reader->ReadBits(16); - } - - const FNetSerializer* ObjSerializer = FObjectPtrNetSerializerPtr; - const FNetSerializerConfig* ObjSerializerConfig = FObjectPtrSerializerConfigPtr; - - //FObjectNetSerializerQuantizedReferenceStorage SeatParent; - FNetDeserializeArgs MemberArgsObj = Args; - MemberArgsObj.NetSerializerConfig = NetSerializerConfigParam(ObjSerializerConfig); - MemberArgsObj.Target = NetSerializerValuePointer(&Target.SeatParent); - ObjSerializer->Deserialize(Context, MemberArgsObj); - - Target.PostSeatedMovementMode = Reader->ReadBits(8); - } - - // Compare two instances to see if they differ - static bool IsEqual(FNetSerializationContext& Context, const FNetIsEqualArgs& Args) - { - if (Args.bStateIsQuantized) - { - const QuantizedType& QuantizedValue0 = *reinterpret_cast(Args.Source0); - const QuantizedType& QuantizedValue1 = *reinterpret_cast(Args.Source1); - return FPlatformMemory::Memcmp(&QuantizedValue0, &QuantizedValue1, sizeof(QuantizedType)) == 0; - } - else - { - const SourceType& L = *reinterpret_cast(Args.Source0); - const SourceType& R = *reinterpret_cast(Args.Source1); - - if (L.bSitting != R.bSitting) return false; - if (L.SeatParent != R.SeatParent) return false; - if(!FMath::IsNearlyEqual(L.AllowedRadius, R.AllowedRadius)) return false; - if (!FMath::IsNearlyEqual(L.AllowedRadiusThreshold, R.AllowedRadiusThreshold)) return false; - if (L.bZeroToHead != R.bZeroToHead) return false; - if (!L.StoredTargetTransform.Equals(R.StoredTargetTransform)) return false; - - if (L.bSitting && !L.InitialRelCameraTransform.Equals(R.InitialRelCameraTransform)) return false; - - return true; - } - } - - static void Apply(FNetSerializationContext&, const FNetApplyArgs& Args) - { - const SourceType& Source = *reinterpret_cast(Args.Source); - SourceType& Target = *reinterpret_cast(Args.Target); - - Target.bSitting = Source.bSitting; - Target.bZeroToHead = Source.bZeroToHead; - Target.StoredTargetTransform = Source.StoredTargetTransform; - - if (Target.bSitting) - { - Target.InitialRelCameraTransform = Source.InitialRelCameraTransform; - Target.AllowedRadius = Source.AllowedRadius; - Target.AllowedRadiusThreshold = Source.AllowedRadiusThreshold; - } - else - { - // Clear non repped values - Target.InitialRelCameraTransform = FTransform::Identity; - Target.AllowedRadius = 0.0f; - Target.AllowedRadiusThreshold = 0.0f; - } - - Target.SeatParent = Source.SeatParent; - Target.PostSeatedMovementMode = Source.PostSeatedMovementMode; - } - }; - - - static const FName PropertyNetSerializerRegistry_NAME_FVRSeatedCharacterInfo("VRSeatedCharacterInfo"); - UE_NET_IMPLEMENT_NAMED_STRUCT_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_FVRSeatedCharacterInfo, FVRSeatedCharacterInfoNetSerializer); - - FVRSeatedCharacterInfoNetSerializer::FNetSerializerRegistryDelegates::~FNetSerializerRegistryDelegates() - { - UE_NET_UNREGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_FVRSeatedCharacterInfo); - } - - void FVRSeatedCharacterInfoNetSerializer::FNetSerializerRegistryDelegates::OnPreFreezeNetSerializerRegistry() - { - InitNetSerializer(); - UE_NET_REGISTER_NETSERIALIZER_INFO(PropertyNetSerializerRegistry_NAME_FVRSeatedCharacterInfo); - } - - UE_NET_IMPLEMENT_SERIALIZER(FVRSeatedCharacterInfoNetSerializer); -} +} \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacterMovementComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacterMovementComponent.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacterMovementComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacterMovementComponent.cpp index 50266e8..581bc8b 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacterMovementComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRBaseCharacterMovementComponent.cpp @@ -1721,17 +1721,6 @@ void UVRBaseCharacterMovementComponent::SimulatedTick(float DeltaSeconds) const FQuat NewCapsuleRotation = UpdatedComponent->GetComponentQuat(); if (Mesh == CharacterOwner->GetMesh() && !NewCapsuleRotation.Equals(OldRotationQuat, 1e-6f) && ClientPredictionData) { - // #TODO: The below is new in 5.6, i don't have saved capsule rotation, don't think i need this change for base char - /* - // Add delta rotation to the target rotation and original offset. Otherwise this object will move back toward the old rotation. - const FQuat RotationDelta = NewCapsuleRotation - SavedCapsuleRotation; - ClientPredictionData->MeshRotationTarget += RotationDelta; - ClientPredictionData->OriginalMeshRotationOffset += RotationDelta; - - // Update the MeshRotationOffset to match the capsule rotation. - ClientPredictionData->MeshRotationOffset = NewCapsuleRotation; - */ - // Smoothing should lerp toward this new rotation target, otherwise it will just try to go back toward the old rotation. ClientPredictionData->MeshRotationTarget = NewCapsuleRotation; Mesh->SetRelativeLocationAndRotation(SavedMeshRelativeLocation, CharacterOwner->GetBaseRotationOffset()); @@ -1952,18 +1941,13 @@ void UVRBaseCharacterMovementComponent::MoveAutonomous( static const auto CVarEnableQueuedAnimEventsOnServer = IConsoleManager::Get().FindConsoleVariable(TEXT("a.EnableQueuedAnimEventsOnServer")); if (CVarEnableQueuedAnimEventsOnServer->GetInt()) { - if (UAnimInstance* AnimInstance = OwnerMesh->GetAnimInstance()) + if (const UAnimInstance* AnimInstance = OwnerMesh->GetAnimInstance()) { if (OwnerMesh->VisibilityBasedAnimTickOption <= EVisibilityBasedAnimTickOption::AlwaysTickPose && AnimInstance->NeedsUpdate()) { // If we are doing a full graph update on the server but its doing a parallel update, - // trigger events right away since these are notifies queued from the montage update, and we could be receiving multiple ServerMoves per frame. + // trigger events right away since these are notifies queued from the montage update and we could be receiving multiple ServerMoves per frame. OwnerMesh->ConditionallyDispatchQueuedAnimEvents(); - - // We need to manually clear the anim notify queue (since normally its only is cleared in PreUpdateAnimation()) otherwise if animation ticks, the notifies queued from the ServerMove would fire twice. - AnimInstance->ClearQueuedAnimEvents(false); - - // When animation ticks, we want its queued events to be triggered. OwnerMesh->AllowQueuedAnimEventsNextDispatch(); } } @@ -1971,7 +1955,7 @@ void UVRBaseCharacterMovementComponent::MoveAutonomous( else { // Revert back to old behavior if wanted/needed. - if (OwnerMesh->ShouldOnlyTickMontages(DeltaTime) || OwnerMesh->ShouldOnlyTickMontagesAndRefreshBones(DeltaTime)) + if (OwnerMesh->ShouldOnlyTickMontages(DeltaTime)) { OwnerMesh->ConditionallyDispatchQueuedAnimEvents(); } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacter.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacter.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacter.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacter.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacterMovementComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacterMovementComponent.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacterMovementComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacterMovementComponent.cpp index c32c9e5..65cc5a3 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacterMovementComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRCharacterMovementComponent.cpp @@ -123,7 +123,7 @@ void UVRCharacterMovementComponent::Crouch(bool bClientSimulation) { if (!bClientSimulation) { - CharacterOwner->SetIsCrouched(true); + CharacterOwner->bIsCrouched = true; } CharacterOwner->OnStartCrouch(0.f, 0.f); return; @@ -195,7 +195,7 @@ void UVRCharacterMovementComponent::Crouch(bool bClientSimulation) //UpdatedComponent->MoveComponent(ScaledHalfHeightAdjust * GetGravityDirection(), UpdatedComponent->GetComponentQuat(), true, nullptr, EMoveComponentFlags::MOVECOMP_NoFlags, ETeleportType::TeleportPhysics); } - CharacterOwner->SetIsCrouched(true); + CharacterOwner->bIsCrouched = true; } bForceNextFloorCheck = true; @@ -240,7 +240,7 @@ void UVRCharacterMovementComponent::UnCrouch(bool bClientSimulation) { if (!bClientSimulation) { - CharacterOwner->SetIsCrouched(false); + CharacterOwner->bIsCrouched = false; } CharacterOwner->OnEndCrouch(0.f, 0.f); return; @@ -341,11 +341,7 @@ void UVRCharacterMovementComponent::UnCrouch(bool bClientSimulation) if (!bEncroached) { // Commit the change in location. - if (!BaseVRCharacterOwner || !BaseVRCharacterOwner->bRetainRoomscale) - { - // we actually move this when not using retained roomscale - //UpdatedComponent->MoveComponent(StandingLocation - PawnLocation, UpdatedComponent->GetComponentQuat(), false, nullptr, EMoveComponentFlags::MOVECOMP_NoFlags, ETeleportType::TeleportPhysics); - } + //UpdatedComponent->MoveComponent(StandingLocation - PawnLocation, UpdatedComponent->GetComponentQuat(), false, nullptr, EMoveComponentFlags::MOVECOMP_NoFlags, ETeleportType::TeleportPhysics); bForceNextFloorCheck = true; } } @@ -356,7 +352,7 @@ void UVRCharacterMovementComponent::UnCrouch(bool bClientSimulation) return; } - CharacterOwner->SetIsCrouched(false); + CharacterOwner->bIsCrouched = false; } else { @@ -885,7 +881,7 @@ void UVRCharacterMovementComponent::PhysWalking(float deltaTime, int32 Iteration return; } - if (!CharacterOwner || (!CharacterOwner->GetController() && !bRunPhysicsWithNoController && !HasAnimRootMotion() && !CurrentRootMotion.HasOverrideVelocity() && (CharacterOwner->GetLocalRole() != ROLE_SimulatedProxy))) + if (!CharacterOwner || (!CharacterOwner->Controller && !bRunPhysicsWithNoController && !HasAnimRootMotion() && !CurrentRootMotion.HasOverrideVelocity() && (CharacterOwner->GetLocalRole() != ROLE_SimulatedProxy))) { Acceleration = FVector::ZeroVector; Velocity = FVector::ZeroVector; @@ -912,19 +908,13 @@ void UVRCharacterMovementComponent::PhysWalking(float deltaTime, int32 Iteration RewindVRRelativeMovement(); // Perform the move - while ((remainingTime >= MIN_TICK_TIME) && (Iterations < MaxSimulationIterations) && CharacterOwner && (CharacterOwner->GetController() || bRunPhysicsWithNoController || HasAnimRootMotion() || CurrentRootMotion.HasOverrideVelocity() || (CharacterOwner->GetLocalRole() == ROLE_SimulatedProxy))) + while ((remainingTime >= MIN_TICK_TIME) && (Iterations < MaxSimulationIterations) && CharacterOwner && (CharacterOwner->Controller || bRunPhysicsWithNoController || HasAnimRootMotion() || CurrentRootMotion.HasOverrideVelocity() || (CharacterOwner->GetLocalRole() == ROLE_SimulatedProxy))) { Iterations++; bJustTeleported = false; const float timeTick = GetSimulationTimeStep(remainingTime, Iterations); remainingTime -= timeTick; -#if UE_WITH_REMOTE_OBJECT_HANDLE - //Scale down impact force if CharacterMoveComponent is taking multiple substeps. - const float LastFrameDt = GetWorld()->GetDeltaSeconds(); - PhysicsForceSubsteppingFactor = timeTick / LastFrameDt; -#endif - // Save current values UPrimitiveComponent * const OldBase = GetMovementBase(); const FVector PreviousBaseLocation = (OldBase != NULL) ? OldBase->GetComponentLocation() : FVector::ZeroVector; @@ -1095,7 +1085,7 @@ void UVRCharacterMovementComponent::PhysWalking(float deltaTime, int32 Iteration } AdjustFloorHeight(); - SetBaseFromFloor(CurrentFloor); + SetBase(CurrentFloor.HitResult.Component.Get(), CurrentFloor.HitResult.BoneName); } else if (CurrentFloor.HitResult.bStartPenetrating && remainingTime <= 0.f) { @@ -2285,7 +2275,7 @@ void UVRCharacterMovementComponent::UpdateBasedMovement(float DeltaSeconds) { // Nothing changed. This means we probably are using another rotation mechanism (bOrientToMovement etc). We should still follow the base object. // @todo: This assumes only Yaw is used, currently a valid assumption. This is the only reason FaceRotation() is used above really, aside from being a virtual hook. - if (bOrientRotationToMovement || (bUseControllerDesiredRotation && CharacterOwner->GetController())) + if (bOrientRotationToMovement || (bUseControllerDesiredRotation && CharacterOwner->Controller)) { // Custom gravity automatically aligns the character to the gravity direction, so we shouldn't zero out pitch and roll. if (!HasCustomGravity()) @@ -2299,7 +2289,7 @@ void UVRCharacterMovementComponent::UpdateBasedMovement(float DeltaSeconds) } // Pipe through ControlRotation, to affect camera. - if (CharacterOwner->GetController()) + if (CharacterOwner->Controller) { const FQuat PawnDeltaRotation = FinalQuat * PawnOldQuat.Inverse(); FRotator FinalRotation = FinalQuat.Rotator(); @@ -3205,7 +3195,7 @@ void UVRCharacterMovementComponent::PhysNavWalking(float deltaTime, int32 Iterat } // Root motion not for VR - if ((!CharacterOwner || !CharacterOwner->GetController()) && !bRunPhysicsWithNoController && !HasAnimRootMotion() && !CurrentRootMotion.HasOverrideVelocity()) + if ((!CharacterOwner || !CharacterOwner->Controller) && !bRunPhysicsWithNoController && !HasAnimRootMotion() && !CurrentRootMotion.HasOverrideVelocity()) { Acceleration = FVector::ZeroVector; Velocity = FVector::ZeroVector; @@ -3229,8 +3219,8 @@ void UVRCharacterMovementComponent::PhysNavWalking(float deltaTime, int32 Iterat Acceleration = ProjectToGravityFloor(Acceleration); //if (!HasRootMotion()) //{ - CalcVelocity(deltaTime, GroundFriction, false, BrakingDecelerationWalking); - devCodeVR(ensureMsgf(!Velocity.ContainsNaN(), TEXT("PhysNavWalking: Velocity contains NaN after CalcVelocity (%s)\n%s"), *GetPathNameSafe(this), *Velocity.ToString())); + CalcVelocity(deltaTime, GroundFriction, false, BrakingDecelerationWalking); + devCodeVR(ensureMsgf(!Velocity.ContainsNaN(), TEXT("PhysNavWalking: Velocity contains NaN after CalcVelocity (%s)\n%s"), *GetPathNameSafe(this), *Velocity.ToString())); //} ApplyRootMotionToVelocity(deltaTime); @@ -3276,7 +3266,7 @@ void UVRCharacterMovementComponent::PhysNavWalking(float deltaTime, int32 Iterat if (bDeltaMoveNearlyZero && bSameNavLocation) { - if (const INavigationDataInterface* NavData = GetNavData()) + if (const INavigationDataInterface * NavData = GetNavData()) { if (!NavData->IsNodeRefValid(CachedNavLocation.NodeRef)) { @@ -3287,7 +3277,6 @@ void UVRCharacterMovementComponent::PhysNavWalking(float deltaTime, int32 Iterat } } - if (bDeltaMoveNearlyZero && bSameNavLocation) { DestNavLocation = CachedNavLocation; @@ -3305,51 +3294,9 @@ void UVRCharacterMovementComponent::PhysNavWalking(float deltaTime, int32 Iterat SetGravitySpaceZ(AdjustedDest, GetGravitySpaceZ(CachedNavLocation.Location)); } - bool bFoundPointOnNavMesh = false; - if (bSlideAlongNavMeshEdge) - { - if (const INavigationDataInterface* NavDataInterface = GetNavData()) - { - const IPathFollowingAgentInterface* PathFollowingAgent = GetPathFollowingAgent(); - const bool bIsOnNavLink = PathFollowingAgent && PathFollowingAgent->IsFollowingNavLink(); - - if (!bIsOnNavLink) - { - FNavLocation StartingNavFloorLocation; - bool bHasValidCachedNavLocation = NavDataInterface->IsNodeRefValid(CachedNavLocation.NodeRef); - - // If we don't have a valid CachedNavLocation lets try finding the NavFloor where we're currently at and use that - if (!bHasValidCachedNavLocation) - { - bHasValidCachedNavLocation = FindNavFloor(OldLocation, OUT StartingNavFloorLocation); - } - else - { - StartingNavFloorLocation = CachedNavLocation; - } - - if (bHasValidCachedNavLocation) - { - bFoundPointOnNavMesh = NavDataInterface->FindMoveAlongSurface(StartingNavFloorLocation, AdjustedDest, OUT DestNavLocation); - - if (bFoundPointOnNavMesh) - { - AdjustedDest = ProjectToGravityFloor(DestNavLocation.Location) + GetGravitySpaceComponentZ(AdjustedDest); - } - } - } - else - { - bFoundPointOnNavMesh = FindNavFloor(AdjustedDest, DestNavLocation); - } - } - } - else - { - bFoundPointOnNavMesh = FindNavFloor(AdjustedDest, DestNavLocation); - } - - if (!bFoundPointOnNavMesh) + // Find the point on the NavMesh + const bool bHasNavigationData = FindNavFloor(AdjustedDest, DestNavLocation); + if (!bHasNavigationData) { RestorePreAdditiveVRMotionVelocity(); SetMovementMode(MOVE_Walking); @@ -3378,7 +3325,7 @@ void UVRCharacterMovementComponent::PhysNavWalking(float deltaTime, int32 Iterat // 4.16 UNCOMMENT FHitResult HitResult; SafeMoveUpdatedComponent(AdjustedDelta, UpdatedComponent->GetComponentQuat(), bSweepWhileNavWalking, HitResult); - + /* 4.16 Delete*/ //const bool bSweep = UpdatedPrimitive ? UpdatedPrimitive->bGenerateOverlapEvents : false; //FHitResult HitResult; @@ -3403,7 +3350,6 @@ void UVRCharacterMovementComponent::PhysNavWalking(float deltaTime, int32 Iterat RestorePreAdditiveVRMotionVelocity(); } - void UVRCharacterMovementComponent::PhysSwimming(float deltaTime, int32 Iterations) { if (deltaTime < MIN_TICK_TIME) @@ -3868,7 +3814,7 @@ void UVRCharacterMovementComponent::SimulateMovement(float DeltaSeconds) if (IsMovingOnGround()) { AdjustFloorHeight(); - SetBaseFromFloor(CurrentFloor); + SetBase(CurrentFloor.HitResult.Component.Get(), CurrentFloor.HitResult.BoneName); } else if (MovementMode == MOVE_Falling) { diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionFunctionLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionFunctionLibrary.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionFunctionLibrary.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionFunctionLibrary.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionPlugin.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionPlugin.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionPlugin.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionPlugin.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionPluginPrivatePCH.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionPluginPrivatePCH.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionPluginPrivatePCH.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRExpansionPluginPrivatePCH.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGestureComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGestureComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGestureComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGestureComponent.cpp index 166f9e3..b660744 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGestureComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGestureComponent.cpp @@ -544,7 +544,7 @@ void UVRGestureComponent::DrawDebugGesture(UObject* WorldContextObject, FTransfo FVector MirrorVector = FVector(1.f, -1.f, 1.f); // Only mirroring on Y axis to flip Left/Right // this means foreground lines can't be persistent - ULineBatchComponent* const LineBatcher = (InWorld ? ((DepthPriority == SDPG_Foreground) ? InWorld->GetLineBatcher(UWorld::ELineBatcherType::Foreground) : ((bPersistentLines || (LifeTime > 0.f)) ? InWorld->GetLineBatcher(UWorld::ELineBatcherType::WorldPersistent) : InWorld->GetLineBatcher(UWorld::ELineBatcherType::World))) : NULL); + ULineBatchComponent* const LineBatcher = (InWorld ? ((DepthPriority == SDPG_Foreground) ? InWorld->ForegroundLineBatcher : ((bPersistentLines || (LifeTime > 0.f)) ? InWorld->PersistentLineBatcher : InWorld->LineBatcher)) : NULL); if (LineBatcher != NULL) { diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGlobalSettings.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGlobalSettings.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGlobalSettings.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGlobalSettings.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGripInterface.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGripInterface.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGripInterface.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRGripInterface.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPathFollowingComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPathFollowingComponent.cpp similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPathFollowingComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPathFollowingComponent.cpp index 3043383..6768f25 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPathFollowingComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPathFollowingComponent.cpp @@ -52,7 +52,7 @@ void UVRPathFollowingComponent::GetDebugStringTokens(TArray& Tokens, TA Tokens.Add(GetStatusDesc()); Flags.Add(EPathFollowingDebugTokens::Description); - if (GetStatus() != EPathFollowingStatus::Moving) + if (Status != EPathFollowingStatus::Moving) { return; } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPlayerController.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPlayerController.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPlayerController.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRPlayerController.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRRootComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRRootComponent.cpp similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRRootComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRRootComponent.cpp index 226f4df..c14c376 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRRootComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRRootComponent.cpp @@ -11,7 +11,6 @@ #include "Engine/ScopedMovementUpdate.h" #include "SceneManagement.h" #include "PrimitiveSceneProxy.h" -#include "SceneView.h" //#include "DrawDebugHelpers.h" #include "IHeadMountedDisplay.h" #include "IXRTrackingSystem.h" @@ -963,7 +962,7 @@ bool UVRRootComponent::MoveComponentImpl(const FVector& Delta, const FQuat& NewR //CSV_SCOPED_TIMING_STAT(PrimitiveComponent, MoveComponentTime); // static things can move before they are registered (e.g. immediately after streaming), but not after. - if (!IsValidChecked(this) || (this->Mobility == EComponentMobility::Static && IsRegistered()))//|| CheckStaticMobilityAndWarn(PrimitiveComponentStatics::MobilityWarnText)) + if (!IsValid(this) || (this->Mobility == EComponentMobility::Static && IsRegistered()))//|| CheckStaticMobilityAndWarn(PrimitiveComponentStatics::MobilityWarnText)) { if (OutHit) { @@ -1234,7 +1233,7 @@ bool UVRRootComponent::MoveComponentImpl(const FVector& Delta, const FQuat& NewR // Handle blocking hit notifications. Avoid if pending kill (which could happen after overlaps). const bool bAllowHitDispatch = !BlockingHit.bStartPenetrating || !(MoveFlags & MOVECOMP_DisableBlockingOverlapDispatch); - if (BlockingHit.bBlockingHit && bAllowHitDispatch && IsValidChecked(this)) + if (BlockingHit.bBlockingHit && bAllowHitDispatch && IsValid(this)) { check(bFilledHitResult); if (IsDeferringMovementUpdates()) @@ -1330,7 +1329,7 @@ bool UVRRootComponent::UpdateOverlapsImpl(const TOverlapArrayView* NewPendingOve TInlineOverlapPointerArray NewOverlappingComponentPtrs; // If pending kill, we should not generate any new overlaps. Also not if overlaps were just disabled during BeginComponentOverlap. - if (IsValidChecked(this) && GetGenerateOverlapEvents()) + if (IsValid(this) && GetGenerateOverlapEvents()) { // 4.17 converted to auto cvar static const auto CVarAllowCachedOverlaps = IConsoleManager::Get().FindConsoleVariable(TEXT("p.AllowCachedOverlaps")); @@ -1374,7 +1373,7 @@ bool UVRRootComponent::UpdateOverlapsImpl(const TOverlapArrayView* NewPendingOve const bool bCheckOverlapFlags = false; // Already checked above if (!ShouldIgnoreOverlapResult(MyWorld, MyActor, *this, Result.OverlapObjectHandle.FetchActor(), *HitComp, bCheckOverlapFlags)) { - OverlapMultiResult.Emplace(HitComp, Result.GetItemIndex()); // don't need to add unique unless the overlap check can return dupes + OverlapMultiResult.Emplace(HitComp, Result.ItemIndex); // don't need to add unique unless the overlap check can return dupes } } } @@ -1554,7 +1553,7 @@ bool UVRRootComponent::IsLocallyControlled() const // Simulated proxies should already have the new height from the server if (!owningVRChar->bRetainRoomscale && (owningVRChar->GetNetMode() < ENetMode::NM_Client || IsLocallyControlled())) { - MoveComponent(this->GetComponentQuat().GetUpVector() * (Offset * this->GetComponentScale().Z), GetComponentQuat(), false, nullptr, EMoveComponentFlags::MOVECOMP_NoFlags, ETeleportType::TeleportPhysics); + MoveComponent(this->GetComponentQuat().GetUpVector() * (Offset * this->GetComponentScale().Z), GetComponentQuat(), true, nullptr, EMoveComponentFlags::MOVECOMP_NoFlags, ETeleportType::TeleportPhysics); } /*else { @@ -1582,7 +1581,7 @@ bool UVRRootComponent::IsLocallyControlled() const void UVRRootComponent::UpdatePhysicsVolume(bool bTriggerNotifiers) { - if (GetShouldUpdatePhysicsVolume() && IsValidChecked(this)) + if (GetShouldUpdatePhysicsVolume() && IsValid(this)) { // SCOPE_CYCLE_COUNTER(STAT_UpdatePhysicsVolume); if (UWorld * MyWorld = GetWorld()) diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRStereoWidgetComponent.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRStereoWidgetComponent.cpp similarity index 96% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRStereoWidgetComponent.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRStereoWidgetComponent.cpp index 1decbd7..2afa1d3 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRStereoWidgetComponent.cpp +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRStereoWidgetComponent.cpp @@ -11,8 +11,6 @@ #include "VRRootComponent.h" #include "TextureResource.h" #include "Engine/Texture.h" -#include "Engine/Texture2D.h" -#include "SceneView.h" #include "Engine/GameInstance.h" #include "SceneManagement.h" #include "Materials/Material.h" @@ -29,8 +27,6 @@ #include "Engine/Engine.h" #include "Engine/GameViewportClient.h" #include "Engine/TextureRenderTarget2D.h" -#include "ImageUtils.h" -#include "ImageCoreUtils.h" //#include "Widgets/SWindow.h" #include "Framework/Application/SlateApplication.h" #include "Kismet/KismetSystemLibrary.h" @@ -419,8 +415,6 @@ UVRStereoWidgetComponent::~UVRStereoWidgetComponent() void UVRStereoWidgetComponent::EndPlay(const EEndPlayReason::Type EndPlayReason) { - Super::EndPlay(EndPlayReason); - if (EndPlayReason == EEndPlayReason::EndPlayInEditor || EndPlayReason == EEndPlayReason::Quit) { //FStereoLayerAdditionalFlagsManager::Destroy(); @@ -437,12 +431,6 @@ void UVRStereoWidgetComponent::BeginDestroy() LayerId = IStereoLayers::FLayerDesc::INVALID_LAYER_ID; } - if (IsValid(TextureRef)) - { - TextureRef->RemoveFromRoot(); - TextureRef = nullptr; - } - Super::BeginDestroy(); } @@ -613,14 +601,7 @@ void UVRStereoWidgetComponent::TickComponent(float DeltaTime, enum ELevelTick Ti if (AVRCharacter* VRChar = Cast(mpawn)) { - if (VRChar->VRMovementReference && VRChar->VRMovementReference->GetReplicatedMovementMode() == EVRConjoinedMovementModes::C_VRMOVE_Seated) - { - - } - else - { - HMDLoc += UVRExpansionFunctionLibrary::GetHMDPureYaw_I(HMDRot.Rotator()).RotateVector(FVector(VRChar->VRRootReference->VRCapsuleOffset.X, VRChar->VRRootReference->VRCapsuleOffset.Y, 0.0f)); - } + HMDLoc += UVRExpansionFunctionLibrary::GetHMDPureYaw_I(HMDRot.Rotator()).RotateVector(FVector(VRChar->VRRootReference->VRCapsuleOffset.X, VRChar->VRRootReference->VRCapsuleOffset.Y, 0.0f)); } DeltaTrans = FTransform(FQuat::Identity, HMDLoc, FVector(1.0f)); @@ -728,23 +709,10 @@ void UVRStereoWidgetComponent::TickComponent(float DeltaTime, enum ELevelTick Ti }*/ } - // Implement the correct facing stereo layers cvar option - static const auto CVarXRUseLegacyFacing = IConsoleManager::Get().FindConsoleVariable(TEXT("XR.StereoLayers.UseLegacyFacing")); - if (!CVarXRUseLegacyFacing->GetBool()) - { - // The default Open Xr Stereo layer object faces the camera at no rotation where as the unreal object faces away from it at zero rotation - LayerDsec.Transform.SetRotation(Transform.GetRotation() * FQuat(0., 0., 1., 0.)); - } - - if (RenderTarget) { - // TODO 5.7 need to figure out how to replace this in some way that isn't so fing slow - //PRAGMA_DISABLE_DEPRECATION_WARNINGS - //LayerDsec.Texture = RenderTarget->GetResource()->TextureRHI; - LayerDsec.TextureObj = RenderTarget; + LayerDsec.Texture = RenderTarget->GetResource()->TextureRHI; LayerDsec.Flags |= (RenderTarget->GetMaterialType() == MCT_TextureExternal) ? IStereoLayers::LAYER_FLAG_TEX_EXTERNAL : 0; - //PRAGMA_ENABLE_DEPRECATION_WARNINGS } // Forget the left texture implementation //if (LeftTexture) @@ -897,7 +865,7 @@ public: if (MaterialInstance) { - MaterialRelevance = MaterialInstance->GetRelevance(GetScene().GetShaderPlatform()); + MaterialRelevance = MaterialInstance->GetRelevance(GetScene().GetFeatureLevel()); } } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRTrackedParentInterface.cpp b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRTrackedParentInterface.cpp similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRTrackedParentInterface.cpp rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Private/VRTrackedParentInterface.cpp diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/CharacterMovementCompTypes.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/CharacterMovementCompTypes.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/CharacterMovementCompTypes.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/CharacterMovementCompTypes.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripMotionControllerComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripMotionControllerComponent.h similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripMotionControllerComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripMotionControllerComponent.h index 516305f..2cb7d90 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripMotionControllerComponent.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripMotionControllerComponent.h @@ -1207,18 +1207,6 @@ public: float NewStiffness, float NewDamping, bool bAlsoSetAngularValues = false, float OptionalAngularStiffness = 0.0f, float OptionalAngularDamping = 0.0f ); - // Set the grips advanced settings, may need to recreate grip locally if altering something important (non owning clients will always re-create the grip) - // Can check HasGripAuthority to decide if callable locally - UFUNCTION(BlueprintCallable, Category = "GripMotionController", meta = (ExpandEnumAsExecs = "Result")) - void SetGripAdvancedGripSettings( - const FBPActorGripInformation& Grip, - EBPVRResultSwitch& Result, - uint8 GripPriority = 0, - bool bSetOwnerOnGrip = true, - bool bDisallowLerping = false, - bool bDisallowSettingPositionOnClientAuthDrop = false - ); - // Used to convert an offset transform to grip relative, useful for storing an initial offset and then lerping back to 0 without re-calculating every tick UFUNCTION(BlueprintPure, Category = "GripMotionController", meta = (DisplayName = "CreateGripRelativeAdditionTransform")) FTransform CreateGripRelativeAdditionTransform_BP( diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Default.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Default.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Default.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Default.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_GunTools.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_GunTools.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_GunTools.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_GunTools.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_InteractibleSettings.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_InteractibleSettings.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_InteractibleSettings.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_InteractibleSettings.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_LerpToHand.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_LerpToHand.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_LerpToHand.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_LerpToHand.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Melee.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Melee.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Melee.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Melee.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Physics.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Physics.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Physics.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/GS_Physics.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/VRGripScriptBase.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/VRGripScriptBase.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/VRGripScriptBase.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/GripScripts/VRGripScriptBase.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableActor.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableActor.h similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableActor.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableActor.h index 9419b0e..75df06f 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableActor.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableActor.h @@ -56,6 +56,7 @@ public: TArray>& GetGripLogicScripts(); bool ReplicateSubobjects(UActorChannel* Channel, class FOutBunch *Bunch, FReplicationFlags *RepFlags) override; + virtual void GetSubobjectsWithStableNamesForNetworking(TArray& ObjList) override; // Sets the Deny Gripping variable on the FBPInterfaceSettings struct UFUNCTION(BlueprintCallable, Category = "VRGripInterface") diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableBoxComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableBoxComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableBoxComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableBoxComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableCapsuleComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableCapsuleComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableCapsuleComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableCapsuleComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableCharacter.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableCharacter.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableCharacter.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableCharacter.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableDataTypes.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableDataTypes.h similarity index 81% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableDataTypes.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableDataTypes.h index 00fccca..53d3216 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableDataTypes.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableDataTypes.h @@ -17,13 +17,12 @@ public: UPROPERTY() bool bIsWelded; - // Not really needed, removing it makes sure Iris will just work - //bool NetSerialize(FArchive& Ar, class UPackageMap* Map, bool& bOutSuccess); + bool NetSerialize(FArchive& Ar, class UPackageMap* Map, bool& bOutSuccess); FRepAttachmentWithWeld(); }; -/*template<> +template<> struct TStructOpsTypeTraits< FRepAttachmentWithWeld > : public TStructOpsTypeTraitsBase2 { enum @@ -32,4 +31,3 @@ struct TStructOpsTypeTraits< FRepAttachmentWithWeld > : public TStructOpsTypeTra //WithNetSharedSerialization = true, }; }; -*/ diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippablePhysicsReplication.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippablePhysicsReplication.h similarity index 82% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippablePhysicsReplication.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippablePhysicsReplication.h index af202ca..10acf5f 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippablePhysicsReplication.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippablePhysicsReplication.h @@ -35,8 +35,7 @@ #pragma region FPhysicsReplicationAsync -class FPhysicsReplicationAsyncVR : public IPhysicsReplicationAsync, - public Chaos::TSimCallbackObject< +class FPhysicsReplicationAsyncVR : public Chaos::TSimCallbackObject< FPhysicsReplicationAsyncInput, Chaos::FSimCallbackNoOutput, Chaos::ESimCallbackOptions::Presimulate | Chaos::ESimCallbackOptions::PhysicsObjectUnregister> @@ -46,9 +45,7 @@ class FPhysicsReplicationAsyncVR : public IPhysicsReplicationAsync, virtual void OnPreSimulate_Internal() override; virtual void OnPhysicsObjectUnregistered_Internal(Chaos::FConstPhysicsObjectHandle PhysicsObject) override; - virtual void ApplyTargetStatesAsync(const float DeltaSeconds); - UE_DEPRECATED(5.6, "Deprecated, call the function with just @param DeltaSeconds instead.") - virtual void ApplyTargetStatesAsync(const float DeltaSeconds, const FPhysicsRepErrorCorrectionData& ErrorCorrection, const TArray& TargetStates) { ApplyTargetStatesAsync(DeltaSeconds); }; + virtual void ApplyTargetStatesAsync(const float DeltaSeconds, const FPhysicsRepErrorCorrectionData& ErrorCorrection, const TArray& TargetStates); // Replication functions virtual void DefaultReplication_DEPRECATED(Chaos::FRigidBodyHandle_Internal* Handle, const FPhysicsRepAsyncInputData& State, const float DeltaSeconds, const FPhysicsRepErrorCorrectionData& ErrorCorrection); @@ -57,23 +54,18 @@ class FPhysicsReplicationAsyncVR : public IPhysicsReplicationAsync, virtual bool ResimulationReplication(Chaos::FPBDRigidParticleHandle* Handle, FReplicatedPhysicsTargetAsync& Target, const float DeltaSeconds); public: - virtual void RegisterSettings(Chaos::FConstPhysicsObjectHandle PhysicsObject, TWeakPtr InSettings) override; + virtual void RegisterSettings(Chaos::FConstPhysicsObjectHandle PhysicsObject, FNetworkPhysicsSettingsAsync InSettings); private: float LatencyOneWay; FRigidBodyErrorCorrection ErrorCorrectionDefault; - FNetworkPhysicsSettingsData SettingsCurrent; - FNetworkPhysicsSettingsData SettingsDefault; + FNetworkPhysicsSettingsAsync SettingsCurrent; + FNetworkPhysicsSettingsAsync SettingsDefault; TMap ObjectToTarget; - TMap> ObjectToSettings; - TArray ResimIslands; - TArray ResimIslandsParticles; + TMap ObjectToSettings; TArray ParticlesInResimIslands; TArray ReplicatedParticleIDs; - int32 ResimOutOfBoundsCounter = 0; - float ResimErrorLogTimer = 0.0f; - private: FReplicatedPhysicsTargetAsync* AddObjectToReplication(Chaos::FConstPhysicsObjectHandle PhysicsObject); void RemoveObjectFromReplication(Chaos::FConstPhysicsObjectHandle PhysicsObject); @@ -82,15 +74,7 @@ private: void CacheResimInteractions(); // Sets SettingsCurrent to either the objects custom settings or to the default settings void FetchObjectSettings(Chaos::FConstPhysicsObjectHandle PhysicsObject); - bool UsePhysicsReplicationLOD(); - void CheckTargetResimValidity(FReplicatedPhysicsTargetAsync& Target); - void ApplyPhysicsReplicationLOD(Chaos::FConstPhysicsObjectHandle PhysicsObjectHandle, FReplicatedPhysicsTargetAsync& Target, const uint32 LODFlags); - void DebugDrawReplicationMode(const FPhysicsRepAsyncInputData& Input); - - /** Static function to extrapolate a target for N ticks using X DeltaSeconds */ static void ExtrapolateTarget(FReplicatedPhysicsTargetAsync& Target, const int32 ExtrapolateFrames, const float DeltaSeconds); - /** Static function to extrapolate a target for N Seconds */ - static void ExtrapolateTarget(FReplicatedPhysicsTargetAsync& Target, const float ExtrapolationTime); public: void Setup(FRigidBodyErrorCorrection ErrorCorrection) diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshActor.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshActor.h similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshActor.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshActor.h index b3bad64..85e87a6 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshActor.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshActor.h @@ -79,12 +79,12 @@ public: void SetReplicateGripScripts(bool NewReplicateGripScripts); inline bool GetReplicateGripScripts() { return bReplicateGripScripts; }; - // Get the grip script array, will automatically dirty it if they are replicated as it is assumed if you are directly accessing it you are altering it TArray>& GetGripLogicScripts(); bool ReplicateSubobjects(UActorChannel* Channel, class FOutBunch* Bunch, FReplicationFlags* RepFlags) override; + virtual void GetSubobjectsWithStableNamesForNetworking(TArray& ObjList) override; // Sets the Deny Gripping variable on the FBPInterfaceSettings struct UFUNCTION(BlueprintCallable, Category = "VRGripInterface") diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSkeletalMeshComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSphereComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSphereComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSphereComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableSphereComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshActor.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshActor.h similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshActor.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshActor.h index f330a39..986c521 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshActor.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshActor.h @@ -80,6 +80,7 @@ public: TArray>& GetGripLogicScripts(); bool ReplicateSubobjects(UActorChannel* Channel, class FOutBunch *Bunch, FReplicationFlags *RepFlags) override; + virtual void GetSubobjectsWithStableNamesForNetworking(TArray& ObjList) override; // Sets the Deny Gripping variable on the FBPInterfaceSettings struct UFUNCTION(BlueprintCallable, Category = "VRGripInterface") diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/GrippableStaticMeshComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/HandSocketComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/HandSocketComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/HandSocketComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Grippables/HandSocketComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRButtonComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRButtonComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRButtonComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRButtonComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRDialComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRDialComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRDialComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRDialComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRInteractibleFunctionLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRInteractibleFunctionLibrary.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRInteractibleFunctionLibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRInteractibleFunctionLibrary.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRLeverComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRLeverComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRLeverComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRLeverComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRMountComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRMountComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRMountComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRMountComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRSliderComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRSliderComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRSliderComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Interactibles/VRSliderComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/BucketUpdateSubsystem.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/BucketUpdateSubsystem.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/BucketUpdateSubsystem.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/BucketUpdateSubsystem.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/CollisionIgnoreSubsystem.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/CollisionIgnoreSubsystem.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/CollisionIgnoreSubsystem.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/CollisionIgnoreSubsystem.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/OptionalRepSkeletalMeshActor.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/OptionalRepSkeletalMeshActor.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/OptionalRepSkeletalMeshActor.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/OptionalRepSkeletalMeshActor.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRAIPerceptionOverrides.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRAIPerceptionOverrides.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRAIPerceptionOverrides.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRAIPerceptionOverrides.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VREPhysicalAnimationComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VREPhysicalAnimationComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VREPhysicalAnimationComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VREPhysicalAnimationComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VREPhysicsConstraintComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VREPhysicsConstraintComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VREPhysicsConstraintComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VREPhysicsConstraintComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRFullScreenUserWidget.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRFullScreenUserWidget.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRFullScreenUserWidget.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRFullScreenUserWidget.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRGameViewportClient.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRGameViewportClient.h similarity index 92% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRGameViewportClient.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRGameViewportClient.h index 6ddbeba..61f52fd 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRGameViewportClient.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRGameViewportClient.h @@ -61,5 +61,5 @@ public: virtual void PostInitProperties() override; virtual bool InputKey(const FInputKeyEventArgs& EventArgs) override; - virtual bool InputAxis(const FInputKeyEventArgs& Args) override; + virtual bool InputAxis(FViewport* tViewport, FInputDeviceId InputDevice, FKey Key, float Delta, float DeltaTime, int32 NumSamples = 1, bool bGamepad = false) override; }; \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRLogComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRLogComponent.h similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRLogComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRLogComponent.h index cc483d4..970d987 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRLogComponent.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRLogComponent.h @@ -67,8 +67,7 @@ public: bIsDirty = false; MaxStoredMessages = 1000; GLog->AddOutputDevice(this); - // Deprecated. Do nothing because AddOutputDevice now serializes the backlog. - //GLog->SerializeBacklog(this); + GLog->SerializeBacklog(this); } ~FVROutputLogHistory() diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRPlayerStart.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRPlayerStart.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRPlayerStart.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRPlayerStart.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRRenderTargetManager.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRRenderTargetManager.h similarity index 95% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRRenderTargetManager.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRRenderTargetManager.h index de6fcff..696817e 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRRenderTargetManager.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRRenderTargetManager.h @@ -3,7 +3,6 @@ #include "GameFramework/Actor.h" #include "Components/ActorComponent.h" #include "Containers/Queue.h" -#include "Iris/Serialization/NetSerializer.h" #include "VRRenderTargetManager.generated.h" class UVRRenderTargetManager; @@ -386,22 +385,3 @@ protected: TQueue RenderDataQueue; }; - - -USTRUCT() -struct FBPVRReplicatedTextureStoreSerializerConfig : public FNetSerializerConfig -{ - GENERATED_BODY() -}; - -USTRUCT() -struct FRenderManagerOperationSerializerConfig : public FNetSerializerConfig -{ - GENERATED_BODY() -}; - -namespace UE::Net -{ - UE_NET_DECLARE_SERIALIZER(FBPVRReplicatedTextureStoreNetSerializer, VREXPANSIONPLUGIN_API); - UE_NET_DECLARE_SERIALIZER(FRenderManagerOperationNetSerializer, VREXPANSIONPLUGIN_API); -} diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRVehiclePawn.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRVehiclePawn.h similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRVehiclePawn.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRVehiclePawn.h index 672e6b4..83afc09 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRVehiclePawn.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRVehiclePawn.h @@ -93,11 +93,11 @@ public: SetupPlayerInputComponent(InputComponent); InputComponent->RegisterComponent(); - //if (UInputDelegateBinding::SupportsInputDelegate(GetClass())) - //{ + if (UInputDelegateBinding::SupportsInputDelegate(GetClass())) + { InputComponent->bBlockInput = bBlockInput; UInputDelegateBinding::BindInputDelegates(GetClass(), InputComponent); - //} + } } } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRWheeledVehicle.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRWheeledVehicle.h similarity index 97% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRWheeledVehicle.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRWheeledVehicle.h index 10b61d4..a0ed62a 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRWheeledVehicle.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Misc/VRWheeledVehicle.h @@ -108,11 +108,11 @@ public: SetupPlayerInputComponent(InputComponent); InputComponent->RegisterComponent(); - //if (UInputDelegateBinding::SupportsInputDelegate(GetClass())) - //{ + if (UInputDelegateBinding::SupportsInputDelegate(GetClass())) + { InputComponent->bBlockInput = bBlockInput; UInputDelegateBinding::BindInputDelegates(GetClass(), InputComponent); - //} + } } } diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Mover/VRMoverComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Mover/VRMoverComponent.h similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Mover/VRMoverComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Mover/VRMoverComponent.h index 575ebaf..687b613 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Mover/VRMoverComponent.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/Mover/VRMoverComponent.h @@ -36,7 +36,7 @@ struct VREXPANSIONPLUGIN_API FLayeredMove_VRMovement : public FLayeredMoveBase uint8 SettingsFlags; // Never finish this movement - virtual bool IsFinished(double CurrentSimTimeMs) const; + virtual bool IsFinished(float CurrentSimTimeMs) const; // Generate a movement virtual bool GenerateMove(const FMoverTickStartData& StartState, const FMoverTimeStep& TimeStep, const UMoverComponent* MoverComp, UMoverBlackboard* SimBlackboard, FProposedMove& OutProposedMove) override; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/ParentRelativeAttachmentComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/ParentRelativeAttachmentComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/ParentRelativeAttachmentComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/ParentRelativeAttachmentComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/ReplicatedVRCameraComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/ReplicatedVRCameraComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/ReplicatedVRCameraComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/ReplicatedVRCameraComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRAIController.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRAIController.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRAIController.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRAIController.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBPDatatypes.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBPDatatypes.h similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBPDatatypes.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBPDatatypes.h index 0e3284a..f04ed78 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBPDatatypes.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBPDatatypes.h @@ -770,14 +770,14 @@ public: UPROPERTY(EditDefaultsOnly, Category = Replication, AdvancedDisplay) EVRRotationQuantization RotationQuantizationLevel; - FORCEINLINE static uint16 CompressAxisTo10BitShort(float Angle) + FORCEINLINE uint16 CompressAxisTo10BitShort(float Angle) { // map [0->360) to [0->1024) and mask off any winding return FMath::RoundToInt(Angle * 1024.f / 360.f) & 0xFFFF; } - FORCEINLINE static float DecompressAxisFrom10BitShort(uint16 Angle) + FORCEINLINE float DecompressAxisFrom10BitShort(uint16 Angle) { // map [0->1024) to [0->360) return (Angle * 360.f / 1024.f); @@ -1243,25 +1243,19 @@ public: UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "AdvancedGripSettings") bool bDisallowLerping; - // If true, we will not set the position on grip release of a client auth grip - UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "AdvancedGripSettings") - bool bDisallowSettingPositionOnClientAuthDrop; - UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "AdvancedGripSettings") FBPAdvGripPhysicsSettings PhysicsSettings; FBPAdvGripSettings() : GripPriority(1), bSetOwnerOnGrip(1), - bDisallowLerping(0), - bDisallowSettingPositionOnClientAuthDrop(0) + bDisallowLerping(0) {} FBPAdvGripSettings(int GripPrio) : GripPriority(GripPrio), bSetOwnerOnGrip(1), - bDisallowLerping(0), - bDisallowSettingPositionOnClientAuthDrop(0) + bDisallowLerping(0) {} }; diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacter.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacter.h similarity index 98% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacter.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacter.h index d34d935..c63ef91 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacter.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacter.h @@ -7,9 +7,6 @@ #include "ReplicatedVRCameraComponent.h" #include "GameFramework/Character.h" #include "Navigation/PathFollowingComponent.h" - -#include "Iris/Serialization/NetSerializer.h" - #include "VRBaseCharacter.generated.h" class AVRPlayerController; @@ -182,7 +179,6 @@ public: CapsuleHeight(0.0f) {} - /** Network serialization */ bool NetSerialize(FArchive& Ar, class UPackageMap* Map, bool& bOutSuccess) { @@ -594,29 +590,4 @@ public: UFUNCTION(BlueprintCallable, Category = "VRBaseCharacter|Navigation") bool GetCurrentNavigationPathPoints(TArray& NavigationPointList); -}; - - - -USTRUCT() -struct FVRReplicatedCapsuleHeightNetSerializerConfig : public FNetSerializerConfig -{ - GENERATED_BODY() -}; - -namespace UE::Net -{ - UE_NET_DECLARE_SERIALIZER(FVRReplicatedCapsuleHeightNetSerializer, VREXPANSIONPLUGIN_API); -} - - -USTRUCT() -struct FVRSeatedCharacterInfoNetSerializerConfig : public FNetSerializerConfig -{ - GENERATED_BODY() -}; - -namespace UE::Net -{ - UE_NET_DECLARE_SERIALIZER(FVRSeatedCharacterInfoNetSerializer, VREXPANSIONPLUGIN_API); -} \ No newline at end of file +}; \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacterMovementComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacterMovementComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacterMovementComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRBaseCharacterMovementComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRCharacter.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRCharacter.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRCharacter.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRCharacter.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRCharacterMovementComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRCharacterMovementComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRCharacterMovementComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRCharacterMovementComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionFunctionLibrary.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionFunctionLibrary.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionFunctionLibrary.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionFunctionLibrary.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionPlugin.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionPlugin.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionPlugin.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRExpansionPlugin.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGestureComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGestureComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGestureComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGestureComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGlobalSettings.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGlobalSettings.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGlobalSettings.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGlobalSettings.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGripInterface.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGripInterface.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGripInterface.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRGripInterface.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRPathFollowingComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRPathFollowingComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRPathFollowingComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRPathFollowingComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRPlayerController.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRPlayerController.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRPlayerController.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRPlayerController.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRRootComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRRootComponent.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRRootComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRRootComponent.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRStereoWidgetComponent.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRStereoWidgetComponent.h similarity index 99% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRStereoWidgetComponent.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRStereoWidgetComponent.h index 39e3e2f..9fddf36 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRStereoWidgetComponent.h +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRStereoWidgetComponent.h @@ -181,9 +181,6 @@ public: UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "StereoLayer", Meta = (GetOptions = "EditorFlagCollector.GetFlagNames")) TArray AdditionalFlags; - UPROPERTY() - TObjectPtr TextureRef = nullptr; - protected: /** Texture displayed on the stereo layer (is stereocopic textures are supported on the platfrom and more than one texture is provided, this will be the right eye) **/ //UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "StereoLayer") diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRTrackedParentInterface.h b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRTrackedParentInterface.h similarity index 100% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRTrackedParentInterface.h rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/Public/VRTrackedParentInterface.h diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs similarity index 95% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs index 56a0175..f065a80 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/Source/VRExpansionPlugin/VRExpansionPlugin.Build.cs @@ -11,8 +11,6 @@ public class VRExpansionPlugin : ModuleRules public VRExpansionPlugin(ReadOnlyTargetRules Target) : base(Target) { - DefaultBuildSettings = BuildSettingsVersion.Latest; - IncludeOrderVersion = EngineIncludeOrderVersion.Latest; PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; //bEnforceIWYU = true; @@ -85,7 +83,6 @@ public class VRExpansionPlugin : ModuleRules // "CoreUObject", //"Engine", "InputCore", - "ImageCore", // For new stereo layer stuff //"FLEX", remove comment if building in the NVIDIA flex branch - NOTE when put in place FLEX only listed win32 and win64 at compatible platforms //"HeadMountedDisplay", "RHI", diff --git a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin.uplugin b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/VRExpansionPlugin.uplugin similarity index 95% rename from VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin.uplugin rename to VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/VRExpansionPlugin.uplugin index f7e3843..cb68065 100644 --- a/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin.uplugin +++ b/VIRTUOS_ExpansionPluginTests/Plugins/VRExpansionPlugin/VRExpansionPlugin/VRExpansionPlugin.uplugin @@ -1,7 +1,7 @@ { "FileVersion": 3, - "Version": 5.7, - "VersionName": "5.7", + "Version": 5.4, + "VersionName": "5.4", "FriendlyName": "VRExpansionPlugin", "Description": "Adds several new VR features & components to UE4", "Category": "VRExpansion", diff --git a/VIRTUOS_ExpansionPluginTests/README.md b/VIRTUOS_ExpansionPluginTests/README.md new file mode 100644 index 0000000..02dcdcf --- /dev/null +++ b/VIRTUOS_ExpansionPluginTests/README.md @@ -0,0 +1,10 @@ +### How do I get set up? ### + +Current compatible versions for template: Latest Engine Version (Template is not kept to as many compatible versions as the plugin itself). + +* Right click on VRExpPluginExample.uproject and switch to your preferred (compatible) engine version. +* If project files did not automatically generate after switching, right click again and select "Generate Visual Studio Files" +* Open Solution and build - Or download the pre-built binary package from the forum thread for the engine version and place into the plugins directory. +* Run + +You need to have visual studio installed and follow the UE4 setup guide for it: https://docs.unrealengine.com/latest/INT/Programming/Development/VisualStudioSetup/ \ No newline at end of file diff --git a/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Private/CodeOnlyFunctionLibrary.cpp b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Private/CodeOnlyFunctionLibrary.cpp deleted file mode 100644 index e5a9920..0000000 --- a/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Private/CodeOnlyFunctionLibrary.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "CodeOnlyFunctionLibrary.h" -#include "GameFramework/Actor.h" -#include "Engine/Level.h" - -FString UCodeOnlyFunctionLibrary::RenameActorUnique(AActor* ActorToRename, const FString& DesiredName, AActor* ReferenceActorForLevel) -{ - if (!ActorToRename || !ReferenceActorForLevel) - { - return FString(); - } - - FString NewName = DesiredName; - - while (!ActorToRename->Rename(*NewName, ReferenceActorForLevel->GetLevel(), REN_Test)) - { - UE_LOG(LogTemp, Warning, TEXT("Rename conflict on drop: %s"), *NewName); - NewName.AppendChar('x'); - } - - ActorToRename->Rename(*NewName, ReferenceActorForLevel->GetLevel()); - - return NewName; -} diff --git a/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Public/CodeOnlyFunctionLibrary.h b/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Public/CodeOnlyFunctionLibrary.h deleted file mode 100644 index 2a6c5bb..0000000 --- a/VIRTUOS_ExpansionPluginTests/Source/VRExpPluginExample/Public/CodeOnlyFunctionLibrary.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "CoreMinimal.h" -#include "Kismet/BlueprintFunctionLibrary.h" -#include "CodeOnlyFunctionLibrary.generated.h" - -UCLASS() -class NO_API UCodeOnlyFunctionLibrary : public UBlueprintFunctionLibrary -{ - GENERATED_BODY() - -public: - - UFUNCTION(BlueprintCallable, Category="Utilities|Actor") - static FString RenameActorUnique(AActor* ActorToRename, const FString& DesiredName, AActor* ReferenceActorForLevel); -}; diff --git a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject index 350eb11..9425187 100644 --- a/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject +++ b/VIRTUOS_ExpansionPluginTests/VRExpPluginExample.uproject @@ -1,16 +1,13 @@ { "FileVersion": 3, - "EngineAssociation": "5.7", + "EngineAssociation": "5.5", "Category": "", "Description": "", "Modules": [ { "Name": "VRExpPluginExample", "Type": "Runtime", - "LoadingPhase": "Default", - "AdditionalDependencies": [ - "Engine" - ] + "LoadingPhase": "Default" } ], "Plugins": [ @@ -20,7 +17,6 @@ "SupportedTargetPlatforms": [ "Win64", "Linux", - "LinuxArm64", "Android" ] }, @@ -65,7 +61,6 @@ "SupportedTargetPlatforms": [ "Win64", "Linux", - "LinuxArm64", "Android" ] }, @@ -120,14 +115,6 @@ { "Name": "Harmonix", "Enabled": true - }, - { - "Name": "DisasterRecoveryClient", - "Enabled": true - }, - { - "Name": "GPULightmass", - "Enabled": true } ], "TargetPlatforms": [