Implements D3DRMVectorNormalize

[David.Adam at math.cnrs.fr]

-------------- next part --------------
>From 07597494ec96d568824222521638553a0f1d749f Mon Sep 17 00:00:00 2001
From: Adam <David.Adam at math.cnrs.fr>
Date: Sun, 15 Apr 2007 13:48:21 +0200
Subject: [PATCH] [8] Implements D3DRMVectorNormalize with test.

---
 dlls/d3drm/d3drm.spec     |    2 +-
 dlls/d3drm/math.c         |   16 ++++++++++++++++
 dlls/d3drm/tests/vector.c |   20 +++++++++++++++++++-
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec
index 1efbfd4..172f07e 100644
--- a/dlls/d3drm/d3drm.spec
+++ b/dlls/d3drm/d3drm.spec
@@ -12,7 +12,7 @@
 @ stdcall D3DRMVectorCrossProduct(ptr ptr ptr)
 @ stdcall D3DRMVectorDotProduct(ptr ptr)
 @ stdcall D3DRMVectorModulus(ptr)
-@ stub D3DRMVectorNormalize
+@ stdcall D3DRMVectorNormalize(ptr)
 @ stub D3DRMVectorRandom
 @ stub D3DRMVectorReflect
 @ stub D3DRMVectorRotate
diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c
index 9d794ee..b542584 100644
--- a/dlls/d3drm/math.c
+++ b/dlls/d3drm/math.c
@@ -65,6 +65,22 @@ D3DVALUE D3DRMAPI D3DRMVectorModulus(LPD
     return result;
 }
 
+/* Normalize a vector.  Returns (1,0,0) if INPUT is the NULL vector. */
+LPD3DVECTOR D3DRMAPI D3DRMVectorNormalize(LPD3DVECTOR u)
+{
+    D3DVALUE modulus;
+    modulus=D3DRMVectorModulus(u);
+    if(modulus) 
+      {
+       D3DRMVectorScale(u,u,1/modulus);
+      }
+    else
+      {
+       u->x=1; u->y=0; u->z=0;
+      }
+    return u; 
+}
+
 /* 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 ece51fd..96c4a3d 100644
--- a/dlls/d3drm/tests/vector.c
+++ b/dlls/d3drm/tests/vector.c
@@ -31,6 +31,7 @@ static LPD3DVECTOR (D3DRMAPI *pD3DRMVect
 static LPD3DVECTOR (D3DRMAPI *pD3DRMVectorCrossProduct)(LPD3DVECTOR,LPD3DVECTOR,LPD3DVECTOR);
 static D3DVALUE (D3DRMAPI *pD3DRMVectorDotProduct)(LPD3DVECTOR,LPD3DVECTOR);
 static D3DVALUE (D3DRMAPI *pD3DRMVectorModulus)(LPD3DVECTOR);
+static LPD3DVECTOR (D3DRMAPI *pD3DRMVectorNormalize)(LPD3DVECTOR);
 static LPD3DVECTOR (D3DRMAPI *pD3DRMVectorScale)(LPD3DVECTOR,LPD3DVECTOR,D3DVALUE);
 static LPD3DVECTOR (D3DRMAPI *pD3DRMVectorSubtract)(LPD3DVECTOR,LPD3DVECTOR,LPD3DVECTOR);
 
@@ -48,6 +49,7 @@ static void init_function_pointers(void)
     pD3DRMVectorCrossProduct = (void*)GetProcAddress(hmod, "D3DRMVectorCrossProduct");
     pD3DRMVectorDotProduct = (void*)GetProcAddress(hmod, "D3DRMVectorDotProduct");
     pD3DRMVectorModulus = (void*)GetProcAddress(hmod, "D3DRMVectorModulus");
+    pD3DRMVectorNormalize = (void*)GetProcAddress(hmod, "D3DRMVectorNormalize");
     pD3DRMVectorScale = (void*)GetProcAddress(hmod, "D3DRMVectorScale");
     pD3DRMVectorSubtract = (void*)GetProcAddress(hmod, "D3DRMVectorSubtract");
 }
@@ -55,7 +57,7 @@ static void init_function_pointers(void)
 static void VectorTest(void)
 {
     D3DVALUE mod,par;
-    D3DVECTOR e,r,u,v;
+    D3DVECTOR e,r,u,v,casnul;
 
     u.x=2.0;u.y=2.0;u.z=1.0;
     v.x=4.0;v.y=4.0;v.z=0.0;
@@ -82,6 +84,22 @@ static void VectorTest(void)
     mod=pD3DRMVectorModulus(&u);
     todo_wine ok((mod == 3.0), "Expected 3.0, Got %f",mod);
 
+/*_______________________VectorNormalize___________________________*/
+    pD3DRMVectorNormalize(&u);
+    e.x=2.0/3.0;e.y=2.0/3.0;e.z=1.0/3.0;
+    todo_wine {
+    expect_vec(e,u);
+              }
+
+/* If u is the NULL vector, MSDN says that the return vector is NULL. In fact, the returned vector is (1,0,0). The following test case prove it. */
+
+    casnul.x=0; casnul.y=0; casnul.z=0;
+    pD3DRMVectorNormalize(&casnul);
+    e.x=1; e.y=0; e.z=0;
+    todo_wine {
+    expect_vec(e,casnul);
+              }
+
 /*_______________________VectorScale__________________________*/
     par=2.5;
     pD3DRMVectorScale(&r,&u,par);
-- 
1.4.2