Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update main from lts #178

Merged
merged 10 commits into from
Mar 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
320 changes: 320 additions & 0 deletions Basis/Assets/AddressableAssetsData/link.xml

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions Basis/Assets/AddressableAssetsData/link.xml.meta

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

Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ MonoBehaviour:
m_DefaultRendererIndex: 0
m_RequireDepthTexture: 0
m_RequireOpaqueTexture: 0
m_OpaqueDownsampling: 1
m_OpaqueDownsampling: 3
m_SupportsTerrainHoles: 0
m_SupportsHDR: 0
m_HDRColorBufferPrecision: 0
m_MSAA: 0
m_MSAA: 1
m_RenderScale: 1
m_UpscalingFilter: 0
m_FsrOverrideSharpness: 0
m_FsrSharpness: 0.92
m_EnableLODCrossFade: 1
m_EnableLODCrossFade: 0
m_LODCrossFadeDitheringType: 0
m_ShEvalMode: 0
m_LightProbeSystem: 1
Expand Down Expand Up @@ -62,17 +62,17 @@ MonoBehaviour:
m_ShadowDepthBias: 1
m_ShadowNormalBias: 1
m_AnyShadowsSupported: 1
m_SoftShadowsSupported: 1
m_SoftShadowsSupported: 0
m_ConservativeEnclosingSphere: 1
m_NumIterationsEnclosingSphere: 64
m_SoftShadowQuality: 3
m_SoftShadowQuality: 1
m_AdditionalLightsCookieResolution: 1024
m_AdditionalLightsCookieFormat: 2
m_UseSRPBatcher: 1
m_SupportsDynamicBatching: 0
m_MixedLightingSupported: 1
m_SupportsLightCookies: 1
m_SupportsLightLayers: 1
m_SupportsLightCookies: 0
m_SupportsLightLayers: 0
m_DebugLevel: 0
m_StoreActionsOptimization: 0
m_UseAdaptivePerformance: 1
Expand All @@ -90,7 +90,7 @@ MonoBehaviour:
m_LocalShadowsAtlasResolution: 256
m_MaxPixelLights: 0
m_ShadowAtlasResolution: 256
m_VolumeFrameworkUpdateMode: 0
m_VolumeFrameworkUpdateMode: 1
m_VolumeProfile: {fileID: 11400000, guid: fe38da480e5432d4096cdaf1f3e9fdc1, type: 2}
apvScenesData:
obsoleteSceneBounds:
Expand All @@ -100,10 +100,10 @@ MonoBehaviour:
m_Keys: []
m_Values:
m_PrefilteringModeMainLightShadows: 3
m_PrefilteringModeAdditionalLight: 0
m_PrefilteringModeAdditionalLightShadows: 2
m_PrefilteringModeAdditionalLight: 2
m_PrefilteringModeAdditionalLightShadows: 0
m_PrefilterXRKeywords: 0
m_PrefilteringModeForwardPlus: 2
m_PrefilteringModeForwardPlus: 0
m_PrefilteringModeDeferredRendering: 0
m_PrefilteringModeScreenSpaceOcclusion: 0
m_PrefilterDebugKeywords: 1
Expand All @@ -124,8 +124,8 @@ MonoBehaviour:
m_PrefilterDBufferMRT3: 1
m_PrefilterSoftShadowsQualityLow: 1
m_PrefilterSoftShadowsQualityMedium: 1
m_PrefilterSoftShadowsQualityHigh: 0
m_PrefilterSoftShadows: 1
m_PrefilterSoftShadowsQualityHigh: 1
m_PrefilterSoftShadows: 0
m_PrefilterScreenCoord: 1
m_PrefilterNativeRenderPass: 1
m_PrefilterUseLegacyLightmaps: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ MonoBehaviour:
failOperation: 0
zFailOperation: 0
m_ShadowTransparentReceive: 0
m_RenderingMode: 2
m_RenderingMode: 0
m_DepthPrimingMode: 1
m_CopyDepthMode: 0
m_DepthAttachmentFormat: 0
m_DepthTextureFormat: 0
m_DepthAttachmentFormat: 90
m_DepthTextureFormat: 90
m_AccurateGbufferNormals: 0
m_IntermediateTextureMode: 0
--- !u!114 &7891264069566464977
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,25 @@ MonoBehaviour:
- rid: 2858994164428701698
- rid: 2858994164428701699
- rid: 2858994164428701700
- rid: 3153963562537582962
- rid: 3153963565282754662
- rid: 2858994164428701702
- rid: 2858994164428701703
- rid: 3153963562537582963
- rid: 3153963562537582964
- rid: 3153963565282754663
- rid: 3153963565282754664
- rid: 2858994164428701706
- rid: 3153963562537582965
- rid: 3153963565282754665
- rid: 2858994164428701708
- rid: 3153963444920385929
- rid: 3153963562537582966
- rid: 3153963562537582967
- rid: 3153963562537582938
- rid: 3153963562537582968
- rid: 3153963562537582969
- rid: 3153963562537582941
- rid: 3153963565282754666
- rid: 3153963565282754667
- rid: 3153963565282754668
- rid: 3153963565282754669
- rid: 3153963565282754670
- rid: 3153963565282754671
- rid: 2858994164428701716
- rid: 2858994164428701717
- rid: 2858994164428701718
- rid: 3153963562537582970
- rid: 3153963565282754672
m_RuntimeSettings:
m_List:
- rid: 2858994164428701698
Expand All @@ -64,9 +64,8 @@ MonoBehaviour:
- rid: 2858994164428701703
- rid: 2858994164428701706
- rid: 2858994164428701708
- rid: 3153963444920385929
- rid: 3153963562537582938
- rid: 3153963562537582941
- rid: 3153963565282754668
- rid: 3153963565282754671
- rid: 2858994164428701716
- rid: 2858994164428701717
- rid: 2858994164428701718
Expand Down Expand Up @@ -173,19 +172,7 @@ MonoBehaviour:
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: 3153963562537582938
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 1
- rid: 3153963562537582941
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: 3153963562537582962
- rid: 3153963565282754662
type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_Version: 0
Expand All @@ -200,14 +187,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: 3153963562537582963
- rid: 3153963565282754663
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: 3153963562537582964
- rid: 3153963565282754664
type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
Expand All @@ -216,7 +203,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: 3153963562537582965
- rid: 3153963565282754665
type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
Expand All @@ -228,13 +215,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: 3153963562537582966
- rid: 3153963565282754666
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: 3153963562537582967
- rid: 3153963565282754667
type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
Expand All @@ -247,7 +234,12 @@ MonoBehaviour:
skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3}
renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3}
- rid: 3153963562537582968
- rid: 3153963565282754668
type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
m_ProbeVolumeDisableStreamingAssets: 1
- rid: 3153963565282754669
type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_Version: 1
Expand All @@ -257,14 +249,21 @@ MonoBehaviour:
probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3}
probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3}
numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3}
- rid: 3153963562537582969
- rid: 3153963565282754670
type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime}
data:
m_version: 0
m_IncludeReferencedInScenes: 0
m_IncludeAssetsByLabel: 0
m_LabelToInclude:
- rid: 3153963562537582970
- rid: 3153963565282754671
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: 3153963565282754672
type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime}
data:
m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2}
1 change: 1 addition & 0 deletions Basis/Assets/Resources/PerformanceTestRunInfo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"GraphicsJobs","GpuSkinning":true,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"IL2CPP","AndroidTargetSdkVersion":"AndroidApiLevel32","AndroidBuildSystem":"Gradle","BuildTarget":"Android","StereoRenderingPath":"Instancing"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.0.41f1","Branch":"6000.0/staging","Changeset":"46e447368a18","Date":1740465182},"Dependencies":["[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]","[email protected]"],"Results":[]}
7 changes: 7 additions & 0 deletions Basis/Assets/Resources/PerformanceTestRunInfo.json.meta

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

1 change: 1 addition & 0 deletions Basis/Assets/Resources/PerformanceTestRunSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"MeasurementCount":-1}
7 changes: 7 additions & 0 deletions Basis/Assets/Resources/PerformanceTestRunSettings.json.meta

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

Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public void Compute(double TimeAsDouble)
{
TargetVectors[0] = Last.Position; // Target position at index 0
OuputVectors[0] = First.Position; // Position at index 0
Vector3 Scale = Player.BasisAvatar.Animator.transform.localScale;
Vector3 Scale = GetScale();
OuputVectors[1] = Scale; // Scale at index 1
TargetVectors[1] = Scale; // Target scale at index 1
}
Expand Down Expand Up @@ -124,6 +124,22 @@ public void Compute(double TimeAsDouble)
}
}
}
public Vector3 GetScale()
{
if (Player != null && Player.BasisAvatar != null && Player.BasisAvatar.Animator != null)
{
Vector3 Scale = Player.BasisAvatar.Animator.transform.localScale;
if(Scale != Vector3.zero)
{
return Scale;
}
else { return Vector3.one; }
}
else
{
return Vector3.one;
}
}
public JobHandle EuroFilterHandle;
public Vector3 PositionOffset;
public void Apply(double TimeAsDouble, float DeltaTime)
Expand Down
2 changes: 2 additions & 0 deletions Basis/ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ PlayerSettings:
- {fileID: 11400000, guid: cf469a9a31a25dc449c2537cb0b17ad6, type: 2}
- {fileID: -944628639613478452, guid: 5e4c3601c6a155f43af19da3bdd35a64, type: 3}
- {fileID: 11400000, guid: cbf2a9bc3df50124e9ab11af8774a1ce, type: 2}
- {fileID: -75955278653016334, guid: ad3dbbd57db07a1488d166f19ed6e7dc, type: 2}
- {fileID: 8430700007858905976, guid: 1d5aae00e097ba9419be9ec26ccae856, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
Expand Down
2 changes: 1 addition & 1 deletion Basis/ProjectSettings/QualitySettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ QualitySettings:
adaptiveVsyncExtraB: 0
lodBias: 2
maximumLODLevel: 0
enableLODCrossFade: 1
enableLODCrossFade: 0
streamingMipmapsActive: 1
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 24142
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ Please help shape the future of Basis and leave your mark on its foundation.

## Installation

This project is currently using Unity 6 (6000.0.33f1)
This project is currently using Unity 6 (6000.0.41f1)
Other Unity versions may work but will require changes and adaptations.
Currently, only OPENXR and SteamVR are supported.
Currently, OPENXR and SteamVR are supported as well as OPENXR Quest.

1. Make sure you have the correct Unity version installed.
2. Clone the repository
Expand Down Expand Up @@ -76,7 +76,8 @@ This would not be possible without the following:
- [OdinSerializer](https://github.com/TeamSirenix/odin-serializer)
- [ULipSync](https://github.com/hecomi/uLipSync)
- [UnityJigglePhysics](https://github.com/naelstrof/UnityJigglePhysics)
- [UnityOpus](https://github.com/TyounanMOTI/UnityOpus)
- [opussharp](https://github.com/AvionBlock/OpusSharp)
- [opus](https://github.com/xiph/opus)
- [Settings Manager](https://assetstore.unity.com/packages/tools/gui/settings-manager-158458)
- [Steam Audio](https://github.com/ValveSoftware/steam-audio)
- [Kevin Iglesias Animations](https://www.keviniglesias.com/)
Expand Down
Loading