Skip to content

CompositionLayerPassthroughAPI: return false on non-Android/Standalone #36

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.

Sign up for GitHub

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

Open
aaronaccessvr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CompositionLayerPassthroughAPI: return false on non-Android/Standalone #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 27 additions & 0 deletions com.htc.upm.vive.openxr/Runtime/CompositionLayer/Scripts/CompositionLayerPassthroughAPI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,9 @@ public static bool DestroyPassthrough(int passthroughID)
#endif
#if UNITY_ANDROID
return passthroughFeature.HTCPassthrough_DestroyPassthrough(passthroughID);
#endif
#if !UNITY_ANDROID && !UNITY_STANDALONE
return false;
#endif
}

Expand Down Expand Up @@ -473,6 +476,9 @@ public static bool SetPassthroughAlpha(int passthroughID, float alpha, bool auto
}
else
return false;
#endif
#if !UNITY_ANDROID && !UNITY_STANDALONE
return false;
#endif
}

Expand Down Expand Up @@ -544,6 +550,9 @@ public static bool SetProjectedPassthroughMesh(int passthroughID, [In, Out] Vect
//Note: Ignore Clock-Wise definition of index buffer for now as passthrough extension does not have back-face culling
#if UNITY_ANDROID
return passthroughFeature.HTCPassthrough_SetMesh(passthroughID, (uint)vertexBuffer.Length, vertexBufferXrVector, (uint)indexBuffer.Length, indexBufferUint); ;
#endif
#if !UNITY_ANDROID && !UNITY_STANDALONE
return false;
#endif
}

Expand Down Expand Up @@ -622,6 +631,9 @@ public static bool SetProjectedPassthroughMeshTransform(int passthroughID, Proje
#endif
#if UNITY_ANDROID
return passthroughFeature.HTCPassthrough_SetMeshTransform(passthroughID, passthroughFeature.GetXrSpaceFromSpaceType(spaceType), meshXrPose, meshXrScale);
#endif
#if !UNITY_ANDROID && !UNITY_STANDALONE
return false;
#endif
}

Expand Down Expand Up @@ -662,6 +674,9 @@ public static bool SetPassthroughLayerType(int passthroughID, LayerType layerTyp
return passthroughFeature.HTCPassthrough_SetLayerType(passthroughID, layerType, compositionDepth);
#endif

#if !UNITY_ANDROID && !UNITY_STANDALONE
return false;
#endif
}

/// <summary>
Expand Down Expand Up @@ -701,6 +716,9 @@ public static bool SetProjectedPassthroughSpaceType(int passthroughID, Projected
#endif
#if UNITY_ANDROID
return passthroughFeature.HTCPassthrough_SetMeshTransformSpace(passthroughID, passthroughFeature.GetXrSpaceFromSpaceType(spaceType));
#endif
#if !UNITY_ANDROID && !UNITY_STANDALONE
return false;
#endif
}

Expand Down Expand Up @@ -763,6 +781,9 @@ public static bool SetProjectedPassthroughMeshPosition(int passthroughID, Vector
#endif
#if UNITY_ANDROID
return passthroughFeature.HTCPassthrough_SetMeshTransformPosition(passthroughID, OpenXRHelper.ToOpenXRVector(trackingSpaceMeshPosition, convertFromUnityToOpenXR));
#endif
#if !UNITY_ANDROID && !UNITY_STANDALONE
return false;
#endif
}

Expand Down Expand Up @@ -825,6 +846,9 @@ public static bool SetProjectedPassthroughMeshOrientation(int passthroughID, Qua
#endif
#if UNITY_ANDROID
return passthroughFeature.HTCPassthrough_SetMeshTransformOrientation(passthroughID, OpenXRHelper.ToOpenXRQuaternion(trackingSpaceMeshRotation, convertFromUnityToOpenXR));
#endif
#if !UNITY_ANDROID && !UNITY_STANDALONE
return false;
#endif
}

Expand Down Expand Up @@ -866,6 +890,9 @@ public static bool SetProjectedPassthroughScale(int passthroughID, Vector3 meshS

#if UNITY_ANDROID
return passthroughFeature.HTCPassthrough_SetMeshTransformScale(passthroughID, OpenXRHelper.ToOpenXRVector(meshScale, false));
#endif
#if !UNITY_ANDROID && !UNITY_STANDALONE
return false;
#endif
}

Expand Down