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
5154b203
Commit
5154b203
authored
Nov 03, 2007
by
David Adam
Committed by
Alexandre Julliard
Nov 05, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx8: Implement D3DXMatrixPerspectiveRH.
parent
324aad45
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
2 deletions
+23
-2
d3dx8.spec
dlls/d3dx8/d3dx8.spec
+1
-1
math.c
dlls/d3dx8/math.c
+12
-0
math.c
dlls/d3dx8/tests/math.c
+9
-1
d3dx8math.h
include/d3dx8math.h
+1
-0
No files found.
dlls/d3dx8/d3dx8.spec
View file @
5154b203
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
@ stub D3DXMatrixAffineTransformation
@ stub D3DXMatrixAffineTransformation
@ stdcall D3DXMatrixLookAtRH(ptr ptr ptr ptr ptr)
@ stdcall D3DXMatrixLookAtRH(ptr ptr ptr ptr ptr)
@ stdcall D3DXMatrixLookAtLH(ptr ptr ptr ptr)
@ stdcall D3DXMatrixLookAtLH(ptr ptr ptr ptr)
@ st
ub D3DXMatrixPerspectiveRH
@ st
dcall D3DXMatrixPerspectiveRH(ptr long long long long)
@ stub D3DXMatrixPerspectiveLH
@ stub D3DXMatrixPerspectiveLH
@ stub D3DXMatrixPerspectiveFovRH
@ stub D3DXMatrixPerspectiveFovRH
@ stub D3DXMatrixPerspectiveFovLH
@ stub D3DXMatrixPerspectiveFovLH
...
...
dlls/d3dx8/math.c
View file @
5154b203
...
@@ -116,6 +116,18 @@ D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, C
...
@@ -116,6 +116,18 @@ D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, C
return
pout
;
return
pout
;
}
}
D3DXMATRIX
*
WINAPI
D3DXMatrixPerspectiveRH
(
D3DXMATRIX
*
pout
,
FLOAT
w
,
FLOAT
h
,
FLOAT
zn
,
FLOAT
zf
)
{
D3DXMatrixIdentity
(
pout
);
pout
->
m
[
0
][
0
]
=
2
.
0
f
*
zn
/
w
;
pout
->
m
[
1
][
1
]
=
2
.
0
f
*
zn
/
h
;
pout
->
m
[
2
][
2
]
=
zf
/
(
zn
-
zf
);
pout
->
m
[
3
][
2
]
=
(
zn
*
zf
)
/
(
zn
-
zf
);
pout
->
m
[
2
][
3
]
=
-
1
.
0
f
;
pout
->
m
[
3
][
3
]
=
0
.
0
f
;
return
pout
;
}
D3DXMATRIX
*
WINAPI
D3DXMatrixRotationAxis
(
D3DXMATRIX
*
pout
,
CONST
D3DXVECTOR3
*
pv
,
FLOAT
angle
)
D3DXMATRIX
*
WINAPI
D3DXMatrixRotationAxis
(
D3DXMATRIX
*
pout
,
CONST
D3DXVECTOR3
*
pv
,
FLOAT
angle
)
{
{
D3DXVECTOR3
v
;
D3DXVECTOR3
v
;
...
...
dlls/d3dx8/tests/math.c
View file @
5154b203
...
@@ -222,7 +222,15 @@ static void D3DXMatrixTest(void)
...
@@ -222,7 +222,15 @@ static void D3DXMatrixTest(void)
D3DXMatrixMultiply
(
&
gotmat
,
&
mat
,
&
mat2
);
D3DXMatrixMultiply
(
&
gotmat
,
&
mat
,
&
mat2
);
expect_mat
(
expectedmat
,
gotmat
);
expect_mat
(
expectedmat
,
gotmat
);
/*____________D3DXMatrixRotationRotationAxis_____*/
/*____________D3DXMatrixPerspectiveRH_______________*/
expectedmat
.
m
[
0
][
0
]
=
-
24
.
0
f
;
expectedmat
.
m
[
0
][
1
]
=
-
0
.
0
f
;
expectedmat
.
m
[
0
][
2
]
=
0
.
0
f
;
expectedmat
.
m
[
0
][
3
]
=
0
.
0
f
;
expectedmat
.
m
[
1
][
0
]
=
0
.
0
f
;
expectedmat
.
m
[
1
][
1
]
=
-
6
.
4
f
;
expectedmat
.
m
[
1
][
2
]
=
0
.
0
;
expectedmat
.
m
[
1
][
3
]
=
0
.
0
f
;
expectedmat
.
m
[
2
][
0
]
=
0
.
0
f
;
expectedmat
.
m
[
2
][
1
]
=
0
.
0
f
;
expectedmat
.
m
[
2
][
2
]
=
-
0
.
783784
f
;
expectedmat
.
m
[
2
][
3
]
=
-
1
.
0
f
;
expectedmat
.
m
[
3
][
0
]
=
0
.
0
f
;
expectedmat
.
m
[
3
][
1
]
=
0
.
0
f
;
expectedmat
.
m
[
3
][
2
]
=
1
.
881081
f
;
expectedmat
.
m
[
3
][
3
]
=
0
.
0
f
;
D3DXMatrixPerspectiveRH
(
&
gotmat
,
0
.
2
f
,
0
.
75
f
,
-
2
.
4
f
,
8
.
7
f
);
expect_mat
(
expectedmat
,
gotmat
);
/*____________D3DXMatrixRotationAxis_____*/
expectedmat
.
m
[
0
][
0
]
=
0
.
508475
f
;
expectedmat
.
m
[
0
][
1
]
=
0
.
763805
f
;
expectedmat
.
m
[
0
][
2
]
=
0
.
397563
f
;
expectedmat
.
m
[
0
][
3
]
=
0
.
0
f
;
expectedmat
.
m
[
0
][
0
]
=
0
.
508475
f
;
expectedmat
.
m
[
0
][
1
]
=
0
.
763805
f
;
expectedmat
.
m
[
0
][
2
]
=
0
.
397563
f
;
expectedmat
.
m
[
0
][
3
]
=
0
.
0
f
;
expectedmat
.
m
[
1
][
0
]
=
-
0
.
814652
f
;
expectedmat
.
m
[
1
][
1
]
=
0
.
576271
f
;
expectedmat
.
m
[
1
][
2
]
=
-
0
.
06521
9
f
;
expectedmat
.
m
[
1
][
3
]
=
0
.
0
f
;
expectedmat
.
m
[
1
][
0
]
=
-
0
.
814652
f
;
expectedmat
.
m
[
1
][
1
]
=
0
.
576271
f
;
expectedmat
.
m
[
1
][
2
]
=
-
0
.
06521
9
f
;
expectedmat
.
m
[
1
][
3
]
=
0
.
0
f
;
expectedmat
.
m
[
2
][
0
]
=
-
0
.
278919
f
;
expectedmat
.
m
[
2
][
1
]
=
-
0
.
290713
f
;
expectedmat
.
m
[
2
][
2
]
=
0
.
915254
f
;
expectedmat
.
m
[
2
][
3
]
=
0
.
0
f
;
expectedmat
.
m
[
2
][
0
]
=
-
0
.
278919
f
;
expectedmat
.
m
[
2
][
1
]
=
-
0
.
290713
f
;
expectedmat
.
m
[
2
][
2
]
=
0
.
915254
f
;
expectedmat
.
m
[
2
][
3
]
=
0
.
0
f
;
...
...
include/d3dx8math.h
View file @
5154b203
...
@@ -62,6 +62,7 @@ FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm);
...
@@ -62,6 +62,7 @@ FLOAT WINAPI D3DXMatrixfDeterminant(CONST D3DXMATRIX *pm);
D3DXMATRIX
*
WINAPI
D3DXMatrixLookAtLH
(
D3DXMATRIX
*
pout
,
CONST
D3DXVECTOR3
*
peye
,
CONST
D3DXVECTOR3
*
pat
,
CONST
D3DXVECTOR3
*
pup
);
D3DXMATRIX
*
WINAPI
D3DXMatrixLookAtLH
(
D3DXMATRIX
*
pout
,
CONST
D3DXVECTOR3
*
peye
,
CONST
D3DXVECTOR3
*
pat
,
CONST
D3DXVECTOR3
*
pup
);
D3DXMATRIX
*
WINAPI
D3DXMatrixLookAtRH
(
D3DXMATRIX
*
pout
,
CONST
D3DXVECTOR3
*
peye
,
CONST
D3DXVECTOR3
*
pat
,
CONST
D3DXVECTOR3
*
pup
);
D3DXMATRIX
*
WINAPI
D3DXMatrixLookAtRH
(
D3DXMATRIX
*
pout
,
CONST
D3DXVECTOR3
*
peye
,
CONST
D3DXVECTOR3
*
pat
,
CONST
D3DXVECTOR3
*
pup
);
D3DXMATRIX
*
WINAPI
D3DXMatrixMultiply
(
D3DXMATRIX
*
pout
,
CONST
D3DXMATRIX
*
pm1
,
CONST
D3DXMATRIX
*
pm2
);
D3DXMATRIX
*
WINAPI
D3DXMatrixMultiply
(
D3DXMATRIX
*
pout
,
CONST
D3DXMATRIX
*
pm1
,
CONST
D3DXMATRIX
*
pm2
);
D3DXMATRIX
*
WINAPI
D3DXMatrixPerspectiveRH
(
D3DXMATRIX
*
pout
,
FLOAT
w
,
FLOAT
h
,
FLOAT
zn
,
FLOAT
zf
);
D3DXMATRIX
*
WINAPI
D3DXMatrixRotationAxis
(
D3DXMATRIX
*
pout
,
CONST
D3DXVECTOR3
*
pv
,
FLOAT
angle
);
D3DXMATRIX
*
WINAPI
D3DXMatrixRotationAxis
(
D3DXMATRIX
*
pout
,
CONST
D3DXVECTOR3
*
pv
,
FLOAT
angle
);
D3DXMATRIX
*
WINAPI
D3DXMatrixRotationQuaternion
(
D3DXMATRIX
*
pout
,
CONST
D3DXQUATERNION
*
pq
);
D3DXMATRIX
*
WINAPI
D3DXMatrixRotationQuaternion
(
D3DXMATRIX
*
pout
,
CONST
D3DXQUATERNION
*
pq
);
D3DXMATRIX
*
WINAPI
D3DXMatrixRotationX
(
D3DXMATRIX
*
pout
,
FLOAT
angle
);
D3DXMATRIX
*
WINAPI
D3DXMatrixRotationX
(
D3DXMATRIX
*
pout
,
FLOAT
angle
);
...
...
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