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
97f36631
Commit
97f36631
authored
Oct 28, 2007
by
Francois Gouget
Committed by
Alexandre Julliard
Oct 29, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx8: Make sure d3dx8math.inl compiles fine, whether nameless unions are supported or not.
parent
eb546b3b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
17 deletions
+23
-17
d3dx8math.inl
include/d3dx8math.inl
+23
-17
No files found.
include/d3dx8math.inl
View file @
97f36631
...
...
@@ -319,26 +319,31 @@ static inline D3DXVECTOR4* D3DXVec4Subtract(D3DXVECTOR4 *pout, CONST D3DXVECTOR4
}
/*__________________D3DXMatrix____________________*/
#ifdef NONAMELESSUNION
# define D3DX_U(x) (x).u
#else
# define D3DX_U(x) (x)
#endif
static inline D3DXMATRIX* D3DXMatrixIdentity(D3DXMATRIX *pout)
{
if ( !pout ) return NULL;
pout->
m[0][1] = 0.0f;
pout->
m[0][2] = 0.0f;
pout->
m[0][3] = 0.0f;
pout->
m[1][0] = 0.0f;
pout->
m[1][2] = 0.0f;
pout->
m[1][3] = 0.0f;
pout->
m[2][0] = 0.0f;
pout->
m[2][1] = 0.0f;
pout->
m[2][3] = 0.0f;
pout->
m[3][0] = 0.0f;
pout->
m[3][1] = 0.0f;
pout->
m[3][2] = 0.0f;
pout->
m[0][0] = 1.0f;
pout->
m[1][1] = 1.0f;
pout->
m[2][2] = 1.0f;
pout->
m[3][3] = 1.0f;
D3DX_U(*pout).
m[0][1] = 0.0f;
D3DX_U(*pout).
m[0][2] = 0.0f;
D3DX_U(*pout).
m[0][3] = 0.0f;
D3DX_U(*pout).
m[1][0] = 0.0f;
D3DX_U(*pout).
m[1][2] = 0.0f;
D3DX_U(*pout).
m[1][3] = 0.0f;
D3DX_U(*pout).
m[2][0] = 0.0f;
D3DX_U(*pout).
m[2][1] = 0.0f;
D3DX_U(*pout).
m[2][3] = 0.0f;
D3DX_U(*pout).
m[3][0] = 0.0f;
D3DX_U(*pout).
m[3][1] = 0.0f;
D3DX_U(*pout).
m[3][2] = 0.0f;
D3DX_U(*pout).
m[0][0] = 1.0f;
D3DX_U(*pout).
m[1][1] = 1.0f;
D3DX_U(*pout).
m[2][2] = 1.0f;
D3DX_U(*pout).
m[3][3] = 1.0f;
return pout;
}
...
...
@@ -354,11 +359,12 @@ static inline BOOL D3DXMatrixIsIdentity(D3DXMATRIX *pm)
{
for (j=0; j<4; j++)
{
if ( fabs(
pm->m[i][j] - testmatrix
.m[i][j]) > 0.0001 ) equal = FALSE;
if ( fabs(
D3DX_U(*pm).m[i][j] - D3DX_U(testmatrix)
.m[i][j]) > 0.0001 ) equal = FALSE;
}
}
return equal;
}
#undef D3DX_U
/*__________________D3DXPLANE____________________*/
...
...
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