Skip to content

Commit 70cffb1

Browse files
author
lawwong
committed
Add Oculus VR 1.35 compatibility
1 parent 9874098 commit 70cffb1

2 files changed

Lines changed: 20 additions & 0 deletions

File tree

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/OculusVRExtension/VIUOvrAvatar.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,23 @@ public void GetReady()
208208

209209
OvrAvatarSDKManager.Instance.RequestAvatarSpecification(avatarSpecRequest);
210210
OvrAvatarSDKManager.Instance.AddLoadingAvatar(ovrAvatar.GetInstanceID());
211+
#elif VIU_OCULUSVR_1_35_0_OR_NEWER
212+
ovrAvatar.SurfaceShader = Shader.Find("OvrAvatar/AvatarSurfaceShader");
213+
ovrAvatar.SurfaceShaderSelfOccluding = Shader.Find("OvrAvatar/AvatarSurfaceShaderSelfOccluding");
214+
ovrAvatar.SurfaceShaderPBS = Shader.Find("OvrAvatar/AvatarSurfaceShaderPBS");
215+
ovrAvatar.SurfaceShaderPBSV2Single = Shader.Find("OvrAvatar/Avatar_Mobile_SingleComponent");
216+
ovrAvatar.SurfaceShaderPBSV2Combined = Shader.Find("OvrAvatar/Avatar_Mobile_CombinedMesh");
217+
ovrAvatar.SurfaceShaderPBSV2Simple = Shader.Find("OvrAvatar/Avatar_PC_SingleComponent");
218+
ovrAvatar.SurfaceShaderPBSV2Loading = Shader.Find("OvrAvatar/Avatar_Mobile_Loader");
219+
220+
OvrAvatarSDKManager.Instance.RequestAvatarSpecification(
221+
0ul,
222+
AvatarSpecificationCallback,
223+
CombineMeshes,
224+
LevelOfDetail,
225+
ForceMobileTextureFormat,
226+
ovrAvatarLookAndFeelVersion.Two,
227+
ovrAvatarLookAndFeelVersion.One);
211228
#else
212229
ovrAvatar.SurfaceShader = Shader.Find("OvrAvatar/AvatarSurfaceShader");
213230
ovrAvatar.SurfaceShaderSelfOccluding = Shader.Find("OvrAvatar/AvatarSurfaceShaderSelfOccluding");

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Misc/OculusVRExtension/VIUOvrAvatarComponent.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,9 @@ private OvrAvatarRenderComponent AddAvatarRenderComp(GameObject go, ovrAvatarRen
290290
return null;
291291
}
292292
}
293+
#else
294+
public VIUOvrAvatar Owner { get; set; }
295+
public bool IsLeft { get; set; }
293296
#endif
294297
}
295298
}

0 commit comments

Comments
 (0)