Implements D3DRMVectorScale
David.Adam at math.cnrs.fr
David.Adam at math.cnrs.fr
Sun Apr 15 18:32:53 CDT 2007
-------------- next part --------------
>From 0f921553b331dd4c2fb146934dd001ea1c1c3e76 Mon Sep 17 00:00:00 2001
From: Adam <David.Adam at math.cnrs.fr>
Date: Sun, 15 Apr 2007 13:41:28 +0200
Subject: [PATCH] [7] Implements D3DRMVectorScale with test.
---
dlls/d3drm/d3drm.spec | 2 +-
dlls/d3drm/math.c | 9 +++++++++
dlls/d3drm/tests/vector.c | 12 +++++++++++-
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec
index b736405..1efbfd4 100644
--- a/dlls/d3drm/d3drm.spec
+++ b/dlls/d3drm/d3drm.spec
@@ -16,7 +16,7 @@
@ stub D3DRMVectorRandom
@ stub D3DRMVectorReflect
@ stub D3DRMVectorRotate
-@ stub D3DRMVectorScale
+@ stdcall D3DRMVectorScale(ptr ptr long)
@ stdcall D3DRMVectorSubtract(ptr ptr ptr)
@ stub Direct3DRMCreate
@ stub DllCanUnloadNow
diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c
index daa0ddf..9d794ee 100644
--- a/dlls/d3drm/math.c
+++ b/dlls/d3drm/math.c
@@ -65,6 +65,15 @@ D3DVALUE D3DRMAPI D3DRMVectorModulus(LPD
return result;
}
+/* Scale a vector */
+LPD3DVECTOR D3DRMAPI D3DRMVectorScale(LPD3DVECTOR d, LPD3DVECTOR s, D3DVALUE factor)
+{
+ d->x=factor * s->x;
+ d->y=factor * s->y;
+ d->z=factor * s->z;
+ return d;
+}
+
/* 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 6fcd9f8..ece51fd 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 *pD3DRMVectorScale)(LPD3DVECTOR,LPD3DVECTOR,D3DVALUE);
static LPD3DVECTOR (D3DRMAPI *pD3DRMVectorSubtract)(LPD3DVECTOR,LPD3DVECTOR,LPD3DVECTOR);
static void init_function_pointers(void)
@@ -47,12 +48,13 @@ static void init_function_pointers(void)
pD3DRMVectorCrossProduct = (void*)GetProcAddress(hmod, "D3DRMVectorCrossProduct");
pD3DRMVectorDotProduct = (void*)GetProcAddress(hmod, "D3DRMVectorDotProduct");
pD3DRMVectorModulus = (void*)GetProcAddress(hmod, "D3DRMVectorModulus");
+ pD3DRMVectorScale = (void*)GetProcAddress(hmod, "D3DRMVectorScale");
pD3DRMVectorSubtract = (void*)GetProcAddress(hmod, "D3DRMVectorSubtract");
}
static void VectorTest(void)
{
- D3DVALUE mod;
+ D3DVALUE mod,par;
D3DVECTOR e,r,u,v;
u.x=2.0;u.y=2.0;u.z=1.0;
@@ -80,6 +82,14 @@ static void VectorTest(void)
mod=pD3DRMVectorModulus(&u);
todo_wine ok((mod == 3.0), "Expected 3.0, Got %f",mod);
+/*_______________________VectorScale__________________________*/
+ par=2.5;
+ pD3DRMVectorScale(&r,&u,par);
+ e.x=5.0;e.y=5.0;e.z=2.5;
+ todo_wine {
+ expect_vec(e,r);
+ }
+
/*_______________________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