diff --git a/index.bs b/index.bs index c8643ce9..965fc951 100755 --- a/index.bs +++ b/index.bs @@ -832,7 +832,7 @@ When this method is invoked, the user agent MUST run the following steps: -Each {{XRSession}} has a list of active XR input sources (a [=/list=] of {{XRInputSource}}) and a list of active XR tracked sources (a [=/list=] of {{XRInputSource}}) which MUST be initially an empty [=/list=]. +Each {{XRSession}} has a list of active XR input sources (a [=/list=] of {{XRInputSource}}) and a list of active XR tracked sources (a [=/list=] of {{XRInputSource}}) which MUST both be initially an empty [=/list=]. Each {{XRSession}} has an XR device, which is an [=/XR device=] set at initialization. @@ -867,7 +867,7 @@ When new [=XR input source=]s become 1. [=list/Extend=] |session|'s [=list of active XR input sources=] with |added primary sources|. 1. If |added primary sources| is not empty, fire an {{XRInputSourcesChangeEvent}} named {{inputsourceschange!!event}} on |session| with {{XRInputSourcesChangeEvent/added}} set to |added primary sources|. 1. [=list/Extend=] |session|'s [=list of active XR tracked sources=] with |added tracked sources|. - 1. If |added tracked sources| is not empty, fire an {{XRTrackedSourcesChangeEvent}} named {{trackedsourceschange!!event}} on |session| with {{XRTrackedSourcesChangeEvent/added}} set to |added tracked sources|. + 1. If |added tracked sources| is not empty, fire an {{XRInputSourcesChangeEvent}} named {{trackedsourceschange!!event}} on |session| with {{XRInputSourcesChangeEvent/added}} set to |added tracked sources|. @@ -892,7 +892,7 @@ When any previously added [=XR inp 1. [=list/Remove=] each {{XRInputSource}} in |removed primary sources| from |session|'s [=list of active XR input sources=]. 1. If |removed primary sources| is not empty, fire an {{XRInputSourcesChangeEvent}} named {{inputsourceschange!!event}} on |session| with {{XRInputSourcesChangeEvent/removed}} set to |removed primary sources|. 1. [=list/Remove=] each {{XRInputSource}} in |removed tracked sources| from |session|'s [=list of active XR tracked sources=]. - 1. If |removed tracked sources| is not empty, fire an {{XRTrackedSourcesChangeEvent}} named {{trackedsourceschange!!event}} on |session| with {{XRTrackedSourcesChangeEvent/removed}} set to |removed tracked sources|. + 1. If |removed tracked sources| is not empty, fire an {{XRInputSourcesChangeEvent}} named {{trackedsourceschange!!event}} on |session| with {{XRInputSourcesChangeEvent/removed}} set to |removed tracked sources|. Note: The user agent MAY fire this event when an input source temporarily loses both position and orientation tracking. It is recommended that this only be done for physical handheld controller input sources. It is not recommended that this event be fired when this happens for tracked hand input sources, because this will happen often, nor is it recommended when this happens for tracker object input sources, since this makes it harder for the application to maintain a notion of identity. @@ -932,7 +932,7 @@ When the {{XRInputSource/ha 1. If |added primary sources| or |removed primary sources| are not empty, fire an {{XRInputSourcesChangeEvent}} named {{inputsourceschange!!event}} on |session| with{{XRInputSourcesChangeEvent/added}} set to |added primary sources| and {{XRInputSourcesChangeEvent/removed}} set to |removed primary sources|. 1. [=list/Remove=] each {{XRInputSource}} in |removed tracked sources| from |session|'s [=list of active XR tracked sources=]. 1. [=list/Extend=] |session|'s [=list of active XR input sources=] with |added tracked sources|. - 1. If |added tracked sources| or |removed tracked sources| are not empty, fire an {{XRTrackedSourcesChangeEvent}} named {{trackedsourceschange!!event}} on |session| with {{XRTrackedSourcesChangeEvent/added}} set to |added tracked sources| and {{XRTrackedSourcesChangeEvent/removed}} set to |removed tracked sources|. + 1. If |added tracked sources| or |removed tracked sources| are not empty, fire an {{XRInputSourcesChangeEvent}} named {{trackedsourceschange!!event}} on |session| with {{XRInputSourcesChangeEvent/added}} set to |added tracked sources| and {{XRInputSourcesChangeEvent/removed}} set to |removed tracked sources|. @@ -977,8 +977,6 @@ The onend attribute is an [=Event handler I The oninputsourceschange attribute is an [=Event handler IDL attribute=] for the {{inputsourceschange}} event type. -The ontrackedsourceschange attribute is an [=Event handler IDL attribute=] for the {{trackedsourceschange}} event type. - The onselectstart attribute is an [=Event handler IDL attribute=] for the {{XRSession/selectstart}} event type. The onselectend attribute is an [=Event handler IDL attribute=] for the {{selectend}} event type. @@ -2527,35 +2525,6 @@ The added attribute is a [= The removed attribute is a [=/list=] of {{XRInputSource}}s that were removed from the {{XRSession}} at the time of the event. -XRTrackedSourcesChangeEvent {#xrtrackedsourceschangeevent-interface} -------------------------- - -{{XRTrackedSourcesChangeEvent}}s are fired to indicate changes to the [=list of active XR tracked sources=] that are available to an {{XRSession}}. - -
-[SecureContext, Exposed=Window]
-interface XRTrackedSourcesChangeEvent : Event {
-  constructor(DOMString type, XRTrackedSourcesChangeEventInit eventInitDict);
-  [SameObject] readonly attribute XRSession session;
-  [SameObject] readonly attribute FrozenArray<XRInputSource> added;
-  [SameObject] readonly attribute FrozenArray<XRInputSource> removed;
-};
-
-dictionary XRTrackedSourcesChangeEventInit : EventInit {
-  required XRSession session;
-  required FrozenArray<XRInputSource> added;
-  required FrozenArray<XRInputSource> removed;
-
-};
-
- -The session attribute indicates the {{XRSession}} that generated the event. - -The added attribute is a [=/list=] of {{XRInputSource}}s that were added to the {{XRSession}} at the time of the event. - -The removed attribute is a [=/list=] of {{XRInputSource}}s that were removed from the {{XRSession}} at the time of the event. - - XRReferenceSpaceEvent {#xrreferencespaceevent-interface} --------------------- @@ -2592,7 +2561,7 @@ A user agent MUST [=fire an event=] named end u A user agent MUST [=fire an event=] named inputsourceschange using {{XRInputSourcesChangeEvent}} on an {{XRSession}} when the session's [=list of active XR input sources=] has changed. -A user agent MUST [=fire an event=] named trackedsourceschange using {{XRTrackedSourcesChangeEvent}} on an {{XRSession}} when the session's [=list of active XR tracked sources=] has changed. +A user agent MUST [=fire an event=] named trackedsourceschange using {{XRInputSourcesChangeEvent}} on an {{XRSession}} when the session's [=list of active XR tracked sources=] has changed. A user agent MUST [=fire an event=] named selectstart using {{XRInputSourceEvent}} on an {{XRSession}} when one of its {{XRInputSource}}s begins its [=primary action=]. The event MUST be of type .