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
110fcb49
Commit
110fcb49
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 D3DXMatrixPerspectiveOffCenterRH.
parent
bc386fd7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
2 deletions
+25
-2
d3dx8.spec
dlls/d3dx8/d3dx8.spec
+1
-1
math.c
dlls/d3dx8/math.c
+14
-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 @
110fcb49
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
@ stdcall D3DXMatrixPerspectiveLH(ptr long long long long)
@ stdcall D3DXMatrixPerspectiveLH(ptr long long long long)
@ stdcall D3DXMatrixPerspectiveFovRH(ptr long long long long)
@ stdcall D3DXMatrixPerspectiveFovRH(ptr long long long long)
@ stdcall D3DXMatrixPerspectiveFovLH(ptr long long long long)
@ stdcall D3DXMatrixPerspectiveFovLH(ptr long long long long)
@ st
ub D3DXMatrixPerspectiveOffCenterRH
@ st
dcall D3DXMatrixPerspectiveOffCenterRH(ptr long long long long long long)
@ stub D3DXMatrixPerspectiveOffCenterLH
@ stub D3DXMatrixPerspectiveOffCenterLH
@ stub D3DXMatrixOrthoRH
@ stub D3DXMatrixOrthoRH
@ stub D3DXMatrixOrthoLH
@ stub D3DXMatrixOrthoLH
...
...
dlls/d3dx8/math.c
View file @
110fcb49
...
@@ -152,6 +152,20 @@ D3DXMATRIX* WINAPI D3DXMatrixPerspectiveLH(D3DXMATRIX *pout, FLOAT w, FLOAT h, F
...
@@ -152,6 +152,20 @@ D3DXMATRIX* WINAPI D3DXMatrixPerspectiveLH(D3DXMATRIX *pout, FLOAT w, FLOAT h, F
return
pout
;
return
pout
;
}
}
D3DXMATRIX
*
WINAPI
D3DXMatrixPerspectiveOffCenterRH
(
D3DXMATRIX
*
pout
,
FLOAT
l
,
FLOAT
r
,
FLOAT
b
,
FLOAT
t
,
FLOAT
zn
,
FLOAT
zf
)
{
D3DXMatrixIdentity
(
pout
);
pout
->
m
[
0
][
0
]
=
2
.
0
f
*
zn
/
(
r
-
l
);
pout
->
m
[
1
][
1
]
=
-
2
.
0
f
*
zn
/
(
b
-
t
);
pout
->
m
[
2
][
0
]
=
1
.
0
f
+
2
.
0
f
*
l
/
(
r
-
l
);
pout
->
m
[
2
][
1
]
=
-
1
.
0
f
-
2
.
0
f
*
t
/
(
b
-
t
);
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
D3DXMatrixPerspectiveRH
(
D3DXMATRIX
*
pout
,
FLOAT
w
,
FLOAT
h
,
FLOAT
zn
,
FLOAT
zf
)
D3DXMATRIX
*
WINAPI
D3DXMatrixPerspectiveRH
(
D3DXMATRIX
*
pout
,
FLOAT
w
,
FLOAT
h
,
FLOAT
zn
,
FLOAT
zf
)
{
{
D3DXMatrixIdentity
(
pout
);
D3DXMatrixIdentity
(
pout
);
...
...
dlls/d3dx8/tests/math.c
View file @
110fcb49
...
@@ -239,13 +239,21 @@ static void D3DXMatrixTest(void)
...
@@ -239,13 +239,21 @@ static void D3DXMatrixTest(void)
expect_mat
(
expectedmat
,
gotmat
);
expect_mat
(
expectedmat
,
gotmat
);
/*____________D3DXMatrixPerspectiveLH_______________*/
/*____________D3DXMatrixPerspectiveLH_______________*/
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
[
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
[
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
[
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
;
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
;
D3DXMatrixPerspectiveLH
(
&
gotmat
,
0
.
2
f
,
0
.
75
f
,
-
2
.
4
f
,
8
.
7
f
);
D3DXMatrixPerspectiveLH
(
&
gotmat
,
0
.
2
f
,
0
.
75
f
,
-
2
.
4
f
,
8
.
7
f
);
expect_mat
(
expectedmat
,
gotmat
);
expect_mat
(
expectedmat
,
gotmat
);
/*____________D3DXMatrixPerspectiveOffCenterRH_______________*/
expectedmat
.
m
[
0
][
0
]
=
11
.
636364
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
]
=
0
.
576577
f
;
expectedmat
.
m
[
1
][
2
]
=
0
.
0
;
expectedmat
.
m
[
1
][
3
]
=
0
.
0
f
;
expectedmat
.
m
[
2
][
0
]
=
1
.
727273
f
;
expectedmat
.
m
[
2
][
1
]
=
0
.
567568
f
;
expectedmat
.
m
[
2
][
2
]
=
-
0
.
840796
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
]
=
-
2
.
690547
f
;
expectedmat
.
m
[
3
][
3
]
=
0
.
0
f
;
D3DXMatrixPerspectiveOffCenterRH
(
&
gotmat
,
0
.
2
f
,
0
.
75
f
,
-
2
.
4
f
,
8
.
7
f
,
3
.
2
f
,
-
16
.
9
f
);
expect_mat
(
expectedmat
,
gotmat
);
/*____________D3DXMatrixPerspectiveRH_______________*/
/*____________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
[
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
[
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
;
...
...
include/d3dx8math.h
View file @
110fcb49
...
@@ -65,6 +65,7 @@ D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, C
...
@@ -65,6 +65,7 @@ D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, C
D3DXMATRIX
*
WINAPI
D3DXMatrixPerspectiveFovLH
(
D3DXMATRIX
*
pout
,
FLOAT
fovy
,
FLOAT
aspect
,
FLOAT
zn
,
FLOAT
zf
);
D3DXMATRIX
*
WINAPI
D3DXMatrixPerspectiveFovLH
(
D3DXMATRIX
*
pout
,
FLOAT
fovy
,
FLOAT
aspect
,
FLOAT
zn
,
FLOAT
zf
);
D3DXMATRIX
*
WINAPI
D3DXMatrixPerspectiveFovRH
(
D3DXMATRIX
*
pout
,
FLOAT
fovy
,
FLOAT
aspect
,
FLOAT
zn
,
FLOAT
zf
);
D3DXMATRIX
*
WINAPI
D3DXMatrixPerspectiveFovRH
(
D3DXMATRIX
*
pout
,
FLOAT
fovy
,
FLOAT
aspect
,
FLOAT
zn
,
FLOAT
zf
);
D3DXMATRIX
*
WINAPI
D3DXMatrixPerspectiveLH
(
D3DXMATRIX
*
pout
,
FLOAT
w
,
FLOAT
h
,
FLOAT
zn
,
FLOAT
zf
);
D3DXMATRIX
*
WINAPI
D3DXMatrixPerspectiveLH
(
D3DXMATRIX
*
pout
,
FLOAT
w
,
FLOAT
h
,
FLOAT
zn
,
FLOAT
zf
);
D3DXMATRIX
*
WINAPI
D3DXMatrixPerspectiveOffCenterRH
(
D3DXMATRIX
*
pout
,
FLOAT
l
,
FLOAT
r
,
FLOAT
b
,
FLOAT
t
,
FLOAT
zn
,
FLOAT
zf
);
D3DXMATRIX
*
WINAPI
D3DXMatrixPerspectiveRH
(
D3DXMATRIX
*
pout
,
FLOAT
w
,
FLOAT
h
,
FLOAT
zn
,
FLOAT
zf
);
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
);
...
...
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