Implements D3DRMVectorModulus

[David.Adam at math.cnrs.fr]

-------------- next part --------------
>From eb2d0d80562740bd594d66a0234f3ff51ff37e6e Mon Sep 17 00:00:00 2001
From: Adam <David.Adam at math.cnrs.fr>
Date: Sun, 15 Apr 2007 13:35:55 +0200
Subject: [PATCH] [6] Implements D3DRMVectorModulus with test.

---
 dlls/d3drm/d3drm.spec     |    2 +-
 dlls/d3drm/math.c         |    8 ++++++++
 dlls/d3drm/tests/vector.c |    6 ++++++
 3 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec
index 59c1e03..b736405 100644
--- a/dlls/d3drm/d3drm.spec
+++ b/dlls/d3drm/d3drm.spec
@@ -11,7 +11,7 @@
 @ stdcall D3DRMVectorAdd(ptr ptr ptr)
 @ stdcall D3DRMVectorCrossProduct(ptr ptr ptr)
 @ stdcall D3DRMVectorDotProduct(ptr ptr)
-@ stub D3DRMVectorModulus
+@ stdcall D3DRMVectorModulus(ptr)
 @ stub D3DRMVectorNormalize
 @ stub D3DRMVectorRandom
 @ stub D3DRMVectorReflect
diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c
index 332f5a5..daa0ddf 100644
--- a/dlls/d3drm/math.c
+++ b/dlls/d3drm/math.c
@@ -57,6 +57,14 @@ D3DVALUE D3DRMAPI D3DRMVectorDotProduct(
     return dot_product;
 }
 
+/* Norm of a vector */
+D3DVALUE D3DRMAPI D3DRMVectorModulus(LPD3DVECTOR v)
+{
+    D3DVALUE result;
+    result=sqrt(v->x * v->x + v->y * v->y + v->z * v->z);
+    return result;
+}
+
 /* Subtract Two Vectors */
 LPD3DVECTOR D3DRMAPI D3DRMVectorSubtract(LPD3DVECTOR d, LPD3DVECTOR s1, LPD3DVECTOR s2)
 {
diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c
index 5eebfd9..6fcd9f8 100644
--- a/dlls/d3drm/tests/vector.c
+++ b/dlls/d3drm/tests/vector.c
@@ -30,6 +30,7 @@ #define expect_vec(expectedvec,gotvec) \
 static LPD3DVECTOR (D3DRMAPI *pD3DRMVectorAdd)(LPD3DVECTOR,LPD3DVECTOR,LPD3DVECTOR);
 static LPD3DVECTOR (D3DRMAPI *pD3DRMVectorCrossProduct)(LPD3DVECTOR,LPD3DVECTOR,LPD3DVECTOR);
 static D3DVALUE (D3DRMAPI *pD3DRMVectorDotProduct)(LPD3DVECTOR,LPD3DVECTOR);
+static D3DVALUE (D3DRMAPI *pD3DRMVectorModulus)(LPD3DVECTOR);
 static LPD3DVECTOR (D3DRMAPI *pD3DRMVectorSubtract)(LPD3DVECTOR,LPD3DVECTOR,LPD3DVECTOR);
 
 static void init_function_pointers(void)
@@ -45,6 +46,7 @@ static void init_function_pointers(void)
     pD3DRMVectorAdd = (void*)GetProcAddress(hmod, "D3DRMVectorAdd");
     pD3DRMVectorCrossProduct = (void*)GetProcAddress(hmod, "D3DRMVectorCrossProduct");
     pD3DRMVectorDotProduct = (void*)GetProcAddress(hmod, "D3DRMVectorDotProduct");
+    pD3DRMVectorModulus = (void*)GetProcAddress(hmod, "D3DRMVectorModulus");
     pD3DRMVectorSubtract = (void*)GetProcAddress(hmod, "D3DRMVectorSubtract");
 }
 
@@ -74,6 +76,10 @@ static void VectorTest(void)
     mod=pD3DRMVectorDotProduct(&u,&v);
     todo_wine ok((mod == 16.0), "Expected 16.0, Got %f",mod); 
 
+/*_______________________VectorModulus_____________________________*/
+    mod=pD3DRMVectorModulus(&u);
+    todo_wine ok((mod == 3.0), "Expected 3.0, Got %f",mod);
+
 /*_______________________VectorSubtract__________________________*/
     pD3DRMVectorSubtract(&r,&u,&v);
     e.x=-2.0;e.y=-2.0;e.z=1.0;
-- 
1.4.2