<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[177198] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/177198">177198</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-12-11 17:41:30 -0800 (Thu, 11 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Normalize iOS DeviceOrientation beta/gamma per spec.
https://bugs.webkit.org/show_bug.cgi?id=137134
<radr://problem/9414459>
Patch by Rich Tibbett <rich.tibbett@gmail.com> on 2014-12-11
Reviewed by Benjamin Poulain.
Normalize DeviceOrientation beta and gamma on iOS to match the
conventions defined in the W3C DeviceOrientation Events specification.
beta values are returned in the range [-180, 180). gamma values are
returned in the range [-90, 90).
* platform/ios/WebCoreMotionManager.mm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebCoreMotionManagermm">trunk/Source/WebCore/platform/ios/WebCoreMotionManager.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177197 => 177198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-12 01:37:07 UTC (rev 177197)
+++ trunk/Source/WebCore/ChangeLog 2014-12-12 01:41:30 UTC (rev 177198)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-12-11 Rich Tibbett <rich.tibbett@gmail.com>
+
+ [iOS] Normalize iOS DeviceOrientation beta/gamma per spec.
+ https://bugs.webkit.org/show_bug.cgi?id=137134
+ <radr://problem/9414459>
+
+ Reviewed by Benjamin Poulain.
+
+ Normalize DeviceOrientation beta and gamma on iOS to match the
+ conventions defined in the W3C DeviceOrientation Events specification.
+
+ beta values are returned in the range [-180, 180). gamma values are
+ returned in the range [-90, 90).
+
+ * platform/ios/WebCoreMotionManager.mm:
+
</ins><span class="cx"> 2014-12-11 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r177081.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebCoreMotionManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebCoreMotionManager.mm (177197 => 177198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebCoreMotionManager.mm 2014-12-12 01:37:07 UTC (rev 177197)
+++ trunk/Source/WebCore/platform/ios/WebCoreMotionManager.mm 2014-12-12 01:41:30 UTC (rev 177198)
</span><span class="lines">@@ -252,23 +252,74 @@
</span><span class="cx"> Vector<WebCore::DeviceOrientationClientIOS*> orientationClients;
</span><span class="cx"> copyToVector(m_deviceOrientationClients, orientationClients);
</span><span class="cx">
</span><del>- // Note that the W3C DeviceOrientation specification labels the X axis
- // as passing between the sides of the device, and the Y axis as passing
- // from top to bottom of the device. Conventional Tait-Bryan Euler angles
- // have the X axis pointing forward (the heading of the aircraft, for
- // example), which is what you would "roll" around, and what the W3C says
- // is the Y axis. Unfortunately CoreMotion doesn't normalize in the
- // same order as the W3C requests, so our beta is [-90, 90] and gamma is
- // [-180, 180]. For most practical uses this is acceptable.
- // See <rdar://problem/9414459> Normalize our DeviceOrientation beta/gamma per spec
</del><ins>+ // Compose the raw motion data to an intermediate ZXY-based 3x3 rotation
+ // matrix (R) where [z=attitude.yaw, x=attitude.pitch, y=attitude.roll]
+ // in the form:
+ //
+ // / R[0] R[1] R[2] \
+ // | R[3] R[4] R[5] |
+ // \ R[6] R[7] R[8] /
</ins><span class="cx">
</span><del>- // Rotation around the Z axis (pointing up, normalized to [0, 360] deg).
- double alpha = rad2deg(attitude.yaw > 0 ? attitude.yaw : (M_PI * 2 + attitude.yaw));
- // Rotation around the X axis (side to side).
- double beta = rad2deg(attitude.pitch);
- // Rotation around the Y axis (top to bottom).
- double gamma = rad2deg(attitude.roll);
</del><ins>+ double cX = cos(attitude.pitch);
+ double cY = cos(attitude.roll);
+ double cZ = cos(attitude.yaw);
+ double sX = sin(attitude.pitch);
+ double sY = sin(attitude.roll);
+ double sZ = sin(attitude.yaw);
</ins><span class="cx">
</span><ins>+ double R[] = {
+ cZ * cY - sZ * sX * sY,
+ - cX * sZ,
+ cY * sZ * sX + cZ * sY,
+ cY * sZ + cZ * sX * sY,
+ cZ * cX,
+ sZ * sY - cZ * cY * sX,
+ - cX * sY,
+ sX,
+ cX * cY
+ };
+
+ // Compute correct, normalized values for DeviceOrientation from
+ // rotation matrix (R) according to the angle conventions defined in the
+ // W3C DeviceOrientation specification.
+
+ double zRot;
+ double xRot;
+ double yRot;
+
+ if (R[8] > 0) {
+ zRot = atan2(-R[1], R[4]);
+ xRot = asin(R[7]);
+ yRot = atan2(-R[6], R[8]);
+ } else if (R[8] < 0) {
+ zRot = atan2(R[1], -R[4]);
+ xRot = -asin(R[7]);
+ xRot += (xRot >= 0) ? -M_PI : M_PI;
+ yRot = atan2(R[6], -R[8]);
+ } else {
+ if (R[6] > 0) {
+ zRot = atan2(-R[1], R[4]);
+ xRot = asin(R[7]);
+ yRot = -M_PI_2;
+ } else if (R[6] < 0) {
+ zRot = atan2(R[1], -R[4]);
+ xRot = -asin(R[7]);
+ xRot += (xRot >= 0) ? -M_PI : M_PI;
+ yRot = -M_PI_2;
+ } else {
+ zRot = atan2(R[3], R[0]);
+ xRot = (R[7] > 0) ? M_PI_2 : -M_PI_2;
+ yRot = 0;
+ }
+ }
+
+ // Rotation around the Z axis (pointing up. normalized to [0, 360] deg).
+ double alpha = rad2deg(zRot > 0 ? zRot : (M_PI * 2 + zRot));
+ // Rotation around the X axis (top to bottom).
+ double beta = rad2deg(xRot);
+ // Rotation around the Y axis (side to side).
+ double gamma = rad2deg(yRot);
+
</ins><span class="cx"> double heading = (m_headingAvailable && newHeading) ? newHeading.magneticHeading : 0;
</span><span class="cx"> double headingAccuracy = (m_headingAvailable && newHeading) ? newHeading.headingAccuracy : -1;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>