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
e84e2e8c
Commit
e84e2e8c
authored
Jan 24, 2013
by
Henri Verbeet
Committed by
Alexandre Julliard
Jan 24, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3drm: Avoid LPD3DRMQUATERNION.
parent
cea0e758
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
9 deletions
+12
-9
math.c
dlls/d3drm/math.c
+4
-3
vector.c
dlls/d3drm/tests/vector.c
+3
-2
d3drmdef.h
include/d3drmdef.h
+5
-4
No files found.
dlls/d3drm/math.c
View file @
e84e2e8c
...
...
@@ -75,7 +75,7 @@ D3DVALUE WINAPI D3DRMColorGetRed(D3DCOLOR color)
}
/* Product of 2 quaternions */
LPD3DRMQUATERNION
WINAPI
D3DRMQuaternionMultiply
(
LPD3DRMQUATERNION
q
,
LPD3DRMQUATERNION
a
,
LPD3DRMQUATERNION
b
)
D3DRMQUATERNION
*
WINAPI
D3DRMQuaternionMultiply
(
D3DRMQUATERNION
*
q
,
D3DRMQUATERNION
*
a
,
D3DRMQUATERNION
*
b
)
{
D3DRMQUATERNION
temp
;
D3DVECTOR
cross_product
;
...
...
@@ -91,7 +91,7 @@ LPD3DRMQUATERNION WINAPI D3DRMQuaternionMultiply(LPD3DRMQUATERNION q, LPD3DRMQUA
}
/* Matrix for the Rotation that a unit quaternion represents */
void
WINAPI
D3DRMMatrixFromQuaternion
(
D3DRMMATRIX4D
m
,
LPD3DRMQUATERNION
q
)
void
WINAPI
D3DRMMatrixFromQuaternion
(
D3DRMMATRIX4D
m
,
D3DRMQUATERNION
*
q
)
{
D3DVALUE
w
,
x
,
y
,
z
;
w
=
q
->
s
;
...
...
@@ -125,7 +125,8 @@ D3DRMQUATERNION * WINAPI D3DRMQuaternionFromRotation(D3DRMQUATERNION *q, D3DVECT
}
/* Interpolation between two quaternions */
LPD3DRMQUATERNION
WINAPI
D3DRMQuaternionSlerp
(
LPD3DRMQUATERNION
q
,
LPD3DRMQUATERNION
a
,
LPD3DRMQUATERNION
b
,
D3DVALUE
alpha
)
D3DRMQUATERNION
*
WINAPI
D3DRMQuaternionSlerp
(
D3DRMQUATERNION
*
q
,
D3DRMQUATERNION
*
a
,
D3DRMQUATERNION
*
b
,
D3DVALUE
alpha
)
{
D3DVALUE
dot
,
epsilon
,
temp
,
theta
,
u
;
D3DVECTOR
v1
,
v2
;
...
...
dlls/d3drm/tests/vector.c
View file @
e84e2e8c
...
...
@@ -67,7 +67,7 @@
static
HMODULE
d3drm_handle
=
0
;
static
void
(
WINAPI
*
pD3DRMMatrixFromQuaternion
)(
D3DRMMATRIX4D
,
LPD3DRMQUATERNION
);
static
void
(
WINAPI
*
pD3DRMMatrixFromQuaternion
)(
D3DRMMATRIX4D
,
D3DRMQUATERNION
*
);
static
D3DVECTOR
*
(
WINAPI
*
pD3DRMVectorAdd
)(
D3DVECTOR
*
,
D3DVECTOR
*
,
D3DVECTOR
*
);
static
D3DVECTOR
*
(
WINAPI
*
pD3DRMVectorCrossProduct
)(
D3DVECTOR
*
,
D3DVECTOR
*
,
D3DVECTOR
*
);
static
D3DVALUE
(
WINAPI
*
pD3DRMVectorDotProduct
)(
D3DVECTOR
*
,
D3DVECTOR
*
);
...
...
@@ -78,7 +78,8 @@ static D3DVECTOR *(WINAPI *pD3DRMVectorRotate)(D3DVECTOR *, D3DVECTOR *, D3DVECT
static
D3DVECTOR
*
(
WINAPI
*
pD3DRMVectorScale
)(
D3DVECTOR
*
,
D3DVECTOR
*
,
D3DVALUE
);
static
D3DVECTOR
*
(
WINAPI
*
pD3DRMVectorSubtract
)(
D3DVECTOR
*
,
D3DVECTOR
*
,
D3DVECTOR
*
);
static
D3DRMQUATERNION
*
(
WINAPI
*
pD3DRMQuaternionFromRotation
)(
D3DRMQUATERNION
*
,
D3DVECTOR
*
,
D3DVALUE
);
static
LPD3DRMQUATERNION
(
WINAPI
*
pD3DRMQuaternionSlerp
)(
LPD3DRMQUATERNION
,
LPD3DRMQUATERNION
,
LPD3DRMQUATERNION
,
D3DVALUE
);
static
D3DRMQUATERNION
*
(
WINAPI
*
pD3DRMQuaternionSlerp
)(
D3DRMQUATERNION
*
,
D3DRMQUATERNION
*
,
D3DRMQUATERNION
*
,
D3DVALUE
);
static
D3DCOLOR
(
WINAPI
*
pD3DRMCreateColorRGB
)(
D3DVALUE
,
D3DVALUE
,
D3DVALUE
);
static
D3DCOLOR
(
WINAPI
*
pD3DRMCreateColorRGBA
)(
D3DVALUE
,
D3DVALUE
,
D3DVALUE
,
D3DVALUE
);
static
D3DVALUE
(
WINAPI
*
pD3DRMColorGetAlpha
)(
D3DCOLOR
);
...
...
include/d3drmdef.h
View file @
e84e2e8c
...
...
@@ -429,11 +429,12 @@ typedef struct _D3DRMVERTEX {
typedef
LONG
D3DRMGROUPINDEX
;
static
const
D3DRMGROUPINDEX
D3DRMGROUP_ALLGROUPS
=
-
1
;
void
WINAPI
D3DRMMatrixFromQuaternion
(
D3DRMMATRIX4D
,
LPD3DRMQUATERNION
);
void
WINAPI
D3DRMMatrixFromQuaternion
(
D3DRMMATRIX4D
m
,
D3DRMQUATERNION
*
q
);
LPD3DRMQUATERNION
WINAPI
D3DRMQuaternionFromRotation
(
D3DRMQUATERNION
*
x
,
D3DVECTOR
*
axis
,
D3DVALUE
theta
);
LPD3DRMQUATERNION
WINAPI
D3DRMQuaternionMultiply
(
LPD3DRMQUATERNION
,
LPD3DRMQUATERNION
,
LPD3DRMQUATERNION
);
LPD3DRMQUATERNION
WINAPI
D3DRMQuaternionSlerp
(
LPD3DRMQUATERNION
,
LPD3DRMQUATERNION
,
LPD3DRMQUATERNION
,
D3DVALUE
);
D3DRMQUATERNION
*
WINAPI
D3DRMQuaternionFromRotation
(
D3DRMQUATERNION
*
x
,
D3DVECTOR
*
axis
,
D3DVALUE
theta
);
D3DRMQUATERNION
*
WINAPI
D3DRMQuaternionMultiply
(
D3DRMQUATERNION
*
ret
,
D3DRMQUATERNION
*
x
,
D3DRMQUATERNION
*
y
);
D3DRMQUATERNION
*
WINAPI
D3DRMQuaternionSlerp
(
D3DRMQUATERNION
*
ret
,
D3DRMQUATERNION
*
x
,
D3DRMQUATERNION
*
y
,
D3DVALUE
alpha
);
D3DVECTOR
*
WINAPI
D3DRMVectorAdd
(
D3DVECTOR
*
ret
,
D3DVECTOR
*
x
,
D3DVECTOR
*
y
);
D3DVECTOR
*
WINAPI
D3DRMVectorCrossProduct
(
D3DVECTOR
*
ret
,
D3DVECTOR
*
x
,
D3DVECTOR
*
y
);
...
...
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