patch [7/15]: Implements D3DRMVectorscale [try 2]
David.Adam at math.cnrs.fr
David.Adam at math.cnrs.fr
Thu Apr 19 14:09:48 CDT 2007
-------------- next part --------------
>From 165d32cf92699f73052f1d238960e735e465d5b2 Mon Sep 17 00:00:00 2001
From: Adam <David.Adam at math.cnrs.fr>
Date: Fri, 20 Apr 2007 02:02:53 +0200
Subject: [PATCH] Implements D3DRMVectorScale with test.
---
dlls/d3drm/d3drm.spec | 2 +-
dlls/d3drm/math.c | 9 +++++++++
dlls/d3drm/tests/vector.c | 8 +++++++-
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec
index f2e8805..d534719 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 372eb18..4c68665 100644
--- a/dlls/d3drm/math.c
+++ b/dlls/d3drm/math.c
@@ -73,3 +73,12 @@ D3DVALUE WINAPI D3DRMVectorModulus(LPD3D
result=sqrt(v->x * v->x + v->y * v->y + v->z * v->z);
return result;
}
+
+/* Scale a vector */
+LPD3DVECTOR WINAPI D3DRMVectorScale(LPD3DVECTOR d, LPD3DVECTOR s, D3DVALUE factor)
+{
+ d->x=factor * s->x;
+ d->y=factor * s->y;
+ d->z=factor * s->z;
+ return d;
+}
\ No newline at end of file
diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c
index d77e272..439ba6b 100644
--- a/dlls/d3drm/tests/vector.c
+++ b/dlls/d3drm/tests/vector.c
@@ -32,7 +32,7 @@ #define expect_vec(expectedvec,gotvec) \
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;
@@ -60,6 +60,12 @@ void VectorTest(void)
/*_______________________VectorModulus_____________________________*/
mod=D3DRMVectorModulus(&u);
ok((mod == 3.0), "Expected 3.0, Got %f",mod);
+
+/*_______________________VectorScale__________________________*/
+ par=2.5;
+ D3DRMVectorScale(&r,&v,par);
+ e.x=10.0; e.y=10.0; e.z=0.0;
+ expect_vec(e,r);
}
START_TEST(vector)
--
1.4.2
More information about the wine-patches
mailing list