Implememnts D3DRMVectorRotate

[David.Adam at math.cnrs.fr]

-------------- next part --------------
>From 340f00cefa0444510b6afefa4ac57346af7905bb Mon Sep 17 00:00:00 2001
From: Adam <David.Adam at math.cnrs.fr>
Date: Mon, 16 Apr 2007 08:23:18 +0200
Subject: [PATCH] [15] Implements D3DRMVectorRotate with test

---
 dlls/d3drm/d3drm.spec     |    2 +-
 dlls/d3drm/math.c         |   18 ++++++++++++++++++
 dlls/d3drm/tests/vector.c |   22 ++++++++++++++++++++--
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec
index 8d79f86..4499211 100644
--- a/dlls/d3drm/d3drm.spec
+++ b/dlls/d3drm/d3drm.spec
@@ -15,7 +15,7 @@
 @ stdcall D3DRMVectorNormalize(ptr)
 @ stdcall D3DRMVectorRandom(ptr)
 @ stdcall D3DRMVectorReflect(ptr ptr ptr)
-@ stub D3DRMVectorRotate
+@ stdcall D3DRMVectorRotate(ptr ptr ptr long)
 @ stdcall D3DRMVectorScale(ptr ptr long)
 @ stdcall D3DRMVectorSubtract(ptr ptr ptr)
 @ stub Direct3DRMCreate
diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c
index 7dbfffa..780d86a 100644
--- a/dlls/d3drm/math.c
+++ b/dlls/d3drm/math.c
@@ -143,6 +143,24 @@ LPD3DVECTOR D3DRMAPI D3DRMVectorReflect(
     return r;
 }
 
+/* Rotation of a vector */
+LPD3DVECTOR D3DRMAPI D3DRMVectorRotate(LPD3DVECTOR r, LPD3DVECTOR v, LPD3DVECTOR axis, D3DVALUE theta)
+{
+    D3DRMQUATERNION quaternion,quaternion1, quaternion2, quaternion3, resultq;
+    D3DVECTOR NORM;
+
+    quaternion1.s=cos(theta*.5);
+    quaternion2.s=cos(theta*.5);
+    NORM=*D3DRMVectorNormalize(axis);
+    D3DRMVectorScale(&(quaternion1.v),&NORM,sin(theta * .5));
+    D3DRMVectorScale(&(quaternion2.v),&NORM,-sin(theta * .5));
+    quaternion3.s=0; quaternion3.v=*v;
+    D3DRMQuaternionMultiply(&quaternion,&quaternion1,&quaternion3);
+    D3DRMQuaternionMultiply(&resultq,&quaternion,&quaternion2);
+    r=D3DRMVectorNormalize(&(resultq.v));
+    return r;
+}
+
 /* Scale a vector */
 LPD3DVECTOR D3DRMAPI D3DRMVectorScale(LPD3DVECTOR d, LPD3DVECTOR s, D3DVALUE factor)
 {
diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c
index 5c8855b..37eb81d 100644
--- a/dlls/d3drm/tests/vector.c
+++ b/dlls/d3drm/tests/vector.c
@@ -57,6 +57,7 @@ static D3DVALUE (D3DRMAPI *pD3DRMVectorD
 static D3DVALUE (D3DRMAPI *pD3DRMVectorModulus)(LPD3DVECTOR);
 static LPD3DVECTOR (D3DRMAPI *pD3DRMVectorNormalize)(LPD3DVECTOR);
 static LPD3DVECTOR (D3DRMAPI *pD3DRMVectorReflect)(LPD3DVECTOR,LPD3DVECTOR,LPD3DVECTOR);
+static LPD3DVECTOR (D3DRMAPI *pD3DRMVectorRotate)(LPD3DVECTOR,LPD3DVECTOR,LPD3DVECTOR,D3DVALUE);
 static LPD3DVECTOR (D3DRMAPI *pD3DRMVectorScale)(LPD3DVECTOR,LPD3DVECTOR,D3DVALUE);
 static LPD3DVECTOR (D3DRMAPI *pD3DRMVectorSubtract)(LPD3DVECTOR,LPD3DVECTOR,LPD3DVECTOR);
 
@@ -81,6 +82,7 @@ static void init_function_pointers(void)
     pD3DRMVectorModulus = (void*)GetProcAddress(hmod, "D3DRMVectorModulus");
     pD3DRMVectorNormalize = (void*)GetProcAddress(hmod, "D3DRMVectorNormalize");
     pD3DRMVectorReflect = (void*)GetProcAddress(hmod, "D3DRMVectorReflect");
+    pD3DRMVectorRotate = (void*)GetProcAddress(hmod, "D3DRMVectorRotate");
     pD3DRMVectorScale = (void*)GetProcAddress(hmod, "D3DRMVectorScale");
     pD3DRMVectorSubtract = (void*)GetProcAddress(hmod, "D3DRMVectorSubtract");
 
@@ -93,11 +95,13 @@ static void init_function_pointers(void)
 
 static void VectorTest(void)
 {
-    D3DVALUE mod,par;
-    D3DVECTOR e,r,u,v,casnul,ray,norm;
+    D3DVALUE mod,par,theta=2*PI/3;
+    D3DVECTOR e,r,u,v,w,axis,casnul,ray,norm;
 
     u.x=2.0;u.y=2.0;u.z=1.0;
     v.x=4.0;v.y=4.0;v.z=0.0;
+    w.x=3.0;w.y=4.0;w.z=0.0;
+    axis.x=0.0;axis.y=0.0;axis.z=1.0;
 
 /*______________________VectorAdd_________________________________*/
     pD3DRMVectorAdd(&r,&u,&v);
@@ -145,6 +149,20 @@ static void VectorTest(void)
     todo_wine {
                expect_vec(e,r);
               }
+ 
+/*_______________________VectorRotate_______________________________*/
+   pD3DRMVectorRotate(&r,&w,&axis,theta);
+    e.x=-0.3-0.4*sqrt(3);e.y=0.3*sqrt(3)-0.4;e.z=0;
+    todo_wine {
+               expect_vec(e,r);
+              }
+
+/* The same formula gives D3DRMVectorRotate, for theta in [-PI/2;+PI/2] or not. The following test proves this fact.*/
+    pD3DRMVectorRotate(&r,&w,&axis,-PI/4);
+    e.x=1.4/sqrt(2); e.y=0.2/sqrt(2); e.z=0;
+    todo_wine {
+               expect_vec(e,r);
+              }
 
 /*_______________________VectorScale__________________________*/
     par=2.5;
-- 
1.4.2