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
8080528f
Commit
8080528f
authored
Jun 05, 2012
by
Christian Costa
Committed by
Alexandre Julliard
Jun 06, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3drm: Pass texture of mesh builder to newly created mesh.
parent
db6b10e2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
5 deletions
+27
-5
meshbuilder.c
dlls/d3drm/meshbuilder.c
+27
-5
No files found.
dlls/d3drm/meshbuilder.c
View file @
8080528f
...
...
@@ -77,6 +77,7 @@ typedef struct {
Coords2d
*
pCoords2d
;
D3DCOLOR
color
;
IDirect3DRMMaterial2
*
material
;
IDirect3DRMTexture3
*
texture
;
}
IDirect3DRMMeshBuilderImpl
;
char
templates
[]
=
{
...
...
@@ -633,13 +634,20 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_SetColor(IDirect3DRMMeshBuilde
}
static
HRESULT
WINAPI
IDirect3DRMMeshBuilder2Impl_SetTexture
(
IDirect3DRMMeshBuilder2
*
iface
,
LPDIRECT3DRMTEXTURE
pT
exture
)
LPDIRECT3DRMTEXTURE
t
exture
)
{
IDirect3DRMMeshBuilderImpl
*
This
=
impl_from_IDirect3DRMMeshBuilder2
(
iface
);
LPDIRECT3DRMTEXTURE3
texture3
=
NULL
;
HRESULT
hr
=
D3DRM_OK
;
FIXME
(
"(%p)->(%p): stub
\n
"
,
This
,
pTexture
);
if
(
texture
)
hr
=
IDirect3DRMTexture_QueryInterface
(
texture
,
&
IID_IDirect3DRMTexture3
,
(
LPVOID
*
)
&
texture3
);
if
(
SUCCEEDED
(
hr
))
hr
=
IDirect3DRMMeshBuilder3_SetTexture
(
&
This
->
IDirect3DRMMeshBuilder3_iface
,
texture3
);
if
(
texture3
)
IDirect3DRMTexture3_Release
(
texture3
);
return
E_NOTIMPL
;
return
hr
;
}
static
HRESULT
WINAPI
IDirect3DRMMeshBuilder2Impl_SetMaterial
(
IDirect3DRMMeshBuilder2
*
iface
,
...
...
@@ -1732,9 +1740,15 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetTexture(IDirect3DRMMeshBuil
{
IDirect3DRMMeshBuilderImpl
*
This
=
impl_from_IDirect3DRMMeshBuilder3
(
iface
);
FIXME
(
"(%p)->(%p): stub
\n
"
,
This
,
texture
);
TRACE
(
"(%p)->(%p)
\n
"
,
This
,
texture
);
return
E_NOTIMPL
;
if
(
texture
)
IDirect3DRMTexture3_AddRef
(
texture
);
if
(
This
->
texture
)
IDirect3DRMTexture3_Release
(
This
->
texture
);
This
->
texture
=
texture
;
return
D3DRM_OK
;
}
static
HRESULT
WINAPI
IDirect3DRMMeshBuilder3Impl_SetMaterial
(
IDirect3DRMMeshBuilder3
*
iface
,
...
...
@@ -2025,6 +2039,14 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_CreateMesh(IDirect3DRMMeshBuil
hr
=
IDirect3DRMMesh_SetGroupColor
(
*
mesh
,
0
,
This
->
color
);
if
(
SUCCEEDED
(
hr
))
hr
=
IDirect3DRMMesh_SetGroupMaterial
(
*
mesh
,
0
,
(
LPDIRECT3DRMMATERIAL
)
This
->
material
);
if
(
SUCCEEDED
(
hr
)
&&
This
->
texture
)
{
LPDIRECT3DRMTEXTURE
texture
;
IDirect3DRMTexture3_QueryInterface
(
This
->
texture
,
&
IID_IDirect3DRMTexture
,
(
LPVOID
*
)
&
texture
);
hr
=
IDirect3DRMMesh_SetGroupTexture
(
*
mesh
,
0
,
texture
);
IDirect3DRMTexture_Release
(
texture
);
}
if
(
FAILED
(
hr
))
IDirect3DRMMesh_Release
(
*
mesh
);
}
...
...
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