Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
716862d6
Commit
716862d6
authored
Oct 30, 2007
by
David Adam
Committed by
Alexandre Julliard
Oct 31, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx8: Implement D3DXMatrixScaling.
parent
e8f887dc
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
1 deletion
+19
-1
d3dx8.spec
dlls/d3dx8/d3dx8.spec
+1
-1
math.c
dlls/d3dx8/math.c
+9
-0
math.c
dlls/d3dx8/tests/math.c
+8
-0
d3dx8math.h
include/d3dx8math.h
+1
-0
No files found.
dlls/d3dx8/d3dx8.spec
View file @
716862d6
...
...
@@ -24,7 +24,7 @@
@ stdcall D3DXMatrixMultiply(ptr ptr ptr)
@ stdcall D3DXMatrixTranspose(ptr ptr)
@ stub D3DXMatrixInverse
@ st
ub D3DXMatrixScaling
@ st
dcall D3DXMatrixScaling(ptr long long long)
@ stub D3DXMatrixTranslation
@ stub D3DXMatrixRotationX
@ stub D3DXMatrixRotationY
...
...
dlls/d3dx8/math.c
View file @
716862d6
...
...
@@ -58,6 +58,15 @@ D3DXMATRIX* WINAPI D3DXMatrixMultiply(D3DXMATRIX *pout, CONST D3DXMATRIX *pm1, C
return
pout
;
}
D3DXMATRIX
*
WINAPI
D3DXMatrixScaling
(
D3DXMATRIX
*
pout
,
FLOAT
sx
,
FLOAT
sy
,
FLOAT
sz
)
{
D3DXMatrixIdentity
(
pout
);
pout
->
m
[
0
][
0
]
=
sx
;
pout
->
m
[
1
][
1
]
=
sy
;
pout
->
m
[
2
][
2
]
=
sz
;
return
pout
;
}
D3DXMATRIX
*
WINAPI
D3DXMatrixTranspose
(
D3DXMATRIX
*
pout
,
CONST
D3DXMATRIX
*
pm
)
{
int
i
,
j
;
...
...
dlls/d3dx8/tests/math.c
View file @
716862d6
...
...
@@ -196,6 +196,14 @@ static void D3DXMatrixTest(void)
D3DXMatrixMultiply
(
&
gotmat
,
&
mat
,
&
mat2
);
expect_mat
(
expectedmat
,
gotmat
);
/*____________D3DXMatrixScaling______________*/
expectedmat
.
m
[
0
][
0
]
=
0
.
69
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
;
expectedmat
.
m
[
1
][
1
]
=
0
.
53
f
;
expectedmat
.
m
[
1
][
2
]
=
0
.
0
f
;
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
]
=
4
.
11
f
;
expectedmat
.
m
[
2
][
3
]
=
0
.
0
f
;
expectedmat
.
m
[
3
][
0
]
=
0
.
0
f
;
expectedmat
.
m
[
3
][
1
]
=
0
.
0
f
;
expectedmat
.
m
[
3
][
2
]
=
0
.
0
f
;
expectedmat
.
m
[
3
][
3
]
=
1
.
0
f
;
D3DXMatrixScaling
(
&
gotmat
,
0
.
69
f
,
0
.
53
f
,
4
.
11
f
);
expect_mat
(
expectedmat
,
gotmat
);
/*____________D3DXMatrixTranspose______________*/
expectedmat
.
m
[
0
][
0
]
=
10
.
0
f
;
expectedmat
.
m
[
0
][
1
]
=
11
.
0
f
;
expectedmat
.
m
[
0
][
2
]
=
19
.
0
f
;
expectedmat
.
m
[
0
][
3
]
=
2
.
0
f
;
expectedmat
.
m
[
1
][
0
]
=
5
.
0
;
expectedmat
.
m
[
1
][
1
]
=
20
.
0
f
;
expectedmat
.
m
[
1
][
2
]
=
-
21
.
0
f
;
expectedmat
.
m
[
1
][
3
]
=
3
.
0
f
;
...
...
include/d3dx8math.h
View file @
716862d6
...
...
@@ -60,6 +60,7 @@ typedef struct D3DXCOLOR
FLOAT
WINAPI
D3DXMatrixfDeterminant
(
CONST
D3DXMATRIX
*
pm
);
D3DXMATRIX
*
WINAPI
D3DXMatrixMultiply
(
D3DXMATRIX
*
pout
,
CONST
D3DXMATRIX
*
pm1
,
CONST
D3DXMATRIX
*
pm2
);
D3DXMATRIX
*
WINAPI
D3DXMatrixScaling
(
D3DXMATRIX
*
pout
,
FLOAT
sx
,
FLOAT
sy
,
FLOAT
sz
);
D3DXMATRIX
*
WINAPI
D3DXMatrixTranspose
(
D3DXMATRIX
*
pout
,
CONST
D3DXMATRIX
*
pm
);
D3DXQUATERNION
*
WINAPI
D3DXQuaternionNormalize
(
D3DXQUATERNION
*
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