blender
/
blender-addons
17
34
Fork 94
Code Issues 530 Pull Requests 32 Projects 1 Releases Wiki Activity

VR: Cleanup after actionmap refactoring 

Aside from general cleanup, changed that default action sets are no
longer automatically loaded (user must press the "Load Default VR
Action Maps" button from the actionmaps menu). This guards against
unintentional scene changes if the user is not aware that actions are
enabled.
This commit is contained in:
Peter Kim 2021-03-14 19:08:43 +09:00
parent a26b930830
commit 6174a60aed
5 changed files with 156 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
viewport_vr_preview/__init__.py
View File

@ -66,18 +66,19 @@ classes = (
main.VIEW3D_OT_cursor_to_vr_landmark,
main.VIEW3D_OT_update_vr_landmark,
main.VIEW3D_UL_vr_action_sets,
main.VIEW3D_MT_vr_action_set_menu,
main.VIEW3D_UL_vr_actionmaps,
main.VIEW3D_MT_vr_actionmap_menu,
main.VIEW3D_UL_vr_actions,
main.VIEW3D_MT_vr_action_menu,
main.VIEW3D_OT_vr_action_set_add,
main.VIEW3D_OT_vr_action_set_remove,
main.VIEW3D_OT_vr_action_set_activate,
main.VIEW3D_OT_vr_action_sets_import,
main.VIEW3D_OT_vr_action_sets_export,
main.VIEW3D_OT_vr_action_set_copy,
main.VIEW3D_OT_vr_action_sets_clear,
main.VIEW3D_OT_vr_actionmap_add,
main.VIEW3D_OT_vr_actionmap_remove,
main.VIEW3D_OT_vr_actionmap_activate,
main.VIEW3D_OT_vr_actionmaps_defaults_load,
main.VIEW3D_OT_vr_actionmaps_import,
main.VIEW3D_OT_vr_actionmaps_export,
main.VIEW3D_OT_vr_actionmap_copy,
main.VIEW3D_OT_vr_actionmaps_clear,
main.VIEW3D_OT_vr_action_add,
main.VIEW3D_OT_vr_action_remove,
main.VIEW3D_OT_vr_action_copy,
@ -137,7 +138,8 @@ def register():
)
bpy.app.handlers.load_post.append(main.vr_ensure_default_landmark)
bpy.app.handlers.load_post.append(defaults.vr_load_default_actionmaps)
bpy.app.handlers.load_post.append(defaults.vr_init_default_actionconfig)
bpy.app.handlers.load_post.append(main.vr_activate_user_actionconfig)
bpy.app.handlers.xr_session_start_pre.append(main.vr_create_actions)
@ -160,5 +162,6 @@ def unregister():
del bpy.types.View3DShading.vr_show_landmarks
bpy.app.handlers.load_post.remove(main.vr_ensure_default_landmark)
bpy.app.handlers.load_post.remove(defaults.vr_load_default_actionmaps)
bpy.app.handlers.load_post.remove(defaults.vr_init_default_actionconfig)
bpy.app.handlers.load_post.remove(main.vr_activate_user_actionconfig)
bpy.app.handlers.xr_session_start_pre.remove(main.vr_create_actions)

8
viewport_vr_preview/configs/default.py
View File

@ -1,6 +1,6 @@
actionconfig_version = (2, 93, 10)
actionconfig_data = \
[("default_oculus",
[("blender_oculus",
{"profile": '/interaction_profiles/oculus/touch_controller'},
{"items":
[("controller_pose", {"type": 'POSE', "user_path0": '/user/hand/left', "component_path0": '/input/grip/pose', "user_path1": '/user/hand/right', "component_path1": '/input/grip/pose', "pose_is_controller": 'True', "pose_location": '(0.0, 0.0, 0.0)', "pose_rotation": '(-0.8726646304130554, 0.0, 0.0)'}, None),
@ -11,7 +11,7 @@ actionconfig_data = \
],
},
),
("default_wmr",
("blender_wmr",
{"profile": '/interaction_profiles/microsoft/motion_controller'},
{"items":
[("controller_pose", {"type": 'POSE', "user_path0": '/user/hand/left', "component_path0": '/input/grip/pose', "user_path1": '/user/hand/right', "component_path1": '/input/grip/pose', "pose_is_controller": 'True', "pose_location": '(0.0, 0.0, 0.0)', "pose_rotation": '(-0.7853981852531433, 0.0, 0.0)'}, None),
@ -22,7 +22,7 @@ actionconfig_data = \
],
},
),
("default_vive",
("blender_vive",
{"profile": '/interaction_profiles/htc/vive_controller'},
{"items":
[("controller_pose", {"type": 'POSE', "user_path0": '/user/hand/left', "component_path0": '/input/grip/pose', "user_path1": '/user/hand/right', "component_path1": '/input/grip/pose', "pose_is_controller": 'True', "pose_location": '(0.0, 0.0, 0.0)', "pose_rotation": '(0.0, 0.0, 0.0)'}, None),
@ -33,7 +33,7 @@ actionconfig_data = \
],
},
),
("default_index",
("blender_index",
{"profile": '/interaction_profiles/valve/index_controller'},
{"items":
[("controller_pose", {"type": 'POSE', "user_path0": '/user/hand/left', "component_path0": '/input/grip/pose', "user_path1": '/user/hand/right', "component_path1": '/input/grip/pose', "pose_is_controller": 'True', "pose_location": '(0.0, 0.0, 0.0)', "pose_rotation": '(0.0, 0.0, 0.0)'}, None),

108
viewport_vr_preview/defaults.py
View File

@ -26,12 +26,29 @@ else:
import bpy
from bpy.app.handlers import persistent
import math
from enum import Enum
import math
# Default actionmaps.
class VRDefaultActionmaps(Enum):
OCULUS = "blender_oculus"
WMR = "blender_wmr"
VIVE = "blender_vive"
INDEX = "blender_index"
# Default actions.
class VRDefaultActions(Enum):
CONTROLLER_POSE = "controller_pose"
RAYCAST_SELECT = "raycast_select"
GRAB = "grab"
UNDO = "undo"
REDO = "redo"
def vr_defaults_actionmap_add(ac, name, profile):
am = ac.actionmaps.new(name)
am = ac.actionmaps.new(name, True)
if am:
am.profile = profile
@ -48,7 +65,7 @@ def vr_defaults_actionmap_item_add(am,
op,
op_flag):
ami = am.actionmap_items.new(name)
ami = am.actionmap_items.new(name, True)
if ami:
ami.type = 'BUTTON'
ami.user_path0 = user_path0
@ -71,7 +88,7 @@ def vr_defaults_pose_actionmap_item_add(am,
is_controller,
location,
rotation):
ami = am.actionmap_items.new(name)
ami = am.actionmap_items.new(name, True)
if ami:
ami.type = 'POSE'
ami.user_path0 = user_path0
@ -94,7 +111,7 @@ def vr_defaults_haptic_actionmap_item_add(am,
duration,
frequency,
amplitude):
ami = am.actionmap_items.new(name)
ami = am.actionmap_items.new(name, True)
if ami:
ami.type = 'HAPTIC'
ami.user_path0 = user_path0
@ -108,31 +125,15 @@ def vr_defaults_haptic_actionmap_item_add(am,
return ami
# Default actionmaps.
class VRDefaultActionmapNames(Enum):
OCULUS = "default_oculus"
WMR = "default_wmr"
VIVE = "default_vive"
INDEX = "default_index"
# Default actionmap items.
class VRDefaultActionmapItemNames(Enum):
CONTROLLER_POSE = "controller_pose"
RAYCAST_SELECT = "raycast_select"
GRAB = "grab"
UNDO = "undo"
REDO = "redo"
def vr_defaults_create_oculus(ac):
am = vr_defaults_actionmap_add(ac,
VRDefaultActionmapNames.OCULUS.value,
VRDefaultActionmaps.OCULUS.value,
"/interaction_profiles/oculus/touch_controller")
if not am:
return
vr_defaults_pose_actionmap_item_add(am,
VRDefaultActionmapItemNames.CONTROLLER_POSE.value,
VRDefaultActions.CONTROLLER_POSE.value,
"/user/hand/left",
"/input/grip/pose",
"/user/hand/right",
@ -141,7 +142,7 @@ def vr_defaults_create_oculus(ac):
(0, 0, 0),
(math.radians(-50), 0, 0))
vr_defaults_actionmap_item_add(am,
VRDefaultActionmapItemNames.RAYCAST_SELECT.value,
VRDefaultActions.RAYCAST_SELECT.value,
"/user/hand/left",
"/input/trigger/value",
"/user/hand/right",
@ -150,7 +151,7 @@ def vr_defaults_create_oculus(ac):
"wm.xr_select_raycast",
'MODAL')
vr_defaults_actionmap_item_add(am,
VRDefaultActionmapItemNames.GRAB.value,
VRDefaultActions.GRAB.value,
"/user/hand/left",
"/input/squeeze/value",
"/user/hand/right",
@ -159,7 +160,7 @@ def vr_defaults_create_oculus(ac):
"wm.xr_grab",
'MODAL')
vr_defaults_actionmap_item_add(am,
VRDefaultActionmapItemNames.UNDO.value,
VRDefaultActions.UNDO.value,
"/user/hand/left",
"/input/x/click",
"",
@ -168,7 +169,7 @@ def vr_defaults_create_oculus(ac):
"ed.undo",
'PRESS')
vr_defaults_actionmap_item_add(am,
VRDefaultActionmapItemNames.REDO.value,
VRDefaultActions.REDO.value,
"/user/hand/right",
"/input/a/click",
"",
@ -180,13 +181,13 @@ def vr_defaults_create_oculus(ac):
def vr_defaults_create_wmr(ac):
am = vr_defaults_actionmap_add(ac,
VRDefaultActionmapNames.WMR.value,
VRDefaultActionmaps.WMR.value,
"/interaction_profiles/microsoft/motion_controller")
if not am:
return
vr_defaults_pose_actionmap_item_add(am,
VRDefaultActionmapItemNames.CONTROLLER_POSE.value,
VRDefaultActions.CONTROLLER_POSE.value,
"/user/hand/left",
"/input/grip/pose",
"/user/hand/right",
@ -195,7 +196,7 @@ def vr_defaults_create_wmr(ac):
(0, 0, 0),
(math.radians(-45), 0, 0))
vr_defaults_actionmap_item_add(am,
VRDefaultActionmapItemNames.RAYCAST_SELECT.value,
VRDefaultActions.RAYCAST_SELECT.value,
"/user/hand/left",
"/input/trigger/value",
"/user/hand/right",
@ -204,7 +205,7 @@ def vr_defaults_create_wmr(ac):
"wm.xr_select_raycast",
'MODAL')
vr_defaults_actionmap_item_add(am,
VRDefaultActionmapItemNames.GRAB.value,
VRDefaultActions.GRAB.value,
"/user/hand/left",
"/input/squeeze/click",
"/user/hand/right",
@ -213,7 +214,7 @@ def vr_defaults_create_wmr(ac):
"wm.xr_grab",
'MODAL')
vr_defaults_actionmap_item_add(am,
VRDefaultActionmapItemNames.UNDO.value,
VRDefaultActions.UNDO.value,
"/user/hand/left",
"/input/menu/click",
"",
@ -222,7 +223,7 @@ def vr_defaults_create_wmr(ac):
"ed.undo",
'PRESS')
vr_defaults_actionmap_item_add(am,
VRDefaultActionmapItemNames.REDO.value,
VRDefaultActions.REDO.value,
"/user/hand/right",
"/input/menu/click",
"",
@ -234,13 +235,13 @@ def vr_defaults_create_wmr(ac):
def vr_defaults_create_vive(ac):
am = vr_defaults_actionmap_add(ac,
VRDefaultActionmapNames.VIVE.value,
VRDefaultActionmaps.VIVE.value,
"/interaction_profiles/htc/vive_controller")
if not am:
return
vr_defaults_pose_actionmap_item_add(am,
VRDefaultActionmapItemNames.CONTROLLER_POSE.value,
VRDefaultActions.CONTROLLER_POSE.value,
"/user/hand/left",
"/input/grip/pose",
"/user/hand/right",
@ -249,7 +250,7 @@ def vr_defaults_create_vive(ac):
(0, 0, 0),
(0, 0, 0))
vr_defaults_actionmap_item_add(am,
VRDefaultActionmapItemNames.RAYCAST_SELECT.value,
VRDefaultActions.RAYCAST_SELECT.value,
"/user/hand/left",
"/input/trigger/value",
"/user/hand/right",
@ -258,7 +259,7 @@ def vr_defaults_create_vive(ac):
"wm.xr_select_raycast",
'MODAL')
vr_defaults_actionmap_item_add(am,
VRDefaultActionmapItemNames.GRAB.value,
VRDefaultActions.GRAB.value,
"/user/hand/left",
"/input/squeeze/click",
"/user/hand/right",
@ -267,7 +268,7 @@ def vr_defaults_create_vive(ac):
"wm.xr_grab",
'MODAL')
vr_defaults_actionmap_item_add(am,
VRDefaultActionmapItemNames.UNDO.value,
VRDefaultActions.UNDO.value,
"/user/hand/left",
"/input/menu/click",
"",
@ -276,7 +277,7 @@ def vr_defaults_create_vive(ac):
"ed.undo",
'PRESS')
vr_defaults_actionmap_item_add(am,
VRDefaultActionmapItemNames.REDO.value,
VRDefaultActions.REDO.value,
"/user/hand/right",
"/input/menu/click",
"",
@ -288,13 +289,13 @@ def vr_defaults_create_vive(ac):
def vr_defaults_create_index(ac):
am = vr_defaults_actionmap_add(ac,
VRDefaultActionmapNames.INDEX.value,
VRDefaultActionmaps.INDEX.value,
"/interaction_profiles/valve/index_controller")
if not am:
return
vr_defaults_pose_actionmap_item_add(am,
VRDefaultActionmapItemNames.CONTROLLER_POSE.value,
VRDefaultActions.CONTROLLER_POSE.value,
"/user/hand/left",
"/input/grip/pose",
"/user/hand/right",
@ -303,7 +304,7 @@ def vr_defaults_create_index(ac):
(0, 0, 0),
(0, 0, 0))
vr_defaults_actionmap_item_add(am,
VRDefaultActionmapItemNames.RAYCAST_SELECT.value,
VRDefaultActions.RAYCAST_SELECT.value,
"/user/hand/left",
"/input/trigger/value",
"/user/hand/right",
@ -312,7 +313,7 @@ def vr_defaults_create_index(ac):
"wm.xr_select_raycast",
'MODAL')
vr_defaults_actionmap_item_add(am,
VRDefaultActionmapItemNames.GRAB.value,
VRDefaultActions.GRAB.value,
"/user/hand/left",
"/input/squeeze/value",
"/user/hand/right",
@ -321,7 +322,7 @@ def vr_defaults_create_index(ac):
"wm.xr_grab",
'MODAL')
vr_defaults_actionmap_item_add(am,
VRDefaultActionmapItemNames.UNDO.value,
VRDefaultActions.UNDO.value,
"/user/hand/left",
"/input/a/click",
"",
@ -330,7 +331,7 @@ def vr_defaults_create_index(ac):
"ed.undo",
'PRESS')
vr_defaults_actionmap_item_add(am,
VRDefaultActionmapItemNames.REDO.value,
VRDefaultActions.REDO.value,
"/user/hand/right",
"/input/a/click",
"",
@ -341,7 +342,7 @@ def vr_defaults_create_index(ac):
@persistent
def vr_load_default_actionmaps(context: bpy.context):
def vr_init_default_actionconfig(context: bpy.context):
context = bpy.context
actionconfigs = context.window_manager.xr_session_settings.actionconfigs
@ -351,18 +352,13 @@ def vr_load_default_actionmaps(context: bpy.context):
if not ac:
return
# Set default action config as active.
# Set default config as active.
actionconfigs.active = ac
if len(ac.actionmaps) > 0:
# Don't load defaults for scenes that already contain actionmaps.
return
# Set default action config as active.
#actionconfigs.active = ac
# Load default actionmaps.
loaded = main.vr_load_actionmaps(context)
filepath = main.vr_get_default_config_path()
loaded = main.vr_load_actionmaps(context, filepath)
if not loaded:
# Create and save default actionmaps.
@ -371,4 +367,4 @@ def vr_load_default_actionmaps(context: bpy.context):
vr_defaults_create_vive(ac)
vr_defaults_create_index(ac)
main.vr_save_actionmaps(context, sort=False)
main.vr_save_actionmaps(context, filepath, sort=False)

4
viewport_vr_preview/io.py
View File

@ -265,7 +265,7 @@ def _ami_props_setattr(ami_props, attr, value):
def actionmap_init_from_data(am, am_items):
new_fn = getattr(am.actionmap_items, "new")
for (ami_name, ami_args, ami_data) in am_items:
ami = new_fn(ami_name) #, **ami_args)
ami = new_fn(ami_name, True)
ami_data_from_args(ami, ami_args)
if ami_data is not None:
ami_props_data = ami_data.get("op_properties", None)
@ -285,7 +285,7 @@ def actionconfig_init_from_data(ac, actionconfig_data, actionconfig_version):
actionconfig_data = actionconfig_update(actionconfig_data, actionconfig_version)
for (am_name, am_args, am_content) in actionconfig_data:
am = ac.actionmaps.new(am_name) #, **am_args)
am = ac.actionmaps.new(am_name, True)
am_data_from_args(am, am_args)
am_items = am_content["items"]
# Check here instead of inside 'actionmap_init_from_data'

214
viewport_vr_preview/main.py
View File

@ -39,7 +39,6 @@ from bpy_extras.io_utils import ImportHelper, ExportHelper
import bgl
import math
from math import radians
import mathutils
from mathutils import Matrix, Euler
import os.path, importlib.util
@ -558,7 +557,7 @@ class VIEW3D_OT_vr_landmark_activate(Operator):
### Actions.
def vr_actionconfig_active_get(context):
if not context.window_manager.xr_session_settings.actionconfigs:
return
return None
return context.window_manager.xr_session_settings.actionconfigs.active
@ -586,6 +585,14 @@ def vr_actionmap_item_selected_get(am):
)
@persistent
def vr_activate_user_actionconfig(context: bpy.context):
# Set user config as active.
actionconfigs = bpy.context.window_manager.xr_session_settings.actionconfigs
if actionconfigs:
actionconfigs.active = actionconfigs.user
@persistent
def vr_create_actions(context: bpy.context):
# Create all vr action sets and actions.
@ -642,7 +649,7 @@ def vr_create_actions(context: bpy.context):
session_state.set_active_action_set(context, am.name)
def vr_load_actionmaps(context, filepath=""):
def vr_load_actionmaps(context, filepath):
# Import all actionmaps for active actionconfig.
actionconfigs = context.window_manager.xr_session_settings.actionconfigs
if not actionconfigs:
@ -651,20 +658,6 @@ def vr_load_actionmaps(context, filepath=""):
if not ac:
return False
if not filepath:
filename = ""
if actionconfigs.default and actionconfigs.default.name == ac.name:
filename = "default.py"
elif actionconfigs.addon and actionconfigs.addon.name == ac.name:
filename = "addon.py"
elif actionconfigs.user and actionconfigs.user.name == ac.name:
filename = "user.py"
else:
return False
filepath = os.path.join(os.path.dirname(os.path.abspath(__file__)), "configs")
filepath = os.path.join(filepath, filename)
if not os.path.exists(filepath):
return False
@ -677,7 +670,7 @@ def vr_load_actionmaps(context, filepath=""):
return True
def vr_save_actionmaps(context, filepath="", sort=False):
def vr_save_actionmaps(context, filepath, sort=False):
# Export all actionmaps for active actionconfig.
actionconfigs = context.window_manager.xr_session_settings.actionconfigs
if not actionconfigs:
@ -686,20 +679,6 @@ def vr_save_actionmaps(context, filepath="", sort=False):
if not ac:
return False
if not filepath:
filename = ""
if actionconfigs.default and actionconfigs.default.name == ac.name:
filename = "default.py"
elif actionconfigs.addon and actionconfigs.addon.name == ac.name:
filename = "addon.py"
elif actionconfigs.user and actionconfigs.user.name == ac.name:
filename = "user.py"
else:
return False
filepath = os.path.join(os.path.dirname(os.path.abspath(__file__)), "configs")
filepath = os.path.join(filepath, filename)
io.actionconfig_export_as_data(ac, filepath, sort=sort)
print("Saved XR actionmaps: " + filepath)
@ -707,27 +686,9 @@ def vr_save_actionmaps(context, filepath="", sort=False):
return True
def vr_name_ensure_unique(basename, items):
name = basename
idx = 1
while True:
exists = False
for item in items:
if item.name == name:
name = basename + str(idx)
if len(name) > 64:
# Generate random base name.
basename = str(mathutils.noise.random())
name = basename
idx = 1
else:
idx += 1
exists = True
break
if not exists:
return name
def vr_get_default_config_path():
filepath = os.path.join(os.path.dirname(os.path.abspath(__file__)), "configs")
return os.path.join(filepath, "default.py")
def vr_draw_ami(ami, layout, level):
@ -764,7 +725,7 @@ def vr_draw_ami(ami, layout, level):
box.template_xr_actionmap_item_properties(ami)
class VIEW3D_UL_vr_action_sets(UIList):
class VIEW3D_UL_vr_actionmaps(UIList):
def draw_item(self, context, layout, _data, item, icon, _active_data,
_active_propname, index):
ac = vr_actionconfig_active_get(context)
@ -782,20 +743,21 @@ class VIEW3D_UL_vr_action_sets(UIList):
'RADIOBUT_ON' if (index == am_active_idx) else 'RADIOBUT_OFF'
)
props = layout.operator(
"view3d.vr_action_set_activate", text="", icon=icon)
"view3d.vr_actionmap_activate", text="", icon=icon)
props.index = index
class VIEW3D_MT_vr_action_set_menu(Menu):
bl_label = "Action Set Controls"
class VIEW3D_MT_vr_actionmap_menu(Menu):
bl_label = "Action Map Controls"
def draw(self, _context):
layout = self.layout
layout.operator("view3d.vr_action_sets_import")
layout.operator("view3d.vr_action_sets_export")
layout.operator("view3d.vr_action_set_copy")
layout.operator("view3d.vr_action_sets_clear")
layout.operator("view3d.vr_actionmaps_defaults_load")
layout.operator("view3d.vr_actionmaps_import")
layout.operator("view3d.vr_actionmaps_export")
layout.operator("view3d.vr_actionmap_copy")
layout.operator("view3d.vr_actionmaps_clear")
class VIEW3D_UL_vr_actions(UIList):
@ -836,17 +798,17 @@ class VIEW3D_PT_vr_actions(Panel):
row0 = layout.row()
col = row0.column(align=True)
col.label(text="Action Sets")
col.label(text="Action Maps")
row1 = layout.row()
row1.template_list("VIEW3D_UL_vr_action_sets", "", ac, "actionmaps",
row1.template_list("VIEW3D_UL_vr_actionmaps", "", ac, "actionmaps",
ac, "selected_actionmap", rows=3)
col = row1.column(align=True)
col.operator("view3d.vr_action_set_add", icon='ADD', text="")
col.operator("view3d.vr_action_set_remove", icon='REMOVE', text="")
col.operator("view3d.vr_actionmap_add", icon='ADD', text="")
col.operator("view3d.vr_actionmap_remove", icon='REMOVE', text="")
col.menu("VIEW3D_MT_vr_action_set_menu", icon='DOWNARROW_HLT', text="")
col.menu("VIEW3D_MT_vr_actionmap_menu", icon='DOWNARROW_HLT', text="")
am = vr_actionmap_selected_get(ac)
@ -860,7 +822,7 @@ class VIEW3D_PT_vr_actions(Panel):
row = row.split()
col1 = row.column(align=True)
col0.prop(am, "name", text="Action Set")
col0.prop(am, "name", text="Action Map")
col0.prop(am, "profile", text="Profile")
row1.template_list("VIEW3D_UL_vr_actions", "", am, "actionmap_items",
@ -898,10 +860,10 @@ class VIEW3D_PT_vr_actions(Panel):
col1.prop(ami, "haptic_amplitude", text="Amplitude")
class VIEW3D_OT_vr_action_set_add(Operator):
bl_idname = "view3d.vr_action_set_add"
bl_label = "Add VR Action Set"
bl_description = "Add a new VR action set to the scene"
class VIEW3D_OT_vr_actionmap_add(Operator):
bl_idname = "view3d.vr_actionmap_add"
bl_label = "Add VR Action Map"
bl_description = "Add a new VR action map to the scene"
bl_options = {'UNDO', 'REGISTER'}
def execute(self, context):
@ -909,9 +871,7 @@ class VIEW3D_OT_vr_action_set_add(Operator):
if not ac:
return {'CANCELLED'}
name = vr_name_ensure_unique("action_set", ac.actionmaps)
am = ac.actionmaps.new(name)
am = ac.actionmaps.new("actionmap", False)
if not am:
return {'CANCELLED'}
@ -921,10 +881,10 @@ class VIEW3D_OT_vr_action_set_add(Operator):
return {'FINISHED'}
class VIEW3D_OT_vr_action_set_remove(Operator):
bl_idname = "view3d.vr_action_set_remove"
bl_label = "Remove VR Action Set"
bl_description = "Delete the selected VR action set from the scene"
class VIEW3D_OT_vr_actionmap_remove(Operator):
bl_idname = "view3d.vr_actionmap_remove"
bl_label = "Remove VR Action Map"
bl_description = "Delete the selected VR action map from the scene"
bl_options = {'UNDO', 'REGISTER'}
def execute(self, context):
@ -936,24 +896,15 @@ class VIEW3D_OT_vr_action_set_remove(Operator):
if not am:
return {'CANCELLED'}
if am == vr_actionmap_active_get(ac):
ac.active_actionmap -= 1
if ac.active_actionmap < 0:
ac.active_actionmap = 0
ac.selected_actionmap -= 1
if ac.selected_actionmap < 0:
ac.selected_actionmap = 0
ac.actionmaps.remove(am)
return {'FINISHED'}
class VIEW3D_OT_vr_action_set_activate(Operator):
bl_idname = "view3d.vr_action_set_activate"
bl_label = "Activate VR Action Set"
bl_description = "Set the current VR action set for the session"
class VIEW3D_OT_vr_actionmap_activate(Operator):
bl_idname = "view3d.vr_actionmap_activate"
bl_label = "Activate VR Action Map"
bl_description = "Set the current VR action map for the session"
bl_options = {'UNDO', 'REGISTER'}
index: bpy.props.IntProperty(
@ -980,10 +931,29 @@ class VIEW3D_OT_vr_action_set_activate(Operator):
return {'FINISHED'}
class VIEW3D_OT_vr_action_sets_import(Operator, ImportHelper):
bl_idname = "view3d.vr_action_sets_import"
bl_label = "Import Action Sets"
bl_description = "Import VR action sets from configuration file"
class VIEW3D_OT_vr_actionmaps_defaults_load(Operator):
bl_idname = "view3d.vr_actionmaps_defaults_load"
bl_label = "Load Default VR Action Maps"
bl_description = "Load default VR action maps"
bl_options = {'UNDO', 'REGISTER'}
def execute(self, context):
ac = vr_actionconfig_active_get(context)
if not ac:
return {'CANCELLED'}
filepath = vr_get_default_config_path()
if not vr_load_actionmaps(context, filepath):
return {'CANCELLED'}
return {'FINISHED'}
class VIEW3D_OT_vr_actionmaps_import(Operator, ImportHelper):
bl_idname = "view3d.vr_actionmaps_import"
bl_label = "Import VR Action Maps"
bl_description = "Import VR action maps from configuration file"
bl_options = {'UNDO', 'REGISTER'}
filter_glob: bpy.props.StringProperty(
@ -996,16 +966,16 @@ class VIEW3D_OT_vr_action_sets_import(Operator, ImportHelper):
if (ext != ".py"):
return {'CANCELLED'}
if not vr_load_actionmaps(context, filepath=self.filepath):
if not vr_load_actionmaps(context, self.filepath):
return {'CANCELLED'}
return {'FINISHED'}
class VIEW3D_OT_vr_action_sets_export(Operator, ExportHelper):
bl_idname = "view3d.vr_action_sets_export"
bl_label = "Export Action Sets"
bl_description = "Export VR action sets to configuration file"
class VIEW3D_OT_vr_actionmaps_export(Operator, ExportHelper):
bl_idname = "view3d.vr_actionmaps_export"
bl_label = "Export VR Action Maps"
bl_description = "Export VR action maps to configuration file"
bl_options = {'REGISTER'}
filter_glob: bpy.props.StringProperty(
@ -1022,16 +992,16 @@ class VIEW3D_OT_vr_action_sets_export(Operator, ExportHelper):
if (ext != ".py"):
return {'CANCELLED'}
if not vr_save_actionmaps(context, filepath=self.filepath):
if not vr_save_actionmaps(context, self.filepath):
return {'CANCELLED'}
return {'FINISHED'}
class VIEW3D_OT_vr_action_set_copy(Operator):
bl_idname = "view3d.vr_action_set_copy"
bl_label = "Copy VR Action Set"
bl_description = "Copy selected VR action set"
class VIEW3D_OT_vr_actionmap_copy(Operator):
bl_idname = "view3d.vr_actionmap_copy"
bl_label = "Copy VR Action Map"
bl_description = "Copy selected VR action map"
bl_options = {'UNDO', 'REGISTER'}
def execute(self, context):
@ -1043,11 +1013,8 @@ class VIEW3D_OT_vr_action_set_copy(Operator):
if not am:
return {'CANCELLED'}
# Update name.
name = vr_name_ensure_unique(am.name, ac.actionmaps)
# Copy actionmap.
am_new = ac.actionmaps.new_from_actionmap(name, am)
am_new = ac.actionmaps.new_from_actionmap(am)
if not am_new:
return {'CANCELLED'}
@ -1057,10 +1024,10 @@ class VIEW3D_OT_vr_action_set_copy(Operator):
return {'FINISHED'}
class VIEW3D_OT_vr_action_sets_clear(Operator):
bl_idname = "view3d.vr_action_sets_clear"
bl_label = "Clear VR Action Sets"
bl_description = "Delete all VR action sets from the scene"
class VIEW3D_OT_vr_actionmaps_clear(Operator):
bl_idname = "view3d.vr_actionmaps_clear"
bl_label = "Clear VR Action Map"
bl_description = "Delete all VR action maps from the scene"
bl_options = {'UNDO', 'REGISTER'}
def execute(self, context):
@ -1068,8 +1035,6 @@ class VIEW3D_OT_vr_action_sets_clear(Operator):
if not ac:
return {'CANCELLED'}
ac.selected_actionmap = ac.active_actionmap = 0
while ac.actionmaps:
ac.actionmaps.remove(ac.actionmaps[0])
@ -1091,9 +1056,7 @@ class VIEW3D_OT_vr_action_add(Operator):
if not am:
return {'CANCELLED'}
name = vr_name_ensure_unique("action", am.actionmap_items)
ami = am.actionmap_items.new(name)
ami = am.actionmap_items.new("action", False)
if not ami:
return {'CANCELLED'}
@ -1120,11 +1083,7 @@ class VIEW3D_OT_vr_action_remove(Operator):
ami = vr_actionmap_item_selected_get(am)
if not ami:
return {'CANCELLED'}
am.selected_item -= 1
if am.selected_item < 0:
am.selected_item = 0
return {'CANCELLED'}
am.actionmap_items.remove(ami)
@ -1150,11 +1109,8 @@ class VIEW3D_OT_vr_action_copy(Operator):
if not ami:
return {'CANCELLED'}
# Update name.
name = vr_name_ensure_unique(ami.name, am.actionmap_items)
# Copy item.
ami_new = am.actionmap_items.new_from_item(name, ami)
ami_new = am.actionmap_items.new_from_item(ami)
if not ami_new:
return {'CANCELLED'}
@ -1167,7 +1123,7 @@ class VIEW3D_OT_vr_action_copy(Operator):
class VIEW3D_OT_vr_actions_clear(Operator):
bl_idname = "view3d.vr_actions_clear"
bl_label = "Clear VR Actions"
bl_description = "Delete all VR actions for the selected action set"
bl_description = "Delete all VR actions for the selected action map"
bl_options = {'UNDO', 'REGISTER'}
def execute(self, context):
@ -1179,8 +1135,6 @@ class VIEW3D_OT_vr_actions_clear(Operator):
if not am:
return {'CANCELLED'}
am.selected_item = 0
while am.actionmap_items:
am.actionmap_items.remove(am.actionmap_items[0])