Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
b3dff5b3
Commit
b3dff5b3
authored
Jun 08, 2013
by
Nozomi Kodama
Committed by
Alexandre Julliard
Jun 10, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Fix the case output = input in D3DXVec3Cross.
parent
699eb85c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
math.c
dlls/d3dx9_36/tests/math.c
+3
-0
d3dx9math.inl
include/d3dx9math.inl
+6
-3
No files found.
dlls/d3dx9_36/tests/math.c
View file @
b3dff5b3
...
...
@@ -1251,6 +1251,9 @@ static void D3DXVector3Test(void)
expectedvec
.
x
=
-
18
.
0
f
;
expectedvec
.
y
=
40
.
0
f
;
expectedvec
.
z
=
-
39
.
0
f
;
D3DXVec3Cross
(
&
gotvec
,
&
u
,
&
v
);
expect_vec3
(
expectedvec
,
gotvec
);
expectedvec
.
x
=
-
277
.
0
f
;
expectedvec
.
y
=
-
150
.
0
f
;
expectedvec
.
z
=
-
26
.
0
f
;
D3DXVec3Cross
(
&
gotvec
,
&
gotvec
,
&
v
);
expect_vec3
(
expectedvec
,
gotvec
);
/* Tests the case NULL */
funcpointer
=
D3DXVec3Cross
(
&
gotvec
,
NULL
,
&
v
);
ok
(
funcpointer
==
NULL
,
"Expected: %p, Got: %p
\n
"
,
NULL
,
funcpointer
);
...
...
include/d3dx9math.inl
View file @
b3dff5b3
...
...
@@ -1029,10 +1029,13 @@ static inline D3DXVECTOR3* D3DXVec3Add(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1
static inline D3DXVECTOR3* D3DXVec3Cross(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2)
{
D3DXVECTOR3 temp;
if ( !pout || !pv1 || !pv2) return NULL;
pout->x = (pv1->y) * (pv2->z) - (pv1->z) * (pv2->y);
pout->y = (pv1->z) * (pv2->x) - (pv1->x) * (pv2->z);
pout->z = (pv1->x) * (pv2->y) - (pv1->y) * (pv2->x);
temp.x = (pv1->y) * (pv2->z) - (pv1->z) * (pv2->y);
temp.y = (pv1->z) * (pv2->x) - (pv1->x) * (pv2->z);
temp.z = (pv1->x) * (pv2->y) - (pv1->y) * (pv2->x);
*pout = temp;
return pout;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment