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
d1c2d2a4
Commit
d1c2d2a4
authored
Jul 11, 2009
by
David Adam
Committed by
Alexandre Julliard
Jul 13, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Merge d3dx8 math into d3dx9.
parent
35ada0dc
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
82 additions
and
0 deletions
+82
-0
d3dx9_36.spec
dlls/d3dx9_36/d3dx9_36.spec
+0
-0
d3dx9_36_private.h
dlls/d3dx9_36/d3dx9_36_private.h
+13
-0
math.c
dlls/d3dx9_36/math.c
+0
-0
d3dx9math.h
include/d3dx9math.h
+69
-0
No files found.
dlls/d3dx9_36/d3dx9_36.spec
View file @
d1c2d2a4
This diff is collapsed.
Click to expand it.
dlls/d3dx9_36/d3dx9_36_private.h
View file @
d1c2d2a4
/*
* Copyright (C) 2002 Raphael Junqueira
* Copyright (C) 2008 David Adam
* Copyright (C) 2008 Tony Wasserka
*
* This library is free software; you can redistribute it and/or
...
...
@@ -63,6 +64,18 @@ typedef struct ID3DXFontImpl
HFONT
hfont
;
}
ID3DXFontImpl
;
/* ID3DXMatrixStack */
typedef
struct
ID3DXMatrixStackImpl
{
/* IUnknown fields */
const
ID3DXMatrixStackVtbl
*
lpVtbl
;
LONG
ref
;
/* ID3DXMatrixStack fields */
unsigned
int
current
;
unsigned
int
stack_size
;
D3DXMATRIX
*
stack
;
}
ID3DXMatrixStackImpl
;
/*ID3DXSprite */
typedef
struct
_SPRITE
{
...
...
dlls/d3dx9_36/math.c
View file @
d1c2d2a4
This diff is collapsed.
Click to expand it.
include/d3dx9math.h
View file @
d1c2d2a4
...
...
@@ -30,6 +30,8 @@
#define D3DXToRadian(degree) ((degree) * (D3DX_PI / 180.0f))
#define D3DXToDegree(radian) ((radian) * (180.0f / D3DX_PI))
typedef
struct
D3DXVECTOR2
{
#ifdef __cplusplus
...
...
@@ -266,6 +268,8 @@ extern "C" {
D3DXCOLOR
*
WINAPI
D3DXColorAdjustContrast
(
D3DXCOLOR
*
pout
,
CONST
D3DXCOLOR
*
pc
,
FLOAT
s
);
D3DXCOLOR
*
WINAPI
D3DXColorAdjustSaturation
(
D3DXCOLOR
*
pout
,
CONST
D3DXCOLOR
*
pc
,
FLOAT
s
);
FLOAT
WINAPI
D3DXFresnelTerm
(
FLOAT
costheta
,
FLOAT
refractionindex
);
D3DXMATRIX
*
WINAPI
D3DXMatrixAffineTransformation
(
D3DXMATRIX
*
pout
,
FLOAT
scaling
,
CONST
D3DXVECTOR3
*
rotationcenter
,
CONST
D3DXQUATERNION
*
rotation
,
CONST
D3DXVECTOR3
*
translation
);
D3DXMATRIX
*
WINAPI
D3DXMatrixAffineTransformation2D
(
D3DXMATRIX
*
pout
,
FLOAT
scaling
,
CONST
D3DXVECTOR2
*
protationcenter
,
FLOAT
rotation
,
CONST
D3DXVECTOR2
*
ptranslation
);
HRESULT
WINAPI
D3DXMatrixDecompose
(
D3DXVECTOR3
*
poutscale
,
D3DXQUATERNION
*
poutrotation
,
D3DXVECTOR3
*
pouttranslation
,
CONST
D3DXMATRIX
*
pm
);
...
...
@@ -358,6 +362,71 @@ D3DXVECTOR4* WINAPI D3DXVec4TransformArray(D3DXVECTOR4 *pout, UINT outstride, CO
}
#endif
typedef
interface
ID3DXMatrixStack
*
LPD3DXMATRIXSTACK
;
DEFINE_GUID
(
IID_ID3DXMatrixStack
,
0xc7885ba7
,
0xf990
,
0x4fe7
,
0x92
,
0x2d
,
0x85
,
0x15
,
0xe4
,
0x77
,
0xdd
,
0x85
);
#undef INTERFACE
#define INTERFACE ID3DXMatrixStack
DECLARE_INTERFACE_
(
ID3DXMatrixStack
,
IUnknown
)
{
STDMETHOD
(
QueryInterface
)(
THIS_
REFIID
riid
,
LPVOID
*
ppvObj
)
PURE
;
STDMETHOD_
(
ULONG
,
AddRef
)(
THIS
)
PURE
;
STDMETHOD_
(
ULONG
,
Release
)(
THIS
)
PURE
;
STDMETHOD
(
Pop
)(
THIS
)
PURE
;
STDMETHOD
(
Push
)(
THIS
)
PURE
;
STDMETHOD
(
LoadIdentity
)(
THIS
)
PURE
;
STDMETHOD
(
LoadMatrix
)(
THIS_
CONST
D3DXMATRIX
*
pM
)
PURE
;
STDMETHOD
(
MultMatrix
)(
THIS_
CONST
D3DXMATRIX
*
pM
)
PURE
;
STDMETHOD
(
MultMatrixLocal
)(
THIS_
CONST
D3DXMATRIX
*
pM
)
PURE
;
STDMETHOD
(
RotateAxis
)(
THIS_
CONST
D3DXVECTOR3
*
pV
,
FLOAT
Angle
)
PURE
;
STDMETHOD
(
RotateAxisLocal
)(
THIS_
CONST
D3DXVECTOR3
*
pV
,
FLOAT
Angle
)
PURE
;
STDMETHOD
(
RotateYawPitchRoll
)(
THIS_
FLOAT
Yaw
,
FLOAT
Pitch
,
FLOAT
Roll
)
PURE
;
STDMETHOD
(
RotateYawPitchRollLocal
)(
THIS_
FLOAT
Yaw
,
FLOAT
Pitch
,
FLOAT
Roll
)
PURE
;
STDMETHOD
(
Scale
)(
THIS_
FLOAT
x
,
FLOAT
y
,
FLOAT
z
)
PURE
;
STDMETHOD
(
ScaleLocal
)(
THIS_
FLOAT
x
,
FLOAT
y
,
FLOAT
z
)
PURE
;
STDMETHOD
(
Translate
)(
THIS_
FLOAT
x
,
FLOAT
y
,
FLOAT
z
)
PURE
;
STDMETHOD
(
TranslateLocal
)(
THIS_
FLOAT
x
,
FLOAT
y
,
FLOAT
z
)
PURE
;
STDMETHOD_
(
D3DXMATRIX
*
,
GetTop
)(
THIS
)
PURE
;
};
#undef INTERFACE
#if !defined(__cplusplus) || defined(CINTERFACE)
#define ID3DXMatrixStack_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define ID3DXMatrixStack_AddRef(p) (p)->lpVtbl->AddRef(p)
#define ID3DXMatrixStack_Release(p) (p)->lpVtbl->Release(p)
#define ID3DXMatrixStack_Pop(p) (p)->lpVtbl->Pop(p)
#define ID3DXMatrixStack_Push(p) (p)->lpVtbl->Push(p)
#define ID3DXMatrixStack_LoadIdentity(p) (p)->lpVtbl->LoadIdentity(p)
#define ID3DXMatrixStack_LoadMatrix(p,a) (p)->lpVtbl->LoadMatrix(p,a)
#define ID3DXMatrixStack_MultMatrix(p,a) (p)->lpVtbl->MultMatrix(p,a)
#define ID3DXMatrixStack_MultMatrixLocal(p,a) (p)->lpVtbl->MultMatrixLocal(p,a)
#define ID3DXMatrixStack_RotateAxis(p,a,b) (p)->lpVtbl->RotateAxis(p,a,b)
#define ID3DXMatrixStack_RotateAxisLocal(p,a,b) (p)->lpVtbl->RotateAxisLocal(p,a,b)
#define ID3DXMatrixStack_RotateYawPitchRoll(p,a,b,c) (p)->lpVtbl->RotateYawPitchRoll(p,a,b,c)
#define ID3DXMatrixStack_RotateYawPitchRollLocal(p,a,b,c) (p)->lpVtbl->RotateYawPitchRollLocal(p,a,b,c)
#define ID3DXMatrixStack_Scale(p,a,b,c) (p)->lpVtbl->Scale(p,a,b,c)
#define ID3DXMatrixStack_ScaleLocal(p,a,b,c) (p)->lpVtbl->ScaleLocal(p,a,b,c)
#define ID3DXMatrixStack_Translate(p,a,b,c) (p)->lpVtbl->Translate(p,a,b,c)
#define ID3DXMatrixStack_TranslateLocal(p,a,b,c) (p)->lpVtbl->TranslateLocal(p,a,b,c)
#define ID3DXMatrixStack_GetTop(p) (p)->lpVtbl->GetTop(p)
#endif
#ifdef __cplusplus
extern
"C"
{
#endif
HRESULT
WINAPI
D3DXCreateMatrixStack
(
DWORD
flags
,
LPD3DXMATRIXSTACK
*
ppstack
);
#ifdef __cplusplus
}
#endif
#include <d3dx9math.inl>
#endif
/* __D3DX9MATH_H__ */
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