Skip to content

Commit 0d04400

Browse files
author
lawwong
committed
Add Oculus VR 1.36 compatibility
1 parent 70cffb1 commit 0d04400

2 files changed

Lines changed: 44 additions & 0 deletions

File tree

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

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

209209
OvrAvatarSDKManager.Instance.RequestAvatarSpecification(avatarSpecRequest);
210210
OvrAvatarSDKManager.Instance.AddLoadingAvatar(ovrAvatar.GetInstanceID());
211+
#elif VIU_OCULUSVR_1_36_0_OR_NEWER
212+
ovrAvatar.Monochrome_SurfaceShader = Shader.Find("OvrAvatar/AvatarSurfaceShader");
213+
ovrAvatar.Monochrome_SurfaceShader_SelfOccluding = Shader.Find("OvrAvatar/AvatarSurfaceShaderSelfOccluding");
214+
ovrAvatar.Monochrome_SurfaceShader_PBS = Shader.Find("OvrAvatar/AvatarSurfaceShaderPBS");
215+
ovrAvatar.Skinshaded_SurfaceShader_SingleComponent = Shader.Find("OvrAvatar/Avatar_PC_SingleComponent");
216+
ovrAvatar.Skinshaded_VertFrag_SingleComponent = Shader.Find("OvrAvatar/Avatar_Mobile_SingleComponent");
217+
ovrAvatar.Skinshaded_VertFrag_CombinedMesh = Shader.Find("OvrAvatar/Avatar_Mobile_CombinedMesh");
218+
ovrAvatar.Skinshaded_Expressive_SurfaceShader_SingleComponent = Shader.Find("OvrAvatar/Avatar_PC_SingleComponentExpressive");
219+
ovrAvatar.Skinshaded_Expressive_VertFrag_SingleComponent = Shader.Find("OvrAvatar/Avatar_Mobile_SingleComponentExpressive");
220+
ovrAvatar.Skinshaded_Expressive_VertFrag_CombinedMesh = Shader.Find("OvrAvatar/Avatar_Mobile_CombinedMeshExpressive");
221+
ovrAvatar.Loader_VertFrag_CombinedMesh = Shader.Find("OvrAvatar/Avatar_Mobile_Loader");
222+
ovrAvatar.EyeLens = Shader.Find("OvrAvatar/Avatar_EyeLens");
223+
224+
OvrAvatarSDKManager.Instance.RequestAvatarSpecification(
225+
0ul,
226+
AvatarSpecificationCallback,
227+
CombineMeshes,
228+
LevelOfDetail,
229+
ForceMobileTextureFormat,
230+
ovrAvatarLookAndFeelVersion.Two,
231+
ovrAvatarLookAndFeelVersion.One,
232+
false);
211233
#elif VIU_OCULUSVR_1_35_0_OR_NEWER
212234
ovrAvatar.SurfaceShader = Shader.Find("OvrAvatar/AvatarSurfaceShader");
213235
ovrAvatar.SurfaceShaderSelfOccluding = Shader.Find("OvrAvatar/AvatarSurfaceShaderSelfOccluding");

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,28 @@ private OvrAvatarRenderComponent AddAvatarRenderComp(GameObject go, ovrAvatarRen
260260
});
261261
return renderer;
262262
}
263+
#elif VIU_OCULUSVR_1_36_0_OR_NEWER
264+
case ovrAvatarRenderPartType.SkinnedMeshRender:
265+
{
266+
var rendererData = CAPI.ovrAvatarRenderPart_GetSkinnedMeshRender(renderPart);
267+
var renderer = go.AddComponent<OvrAvatarSkinnedMeshRenderComponent>();
268+
renderer.Initialize(rendererData, null, null, 0, 0, ctrlComp.RenderParts.Count);
269+
return renderer;
270+
}
271+
case ovrAvatarRenderPartType.SkinnedMeshRenderPBS:
272+
{
273+
var rendererData = CAPI.ovrAvatarRenderPart_GetSkinnedMeshRenderPBS(renderPart);
274+
var renderer = go.AddComponent<OvrAvatarSkinnedMeshRenderPBSComponent>();
275+
renderer.Initialize(rendererData, null, 0, 0, ctrlComp.RenderParts.Count);
276+
return renderer;
277+
}
278+
case ovrAvatarRenderPartType.SkinnedMeshRenderPBS_V2:
279+
{
280+
var rendererData = CAPI.ovrAvatarRenderPart_GetSkinnedMeshRenderPBSV2(renderPart);
281+
var renderer = go.AddComponent<OvrAvatarSkinnedMeshPBSV2RenderComponent>();
282+
renderer.Initialize(renderPart, rendererData, owner.ovrMaterialManager, 0, 0, ctrlComp.RenderParts.Count, false, owner.LevelOfDetail, false, owner.ovrAvatar);
283+
return renderer;
284+
}
263285
#else
264286
case ovrAvatarRenderPartType.SkinnedMeshRender:
265287
{

0 commit comments

Comments
 (0)