WIP - Use Input Profiles

Author: De-Panther

MainProject/Assets/WebXR/Samples/ShaderVariants.meta

@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!200 &20000000
+ShaderVariantCollection:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: GLTFShaderVariants
+  m_Shaders:
+  - first: {fileID: 4800000, guid: 99fa998bbbed3408aafa652b466d261d, type: 3}
+    second:
+      variants:
+      - keywords: BILLBOARD_FACE_CAMERA_POS DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN
+          SHADOWS_SOFT SHADOWS_SPLIT_SPHERES SOFTPARTICLES_ON UNITY_HDR_ON _METALLICGLOSSMAP
+        passType: 4
+      - keywords: 
+        passType: 8
+      - keywords: _METALLICGLOSSMAP
+        passType: 8
+      - keywords: SHADOWS_DEPTH _METALLICGLOSSMAP
+        passType: 8

MainProject/Assets/WebXR/Samples/ShaderVariants/GLTFShaderVariants.shadervariants

@@ -38,7 +38,8 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
-  m_PreloadedShaders: []
+  m_PreloadedShaders:
+  - {fileID: 20000000, guid: 14ec05db04ad028438150751d08d01df, type: 2}
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}
   m_CustomRenderPipeline: {fileID: 0}

MainProject/Assets/WebXR/Samples/ShaderVariants/GLTFShaderVariants.shadervariants.meta

@@ -1,5 +1,8 @@
 using UnityEngine;
 using System.Collections.Generic;
+#if WEBXR_INPUT_PROFILES
+using WebXRInputProfile;
+#endif
 
 namespace WebXR.Interactions
 {
@@ -16,12 +19,45 @@ public class ControllerInteraction : MonoBehaviour
 
     public Transform handJointPrefab;
 
+    public GameObject inputProfileObject;
+    public GameObject inputProfileModelParent;
+
     private GameObject[] handJointsVisuals = new GameObject[25];
     private Dictionary<int, Transform> handJoints = new Dictionary<int, Transform>();
 
+#if WEBXR_INPUT_PROFILES
+    private InputProfileLoader inputProfileLoader;
+    private InputProfileModel inputProfileModel;
+    private bool hasProfileList = false;
+    private bool loadedModel = false;
+    private string loadedProfile = null;
+#endif
+
     void Awake()
     {
       attachJoint = GetComponent<FixedJoint>();
+      anim = gameObject.GetComponent<Animator>();
+      controller = gameObject.GetComponent<WebXRController>();
+#if WEBXR_INPUT_PROFILES
+      Debug.LogError("WEBXR_INPUT_PROFILES");
+      if (inputProfileObject != null)
+      {
+        inputProfileLoader = inputProfileObject.GetComponent<InputProfileLoader>();
+        if (inputProfileLoader == null)
+        {
+          inputProfileLoader = inputProfileObject.AddComponent<InputProfileLoader>();
+        }
+        if (InputProfileLoader.ProfilesPaths == null || InputProfileLoader.ProfilesPaths.Count == 0)
+        {
+
+          inputProfileLoader.LoadProfilesList(HandleProfilesList);
+        }
+        else
+        {
+          HandleProfilesList(InputProfileLoader.ProfilesPaths);
+        }
+      }
+#endif
     }
 
     void OnEnable()
@@ -38,12 +74,6 @@ void OnDisabled()
       controller.OnHandUpdate -= OnHandUpdate;
     }
 
-    void Start()
-    {
-      anim = gameObject.GetComponent<Animator>();
-      controller = gameObject.GetComponent<WebXRController>();
-    }
-
     void Update()
     {
       controller.TryUpdateButtons();
@@ -67,6 +97,14 @@ void Update()
         Drop();
       }
 
+#if WEBXR_INPUT_PROFILES
+      if (loadedModel)
+      {
+        UpdateModelInput();
+        return;
+      }
+#endif
+
       // Use the controller button or axis position to manipulate the playback time for hand model.
       anim.Play("Take", -1, normalizedTime);
     }
@@ -90,6 +128,23 @@ void OnTriggerExit(Collider other)
 
     void SetControllerVisible(bool visible)
     {
+#if WEBXR_INPUT_PROFILES
+      loadedModel = false;
+      if (visible)
+      {
+        inputProfileModelParent.SetActive(true);
+        if (inputProfileModel != null)
+        {
+          loadedModel = true;
+          return;
+        }
+        LoadInputProfile();
+      }
+      else
+      {
+        inputProfileModelParent.SetActive(false);
+      }
+#endif
       foreach (var visual in controllerVisuals)
       {
         visual.SetActive(visible);
@@ -138,6 +193,92 @@ private void OnHandUpdate(WebXRHandData handData)
       }
     }
 
+#if WEBXR_INPUT_PROFILES
+    void HandleProfilesList(Dictionary<string, string> profilesList)
+    {
+      if (profilesList == null || profilesList.Count == 0)
+      {
+        return;
+      }
+      hasProfileList = true;
+    }
+
+    void LoadInputProfile()
+    {
+      var profiles = controller.GetProfiles();
+      Debug.LogError($"LoadInputProfile {hasProfileList} {profiles != null}");
+      if (hasProfileList && profiles != null && profiles.Length > 0)
+      {
+        for (int i = 0; i < profiles.Length; i++)
+        {
+          Debug.LogError(profiles[i]);
+        }
+        loadedProfile = profiles[0];
+        inputProfileLoader.LoadProfile(profiles, OnProfileLoaded);
+      }
+    }
+
+    private void OnProfileLoaded(bool success)
+    {
+      if (success)
+      {
+        LoadInputModel();
+      }
+    }
+
+    void LoadInputModel()
+    {
+      inputProfileModel = inputProfileLoader.LoadModelForHand(loadedProfile, (InputProfileLoader.Handedness)controller.hand, HandleModelLoaded);
+      if (inputProfileModel != null)
+      {
+        var inputProfileModelTransform = inputProfileModel.transform;
+        inputProfileModelTransform.SetParent(inputProfileModelParent.transform);
+        inputProfileModelTransform.localPosition = Vector3.zero;
+        inputProfileModelTransform.rotation = Quaternion.identity;
+        inputProfileModelTransform.localScale = Vector3.one;
+        UpdateModelInput();
+      }
+    }
+
+    void HandleModelLoaded(bool success)
+    {
+      loadedModel = success;
+      if (loadedModel)
+      {
+        foreach (var visual in controllerVisuals)
+        {
+          visual.SetActive(false);
+        }
+      }
+      else
+      {
+        Destroy(inputProfileModel.gameObject);
+      }
+    }
+
+    void UpdateModelInput()
+    {
+      for (int i = 0; i < 6; i++)
+      {
+        SetButtonValue(i);
+      }
+      for (int i = 0; i < 4; i++)
+      {
+        SetAxisValue(i);
+      }
+    }
+
+    void SetButtonValue(int index)
+    {
+      inputProfileModel.SetButtonValue(index, controller.GetButtonIndexValue(index));
+    }
+
+    public void SetAxisValue(int index)
+    {
+      inputProfileModel.SetAxisValue(index, controller.GetAxisIndexValue(index));
+    }
+#endif
+
     public void Pickup()
     {
       currentRigidBody = GetNearestRigidBody();

MainProject/ProjectSettings/GraphicsSettings.asset

@@ -1,7 +1,8 @@
 {
     "name": "WebXR.Samples.Scripts",
     "references": [
-        "GUID:fd4abe4ffe74ef1448afe15c6cb36bb7"
+        "GUID:fd4abe4ffe74ef1448afe15c6cb36bb7",
+        "GUID:84a2d09f0bb073f40922f5ea5362abe7"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
@@ -13,7 +14,7 @@
     "versionDefines": [
         {
             "name": "com.de-panther.webxr-input-profiles-loader",
-            "expression": "0.2.0",
+            "expression": "[0.2.0]",
             "define": "WEBXR_INPUT_PROFILES"
         }
     ],

Packages/webxr-interactions/Runtime/Scripts/ControllerInteraction.cs

@@ -1295,6 +1295,7 @@ Transform:
   m_Children:
   - {fileID: 4603535410349480}
   - {fileID: 4925627231713262}
+  - {fileID: 1218315907877956796}
   m_Father: {fileID: 4545079059221816}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1393,6 +1394,8 @@ MonoBehaviour:
   - {fileID: 1664295426898042}
   handJointPrefab: {fileID: 8513787482403080262, guid: 67541c9d1fd5e2c4798986ee73c07923,
     type: 3}
+  inputProfileObject: {fileID: 1611361787474004}
+  inputProfileModelParent: {fileID: 1469228564561163144}
 --- !u!114 &7185579886917944061
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1785,6 +1788,7 @@ Transform:
   m_Children:
   - {fileID: 4817586320957540}
   - {fileID: 4974700127051642}
+  - {fileID: 3819867499605581648}
   m_Father: {fileID: 4545079059221816}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1883,6 +1887,8 @@ MonoBehaviour:
   - {fileID: 1091283458777958}
   handJointPrefab: {fileID: 8513787482403080262, guid: 67541c9d1fd5e2c4798986ee73c07923,
     type: 3}
+  inputProfileObject: {fileID: 1611361787474004}
+  inputProfileModelParent: {fileID: 599836867309221058}
 --- !u!114 &1966769163579045322
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1901,6 +1907,66 @@ MonoBehaviour:
   m_TrackingType: 0
   m_UpdateType: 0
   m_UseRelativeTransform: 0
+--- !u!1 &599836867309221058
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3819867499605581648}
+  m_Layer: 0
+  m_Name: InputModel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3819867499605581648
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 599836867309221058}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4446684710817404}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1469228564561163144
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1218315907877956796}
+  m_Layer: 0
+  m_Name: InputModel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1218315907877956796
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1469228564561163144}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4427160273819458}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3250837035476248814
 GameObject:
   m_ObjectHideFlags: 0