mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-01 12:46:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

aux/binding: extract monado_binding earlier from list

Browse source
This commit is contained in:
Christoph Haag 2022-01-13 14:16:20 +01:00
parent d8cce715da
commit 77f19161fb
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/xrt/auxiliary/bindings/bindings.py
View file

@ -56,12 +56,16 @@ class Component:
continue continue
for component_name in json_subpath["components"]: # click, touch, ... for component_name in json_subpath["components"]: # click, touch, ...
monado_binding = None
if component_name in json_subpath["monado_bindings"]:
monado_binding = json_subpath["monado_bindings"][component_name]
c = Component(subaction_path, c = Component(subaction_path,
subpath_name, subpath_name,
json_subpath["localized_name"], json_subpath["localized_name"],
json_subpath["type"], json_subpath["type"],
component_name, component_name,
json_subpath["monado_bindings"], monado_binding,
json_subpath["components"]) json_subpath["components"])
component_list.append(c) component_list.append(c)
@ -73,14 +77,14 @@ class Component:
subpath_localized_name, subpath_localized_name,
subpath_type, subpath_type,
component_name, component_name,
json_monado_bindings, monado_binding,
components_for_subpath): components_for_subpath):
self.subaction_path = subaction_path self.subaction_path = subaction_path
self.subpath_name = subpath_name # note: starts with a slash self.subpath_name = subpath_name # note: starts with a slash
self.subpath_localized_name = subpath_localized_name self.subpath_localized_name = subpath_localized_name
self.subpath_type = subpath_type self.subpath_type = subpath_type
self.component_name = component_name self.component_name = component_name
self.json_monado_bindings = json_monado_bindings self.monado_binding = monado_binding
# click, touch etc. components under the subpath of this component. Only needed for steamvr profile gen. # click, touch etc. components under the subpath of this component. Only needed for steamvr profile gen.
self.components_for_subpath = components_for_subpath self.components_for_subpath = components_for_subpath
@ -236,8 +240,8 @@ def generate_bindings_c(file, p):
component_str = component.component_name component_str = component.component_name
# controllers can have input that we don't have bindings for # controllers can have input that we don't have bindings for
if component_str in component.json_monado_bindings: if component.monado_binding:
monado_binding = component.json_monado_bindings[component_str] monado_binding = component.monado_binding
if component.is_input() and monado_binding is not None: if component.is_input() and monado_binding is not None:
f.write(f'\t\t\t\t.input = {monado_binding},\n') f.write(f'\t\t\t\t.input = {monado_binding},\n')
@ -262,16 +266,13 @@ def generate_bindings_c(file, p):
component: Component component: Component
for idx, component in enumerate(profile.components): for idx, component in enumerate(profile.components):
component_str = component.component_name if not component.monado_binding:
if component_str not in component.json_monado_bindings:
continue continue
monado_binding = component.json_monado_bindings[component_str]
if component.subpath_type == "vibration": if component.subpath_type == "vibration":
outputs.add(monado_binding) outputs.add(component.monado_binding)
else: else:
inputs.add(monado_binding) inputs.add(component.monado_binding)
# special cased bindings that are never directly used in the input profiles # special cased bindings that are never directly used in the input profiles
inputs.add("XRT_INPUT_GENERIC_HEAD_POSE") inputs.add("XRT_INPUT_GENERIC_HEAD_POSE")