Implements D3DRMVectorDotProduct
David.Adam at math.cnrs.fr
David.Adam at math.cnrs.fr
Sun Apr 15 18:31:47 CDT 2007
-------------- next part --------------
>From bb9e1c4d34d87dc41b5501088e1624fa30a446fb Mon Sep 17 00:00:00 2001
From: Adam <David.Adam at math.cnrs.fr>
Date: Sun, 15 Apr 2007 12:52:49 +0200
Subject: [PATCH] [5] Implements D3DRMVectorDotProduct with test.
---
dlls/d3drm/d3drm.spec | 2 +-
dlls/d3drm/math.c | 8 ++++++++
dlls/d3drm/tests/vector.c | 7 +++++++
3 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec
index 4347160..59c1e03 100644
--- a/dlls/d3drm/d3drm.spec
+++ b/dlls/d3drm/d3drm.spec
@@ -10,7 +10,7 @@
@ stub D3DRMQuaternionSlerp
@ stdcall D3DRMVectorAdd(ptr ptr ptr)
@ stdcall D3DRMVectorCrossProduct(ptr ptr ptr)
-@ stub D3DRMVectorDotProduct
+@ stdcall D3DRMVectorDotProduct(ptr ptr)
@ stub D3DRMVectorModulus
@ stub D3DRMVectorNormalize
@ stub D3DRMVectorRandom
diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c
index f15db68..332f5a5 100644
--- a/dlls/d3drm/math.c
+++ b/dlls/d3drm/math.c
@@ -49,6 +49,14 @@ LPD3DVECTOR D3DRMAPI D3DRMVectorCrossPro
return d;
}
+/* Dot Product of Two vectors */
+D3DVALUE D3DRMAPI D3DRMVectorDotProduct(LPD3DVECTOR s1, LPD3DVECTOR s2)
+{
+ D3DVALUE dot_product;
+ dot_product=s1->x * s2->x + s1->y * s2->y + s1->z * s2->z;
+ return dot_product;
+}
+
/* 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 fa7ff9d..5eebfd9 100644
--- a/dlls/d3drm/tests/vector.c
+++ b/dlls/d3drm/tests/vector.c
@@ -29,6 +29,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 LPD3DVECTOR (D3DRMAPI *pD3DRMVectorSubtract)(LPD3DVECTOR,LPD3DVECTOR,LPD3DVECTOR);
static void init_function_pointers(void)
@@ -43,11 +44,13 @@ static void init_function_pointers(void)
pD3DRMVectorAdd = (void*)GetProcAddress(hmod, "D3DRMVectorAdd");
pD3DRMVectorCrossProduct = (void*)GetProcAddress(hmod, "D3DRMVectorCrossProduct");
+ pD3DRMVectorDotProduct = (void*)GetProcAddress(hmod, "D3DRMVectorDotProduct");
pD3DRMVectorSubtract = (void*)GetProcAddress(hmod, "D3DRMVectorSubtract");
}
static void VectorTest(void)
{
+ D3DVALUE mod;
D3DVECTOR e,r,u,v;
u.x=2.0;u.y=2.0;u.z=1.0;
@@ -67,6 +70,10 @@ static void VectorTest(void)
expect_vec(e,r);
}
+/*_______________________VectorDotProduct__________________________*/
+ mod=pD3DRMVectorDotProduct(&u,&v);
+ todo_wine ok((mod == 16.0), "Expected 16.0, Got %f",mod);
+
/*_______________________VectorSubtract__________________________*/
pD3DRMVectorSubtract(&r,&u,&v);
e.x=-2.0;e.y=-2.0;e.z=1.0;
--
1.4.2
More information about the wine-patches
mailing list