Skip to content

Commit

Permalink
Merge pull request #170 from BasisVR/doolysbranch
Browse files Browse the repository at this point in the history 
Doolysbranch
  • Loading branch information
@dooly123
dooly123 authored Mar 3, 2025
2 parents 9901e0a + e351d8e commit 4a2e9e9
Show file tree
Hide file tree
Showing 43 changed files with 536 additions and 663 deletions.
6 changes: 2 additions & 4 deletions Basis Server/BasisNetworkServer/BasisNetworking/InitalData/BasisLoadableLoader.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,8 @@ public static LocalLoadResource FromBasisLoadableConfiguration(BasisLoadableConf
<LoadedNetID></LoadedNetID>
<!-- Unlock password -->
<UnlockPassword></UnlockPassword>
<!-- Meta URL -->
<MetaURL></MetaURL>
<!-- Bundle URL -->
<BundleURL></BundleURL>
<!-- Combined URl -->
<CombinedURL></CombinedURL>
<!-- Local load flag -->
<IsLocalLoad>false</IsLocalLoad>
Expand Down
317 changes: 0 additions & 317 deletions Basis/Assets/AddressableAssetsData/link.xml
View file

This file was deleted.

2 changes: 1 addition & 1 deletion Basis/Assets/Basis/Settings/Quality Settiings/Modified - Desktop.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ MonoBehaviour:
m_SupportsTerrainHoles: 0
m_SupportsHDR: 0
m_HDRColorBufferPrecision: 0
m_MSAA: 1
m_MSAA: 8
m_RenderScale: 1
m_UpscalingFilter: 0
m_FsrOverrideSharpness: 0
Expand Down
10 changes: 5 additions & 5 deletions Basis/Assets/Basis/Settings/Quality Settiings/Modified - Quest.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ MonoBehaviour:
m_RendererType: 1
m_RendererData: {fileID: 0}
m_RendererDataList:
- {fileID: 11400000, guid: c40be3174f62c4acf8c1216858c64956, type: 2}
- {fileID: 11400000, guid: dc6efa2bbf91054468277b399108bb90, type: 2}
m_DefaultRendererIndex: 0
m_RequireDepthTexture: 0
m_RequireOpaqueTexture: 0
m_OpaqueDownsampling: 1
m_SupportsTerrainHoles: 0
m_SupportsHDR: 0
m_HDRColorBufferPrecision: 0
m_MSAA: 4
m_MSAA: 2
m_RenderScale: 1
m_UpscalingFilter: 0
m_FsrOverrideSharpness: 0
Expand Down Expand Up @@ -77,14 +77,14 @@ MonoBehaviour:
m_StoreActionsOptimization: 0
m_UseAdaptivePerformance: 1
m_ColorGradingMode: 0
m_ColorGradingLutSize: 32
m_ColorGradingLutSize: 16
m_AllowPostProcessAlphaOutput: 0
m_UseFastSRGBLinearConversion: 1
m_SupportDataDrivenLensFlare: 0
m_SupportScreenSpaceLensFlare: 0
m_GPUResidentDrawerMode: 1
m_SmallMeshScreenPercentage: 0
m_GPUResidentDrawerEnableOcclusionCullingInCameras: 1
m_GPUResidentDrawerEnableOcclusionCullingInCameras: 0
m_ShadowType: 1
m_LocalShadowsSupported: 0
m_LocalShadowsAtlasResolution: 256
Expand All @@ -107,7 +107,7 @@ MonoBehaviour:
m_PrefilteringModeDeferredRendering: 0
m_PrefilteringModeScreenSpaceOcclusion: 0
m_PrefilterDebugKeywords: 1
m_PrefilterWriteRenderingLayers: 0
m_PrefilterWriteRenderingLayers: 1
m_PrefilterHDROutput: 1
m_PrefilterAlphaOutput: 1
m_PrefilterSSAODepthNormals: 1
Expand Down
2 changes: 1 addition & 1 deletion ...Rendering Defaults/StandardRenderer.asset → ... Rendering Defaults/DesktopRenderer.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
m_Name: StandardRenderer
m_Name: DesktopRenderer
m_EditorClassIdentifier:
debugShaders:
debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3}
Expand Down
0 ...ring Defaults/StandardRenderer.asset.meta → ...ering Defaults/DesktopRenderer.asset.meta
View file
File renamed without changes.
90 changes: 90 additions & 0 deletions Basis/Assets/Basis/Settings/Unity Rendering Defaults/QuestRenderer.asset
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-4357968347084770853
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 980a78cc4df543b29a2663be288cd2f5, type: 3}
m_Name: UniversalBlurFeature
m_EditorClassIdentifier:
m_Active: 1
<PassIndex>k__BackingField: 0
injectionPoint: 450
<Intensity>k__BackingField: 0.689
downsample: 3.44
iterations: 6
scale: 1.45
scaleBlurWith: 2
scaleReferenceSize: 1080
shader: {fileID: 4800000, guid: bb11bdc2e8aaf4c80b5315f3778d7ad4, type: 3}
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
m_Name: QuestRenderer
m_EditorClassIdentifier:
debugShaders:
debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3}
hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3}
probeVolumeSamplingDebugComputeShader: {fileID: 7200000, guid: 53626a513ea68ce47b59dc1299fe3959, type: 3}
probeVolumeResources:
probeVolumeDebugShader: {fileID: 4800000, guid: e5c6678ed2aaa91408dd3df699057aae, type: 3}
probeVolumeFragmentationDebugShader: {fileID: 4800000, guid: 03cfc4915c15d504a9ed85ecc404e607, type: 3}
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: 53a11f4ebaebf4049b3638ef78dc9664, type: 3}
probeVolumeSamplingDebugShader: {fileID: 4800000, guid: 8f96cd657dc40064aa21efcc7e50a2e7, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 57d7c4c16e2765b47a4d2069b311bffe, type: 3}
probeSamplingDebugTexture: {fileID: 2800000, guid: 24ec0e140fb444a44ab96ee80844e18e, type: 3}
probeVolumeBlendStatesCS: {fileID: 0}
m_RendererFeatures: []
m_RendererFeatureMap:
m_UseNativeRenderPass: 1
xrSystemData: {fileID: 0}
postProcessData: {fileID: 0}
m_AssetVersion: 2
m_OpaqueLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_TransparentLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_DefaultStencilState:
overrideStencilState: 0
stencilReference: 0
stencilCompareFunction: 8
passOperation: 2
failOperation: 0
zFailOperation: 0
m_ShadowTransparentReceive: 0
m_RenderingMode: 2
m_DepthPrimingMode: 1
m_CopyDepthMode: 0
m_DepthAttachmentFormat: 0
m_DepthTextureFormat: 0
m_AccurateGbufferNormals: 0
m_IntermediateTextureMode: 0
--- !u!114 &7891264069566464977
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d69a19d29ef66464ea0afc7cd84fd6c2, type: 3}
m_Name: VolumetricFogRendererFeature
m_EditorClassIdentifier:
m_Active: 1
downsampleDepthShader: {fileID: 4800000, guid: cffeaeec0396a2c4dad475266cc8dfeb, type: 3}
volumetricFogShader: {fileID: 4800000, guid: 08f816187f9af0244a95556ee0cab83f, type: 3}
5 changes: 3 additions & 2 deletions ...ssets/AddressableAssetsData/link.xml.meta → ...ndering Defaults/QuestRenderer.asset.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

88 changes: 44 additions & 44 deletions ...ssets/Basis/Settings/Unity Rendering Defaults/UniversalRenderPipelineGlobalSettings.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,25 @@ MonoBehaviour:
- rid: 2858994164428701698
- rid: 2858994164428701699
- rid: 2858994164428701700
- rid: 3153963431898906765
- rid: 3153963477245886578
- rid: 2858994164428701702
- rid: 2858994164428701703
- rid: 3153963431898906766
- rid: 3153963431898906767
- rid: 3153963477245886579
- rid: 3153963477245886580
- rid: 2858994164428701706
- rid: 3153963431898906768
- rid: 3153963477245886581
- rid: 2858994164428701708
- rid: 6147443362521677920
- rid: 3153963431898906769
- rid: 3153963431898906770
- rid: 6147443694684864618
- rid: 3153963431898906771
- rid: 3153963431898906772
- rid: 6147443694684864621
- rid: 3153963444920385929
- rid: 3153963477245886582
- rid: 3153963477245886583
- rid: 3153963477245886584
- rid: 3153963477245886585
- rid: 3153963477245886586
- rid: 3153963477245886587
- rid: 2858994164428701716
- rid: 2858994164428701717
- rid: 2858994164428701718
- rid: 3153963431898906773
- rid: 3153963477245886588
m_RuntimeSettings:
m_List:
- rid: 2858994164428701698
Expand All @@ -64,7 +64,7 @@ MonoBehaviour:
- rid: 2858994164428701703
- rid: 2858994164428701706
- rid: 2858994164428701708
- rid: 6147443362521677920
- rid: 3153963444920385929
- rid: 2858994164428701716
- rid: 2858994164428701717
- rid: 2858994164428701718
Expand Down Expand Up @@ -158,7 +158,20 @@ MonoBehaviour:
m_version: 0
m_EnableCompilationCaching: 1
m_EnableValidityChecks: 1
- rid: 3153963431898906765
- rid: 3153963444920385929
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data:
m_Version: 0
m_InstanceDataBufferCopyKernels: {fileID: 7200000, guid: f984aeb540ded8b4fbb8a2047ab5b2e2, type: 3}
m_InstanceDataBufferUploadKernels: {fileID: 7200000, guid: 53864816eb00f2343b60e1a2c5a262ef, type: 3}
m_TransformUpdaterKernels: {fileID: 7200000, guid: 2a567b9b2733f8d47a700c3c85bed75b, type: 3}
m_WindDataUpdaterKernels: {fileID: 7200000, guid: fde76746e4fd0ed418c224f6b4084114, type: 3}
m_OccluderDepthPyramidKernels: {fileID: 7200000, guid: 08b2b5fb307b0d249860612774a987da, type: 3}
m_InstanceOcclusionCullingKernels: {fileID: 7200000, guid: f6d223acabc2f974795a5a7864b50e6c, type: 3}
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
- rid: 3153963477245886578
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
Expand All @@ -173,14 +186,14 @@ MonoBehaviour:
m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2}
- rid: 3153963431898906766
- rid: 3153963477245886579
type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
m_StripUnusedPostProcessingVariants: 1
m_StripUnusedVariants: 1
m_StripScreenCoordOverrideVariants: 1
- rid: 3153963431898906767
- rid: 3153963477245886580
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
Expand All @@ -189,7 +202,7 @@ MonoBehaviour:
m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2}
m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2}
m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
- rid: 3153963431898906768
- rid: 3153963477245886581
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
Expand All @@ -201,13 +214,13 @@ MonoBehaviour:
m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3}
m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3}
m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3}
- rid: 3153963431898906769
- rid: 3153963477245886582
type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3}
m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3}
m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3}
- rid: 3153963431898906770
- rid: 3153963477245886583
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
Expand All @@ -220,7 +233,12 @@ MonoBehaviour:
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
- rid: 3153963431898906771
- rid: 3153963477245886584
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 1
- rid: 3153963477245886585
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
Expand All @@ -230,39 +248,21 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 3153963431898906772
- rid: 3153963477245886586
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0
m_LabelToInclude:
- rid: 3153963431898906773
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
- rid: 6147443362521677920
type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime}
data:
m_Version: 0
m_InstanceDataBufferCopyKernels: {fileID: 7200000, guid: f984aeb540ded8b4fbb8a2047ab5b2e2, type: 3}
m_InstanceDataBufferUploadKernels: {fileID: 7200000, guid: 53864816eb00f2343b60e1a2c5a262ef, type: 3}
m_TransformUpdaterKernels: {fileID: 7200000, guid: 2a567b9b2733f8d47a700c3c85bed75b, type: 3}
m_WindDataUpdaterKernels: {fileID: 7200000, guid: fde76746e4fd0ed418c224f6b4084114, type: 3}
m_OccluderDepthPyramidKernels: {fileID: 7200000, guid: 08b2b5fb307b0d249860612774a987da, type: 3}
m_InstanceOcclusionCullingKernels: {fileID: 7200000, guid: f6d223acabc2f974795a5a7864b50e6c, type: 3}
m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3}
m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3}
m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3}
- rid: 6147443694684864618
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 1
- rid: 6147443694684864621
- rid: 3153963477245886587
type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3}
probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3}
probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3}
- rid: 3153963477245886588
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
2 changes: 1 addition & 1 deletion Basis/Packages/com.avionblock.opussharp/OpusSharp.Core/NativeOpus.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using OpusSharp.Core.SafeHandlers;
using OpusSharp.Core.SafeHandlers;
using System;
using System.Runtime.InteropServices;
namespace OpusSharp.Core
Expand Down
12 changes: 11 additions & 1 deletion ...s/com.basis.framework/Device Management/Device Configuration/BasisDeviceLoaderAndSaver.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using UnityEngine;

Expand Down Expand Up @@ -91,11 +92,20 @@ public static void SaveDevices(string directoryPath, List<BasisDeviceMatchSettin
continue;
}

string filePath = Path.Combine(directoryPath, device.DeviceID + JsonIdentifier);

string filePath = Path.Combine(directoryPath, MakeDeviceSafeForSave(device.DeviceID) + JsonIdentifier);
Task.Run(() => SaveDeviceAsync(filePath, device));
}
}
public static string MakeDeviceSafeForSave(string fileName)
{
// Define a regex pattern to match invalid filename characters
string invalidChars = new string(Path.GetInvalidFileNameChars()) + "{}";
string pattern = $"[{Regex.Escape(invalidChars)}]";

// Replace invalid characters with an underscore
return Regex.Replace(fileName, pattern, "_");
}
public static void SaveDeviceAsync(string filePath, BasisDeviceMatchSettings device)
{
try
Expand Down
Loading

0 comments on commit 4a2e9e9

Please sign in to comment.