Skip to content

Commit 78d4dcf

Browse files
committed
Fix issues in haptic action semantics (2nd edition)
1 parent 9d5619f commit 78d4dcf

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

extensions/2.0/Vendor/MPEG_interactivity/schema/MPEG_interactivity.hapticActionMedia.schema.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
"description": "Indices of the perceptions of the media that shall be rendered. If the list is empty, all perceptions shall be rendered."
1616
},
17-
"haptic_modality": {
17+
"hapticModality": {
1818
"type": "array",
1919
"enum": [0,1,2,3,4,5],
2020
"items": {
@@ -24,7 +24,7 @@
2424
"gltf_detailedDescription": "Value is oneOf Stiffness = 0, Friction = 1,Vibrotactile Texture = 2, Temperature = 3,Vibration = 4, Custom = 5"
2525

2626
},
27-
"haptic_control": {
27+
"hapticControl": {
2828
"type": "integer",
2929
"enum": [0,1,2,3],
3030
"default": 0,
@@ -38,7 +38,7 @@
3838
}
3939
},
4040
"required": [
41-
"media_index",
42-
"perception_indices"
41+
"mediaIndex",
42+
"perceptionIndices"
4343
]
4444
}

extensions/2.0/Vendor/MPEG_interactivity/schema/MPEG_interactivity.hapticActionNode.schema.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
"type": "integer",
88
"description": "Index of the node in the nodes array to launch their haptic feedbacks"
99
},
10-
"material_haptic_modality": {
10+
"hapticObject": {
11+
"type": "integer",
12+
"description": "Index to a haptic object in the hapticObjects array of the MPEG_haptic extension."
13+
},
14+
"materialHapticModality": {
1115
"type": "array",
1216
"items": {
1317
"type": "integer",
@@ -31,7 +35,7 @@
3135
"default": false,
3236
"description": "Used with a Collision trigger. If True, the rendering engine shall use collision information to estimate the desired location of the haptic feedback on the body. If false, the signal shall be rendered based on the information specified in the Haptic file.."
3337
},
34-
"haptic_action_medias": {
38+
"hapticActionMedias": {
3539
"description": "List of haptic medias that shall be rendered with their associated properties.",
3640
"type": "array",
3741
"items": {
@@ -42,6 +46,6 @@
4246
},
4347
"required": [
4448
"node",
45-
"haptic_action_medias"
49+
"hapticActionMedias"
4650
]
4751
}

0 commit comments

Comments
 (0)