patch [10/15]: Implement d#dRMVectorReflect [try2]
David.Adam at math.cnrs.fr
David.Adam at math.cnrs.fr
Thu Apr 19 14:11:38 CDT 2007
-------------- next part --------------
>From 4dd186b874d34c71b4785e714c80a223bd7f13a8 Mon Sep 17 00:00:00 2001
From: Adam <David.Adam at math.cnrs.fr>
Date: Fri, 20 Apr 2007 02:10:00 +0200
Subject: [PATCH] Implements D3DRMVectorReflect with test.
---
dlls/d3drm/d3drm.spec | 2 +-
dlls/d3drm/math.c | 8 ++++++++
dlls/d3drm/tests/vector.c | 9 ++++++++-
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec
index 575b097..7eb9414 100644
--- a/dlls/d3drm/d3drm.spec
+++ b/dlls/d3drm/d3drm.spec
@@ -14,7 +14,7 @@
@ stdcall D3DRMVectorModulus(ptr)
@ stdcall D3DRMVectorNormalize(ptr)
@ stdcall D3DRMVectorRandom(ptr)
-@ stub D3DRMVectorReflect
+@ stdcall D3DRMVectorReflect(ptr ptr ptr)
@ stub D3DRMVectorRotate
@ stdcall D3DRMVectorScale(ptr ptr long)
@ stdcall D3DRMVectorSubtract(ptr ptr ptr)
diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c
index 98e7796..7cc3a84 100644
--- a/dlls/d3drm/math.c
+++ b/dlls/d3drm/math.c
@@ -101,6 +101,14 @@ LPD3DVECTOR WINAPI D3DRMVectorRandom(LPD
return d;
}
+/* Reflection of a vector on a surface */
+LPD3DVECTOR WINAPI D3DRMVectorReflect(LPD3DVECTOR r, LPD3DVECTOR ray, LPD3DVECTOR norm)
+{
+ D3DVECTOR sca;
+ D3DRMVectorSubtract(r,D3DRMVectorScale(&sca,norm,2.0*D3DRMVectorDotProduct(ray,norm)),ray);
+ return r;
+}
+
/* Scale a vector */
LPD3DVECTOR WINAPI D3DRMVectorScale(LPD3DVECTOR d, LPD3DVECTOR s, D3DVALUE factor)
{
diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c
index ad8cd39..76d142d 100644
--- a/dlls/d3drm/tests/vector.c
+++ b/dlls/d3drm/tests/vector.c
@@ -33,7 +33,7 @@ #define expect_vec(expectedvec,gotvec) \
void VectorTest(void)
{
D3DVALUE mod,par;
- D3DVECTOR e,r,u,v,casnul;
+ D3DVECTOR e,r,u,v,casnul,norm,ray;
u.x=2.0;u.y=2.0;u.z=1.0;
v.x=4.0;v.y=4.0;v.z=0.0;
@@ -73,6 +73,13 @@ void VectorTest(void)
e.x=1.0; e.y=0.0; e.z=0.0;
expect_vec(e,casnul);
+/*____________________VectorReflect_________________________________*/
+ ray.x=3.0; ray.y=-4.0; ray.z=5.0;
+ norm.x=1.0; norm.y=-2.0; norm.z=6.0;
+ e.x=79.0; e.y=-160.0; e.z=487.0;
+ D3DRMVectorReflect(&r,&ray,&norm);
+ expect_vec(e,r);
+
/*_______________________VectorScale__________________________*/
par=2.5;
D3DRMVectorScale(&r,&v,par);
--
1.4.2
More information about the wine-patches
mailing list