InnoLab/VIVE-OpenXR-Unity
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version 2.3.0

Browse Source
This commit is contained in:
Sean Lu(呂祥榮)
2024-05-15 14:09:18 +08:00
parent 45b4e46f74
commit 7f2a459592
289 changed files with 116381 additions and 5440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
com.htc.upm.vive.openxr/Editor/CompositionLayer/Scripts/CompositionLayerEditor.cs
View File

@@ -75,6 +75,11 @@ namespace VIVE.OpenXR.CompositionLayer.Editor
static GUIContent Label_ApplyColorScaleBias = new GUIContent("Apply Color Scale Bias", "Color scale and bias are applied to a layer color during composition, after its conversion to premultiplied alpha representation. LayerColor = LayerColor * colorScale + colorBias");
SerializedProperty Property_ApplyColorScaleBias;
static string PropertyName_SolidEffect = "solidEffect";
static GUIContent Label_SolidEffect = new GUIContent("Solid Effect", "Apply UnderLay Color Scale Bias in Runtime Level.");
SerializedProperty Property_SolidEffect;
static string PropertyName_ColorScale = "colorScale";
static GUIContent Label_ColorScale = new GUIContent("Color Scale", "Will be used for modulatting the color sourced from the images.");
SerializedProperty Property_ColorScale;
@@ -114,6 +119,7 @@ namespace VIVE.OpenXR.CompositionLayer.Editor
if (Property_AngleOfArc == null) Property_AngleOfArc = serializedObject.FindProperty(PropertyName_AngleOfArc);
if (Property_IsDynamicLayer == null) Property_IsDynamicLayer = serializedObject.FindProperty(PropertyName_IsDynamicLayer);
if (Property_ApplyColorScaleBias == null) Property_ApplyColorScaleBias = serializedObject.FindProperty(PropertyName_ApplyColorScaleBias);
if (Property_SolidEffect == null) Property_SolidEffect = serializedObject.FindProperty(PropertyName_SolidEffect);
if (Property_ColorScale == null) Property_ColorScale = serializedObject.FindProperty(PropertyName_ColorScale);
if (Property_ColorBias == null) Property_ColorBias = serializedObject.FindProperty(PropertyName_ColorBias);
if (Property_IsProtectedSurface == null) Property_IsProtectedSurface = serializedObject.FindProperty(PropertyName_IsProtectedSurface);
@@ -441,6 +447,11 @@ namespace VIVE.OpenXR.CompositionLayer.Editor
}
EditorGUI.indentLevel++;
if (targetCompositionLayer.layerType == CompositionLayer.LayerType.Underlay)
{
EditorGUILayout.PropertyField(Property_SolidEffect, Label_SolidEffect);
serializedObject.ApplyModifiedProperties();
}
showColorScaleBiasParams = EditorGUILayout.Foldout(showColorScaleBiasParams, "Color Scale Bias Parameters");
if (showColorScaleBiasParams)
{

26
com.htc.upm.vive.openxr/Editor/VIVEFocus3FeatureSet.cs
View File

@@ -7,24 +7,26 @@ using UnityEditor.XR.OpenXR.Features;
namespace VIVE.OpenXR
{
[OpenXRFeatureSet(
FeatureIds = new string[] {
FeatureIds = new string[] {
VIVEFocus3Feature.featureId,
VIVEFocus3Profile.featureId,
Hand.ViveHandTracking.featureId,
"vive.vive.openxr.feature.compositionlayer",
"vive.vive.openxr.feature.compositionlayer.cylinder",
"vive.vive.openxr.feature.compositionlayer.colorscalebias",
"vive.openxr.feature.compositionlayer",
"vive.openxr.feature.compositionlayer.cylinder",
"vive.openxr.feature.compositionlayer.colorscalebias",
Tracker.ViveWristTracker.featureId,
Hand.ViveHandInteraction.featureId,
"vive.vive.openxr.feature.foveation",
"vive.openxr.feature.foveation",
FacialTracking.ViveFacialTracking.featureId,
},
UiName = "VIVE XR Support",
Description = "Necessary to deploy an VIVE XR compatible app.",
FeatureSetId = "com.htc.vive.openxr.featureset.vivexr",
DefaultFeatureIds = new string[] { VIVEFocus3Feature.featureId, VIVEFocus3Profile.featureId, },
SupportedBuildTargets = new BuildTargetGroup[] { BuildTargetGroup.Android }
)]
PlaneDetection.VivePlaneDetection.featureId,
Anchor.ViveAnchor.featureId,
},
UiName = "VIVE XR Support",
Description = "Necessary to deploy an VIVE XR compatible app.",
FeatureSetId = "com.htc.vive.openxr.featureset.vivexr",
DefaultFeatureIds = new string[] { VIVEFocus3Feature.featureId, VIVEFocus3Profile.featureId, },
SupportedBuildTargets = new BuildTargetGroup[] { BuildTargetGroup.Android }
)]
sealed class VIVEFocus3FeatureSet { }
}
#endif