Bug 1631648 [wpt PR 23126] - WebXR - AR - adjust XRRay to match the spec, a=testonly

marco-c · marco-c · commit 1dbed31d99a3 · 2020-05-03T16:20:58.000Z
Automatic update from web-platform-tests WebXR - AR - adjust XRRay to match the spec Bring XRRay up to spec, adjusting the behavior with changes introduced by PR: immersive-web/hit-test#85 Additionally, fix Chrome's Web IDL to not rely on overloads. Change-Id: I98af1a4ed90dbeb8e311795e818efb64bb15034d -- wpt-commits: fd045759df43fa155b34a5e4fe4187610ad1bb24 wpt-pr: 23126 UltraBlame original commit: 32e3888c79b097fdd320539a1b9b1895f9cd03ff
diff --git a/testing/web-platform/tests/webxr/hit-test/xrRay_constructor.https.html b/testing/web-platform/tests/webxr/hit-test/xrRay_constructor.https.html
@@ -167,16 +167,38 @@
 transform
 :
 let
-xrRay
+xrRay1
+=
+new
+XRRay
+(
+)
+;
+let
+xrRay2
 =
 new
 XRRay
 (
+{
+}
+)
+;
+let
+xrRay3
+=
+new
+XRRay
+(
+{
+}
+{
+}
 )
 ;
 assert_point_approx_equals
 (
-xrRay
+xrRay1
 .
 origin
 {
@@ -212,7 +234,7 @@
 ;
 assert_point_approx_equals
 (
-xrRay
+xrRay1
 .
 direction
 {
@@ -249,7 +271,7 @@
 ;
 assert_matrix_approx_equals
 (
-xrRay
+xrRay1
 .
 matrix
 IDENTITY_MATRIX
@@ -262,6 +284,36 @@
 "
 )
 ;
+assert_ray_approx_equals
+(
+xrRay1
+xrRay2
+FLOAT_EPSILON
+"
+ray1
+-
+ray2
+-
+default
+:
+"
+)
+;
+assert_ray_approx_equals
+(
+xrRay2
+xrRay3
+FLOAT_EPSILON
+"
+ray2
+-
+ray3
+-
+default
+:
+"
+)
+;
 }
 {
 /
@@ -302,6 +354,15 @@
 }
 ;
 let
+xrRay1
+=
+new
+XRRay
+(
+originDict
+)
+;
+let
 xrRay2
 =
 new
@@ -353,7 +414,7 @@
 ;
 assert_point_approx_equals
 (
-xrRay2
+xrRay1
 .
 origin
 originDict
@@ -372,7 +433,7 @@
 ;
 assert_point_approx_equals
 (
-xrRay2
+xrRay1
 .
 direction
 {
@@ -413,7 +474,7 @@
 ;
 assert_matrix_approx_equals
 (
-xrRay2
+xrRay1
 .
 matrix
 matrix1
@@ -432,6 +493,23 @@
 ;
 assert_ray_approx_equals
 (
+xrRay1
+xrRay2
+FLOAT_EPSILON
+"
+ray1
+-
+ray2
+-
+direction
+-
+default
+:
+"
+)
+;
+assert_ray_approx_equals
+(
 xrRay2
 xrRay3
 FLOAT_EPSILON
@@ -587,6 +665,16 @@
 ]
 ;
 let
+xrRay1
+=
+new
+XRRay
+(
+originDict
+directionDict
+)
+;
+let
 xrRay2
 =
 new
@@ -628,7 +716,7 @@
 ;
 assert_point_approx_equals
 (
-xrRay2
+xrRay1
 .
 origin
 originDict
@@ -643,7 +731,7 @@
 ;
 assert_point_approx_equals
 (
-xrRay2
+xrRay1
 .
 direction
 directionNorm
@@ -658,7 +746,7 @@
 ;
 assert_matrix_approx_equals
 (
-xrRay2
+xrRay1
 .
 matrix
 matrix1
@@ -673,6 +761,19 @@
 ;
 assert_ray_approx_equals
 (
+xrRay1
+xrRay2
+FLOAT_EPSILON
+"
+ray1
+-
+ray2
+:
+"
+)
+;
+assert_ray_approx_equals
+(
 xrRay2
 xrRay3
 FLOAT_EPSILON
@@ -1063,7 +1164,7 @@
 ]
 ;
 let
-xrRay4
+xrRay
 =
 new
 XRRay
@@ -1088,7 +1189,7 @@
 ;
 assert_point_approx_equals
 (
-xrRay4
+xrRay
 .
 origin
 originDict
@@ -1105,7 +1206,7 @@
 ;
 assert_point_approx_equals
 (
-xrRay4
+xrRay
 .
 direction
 directionNorm2
@@ -1122,7 +1223,7 @@
 ;
 assert_matrix_approx_equals
 (
-xrRay4
+xrRay
 .
 matrix
 matrix2

Original file line number	Diff line number	Diff line change
`@@ -167,16 +167,38 @@`
`167`	`167`	`transform`
`168`	`168`	`:`
`169`	`169`	`let`
`170`		`-xrRay`
	`170`	`+xrRay1`
	`171`	`+=`
	`172`	`+new`
	`173`	`+XRRay`
	`174`	`+(`
	`175`	`+)`
	`176`	`+;`
	`177`	`+let`
	`178`	`+xrRay2`
`171`	`179`	`=`
`172`	`180`	`new`
`173`	`181`	`XRRay`
`174`	`182`	`(`
	`183`	`+{`
	`184`	`+}`
	`185`	`+)`
	`186`	`+;`
	`187`	`+let`
	`188`	`+xrRay3`
	`189`	`+=`
	`190`	`+new`
	`191`	`+XRRay`
	`192`	`+(`
	`193`	`+{`
	`194`	`+}`
	`195`	`+{`
	`196`	`+}`
`175`	`197`	`)`
`176`	`198`	`;`
`177`	`199`	`assert_point_approx_equals`
`178`	`200`	`(`
`179`		`-xrRay`
	`201`	`+xrRay1`
`180`	`202`	`.`
`181`	`203`	`origin`
`182`	`204`	`{`
`@@ -212,7 +234,7 @@`
`212`	`234`	`;`
`213`	`235`	`assert_point_approx_equals`
`214`	`236`	`(`
`215`		`-xrRay`
	`237`	`+xrRay1`
`216`	`238`	`.`
`217`	`239`	`direction`
`218`	`240`	`{`
`@@ -249,7 +271,7 @@`
`249`	`271`	`;`
`250`	`272`	`assert_matrix_approx_equals`
`251`	`273`	`(`
`252`		`-xrRay`
	`274`	`+xrRay1`
`253`	`275`	`.`
`254`	`276`	`matrix`
`255`	`277`	`IDENTITY_MATRIX`
`@@ -262,6 +284,36 @@`
`262`	`284`	`"`
`263`	`285`	`)`
`264`	`286`	`;`
	`287`	`+assert_ray_approx_equals`
	`288`	`+(`
	`289`	`+xrRay1`
	`290`	`+xrRay2`
	`291`	`+FLOAT_EPSILON`
	`292`	`+"`
	`293`	`+ray1`
	`294`	`+-`
	`295`	`+ray2`
	`296`	`+-`
	`297`	`+default`
	`298`	`+:`
	`299`	`+"`
	`300`	`+)`
	`301`	`+;`
	`302`	`+assert_ray_approx_equals`
	`303`	`+(`
	`304`	`+xrRay2`
	`305`	`+xrRay3`
	`306`	`+FLOAT_EPSILON`
	`307`	`+"`
	`308`	`+ray2`
	`309`	`+-`
	`310`	`+ray3`
	`311`	`+-`
	`312`	`+default`
	`313`	`+:`
	`314`	`+"`
	`315`	`+)`
	`316`	`+;`
`265`	`317`	`}`
`266`	`318`	`{`
`267`	`319`	`/`
`@@ -302,6 +354,15 @@`
`302`	`354`	`}`
`303`	`355`	`;`
`304`	`356`	`let`
	`357`	`+xrRay1`
	`358`	`+=`
	`359`	`+new`
	`360`	`+XRRay`
	`361`	`+(`
	`362`	`+originDict`
	`363`	`+)`
	`364`	`+;`
	`365`	`+let`
`305`	`366`	`xrRay2`
`306`	`367`	`=`
`307`	`368`	`new`
`@@ -353,7 +414,7 @@`
`353`	`414`	`;`
`354`	`415`	`assert_point_approx_equals`
`355`	`416`	`(`
`356`		`-xrRay2`
	`417`	`+xrRay1`
`357`	`418`	`.`
`358`	`419`	`origin`
`359`	`420`	`originDict`
`@@ -372,7 +433,7 @@`
`372`	`433`	`;`
`373`	`434`	`assert_point_approx_equals`
`374`	`435`	`(`
`375`		`-xrRay2`
	`436`	`+xrRay1`
`376`	`437`	`.`
`377`	`438`	`direction`
`378`	`439`	`{`
`@@ -413,7 +474,7 @@`
`413`	`474`	`;`
`414`	`475`	`assert_matrix_approx_equals`
`415`	`476`	`(`
`416`		`-xrRay2`
	`477`	`+xrRay1`
`417`	`478`	`.`
`418`	`479`	`matrix`
`419`	`480`	`matrix1`
`@@ -432,6 +493,23 @@`
`432`	`493`	`;`
`433`	`494`	`assert_ray_approx_equals`
`434`	`495`	`(`
	`496`	`+xrRay1`
	`497`	`+xrRay2`
	`498`	`+FLOAT_EPSILON`
	`499`	`+"`
	`500`	`+ray1`
	`501`	`+-`
	`502`	`+ray2`
	`503`	`+-`
	`504`	`+direction`
	`505`	`+-`
	`506`	`+default`
	`507`	`+:`
	`508`	`+"`
	`509`	`+)`
	`510`	`+;`
	`511`	`+assert_ray_approx_equals`
	`512`	`+(`
`435`	`513`	`xrRay2`
`436`	`514`	`xrRay3`
`437`	`515`	`FLOAT_EPSILON`
`@@ -587,6 +665,16 @@`
`587`	`665`	`]`
`588`	`666`	`;`
`589`	`667`	`let`
	`668`	`+xrRay1`
	`669`	`+=`
	`670`	`+new`
	`671`	`+XRRay`
	`672`	`+(`
	`673`	`+originDict`
	`674`	`+directionDict`
	`675`	`+)`
	`676`	`+;`
	`677`	`+let`
`590`	`678`	`xrRay2`
`591`	`679`	`=`
`592`	`680`	`new`
`@@ -628,7 +716,7 @@`
`628`	`716`	`;`
`629`	`717`	`assert_point_approx_equals`
`630`	`718`	`(`
`631`		`-xrRay2`
	`719`	`+xrRay1`
`632`	`720`	`.`
`633`	`721`	`origin`
`634`	`722`	`originDict`
`@@ -643,7 +731,7 @@`
`643`	`731`	`;`
`644`	`732`	`assert_point_approx_equals`
`645`	`733`	`(`
`646`		`-xrRay2`
	`734`	`+xrRay1`
`647`	`735`	`.`
`648`	`736`	`direction`
`649`	`737`	`directionNorm`
`@@ -658,7 +746,7 @@`
`658`	`746`	`;`
`659`	`747`	`assert_matrix_approx_equals`
`660`	`748`	`(`
`661`		`-xrRay2`
	`749`	`+xrRay1`
`662`	`750`	`.`
`663`	`751`	`matrix`
`664`	`752`	`matrix1`
`@@ -673,6 +761,19 @@`
`673`	`761`	`;`
`674`	`762`	`assert_ray_approx_equals`
`675`	`763`	`(`
	`764`	`+xrRay1`
	`765`	`+xrRay2`
	`766`	`+FLOAT_EPSILON`
	`767`	`+"`
	`768`	`+ray1`
	`769`	`+-`
	`770`	`+ray2`
	`771`	`+:`
	`772`	`+"`
	`773`	`+)`
	`774`	`+;`
	`775`	`+assert_ray_approx_equals`
	`776`	`+(`
`676`	`777`	`xrRay2`
`677`	`778`	`xrRay3`
`678`	`779`	`FLOAT_EPSILON`
`@@ -1063,7 +1164,7 @@`
`1063`	`1164`	`]`
`1064`	`1165`	`;`
`1065`	`1166`	`let`
`1066`		`-xrRay4`
	`1167`	`+xrRay`
`1067`	`1168`	`=`
`1068`	`1169`	`new`
`1069`	`1170`	`XRRay`
`@@ -1088,7 +1189,7 @@`
`1088`	`1189`	`;`
`1089`	`1190`	`assert_point_approx_equals`
`1090`	`1191`	`(`
`1091`		`-xrRay4`
	`1192`	`+xrRay`
`1092`	`1193`	`.`
`1093`	`1194`	`origin`
`1094`	`1195`	`originDict`
`@@ -1105,7 +1206,7 @@`
`1105`	`1206`	`;`
`1106`	`1207`	`assert_point_approx_equals`
`1107`	`1208`	`(`
`1108`		`-xrRay4`
	`1209`	`+xrRay`
`1109`	`1210`	`.`
`1110`	`1211`	`direction`
`1111`	`1212`	`directionNorm2`
`@@ -1122,7 +1223,7 @@`
`1122`	`1223`	`;`
`1123`	`1224`	`assert_matrix_approx_equals`
`1124`	`1225`	`(`
`1125`		`-xrRay4`
	`1226`	`+xrRay`
`1126`	`1227`	`.`
`1127`	`1228`	`matrix`
`1128`	`1229`	`matrix2`