April 2007 - Wine-Commits - list.winehq.org

Maarten Lankhorst : winealsa: Remove disabled code.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 452f728f007f81570f35709c47bf043f08953b34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=452f728f007f81570f35709c4… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 21 20:40:20 2007 +0200 winealsa: Remove disabled code. SND_PCM_ASYNC was needed to get asynchronous callbacks, but they are not used any more, so remove the code. --- dlls/winealsa.drv/wavein.c | 4 ---- dlls/winealsa.drv/waveout.c | 6 ------ 2 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index d816706..97b8e5a 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -463,10 +463,6 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) wwi->pcm = 0; flags = SND_PCM_NONBLOCK; -#if 0 - if ( dwFlags & WAVE_DIRECTSOUND ) - flags |= SND_PCM_ASYNC; -#endif if ( (err=snd_pcm_open(&pcm, wwi->pcmname, SND_PCM_STREAM_CAPTURE, flags)) < 0 ) { diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 6a8a435..d7bd6ad 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -647,12 +647,6 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) flags = SND_PCM_NONBLOCK; - /* FIXME - why is this ifdefed? */ -#if 0 - if ( dwFlags & WAVE_DIRECTSOUND ) - flags |= SND_PCM_ASYNC; -#endif - if ( (err = snd_pcm_open(&pcm, wwo->pcmname, SND_PCM_STREAM_PLAYBACK, flags)) < 0) { ERR("Error open: %s\n", snd_strerror(err));

1 0

Maarten Lankhorst : winealsa: Clear WAVECAPS_DIRECTSOUND for capture.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 761ea7895bda8c3025591955240bada23e4dbe42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=761ea7895bda8c30255919552… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Sat Apr 21 20:38:47 2007 +0200 winealsa: Clear WAVECAPS_DIRECTSOUND for capture. --- dlls/winealsa.drv/waveinit.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c index a46efcb..6614c00 100644 --- a/dlls/winealsa.drv/waveinit.c +++ b/dlls/winealsa.drv/waveinit.c @@ -504,6 +504,12 @@ static int ALSA_AddCaptureDevice(snd_ctl_t *ctl, snd_pcm_t *pcm, const char *pcm wwi.incaps.wPid = MM_CREATIVE_SBP16_WAVEOUT; wwi.incaps.vDriverVersion = 0x0100; + if (wwi.ds_caps.dwFlags & WAVECAPS_DIRECTSOUND) + { + FIXME("Add support for DSCapture\n"); + wwi.ds_caps.dwFlags &= ~WAVECAPS_DIRECTSOUND; + } + rc = ALSA_ComputeCaps(ctl, pcm, &wwi.incaps.wChannels, &wwi.ds_caps.dwFlags, &wwi.incaps.dwFormats, &wwi.dwSupport); if (rc)

1 0

David Adam : d3drm: Implement D3DRMQuaternionFromRotation.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 909b5023600bc7432c17cb57e28dce05cef66272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=909b5023600bc7432c17cb57e… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Apr 19 21:13:51 2007 +0200 d3drm: Implement D3DRMQuaternionFromRotation. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 8 ++++++++ dlls/d3drm/tests/vector.c | 24 ++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index a8133ab..8713d01 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -5,7 +5,7 @@ @ stub D3DRMCreateColorRGB @ stub D3DRMCreateColorRGBA @ stdcall D3DRMMatrixFromQuaternion(ptr ptr) -@ stub D3DRMQuaternionFromRotation +@ stdcall D3DRMQuaternionFromRotation(ptr ptr long) @ stdcall D3DRMQuaternionMultiply(ptr ptr ptr) @ stub D3DRMQuaternionSlerp @ stdcall D3DRMVectorAdd(ptr ptr ptr) diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 714f35f..21a4151 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -70,6 +70,14 @@ void WINAPI D3DRMMatrixFromQuaternion(D3DRMMATRIX4D m, LPD3DRMQUATERNION q) m[3][3] = 1.0; } +/* Return a unit quaternion that represents a rotation of an angle around an axis */ +LPD3DRMQUATERNION WINAPI D3DRMQuaternionFromRotation(LPD3DRMQUATERNION q, LPD3DVECTOR v, D3DVALUE theta) +{ + q->s = cos(theta/2.0); + D3DRMVectorScale(&q->v, D3DRMVectorNormalize(v), sin(theta/2.0)); + return q; +} + /* Add Two Vectors */ LPD3DVECTOR WINAPI D3DRMVectorAdd(LPD3DVECTOR d, LPD3DVECTOR s1, LPD3DVECTOR s2) { diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index b71805b..744eb16 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -50,6 +50,15 @@ gotmat[3][0],gotmat[3][1],gotmat[3][2],gotmat[3][3] ); \ } +#define expect_quat(expectedquat,gotquat) \ + ok( (fabs(expectedquat.v.x-gotquat.v.x)<admit_error) && \ + (fabs(expectedquat.v.y-gotquat.v.y)<admit_error) && \ + (fabs(expectedquat.v.z-gotquat.v.z)<admit_error) && \ + (fabs(expectedquat.s-gotquat.s)<admit_error), \ + "Expected Quaternion %f %f %f %f , Got Quaternion %f %f %f %f\n", \ + expectedquat.s,expectedquat.v.x,expectedquat.v.y,expectedquat.v.z, \ + gotquat.s,gotquat.v.x,gotquat.v.y,gotquat.v.z); + #define expect_vec(expectedvec,gotvec) \ ok( ((fabs(expectedvec.x-gotvec.x)<admit_error)&&(fabs(expectedvec.y-gotvec.y)<admit_error)&&(fabs(expectedvec.z-gotvec.z)<admit_error)), \ "Expected Vector= (%f, %f, %f)\n , Got Vector= (%f, %f, %f)\n", \ @@ -141,8 +150,23 @@ static void MatrixTest(void) expect_mat(exp,mat); } +static void QuaternionTest(void) +{ + D3DVECTOR axis; + D3DVALUE theta; + D3DRMQUATERNION q,r; + +/*_________________QuaternionFromRotation___________________*/ + axis.x=1.0;axis.y=1.0;axis.z=1.0; + theta=2.0*PI/3.0; + D3DRMQuaternionFromRotation(&r,&axis,theta); + q.s=0.5;q.v.x=0.5;q.v.y=0.5;q.v.z=0.5; + expect_quat(q,r); +} + START_TEST(vector) { VectorTest(); MatrixTest(); + QuaternionTest(); }

1 0

David Adam : d3drm: Implement D3DRMMatrixFromQuaternion.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: f13c45f4dc71a4faa59707012a79ab0270d33537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13c45f4dc71a4faa59707012… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Apr 19 21:12:40 2007 +0200 d3drm: Implement D3DRMMatrixFromQuaternion. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 26 ++++++++++++++++++++++++++ dlls/d3drm/tests/vector.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index c907bab..a8133ab 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -4,7 +4,7 @@ @ stub D3DRMColorGetRed @ stub D3DRMCreateColorRGB @ stub D3DRMCreateColorRGBA -@ stub D3DRMMatrixFromQuaternion +@ stdcall D3DRMMatrixFromQuaternion(ptr ptr) @ stub D3DRMQuaternionFromRotation @ stdcall D3DRMQuaternionMultiply(ptr ptr ptr) @ stub D3DRMQuaternionSlerp diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 02dd965..714f35f 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -44,6 +44,32 @@ LPD3DRMQUATERNION WINAPI D3DRMQuaternionMultiply(LPD3DRMQUATERNION q, LPD3DRMQUA return q; } +/* Matrix for the Rotation that a unit quaternion represents */ +void WINAPI D3DRMMatrixFromQuaternion(D3DRMMATRIX4D m, LPD3DRMQUATERNION q) +{ + D3DVALUE w,x,y,z; + w = q->s; + x = q->v.x; + y = q->v.y; + z = q->v.z; + m[0][0] = 1.0-2.0*(y*y+z*z); + m[1][1] = 1.0-2.0*(x*x+z*z); + m[2][2] = 1.0-2.0*(x*x+y*y); + m[1][0] = 2.0*(x*y+z*w); + m[0][1] = 2.0*(x*y-z*w); + m[2][0] = 2.0*(x*z-y*w); + m[0][2] = 2.0*(x*z+y*w); + m[2][1] = 2.0*(y*z+x*w); + m[1][2] = 2.0*(y*z-x*w); + m[3][0] = 0.0; + m[3][1] = 0.0; + m[3][2] = 0.0; + m[0][3] = 0.0; + m[1][3] = 0.0; + m[2][3] = 0.0; + m[3][3] = 1.0; +} + /* Add Two Vectors */ LPD3DVECTOR WINAPI D3DRMVectorAdd(LPD3DVECTOR d, LPD3DVECTOR s1, LPD3DVECTOR s2) { diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 9f89893..b71805b 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -25,12 +25,37 @@ #define PI (4*atan(1.0)) #define admit_error 0.000001 +#define expect_mat( expectedmat, gotmat)\ +{ \ + int i,j,equal=1; \ + for (i=0; i<4; i++)\ + {\ + for (j=0; j<4; j++)\ + {\ + if (fabs(expectedmat[i][j]-gotmat[i][j])>admit_error)\ + {\ + equal=0;\ + }\ + }\ + }\ + ok(equal, "Expected matrix=\n(%f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f\n)\n\n" \ + "Got matrix=\n(%f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f\n %f,%f,%f,%f)\n", \ + expectedmat[0][0],expectedmat[0][1],expectedmat[0][2],expectedmat[0][3], \ + expectedmat[1][0],expectedmat[1][1],expectedmat[1][2],expectedmat[1][3], \ + expectedmat[2][0],expectedmat[2][1],expectedmat[2][2],expectedmat[2][3], \ + expectedmat[3][0],expectedmat[3][1],expectedmat[3][2],expectedmat[3][3], \ + gotmat[0][0],gotmat[0][1],gotmat[0][2],gotmat[0][3], \ + gotmat[1][0],gotmat[1][1],gotmat[1][2],gotmat[1][3], \ + gotmat[2][0],gotmat[2][1],gotmat[2][2],gotmat[2][3], \ + gotmat[3][0],gotmat[3][1],gotmat[3][2],gotmat[3][3] ); \ +} + #define expect_vec(expectedvec,gotvec) \ ok( ((fabs(expectedvec.x-gotvec.x)<admit_error)&&(fabs(expectedvec.y-gotvec.y)<admit_error)&&(fabs(expectedvec.z-gotvec.z)<admit_error)), \ "Expected Vector= (%f, %f, %f)\n , Got Vector= (%f, %f, %f)\n", \ expectedvec.x,expectedvec.y,expectedvec.z, gotvec.x, gotvec.y, gotvec.z); -void VectorTest(void) +static void VectorTest(void) { D3DVALUE mod,par,theta; D3DVECTOR e,r,u,v,w,axis,casnul,norm,ray; @@ -101,7 +126,23 @@ void VectorTest(void) expect_vec(e,r); } +static void MatrixTest(void) +{ + D3DRMQUATERNION q; + D3DRMMATRIX4D exp,mat; + + exp[0][0]=-49.0; exp[0][1]=4.0; exp[0][2]=22.0; exp[0][3]=0.0; + exp[1][0]=20.0; exp[1][1]=-39.0; exp[1][2]=20.0; exp[1][3]=0.0; + exp[2][0]=10.0; exp[2][1]=28.0; exp[2][2]=-25.0; exp[2][3]=0.0; + exp[3][0]=0.0; exp[3][1]=0.0; exp[3][2]=0.0; exp[3][3]=1.0; + q.s=1.0; q.v.x=2.0; q.v.y=3.0; q.v.z=4.0; + + D3DRMMatrixFromQuaternion(mat,&q); + expect_mat(exp,mat); +} + START_TEST(vector) { VectorTest(); + MatrixTest(); }

1 0

David Adam : d3drm: Implement D3DRMQuaternionSlerp.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: d53d7c9ea29bbac5f2527ee042cc60f706836c11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d53d7c9ea29bbac5f2527ee04… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Apr 19 21:16:57 2007 +0200 d3drm: Implement D3DRMQuaternionSlerp. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 12 ++++++++++++ dlls/d3drm/tests/vector.c | 35 +++++++++++++++++++++++++++++++++-- 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index 8713d01..4499211 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -7,7 +7,7 @@ @ stdcall D3DRMMatrixFromQuaternion(ptr ptr) @ stdcall D3DRMQuaternionFromRotation(ptr ptr long) @ stdcall D3DRMQuaternionMultiply(ptr ptr ptr) -@ stub D3DRMQuaternionSlerp +@ stdcall D3DRMQuaternionSlerp(ptr ptr ptr long) @ stdcall D3DRMVectorAdd(ptr ptr ptr) @ stdcall D3DRMVectorCrossProduct(ptr ptr ptr) @ stdcall D3DRMVectorDotProduct(ptr ptr) diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 21a4151..0355b22 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -78,6 +78,18 @@ LPD3DRMQUATERNION WINAPI D3DRMQuaternionFromRotation(LPD3DRMQUATERNION q, LPD3DV return q; } +/* Interpolation between two quaternions */ +LPD3DRMQUATERNION WINAPI D3DRMQuaternionSlerp(LPD3DRMQUATERNION q, LPD3DRMQUATERNION a, LPD3DRMQUATERNION b, D3DVALUE alpha) +{ + D3DVALUE epsilon=1.0; + D3DVECTOR sca1,sca2; + if (a->s * b->s + D3DRMVectorDotProduct(&a->v, &b->v) < 0.0) epsilon = -1.0; + q->s = (1.0 - alpha) * a->s + epsilon * alpha * b->s; + D3DRMVectorAdd(&q->v, D3DRMVectorScale(&sca1, &a->v, 1.0 - alpha), + D3DRMVectorScale(&sca2, &b->v, epsilon * alpha)); + return q; +} + /* Add Two Vectors */ LPD3DVECTOR WINAPI D3DRMVectorAdd(LPD3DVECTOR d, LPD3DVECTOR s1, LPD3DVECTOR s2) { diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 744eb16..1c25c50 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -153,8 +153,8 @@ static void MatrixTest(void) static void QuaternionTest(void) { D3DVECTOR axis; - D3DVALUE theta; - D3DRMQUATERNION q,r; + D3DVALUE g,h,epsilon,par,theta; + D3DRMQUATERNION q,q1,q2,r; /*_________________QuaternionFromRotation___________________*/ axis.x=1.0;axis.y=1.0;axis.z=1.0; @@ -162,6 +162,37 @@ static void QuaternionTest(void) D3DRMQuaternionFromRotation(&r,&axis,theta); q.s=0.5;q.v.x=0.5;q.v.y=0.5;q.v.z=0.5; expect_quat(q,r); + +/*_________________QuaternionSlerp_________________________*/ +/* Interpolation slerp is in fact a linear interpolation, not a spherical linear + * interpolation. Moreover, if the angle of the two quaternions is in ]PI/2;3PI/2[, QuaternionSlerp + * interpolates between the first quaternion and the opposite of the second one. The test proves + * these two facts. */ + par=0.31; + q1.s=1.0; q1.v.x=2.0; q1.v.y=3.0; q1.v.z=50.0; + q2.s=-4.0; q2.v.x=6.0; q2.v.y=7.0; q2.v.z=8.0; +/* The angle between q1 and q2 is in [-PI/2,PI/2]. So, one interpolates between q1 and q2. */ + epsilon=1.0; + g=1.0-par; h=epsilon*par; +/* Part of the test proving that the interpolation is linear. */ + q.s=g*q1.s+h*q2.s; + q.v.x=g*q1.v.x+h*q2.v.x; + q.v.y=g*q1.v.y+h*q2.v.y; + q.v.z=g*q1.v.z+h*q2.v.z; + D3DRMQuaternionSlerp(&r,&q1,&q2,par); + expect_quat(q,r); + + q1.s=1.0; q1.v.x=2.0; q1.v.y=3.0; q1.v.z=50.0; + q2.s=-94.0; q2.v.x=6.0; q2.v.y=7.0; q2.v.z=-8.0; +/* The angle between q1 and q2 is not in [-PI/2,PI/2]. So, one interpolates between q1 and -q2. */ + epsilon=-1.0; + g=1.0-par; h=epsilon*par; + q.s=g*q1.s+h*q2.s; + q.v.x=g*q1.v.x+h*q2.v.x; + q.v.y=g*q1.v.y+h*q2.v.y; + q.v.z=g*q1.v.z+h*q2.v.z; + D3DRMQuaternionSlerp(&r,&q1,&q2,par); + expect_quat(q,r); } START_TEST(vector)

1 0

David Adam : d3drm: Implement D3DRMVectorRandom.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: f9e6f42b8607dcc126bf24eca76e250faa15b25f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e6f42b8607dcc126bf24eca… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Apr 19 21:11:02 2007 +0200 d3drm: Implement D3DRMVectorRandom. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index 172f07e..5af714e 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -13,7 +13,7 @@ @ stdcall D3DRMVectorDotProduct(ptr ptr) @ stdcall D3DRMVectorModulus(ptr) @ stdcall D3DRMVectorNormalize(ptr) -@ stub D3DRMVectorRandom +@ stdcall D3DRMVectorRandom(ptr) @ stub D3DRMVectorReflect @ stub D3DRMVectorRotate @ stdcall D3DRMVectorScale(ptr ptr long) diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 8ab947a..670a89b 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -92,6 +92,16 @@ LPD3DVECTOR WINAPI D3DRMVectorNormalize(LPD3DVECTOR u) return u; } +/* Returns a random unit vector */ +LPD3DVECTOR WINAPI D3DRMVectorRandom(LPD3DVECTOR d) +{ + d->x = rand(); + d->y = rand(); + d->z = rand(); + D3DRMVectorNormalize(d); + return d; +} + /* Scale a vector */ LPD3DVECTOR WINAPI D3DRMVectorScale(LPD3DVECTOR d, LPD3DVECTOR s, D3DVALUE factor) {

1 0

David Adam : d3drm: Implement D3DRMVectorscale.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 5524923c07d47adc091d61d7d70f8b80e26b2755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5524923c07d47adc091d61d7d… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Apr 19 21:09:48 2007 +0200 d3drm: Implement D3DRMVectorscale. --- 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 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 5b31171..77f176e 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -74,3 +74,12 @@ D3DVALUE WINAPI D3DRMVectorModulus(LPD3DVECTOR v) 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; +} diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index 83f6446..6f45801 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -32,7 +32,7 @@ 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 0

David Adam : d3drm: Implement D3DRMVectorRotate.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 9fa78fd4d7a4259a0575e21d26e1216792ecd2ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fa78fd4d7a4259a0575e21d2… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Apr 19 21:12:00 2007 +0200 d3drm: Implement D3DRMVectorRotate. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 19 +++++++++++++++++++ dlls/d3drm/tests/vector.c | 18 ++++++++++++++++-- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index 1cb0ff7..c907bab 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -15,7 +15,7 @@ @ stdcall D3DRMVectorNormalize(ptr) @ stdcall D3DRMVectorRandom(ptr) @ stdcall D3DRMVectorReflect(ptr ptr ptr) -@ stub D3DRMVectorRotate +@ stdcall D3DRMVectorRotate(ptr ptr ptr long) @ stdcall D3DRMVectorScale(ptr ptr long) @ stdcall D3DRMVectorSubtract(ptr ptr ptr) @ stub Direct3DRMCreate diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 1dbff45..02dd965 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -122,6 +122,25 @@ LPD3DVECTOR WINAPI D3DRMVectorReflect(LPD3DVECTOR r, LPD3DVECTOR ray, LPD3DVECTO return r; } +/* Rotation of a vector */ +LPD3DVECTOR WINAPI D3DRMVectorRotate(LPD3DVECTOR r, LPD3DVECTOR v, LPD3DVECTOR axis, D3DVALUE theta) +{ + D3DRMQUATERNION quaternion,quaternion1, quaternion2, quaternion3, resultq; + D3DVECTOR NORM; + + quaternion1.s = cos(theta*.5); + quaternion2.s = cos(theta*.5); + NORM = *D3DRMVectorNormalize(axis); + D3DRMVectorScale(&quaternion1.v, &NORM, sin(theta * .5)); + D3DRMVectorScale(&quaternion2.v, &NORM, -sin(theta * .5)); + quaternion3.s = 0.0; + quaternion3.v = *v; + D3DRMQuaternionMultiply(&quaternion, &quaternion1, &quaternion3); + D3DRMQuaternionMultiply(&resultq, &quaternion, &quaternion2); + *r = *D3DRMVectorNormalize(&resultq.v); + 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 88fbaf7..9f89893 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -32,8 +32,8 @@ void VectorTest(void) { - D3DVALUE mod,par; - D3DVECTOR e,r,u,v,casnul,norm,ray; + D3DVALUE mod,par,theta; + D3DVECTOR e,r,u,v,w,axis,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; @@ -80,6 +80,20 @@ void VectorTest(void) D3DRMVectorReflect(&r,&ray,&norm); expect_vec(e,r); +/*_______________________VectorRotate_______________________________*/ + w.x=3.0;w.y=4.0;w.z=0.0; + axis.x=0.0;axis.y=0.0;axis.z=1.0; + theta=2.0*PI/3.0; + D3DRMVectorRotate(&r,&w,&axis,theta); + e.x=-0.3-0.4*sqrt(3.0); e.y=0.3*sqrt(3.0)-0.4; e.z=0.0; + expect_vec(e,r); + +/* The same formula gives D3DRMVectorRotate, for theta in [-PI/2;+PI/2] or not. The following test proves this fact.*/ + theta=-PI/4.0; + D3DRMVectorRotate(&r,&w,&axis,-PI/4); + e.x=1.4/sqrt(2.0); e.y=0.2/sqrt(2.0); e.z=0.0; + expect_vec(e,r); + /*_______________________VectorScale__________________________*/ par=2.5; D3DRMVectorScale(&r,&v,par);

1 0

David Adam : d3drm: Implement D3DRMQuaternionMultiply.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: f289cf312901130bf91a1d4a262a0fb510fdf6e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f289cf312901130bf91a1d4a2… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Apr 19 21:14:47 2007 +0200 d3drm: Implement D3DRMQuaternionMultiply. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index 19361a9..1cb0ff7 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -6,7 +6,7 @@ @ stub D3DRMCreateColorRGBA @ stub D3DRMMatrixFromQuaternion @ stub D3DRMQuaternionFromRotation -@ stub D3DRMQuaternionMultiply +@ stdcall D3DRMQuaternionMultiply(ptr ptr ptr) @ stub D3DRMQuaternionSlerp @ stdcall D3DRMVectorAdd(ptr ptr ptr) @ stdcall D3DRMVectorCrossProduct(ptr ptr ptr) diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index b0de7d6..1dbff45 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -32,6 +32,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); +/* Product of 2 quaternions */ +LPD3DRMQUATERNION WINAPI D3DRMQuaternionMultiply(LPD3DRMQUATERNION q, LPD3DRMQUATERNION a, LPD3DRMQUATERNION b) +{ + D3DVECTOR cross_product; + D3DRMVectorCrossProduct(&cross_product, &a->v, &b->v); + q->s = a->s * b->s - D3DRMVectorDotProduct(&a->v, &b->v); + q->v.x = a->s * b->v.x + b->s * a->v.x + cross_product.x; + q->v.y = a->s * b->v.y + b->s * a->v.y + cross_product.y; + q->v.z = a->s * b->v.z + b->s * a->v.z + cross_product.z; + return q; +} + /* Add Two Vectors */ LPD3DVECTOR WINAPI D3DRMVectorAdd(LPD3DVECTOR d, LPD3DVECTOR s1, LPD3DVECTOR s2) {

1 0

David Adam : d3drm: Implement D3DRMVectorNormalize.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 819362d0f73cce3c24c3db0f4f60167e66b91a40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=819362d0f73cce3c24c3db0f4… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Apr 19 21:10:46 2007 +0200 d3drm: Implement D3DRMVectorNormalize. --- dlls/d3drm/d3drm.spec | 2 +- dlls/d3drm/math.c | 17 +++++++++++++++++ dlls/d3drm/tests/vector.c | 14 +++++++++++++- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/d3drm.spec b/dlls/d3drm/d3drm.spec index 1efbfd4..172f07e 100644 --- a/dlls/d3drm/d3drm.spec +++ b/dlls/d3drm/d3drm.spec @@ -12,7 +12,7 @@ @ stdcall D3DRMVectorCrossProduct(ptr ptr ptr) @ stdcall D3DRMVectorDotProduct(ptr ptr) @ stdcall D3DRMVectorModulus(ptr) -@ stub D3DRMVectorNormalize +@ stdcall D3DRMVectorNormalize(ptr) @ stub D3DRMVectorRandom @ stub D3DRMVectorReflect @ stub D3DRMVectorRotate diff --git a/dlls/d3drm/math.c b/dlls/d3drm/math.c index 77f176e..8ab947a 100644 --- a/dlls/d3drm/math.c +++ b/dlls/d3drm/math.c @@ -75,6 +75,23 @@ D3DVALUE WINAPI D3DRMVectorModulus(LPD3DVECTOR v) return result; } +/* Normalize a vector. Returns (1,0,0) if INPUT is the NULL vector. */ +LPD3DVECTOR WINAPI D3DRMVectorNormalize(LPD3DVECTOR u) +{ + D3DVALUE modulus = D3DRMVectorModulus(u); + if(modulus) + { + D3DRMVectorScale(u,u,1.0/modulus); + } + else + { + u->x=1.0; + u->y=0.0; + u->z=0.0; + } + return u; +} + /* 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 6f45801..45d6323 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -33,7 +33,7 @@ void VectorTest(void) { D3DVALUE mod,par; - D3DVECTOR e,r,u,v; + D3DVECTOR e,r,u,v,casnul; u.x=2.0;u.y=2.0;u.z=1.0; v.x=4.0;v.y=4.0;v.z=0.0; @@ -61,6 +61,18 @@ void VectorTest(void) mod=D3DRMVectorModulus(&u); ok((mod == 3.0), "Expected 3.0, Got %f",mod); +/*_______________________VectorNormalize___________________________*/ + D3DRMVectorNormalize(&u); + e.x=2.0/3.0;e.y=2.0/3.0;e.z=1.0/3.0; + expect_vec(e,u); + +/* If u is the NULL vector, MSDN says that the return vector is NULL. In fact, the returned vector is (1,0,0). The following test case prove it. */ + + casnul.x=0.0; casnul.y=0.0; casnul.z=0.0; + D3DRMVectorNormalize(&casnul); + e.x=1.0; e.y=0.0; e.z=0.0; + expect_vec(e,casnul); + /*_______________________VectorScale__________________________*/ par=2.5; D3DRMVectorScale(&r,&v,par);

1 0