Update with changes from D10943

4 files changed, 193 insertions, 173 deletions

diff --git a/viewport_vr_preview/configs/default.py b/viewport_vr_preview/configs/default.py
index b17dffd3..dd24dd54 100644
--- a/viewport_vr_preview/configs/default.py
+++ b/viewport_vr_preview/configs/default.py
@@ -1,4 +1,4 @@
-actionconfig_version = (3, 0, 13)
+actionconfig_version = (3, 0, 15)
 actionconfig_data = \
 [("blender_default",
   {"items":
@@ -23,105 +23,105 @@ actionconfig_data = \
       },
      ),
     ("teleport",
-     {"type": 'BUTTON', "user_path0": '/user/hand/left', "user_path1": '', "op": 'wm.xr_navigation_teleport', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/hand/left', "user_path1": '', "op": 'wm.xr_navigation_teleport', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("interpolation", 0.9),
        ("color", (0.0, 1.0, 1.0, 1.0)),
        ],
       },     
      {"bindings":
-      [("simple", {"profile": '/interaction_profiles/khr/simple_controller', "component_path0": '/input/select/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/trigger/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/trigger/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trigger/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/trigger/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
+      [("simple", {"profile": '/interaction_profiles/khr/simple_controller', "component_path0": '/input/select/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/trigger/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/trigger/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trigger/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/trigger/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
        ],
       },
      ),
     ("nav_grab",
-     {"type": 'BUTTON', "user_path0": '/user/hand/left', "user_path1": '/user/hand/right', "op": 'wm.xr_navigation_grab', "op_flag": 'MODAL', "bimanual": 'True', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/hand/left', "user_path1": '/user/hand/right', "op": 'wm.xr_navigation_grab', "op_mode": 'MODAL', "bimanual": 'True', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("lock_rotation", True),
        ],
       },     
      {"bindings":
-      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/squeeze/value', "component_path1": '/input/squeeze/value', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/squeeze/click', "component_path1": '/input/squeeze/click', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/squeeze/click', "component_path1": '/input/squeeze/click', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/squeeze/value', "component_path1": '/input/squeeze/value', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
+      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/squeeze/value', "component_path1": '/input/squeeze/value', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/squeeze/click', "component_path1": '/input/squeeze/click', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/squeeze/click', "component_path1": '/input/squeeze/click', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/squeeze/value', "component_path1": '/input/squeeze/value', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
        ],
       },
      ),
-    ("fly", {"type": 'BUTTON', "user_path0": '/user/hand/left', "user_path1": '/user/hand/right', "op": 'wm.xr_navigation_fly', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'}, None,
+    ("fly", {"type": 'FLOAT', "user_path0": '/user/hand/left', "user_path1": '/user/hand/right', "op": 'wm.xr_navigation_fly', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'}, None,
      {"bindings":
-      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/thumbstick/click', "component_path1": '/input/thumbstick/click', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/thumbstick/click', "component_path1": '/input/thumbstick/click', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/thumbstick/click', "component_path1": '/input/thumbstick/click', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
+      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/thumbstick/click', "component_path1": '/input/thumbstick/click', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/thumbstick/click', "component_path1": '/input/thumbstick/click', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/thumbstick/click', "component_path1": '/input/thumbstick/click', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
        ],
       },
      ),
     ("fly_forward",
-     {"type": 'BUTTON', "user_path0": '/user/hand/left', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/hand/left', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("mode", 'VIEWER_FORWARD'),
        ("lock_location_z", True),
        ],
       },     
      {"bindings":
-      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
-       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
-       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
-       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
+      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
+       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
+       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
+       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
        ],
       },
      ),
     ("fly_back",
-     {"type": 'BUTTON', "user_path0": '/user/hand/left', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/hand/left', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("mode", 'VIEWER_BACK'),
        ("lock_location_z", True),
        ],
       },     
      {"bindings":
-      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
-       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
-       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
-       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
+      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
+       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
+       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
+       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
        ],
       },
      ),
     ("fly_left",
-     {"type": 'BUTTON', "user_path0": '/user/hand/left', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/hand/left', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("mode", 'VIEWER_LEFT'),
        ("lock_location_z", True),
        ],
       },     
      {"bindings":
-      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
-       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
-       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
-       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
+      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
+       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
+       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
+       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
        ],
       },
      ),
     ("fly_right",
-     {"type": 'BUTTON', "user_path0": '/user/hand/left', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/hand/left', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("mode", 'VIEWER_RIGHT'),
        ("lock_location_z", True),
        ],
       },     
      {"bindings":
-      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
-       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
-       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
-       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
+      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
+       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
+       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
+       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
        ],
       },
      ),
     ("fly_up",
-     {"type": 'BUTTON', "user_path0": '/user/hand/right', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/hand/right', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("mode", 'UP'),
        ("speed_min", 0.014),
@@ -129,15 +129,15 @@ actionconfig_data = \
        ],
       },     
      {"bindings":
-      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
-       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
-       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
-       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
+      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
+       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
+       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
+       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
        ],
       },
      ),
     ("fly_down",
-     {"type": 'BUTTON', "user_path0": '/user/hand/right', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/hand/right', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("mode", 'DOWN'),
        ("speed_min", 0.014),
@@ -145,15 +145,15 @@ actionconfig_data = \
        ],
       },     
      {"bindings":
-      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
-       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
-       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
-       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
+      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
+       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
+       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
+       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/thumbstick/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
        ],
       },
      ),
     ("fly_turnleft",
-     {"type": 'BUTTON', "user_path0": '/user/hand/right', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/hand/right', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("mode", 'TURNLEFT'),
        ("speed_min", 0.01),
@@ -161,15 +161,15 @@ actionconfig_data = \
        ],
       },     
      {"bindings":
-      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
-       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
-       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
-       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
+      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
+       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
+       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
+       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
        ],
       },
      ),
     ("fly_turnright",
-     {"type": 'BUTTON', "user_path0": '/user/hand/right', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/hand/right', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("mode", 'TURNRIGHT'),
        ("speed_min", 0.01),
@@ -177,52 +177,52 @@ actionconfig_data = \
        ],
       },     
      {"bindings":
-      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
-       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
-       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
-       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
+      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
+       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
+       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
+       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/thumbstick/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
        ],
       },
      ),
-    ("raycast_select", {"type": 'BUTTON', "user_path0": '/user/hand/right', "user_path1": '', "op": 'wm.xr_select_raycast', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'}, None,
+    ("raycast_select", {"type": 'FLOAT', "user_path0": '/user/hand/right', "user_path1": '', "op": 'wm.xr_select_raycast', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'}, None,
      {"bindings":
-      [("simple", {"profile": '/interaction_profiles/khr/simple_controller', "component_path0": '/input/select/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/trigger/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/trigger/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trigger/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/trigger/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
+      [("simple", {"profile": '/interaction_profiles/khr/simple_controller', "component_path0": '/input/select/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/trigger/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/trigger/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trigger/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/trigger/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
        ],
       },
      ),
-    ("grab", {"type": 'BUTTON', "user_path0": '/user/hand/left', "user_path1": '/user/hand/right', "op": 'wm.xr_transform_grab', "op_flag": 'MODAL', "bimanual": 'True', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'}, None,
+    ("grab", {"type": 'FLOAT', "user_path0": '/user/hand/left', "user_path1": '/user/hand/right', "op": 'wm.xr_transform_grab', "op_mode": 'MODAL', "bimanual": 'True', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'}, None,
      {"bindings":
-      [("simple", {"profile": '/interaction_profiles/khr/simple_controller', "component_path0": '/input/menu/click', "component_path1": '/input/menu/click', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/x/click', "component_path1": '/input/a/click', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/menu/click', "component_path1": '/input/menu/click', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/menu/click', "component_path1": '/input/menu/click', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/a/click', "component_path1": '/input/a/click', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
+      [("simple", {"profile": '/interaction_profiles/khr/simple_controller', "component_path0": '/input/menu/click', "component_path1": '/input/menu/click', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/x/click', "component_path1": '/input/a/click', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/menu/click', "component_path1": '/input/menu/click', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/menu/click', "component_path1": '/input/menu/click', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/a/click', "component_path1": '/input/a/click', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
        ],
       },
      ),
-    ("undo", {"type": 'BUTTON', "user_path0": '/user/hand/left', "user_path1": '', "op": 'ed.undo', "op_flag": 'PRESS', "bimanual": 'False', "haptic_name": 'haptic', "haptic_match_user_paths": 'True', "haptic_duration": '0.30000001192092896', "haptic_frequency": '3000.0', "haptic_amplitude": '0.5', "haptic_flag": 'PRESS'}, None,
+    ("undo", {"type": 'FLOAT', "user_path0": '/user/hand/left', "user_path1": '', "op": 'ed.undo', "op_mode": 'PRESS', "bimanual": 'False', "haptic_name": 'haptic', "haptic_match_user_paths": 'True', "haptic_duration": '0.30000001192092896', "haptic_frequency": '3000.0', "haptic_amplitude": '0.5', "haptic_mode": 'PRESS'}, None,
      {"bindings":
-      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/y/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/trackpad/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/b/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
+      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/y/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/trackpad/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/b/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
        ],
       },
      ),
-    ("redo", {"type": 'BUTTON', "user_path0": '/user/hand/right', "user_path1": '', "op": 'ed.redo', "op_flag": 'PRESS', "bimanual": 'False', "haptic_name": 'haptic', "haptic_match_user_paths": 'True', "haptic_duration": '0.30000001192092896', "haptic_frequency": '3000.0', "haptic_amplitude": '0.5', "haptic_flag": 'PRESS'}, None,
+    ("redo", {"type": 'FLOAT', "user_path0": '/user/hand/right', "user_path1": '', "op": 'ed.redo', "op_mode": 'PRESS', "bimanual": 'False', "haptic_name": 'haptic', "haptic_match_user_paths": 'True', "haptic_duration": '0.30000001192092896', "haptic_frequency": '3000.0', "haptic_amplitude": '0.5', "haptic_mode": 'PRESS'}, None,
      {"bindings":
-      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/b/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/trackpad/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
-       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/b/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
+      [("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/input/b/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("wmr", {"profile": '/interaction_profiles/microsoft/motion_controller', "component_path0": '/input/trackpad/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("vive", {"profile": '/interaction_profiles/htc/vive_controller', "component_path0": '/input/trackpad/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
+       ("index", {"profile": '/interaction_profiles/valve/index_controller', "component_path0": '/input/b/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
        ],
       },
      ),
-    ("haptic", {"type": 'HAPTIC', "user_path0": '/user/hand/left', "user_path1": '/user/hand/right'}, None,
+    ("haptic", {"type": 'VIBRATION', "user_path0": '/user/hand/left', "user_path1": '/user/hand/right'}, None,
      {"bindings":
       [("simple", {"profile": '/interaction_profiles/khr/simple_controller', "component_path0": '/output/haptic', "component_path1": '/output/haptic'}),
        ("oculus", {"profile": '/interaction_profiles/oculus/touch_controller', "component_path0": '/output/haptic', "component_path1": '/output/haptic'}),
@@ -238,7 +238,7 @@ actionconfig_data = \
  ("blender_default_gamepad",
   {"items":
    [("teleport",
-     {"type": 'BUTTON', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_teleport', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_teleport', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("interpolation", 0.9),
        ("from_viewer", True),
@@ -246,66 +246,66 @@ actionconfig_data = \
        ],
       },     
      {"bindings":
-      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/trigger_left/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
+      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/trigger_left/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
        ],
       },
      ),
-    ("fly", {"type": 'BUTTON', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'}, None,
+    ("fly", {"type": 'FLOAT', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'}, None,
      {"bindings":
-      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/a/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
+      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/a/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
        ],
       },
      ),
     ("fly_forward",
-     {"type": 'BUTTON', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("mode", 'VIEWER_FORWARD'),
        ("lock_location_z", True),
        ],
       },     
      {"bindings":
-      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_left/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
+      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_left/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
        ],
       },
      ),
     ("fly_back",
-     {"type": 'BUTTON', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("mode", 'VIEWER_BACK'),
        ("lock_location_z", True),
        ],
       },     
      {"bindings":
-      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_left/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
+      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_left/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
        ],
       },
      ),
     ("fly_left",
-     {"type": 'BUTTON', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("mode", 'VIEWER_LEFT'),
        ("lock_location_z", True),
        ],
       },     
      {"bindings":
-      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_left/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
+      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_left/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
        ],
       },
      ),
     ("fly_right",
-     {"type": 'BUTTON', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("mode", 'VIEWER_RIGHT'),
        ("lock_location_z", True),
        ],
       },     
      {"bindings":
-      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_left/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
+      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_left/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
        ],
       },
      ),
     ("fly_up",
-     {"type": 'BUTTON', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("mode", 'UP'),
        ("speed_min", 0.014),
@@ -313,12 +313,12 @@ actionconfig_data = \
        ],
       },     
      {"bindings":
-      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_right/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
+      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_right/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
        ],
       },
      ),
     ("fly_down",
-     {"type": 'BUTTON', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("mode", 'DOWN'),
        ("speed_min", 0.014),
@@ -326,12 +326,12 @@ actionconfig_data = \
        ],
       },     
      {"bindings":
-      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_right/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
+      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_right/y', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
        ],
       },
      ),
     ("fly_turnleft",
-     {"type": 'BUTTON', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("mode", 'TURNLEFT'),
        ("speed_min", 0.01),
@@ -339,12 +339,12 @@ actionconfig_data = \
        ],
       },     
      {"bindings":
-      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_right/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'NEGATIVE'}),
+      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_right/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'NEGATIVE'}),
        ],
       },
      ),
     ("fly_turnright",
-     {"type": 'BUTTON', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_navigation_fly', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("mode", 'TURNRIGHT'),
        ("speed_min", 0.01),
@@ -352,52 +352,52 @@ actionconfig_data = \
        ],
       },     
      {"bindings":
-      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_right/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'POSITIVE'}),
+      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/thumbstick_right/x', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'POSITIVE'}),
        ],
       },
      ),
     ("raycast_select",
-     {"type": 'BUTTON', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_select_raycast', "op_flag": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_flag": 'PRESS'},
+     {"type": 'FLOAT', "user_path0": '/user/gamepad', "user_path1": '', "op": 'wm.xr_select_raycast', "op_mode": 'MODAL', "bimanual": 'False', "haptic_name": '', "haptic_match_user_paths": 'False', "haptic_duration": '0.0', "haptic_frequency": '0.0', "haptic_amplitude": '0.0', "haptic_mode": 'PRESS'},
      {"op_properties":
       [("from_viewer", True),
        ],
       },     
      {"bindings":
-      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/trigger_right/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
+      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/trigger_right/value', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
        ],
       },
      ),
-    ("undo", {"type": 'BUTTON', "user_path0": '/user/gamepad', "user_path1": '', "op": 'ed.undo', "op_flag": 'PRESS', "bimanual": 'False', "haptic_name": 'haptic_left', "haptic_match_user_paths": 'True', "haptic_duration": '0.30000001192092896', "haptic_frequency": '3000.0', "haptic_amplitude": '0.5', "haptic_flag": 'PRESS'}, None,
+    ("undo", {"type": 'FLOAT', "user_path0": '/user/gamepad', "user_path1": '', "op": 'ed.undo', "op_mode": 'PRESS', "bimanual": 'False', "haptic_name": 'haptic_left', "haptic_match_user_paths": 'True', "haptic_duration": '0.30000001192092896', "haptic_frequency": '3000.0', "haptic_amplitude": '0.5', "haptic_mode": 'PRESS'}, None,
      {"bindings":
-      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/x/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
+      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/x/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
        ],
       },
      ),
-    ("redo", {"type": 'BUTTON', "user_path0": '/user/gamepad', "user_path1": '', "op": 'ed.redo', "op_flag": 'PRESS', "bimanual": 'False', "haptic_name": 'haptic_right', "haptic_match_user_paths": 'True', "haptic_duration": '0.30000001192092896', "haptic_frequency": '3000.0', "haptic_amplitude": '0.5', "haptic_flag": 'PRESS'}, None,
+    ("redo", {"type": 'FLOAT', "user_path0": '/user/gamepad', "user_path1": '', "op": 'ed.redo', "op_mode": 'PRESS', "bimanual": 'False', "haptic_name": 'haptic_right', "haptic_match_user_paths": 'True', "haptic_duration": '0.30000001192092896', "haptic_frequency": '3000.0', "haptic_amplitude": '0.5', "haptic_mode": 'PRESS'}, None,
      {"bindings":
-      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/b/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_flag": 'ANY'}),
+      [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/input/b/click', "component_path1": '', "threshold": '0.30000001192092896', "axis_region": 'ANY'}),
        ],
       },
      ),
-    ("haptic_left", {"type": 'HAPTIC', "user_path0": '/user/gamepad', "user_path1": ''}, None,
+    ("haptic_left", {"type": 'VIBRATION', "user_path0": '/user/gamepad', "user_path1": ''}, None,
      {"bindings":
       [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/output/haptic_left', "component_path1": ''}),
        ],
       },
      ),
-    ("haptic_right", {"type": 'HAPTIC', "user_path0": '/user/gamepad', "user_path1": ''}, None,
+    ("haptic_right", {"type": 'VIBRATION', "user_path0": '/user/gamepad', "user_path1": ''}, None,
      {"bindings":
       [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/output/haptic_right', "component_path1": ''}),
        ],
       },
      ),
-    ("haptic_lefttrigger", {"type": 'HAPTIC', "user_path0": '/user/gamepad', "user_path1": ''}, None,
+    ("haptic_lefttrigger", {"type": 'VIBRATION', "user_path0": '/user/gamepad', "user_path1": ''}, None,
      {"bindings":
       [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/output/haptic_left_trigger', "component_path1": ''}),
        ],
       },
      ),
-    ("haptic_righttrigger", {"type": 'HAPTIC', "user_path0": '/user/gamepad', "user_path1": ''}, None,
+    ("haptic_righttrigger", {"type": 'VIBRATION', "user_path0": '/user/gamepad', "user_path1": ''}, None,
      {"bindings":
       [("gamepad", {"profile": '/interaction_profiles/microsoft/xbox_controller', "component_path0": '/output/haptic_right_trigger', "component_path1": ''}),
        ],
diff --git a/viewport_vr_preview/defaults.py b/viewport_vr_preview/defaults.py
index 03ca366f..1db6a36f 100644
--- a/viewport_vr_preview/defaults.py
+++ b/viewport_vr_preview/defaults.py
@@ -91,30 +91,30 @@ def vr_defaults_action_add(am,
                            user_path0,
                            user_path1,
                            op,
-                           op_flag,
+                           op_mode,
                            bimanual,
                            haptic_name,
                            haptic_match_user_paths,
                            haptic_duration,
                            haptic_frequency,
                            haptic_amplitude,
-                           haptic_flag):
+                           haptic_mode):
 
 
     ami = am.actionmap_items.new(name, True)
     if ami:        
-        ami.type = 'BUTTON'
+        ami.type = 'FLOAT'
         ami.user_path0 = user_path0
         ami.user_path1 = user_path1
         ami.op = op
-        ami.op_flag = op_flag
+        ami.op_mode = op_mode
         ami.bimanual = bimanual
         ami.haptic_name = haptic_name
         ami.haptic_match_user_paths = haptic_match_user_paths
         ami.haptic_duration = haptic_duration
         ami.haptic_frequency = haptic_frequency
         ami.haptic_amplitude = haptic_amplitude
-        ami.haptic_flag = haptic_flag
+        ami.haptic_mode = haptic_mode
 
     return ami
 
@@ -142,7 +142,7 @@ def vr_defaults_haptic_action_add(am,
                                   user_path1):
     ami = am.actionmap_items.new(name, True)
     if ami:        
-        ami.type = 'HAPTIC'
+        ami.type = 'VIBRATION'
         ami.user_path0 = user_path0
         ami.user_path1 = user_path1
     
@@ -155,16 +155,16 @@ def vr_defaults_actionbinding_add(ami,
                                   component_path0,
                                   component_path1,
                                   threshold,
-                                  axis0_flag,
-                                  axis1_flag):
+                                  axis0_region,
+                                  axis1_region):
     amb = ami.bindings.new(name, True)    
     if amb:
         amb.profile = profile
         amb.component_path0 = component_path0
         amb.component_path1 = component_path1
         amb.threshold = threshold
-        amb.axis0_flag = axis0_flag
-        amb.axis1_flag = axis1_flag
+        amb.axis0_region = axis0_region
+        amb.axis1_region = axis1_region
 
     return amb
 
diff --git a/viewport_vr_preview/io.py b/viewport_vr_preview/io.py
index 75442d1d..e17ed2c9 100644
--- a/viewport_vr_preview/io.py
+++ b/viewport_vr_preview/io.py
@@ -59,16 +59,16 @@ def ami_args_as_data(ami):
         f"\"user_path1\": '{ami.user_path1}'",
     ]
 
-    if ami.type == 'BUTTON' or ami.type == 'AXIS':
+    if ami.type == 'FLOAT' or ami.type == 'VECTOR2D':
         s.append(f"\"op\": '{ami.op}'")
-        s.append(f"\"op_flag\": '{ami.op_flag}'")
+        s.append(f"\"op_mode\": '{ami.op_mode}'")
         s.append(f"\"bimanual\": '{ami.bimanual}'")
         s.append(f"\"haptic_name\": '{ami.haptic_name}'")
         s.append(f"\"haptic_match_user_paths\": '{ami.haptic_match_user_paths}'")
         s.append(f"\"haptic_duration\": '{ami.haptic_duration}'")
         s.append(f"\"haptic_frequency\": '{ami.haptic_frequency}'")
         s.append(f"\"haptic_amplitude\": '{ami.haptic_amplitude}'")
-        s.append(f"\"haptic_flag\": '{ami.haptic_flag}'")
+        s.append(f"\"haptic_mode\": '{ami.haptic_mode}'")
     elif ami.type == 'POSE':
         s.append(f"\"pose_is_controller_grip\": '{ami.pose_is_controller_grip}'")
         s.append(f"\"pose_is_controller_aim\": '{ami.pose_is_controller_aim}'")
@@ -82,16 +82,16 @@ def ami_data_from_args(ami, args):
     ami.user_path0 = args["user_path0"]
     ami.user_path1 = args["user_path1"]
     
-    if ami.type == 'BUTTON' or ami.type == 'AXIS':
+    if ami.type == 'FLOAT' or ami.type == 'VECTOR2D':
         ami.op = args["op"]
-        ami.op_flag = args["op_flag"]
+        ami.op_mode = args["op_mode"]
         ami.bimanual = True if (args["bimanual"] == 'True') else False
         ami.haptic_name = args["haptic_name"]
         ami.haptic_match_user_paths = True if (args["haptic_match_user_paths"] == 'True') else False
         ami.haptic_duration = float(args["haptic_duration"])
         ami.haptic_frequency = float(args["haptic_frequency"])
         ami.haptic_amplitude = float(args["haptic_amplitude"])
-        ami.haptic_flag = args["haptic_flag"]
+        ami.haptic_mode = args["haptic_mode"]
     elif ami.type == 'POSE':
         ami.pose_is_controller_grip = True if (args["pose_is_controller_grip"] == 'True') else False
         ami.pose_is_controller_aim = True if (args["pose_is_controller_aim"] == 'True') else False
@@ -154,13 +154,13 @@ def amb_args_as_data(amb, type):
         f"\"component_path1\": '{amb.component_path1}'",
     ]
 
-    if type == 'BUTTON' or type == 'AXIS':
+    if type == 'FLOAT' or type == 'VECTOR2D':
         s.append(f"\"threshold\": '{amb.threshold}'")
-        if type == 'BUTTON':
-            s.append(f"\"axis_flag\": '{amb.axis0_flag}'")
-        else: # type == 'AXIS':
-            s.append(f"\"axis0_flag\": '{amb.axis0_flag}'")
-            s.append(f"\"axis1_flag\": '{amb.axis1_flag}'")
+        if type == 'FLOAT':
+            s.append(f"\"axis_region\": '{amb.axis0_region}'")
+        else: # type == 'VECTOR2D':
+            s.append(f"\"axis0_region\": '{amb.axis0_region}'")
+            s.append(f"\"axis1_region\": '{amb.axis1_region}'")
     elif type == 'POSE':
         s.append(f"\"pose_location\": '{amb.pose_location.x, amb.pose_location.y, amb.pose_location.z}'")
         s.append(f"\"pose_rotation\": '{amb.pose_rotation.x, amb.pose_rotation.y, amb.pose_rotation.z}'")
@@ -173,13 +173,13 @@ def amb_data_from_args(amb, args, type):
     amb.component_path0 = args["component_path0"]
     amb.component_path1 = args["component_path1"]
 
-    if type == 'BUTTON' or type == 'AXIS':
+    if type == 'FLOAT' or type == 'VECTOR2D':
         amb.threshold = float(args["threshold"])
-        if type == 'BUTTON':
-            amb.axis0_flag = args["axis_flag"]
-        else: # type == 'AXIS':
-            amb.axis0_flag = args["axis0_flag"]
-            amb.axis1_flag = args["axis1_flag"]
+        if type == 'FLOAT':
+            amb.axis0_region = args["axis_region"]
+        else: # type == 'VECTOR2D':
+            amb.axis0_region = args["axis0_region"]
+            amb.axis1_region = args["axis1_region"]
     elif type == 'POSE':
         l = args["pose_location"].strip(')(').split(', ')
         amb.pose_location.x = float(l[0])
diff --git a/viewport_vr_preview/main.py b/viewport_vr_preview/main.py
index 350e7bd2..93551125 100644
--- a/viewport_vr_preview/main.py
+++ b/viewport_vr_preview/main.py
@@ -28,19 +28,20 @@ import bpy
 from bpy.types import (
     Gizmo,
     GizmoGroup,
-    PropertyGroup,
-    UIList,
     Menu,
-    Panel,
     Operator,
+    Panel,
+    PropertyGroup,
+    UIList,
 )
 from bpy.app.handlers import persistent
-from bpy_extras.io_utils import ImportHelper, ExportHelper
+from bpy_extras.io_utils import ExportHelper, ImportHelper
 import bgl
+import importlib.util
 import math
 from math import radians
-from mathutils import Matrix, Euler
-import os.path, importlib.util
+from mathutils import Euler, Matrix, Quaternion, Vector
+import os.path
 
 
 ### Session.
@@ -643,16 +644,45 @@ def vr_create_actions(context: bpy.context):
     if not session_state:
         return
 
-    am_active = vr_actionmap_active_get(ac)
-
     for am in ac.actionmaps:    
         if len(am.actionmap_items) < 1:
             continue
 
-        ok = session_state.create_action_set(context, am, (am == am_active))
+        ok = session_state.action_set_create(context, am)
         if not ok:
             return
 
+        controller_grip_name = ""
+        controller_aim_name = ""
+
+        for ami in am.actionmap_items:
+            if len(ami.bindings) < 1:
+                continue
+            
+            ok = session_state.action_create(context, am, ami)
+            if not ok:
+                return
+
+            if ami.type == 'POSE':
+                if ami.pose_is_controller_grip:
+                    controller_grip_name = ami.name
+                if ami.pose_is_controller_aim:
+                    controller_aim_name = ami.name
+
+            for amb in ami.bindings:
+                ok = session_state.action_binding_create(context, am, ami, amb)
+                if not ok:
+                    return
+
+        # Set controller pose actions.
+        if controller_grip_name and controller_aim_name:
+            session_state.controller_pose_actions_set(context, am.name, controller_grip_name, controller_aim_name)
+
+    # Set active action set.
+    am = vr_actionmap_active_get(ac)
+    if am:
+        session_state.active_action_set_set(context, am.name)
+
 
 def vr_load_actionmaps(context, filepath):
     # Import all actionmaps for active actionconfig.
@@ -887,9 +917,9 @@ class VIEW3D_PT_vr_actions_actions(VRActionsPanel, Panel):
                 col.prop(ami, "user_path0", text="User Path 0")
                 col.prop(ami, "user_path1", text="User Path 1")
 
-                if ami.type == 'BUTTON' or ami.type == 'AXIS':
+                if ami.type == 'FLOAT' or ami.type == 'VECTOR2D':
                     col.prop(ami, "op", text="Operator")
-                    col.prop(ami, "op_flag", text="Operator Flag")
+                    col.prop(ami, "op_mode", text="Operator Mode")
                     col.prop(ami, "bimanual", text="Bimanual")
                     # Properties.
                     vr_draw_ami(ami, col, 1)
@@ -920,13 +950,13 @@ class VIEW3D_PT_vr_actions_haptics(VRActionsPanel, Panel):
                 row = layout.row()
                 col = row.column(align=True)
 
-                if ami.type == 'BUTTON' or ami.type == 'AXIS':
+                if ami.type == 'FLOAT' or ami.type == 'VECTOR2D':
                     col.prop(ami, "haptic_name", text="Haptic Action")
                     col.prop(ami, "haptic_match_user_paths", text="Match User Paths")
                     col.prop(ami, "haptic_duration", text="Duration")
                     col.prop(ami, "haptic_frequency", text="Frequency")
                     col.prop(ami, "haptic_amplitude", text="Amplitude")
-                    col.prop(ami, "haptic_flag", text="Haptic Flag")
+                    col.prop(ami, "haptic_mode", text="Haptic Mode")
 
 
 class VIEW3D_PT_vr_actions_bindings(VRActionsPanel, Panel):
@@ -969,13 +999,13 @@ class VIEW3D_PT_vr_actions_bindings(VRActionsPanel, Panel):
                     col.prop(amb, "profile", text="Profile")
                     col.prop(amb, "component_path0", text="Component Path 0")
                     col.prop(amb, "component_path1", text="Component Path 1")
-                    if ami.type == 'BUTTON' or ami.type == 'AXIS':
+                    if ami.type == 'FLOAT' or ami.type == 'VECTOR2D':
                         col.prop(amb, "threshold", text="Threshold")
-                        if ami.type == 'BUTTON':
-                            col.prop(amb, "axis0_flag", text="Axis Flag")
-                        else: # ami.type == 'AXIS'
-                            col.prop(amb, "axis0_flag", text="Axis 0 Flag")
-                            col.prop(amb, "axis1_flag", text="Axis 1 Flag")
+                        if ami.type == 'FLOAT':
+                            col.prop(amb, "axis0_region", text="Axis Region")
+                        else: # ami.type == 'VECTOR2D'
+                            col.prop(amb, "axis0_region", text="Axis 0 Region")
+                            col.prop(amb, "axis1_region", text="Axis 1 Region")
                     elif ami.type == 'POSE':
                         col.prop(amb, "pose_location", text="Location Offset")
                         col.prop(amb, "pose_rotation", text="Rotation Offset")
@@ -1047,7 +1077,7 @@ class VIEW3D_OT_vr_actionmap_activate(Operator):
         if session_state:
             am = vr_actionmap_active_get(ac)
             if am:
-                session_state.set_active_action_set(context, am.name)
+                session_state.active_action_set_set(context, am.name)
 
         return {'FINISHED'}
 
@@ -1611,25 +1641,15 @@ class VIEW3D_GGT_vr_controller_poses(GizmoGroup):
 
         loc = None
         rot = None
-        if idx == 0:
-            if is_grip:
-                loc = wm.xr_session_state.controller0_grip_location
-                rot = wm.xr_session_state.controller0_grip_rotation
-            else:
-                loc = wm.xr_session_state.controller0_aim_location
-                rot = wm.xr_session_state.controller0_aim_rotation
-        elif idx == 1:
-            if is_grip:                
-                loc = wm.xr_session_state.controller1_grip_location
-                rot = wm.xr_session_state.controller1_grip_rotation
-            else:
-                loc = wm.xr_session_state.controller1_aim_location
-                rot = wm.xr_session_state.controller1_aim_rotation
+        if is_grip:
+            loc = wm.xr_session_state.controller_grip_location_get(context, idx)
+            rot = wm.xr_session_state.controller_grip_rotation_get(context, idx)
         else:
-            return Matrix.Identity(4);
+            loc = wm.xr_session_state.controller_aim_location_get(context, idx)
+            rot = wm.xr_session_state.controller_aim_rotation_get(context, idx)
 
         rotmat = Matrix.Identity(3)
-        rotmat.rotate(rot)
+        rotmat.rotate(Quaternion(Vector(rot)))
         rotmat.resize_4x4()
         transmat = Matrix.Translation(loc)
         scalemat = Matrix.Scale(scale, 4)