=?UTF-8?Q?Rico=20Sch=C3=BCller=20?=: d3dx9: Use float functions in D3DXQuaternionLn().

Alexandre Julliard julliard at winehq.org
Thu Sep 27 15:39:08 CDT 2012


Module: wine
Branch: master
Commit: e921953374b1a4f4abeb1df5fac25a0a779149e2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e921953374b1a4f4abeb1df5fac25a0a779149e2

Author: Rico Schüller <kgbricola at web.de>
Date:   Thu Sep 27 12:14:18 2012 +0200

d3dx9: Use float functions in D3DXQuaternionLn().

---

 dlls/d3dx9_36/math.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c
index 9be3011..8cce57e 100644
--- a/dlls/d3dx9_36/math.c
+++ b/dlls/d3dx9_36/math.c
@@ -1305,23 +1305,23 @@ D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3DXQUA
     return pout;
 }
 
-D3DXQUATERNION* WINAPI D3DXQuaternionLn(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq)
+D3DXQUATERNION * WINAPI D3DXQuaternionLn(D3DXQUATERNION *out, const D3DXQUATERNION *q)
 {
     FLOAT t;
 
-    TRACE("(%p, %p)\n", pout, pq);
+    TRACE("out %p, q %p\n", out, q);
 
-    if ( (pq->w >= 1.0f) || (pq->w == -1.0f) )
+    if ((q->w >= 1.0f) || (q->w == -1.0f))
         t = 1.0f;
     else
-        t = acos( pq->w ) / sqrt( 1.0f - pq->w * pq->w );
+        t = acosf(q->w) / sqrtf(1.0f - q->w * q->w);
 
-    pout->x = t * pq->x;
-    pout->y = t * pq->y;
-    pout->z = t * pq->z;
-    pout->w = 0.0f;
+    out->x = t * q->x;
+    out->y = t * q->y;
+    out->z = t * q->z;
+    out->w = 0.0f;
 
-    return pout;
+    return out;
 }
 
 D3DXQUATERNION* WINAPI D3DXQuaternionMultiply(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq1, CONST D3DXQUATERNION *pq2)




More information about the wine-cvs mailing list