Skip to content

Commit

Permalink
version 6.0.0-r.14
Browse files Browse the repository at this point in the history
  • Loading branch information
srl87 committed Apr 25, 2024
1 parent 8edec13 commit dd738b6
Show file tree
Hide file tree
Showing 101 changed files with 5,358 additions and 1,246 deletions.
302 changes: 280 additions & 22 deletions com.htc.upm.wave.essence/Editor/EssenceSettingsProvider.cs

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions com.htc.upm.wave.essence/Editor/PackageEssenceAsset.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public class PackageEssenceAsset : ScriptableObject
public bool importedInteractionModePackage = false;
public bool importedTrackerModelPackage = false;
public bool importedBodyTrackingPackage = false;
public bool importedFacialExpressionMakerPackage = false;
}
}
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,19 @@ public static void AddTrackerManager()
}

SerializedProperty m_InitialStartTracker/*, m_UseXRDevice*/;
SerializedProperty m_OnSwipeToRight;
SerializedProperty m_OnSwipeToLeft;
SerializedProperty m_OnSwipeToUp;
SerializedProperty m_OnSwipeToDown;
bool swipeEvent = false;
private void OnEnable()
{
//m_UseXRDevice = serializedObject.FindProperty("m_UseXRDevice");
m_InitialStartTracker = serializedObject.FindProperty("m_InitialStartTracker");
m_OnSwipeToRight = serializedObject.FindProperty("m_OnSwipeToRight");
m_OnSwipeToLeft = serializedObject.FindProperty("m_OnSwipeToLeft");
m_OnSwipeToUp = serializedObject.FindProperty("m_OnSwipeToUp");
m_OnSwipeToDown = serializedObject.FindProperty("m_OnSwipeToDown");
}

public override void OnInspectorGUI()
Expand All @@ -52,6 +61,20 @@ public override void OnInspectorGUI()
MessageType.Info);
EditorGUILayout.PropertyField(m_InitialStartTracker);

swipeEvent = EditorGUILayout.Foldout(swipeEvent, "Swipe Event");
if (swipeEvent)
{
GUILayout.Space(5);
EditorGUILayout.HelpBox(
"When received value 0, it means TrackId 0.",
MessageType.Info);
GUILayout.Space(5);
EditorGUILayout.PropertyField(m_OnSwipeToRight);
EditorGUILayout.PropertyField(m_OnSwipeToLeft);
EditorGUILayout.PropertyField(m_OnSwipeToUp);
EditorGUILayout.PropertyField(m_OnSwipeToDown);
}

/*GUILayout.Space(5);
EditorGUILayout.HelpBox(
"Retrieve the Tracker data from UnityEngine.XR.InputDevice.",
Expand Down
7 changes: 6 additions & 1 deletion com.htc.upm.wave.essence/Runtime/Scripts/Definitions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,16 @@ public class XR_Feature
public static readonly InputFeatureUsage<bool> secondaryTouch = CommonUsages.secondaryTouch;
// A binary value representing the Grip press state.
public static readonly InputFeatureUsage<bool> gripButton = CommonUsages.gripButton;
// A binary value representing the Grip touch state.
public static readonly InputFeatureUsage<bool> gripTouch = new InputFeatureUsage<bool>("GripTouch");
// A binary value representing the Trigger press state.
public static readonly InputFeatureUsage<bool> triggerButton = CommonUsages.triggerButton;
// A binary value representing the Trigger touch state.
public static readonly InputFeatureUsage<bool> triggerTouch = new InputFeatureUsage<bool>("TriggerTouch");
// A binary value representing the Menu press state.
public static readonly InputFeatureUsage<bool> menuButton = CommonUsages.menuButton;
// A binary value representing the Menu touch state.
public static readonly InputFeatureUsage<bool> menuTouch = new InputFeatureUsage<bool>("MenuTouch");
// A binary value representing the Touchpad or Thumbstick press state.
public static readonly InputFeatureUsage<bool> primary2DAxisClick = CommonUsages.primary2DAxisClick;
// A binary value representing the Touchpad or Thumbstick touch state.
Expand All @@ -58,7 +64,6 @@ public class XR_Feature
// A binary value representing the Thumbstick touch state.
public static readonly InputFeatureUsage<bool> secondary2DAxisTouch = CommonUsages.secondary2DAxisTouch;

public static readonly InputFeatureUsage<bool> triggerTouch = new InputFeatureUsage<bool>("TriggerTouch");
// A float value representing the Trigger axis.
public static readonly InputFeatureUsage<float> trigger = CommonUsages.trigger;
// A float value representing the Grip axis.
Expand Down
Loading

0 comments on commit dd738b6

Please sign in to comment.