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
8d9d97be
Commit
8d9d97be
authored
May 27, 2012
by
Christian Costa
Committed by
Alexandre Julliard
May 30, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3drm: Generate normals automatically when there are not present in the x file.
parent
3fbe4914
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
6 deletions
+51
-6
meshbuilder.c
dlls/d3drm/meshbuilder.c
+50
-5
d3drm.c
dlls/d3drm/tests/d3drm.c
+1
-1
No files found.
dlls/d3drm/meshbuilder.c
View file @
8d9d97be
...
...
@@ -1118,6 +1118,8 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData)
TRACE
(
"Mesh name is '%s'
\n
"
,
This
->
name
?
This
->
name
:
""
);
This
->
nb_normals
=
0
;
hr
=
IDirectXFileData_GetData
(
pData
,
NULL
,
&
size
,
(
void
**
)
&
ptr
);
if
(
hr
!=
DXFILE_OK
)
goto
end
;
...
...
@@ -1211,10 +1213,19 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData)
pData2
=
NULL
;
}
if
(
!
This
->
nb_normals
)
{
/* Allocate normals, one per vertex */
This
->
pNormals
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
This
->
nb_vertices
*
sizeof
(
D3DVECTOR
));
if
(
!
This
->
pNormals
)
goto
end
;
}
for
(
i
=
0
;
i
<
This
->
nb_faces
;
i
++
)
{
DWORD
j
;
DWORD
nb_face_indexes
;
D3DVECTOR
face_normal
;
if
(
faces_vertex_idx_size
<
sizeof
(
DWORD
))
WARN
(
"Not enough data to read number of indices of face %d
\n
"
,
i
);
...
...
@@ -1227,22 +1238,46 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData)
if
(
faces_vertex_idx_size
<
(
nb_face_indexes
*
sizeof
(
DWORD
)))
WARN
(
"Not enough data to read all indices of face %d
\n
"
,
i
);
if
(
!
This
->
nb_normals
)
{
/* Compute face normal */
if
(
nb_face_indexes
>
2
)
{
D3DVECTOR
a
,
b
;
D3DRMVectorSubtract
(
&
a
,
&
This
->
pVertices
[
faces_vertex_idx_ptr
[
2
]],
&
This
->
pVertices
[
faces_vertex_idx_ptr
[
1
]]);
D3DRMVectorSubtract
(
&
a
,
&
This
->
pVertices
[
faces_vertex_idx_ptr
[
1
]],
&
This
->
pVertices
[
faces_vertex_idx_ptr
[
0
]]);
D3DRMVectorCrossProduct
(
&
face_normal
,
&
a
,
&
b
);
D3DRMVectorNormalize
(
&
face_normal
);
}
else
{
face_normal
.
u1
.
x
=
0
.
0
f
;
face_normal
.
u2
.
y
=
0
.
0
f
;
face_normal
.
u3
.
z
=
0
.
0
f
;
}
}
for
(
j
=
0
;
j
<
nb_face_indexes
;
j
++
)
{
/* Copy vertex index */
*
(
faces_data_ptr
+
faces_data_size
++
)
=
*
(
faces_vertex_idx_ptr
++
)
;
*
(
faces_data_ptr
+
faces_data_size
++
)
=
*
faces_vertex_idx_ptr
;
/* Copy normal index */
if
(
faces_normal_idx_data
)
if
(
This
->
nb_normals
)
{
/* Read from x file */
*
(
faces_data_ptr
+
faces_data_size
++
)
=
*
(
faces_normal_idx_ptr
++
);
}
else
{
FIXME
(
"No normal available, generate a fake normal index
\n
"
);
/* Must be generated, put 0 for now */
*
(
faces_data_ptr
+
faces_data_size
++
)
=
0
;
DWORD
vertex_idx
=
*
faces_vertex_idx_ptr
;
if
(
vertex_idx
>
This
->
nb_vertices
)
vertex_idx
=
0
;
*
(
faces_data_ptr
+
faces_data_size
++
)
=
vertex_idx
;
/* Add face normal to vertex normal */
D3DRMVectorAdd
(
&
This
->
pNormals
[
vertex_idx
],
&
This
->
pNormals
[
vertex_idx
],
&
face_normal
);
}
faces_vertex_idx_ptr
++
;
}
faces_vertex_idx_size
-=
nb_face_indexes
;
}
...
...
@@ -1253,6 +1288,16 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData)
/* Set size (in number of DWORD) of all faces data */
This
->
face_data_size
=
faces_data_size
;
if
(
!
This
->
nb_normals
)
{
/* Normalize all normals */
for
(
i
=
0
;
i
<
This
->
nb_vertices
;
i
++
)
{
D3DRMVectorNormalize
(
&
This
->
pNormals
[
i
]);
}
This
->
nb_normals
=
This
->
nb_vertices
;
}
/* If there is no texture coordinates, generate default texture coordinates (0.0f, 0.0f) for each vertex */
if
(
!
This
->
pCoords2d
)
{
...
...
dlls/d3drm/tests/d3drm.c
View file @
8d9d97be
...
...
@@ -240,7 +240,7 @@ static void test_MeshBuilder(void)
hr
=
IDirect3DRMMeshBuilder_GetVertices
(
pMeshBuilder
,
&
val1
,
NULL
,
&
val2
,
NULL
,
&
val3
,
NULL
);
ok
(
hr
==
D3DRM_OK
,
"Cannot get vertices information (hr = %x)
\n
"
,
hr
);
ok
(
val1
==
4
,
"Wrong number of vertices %d (must be 4)
\n
"
,
val1
);
todo_wine
ok
(
val2
==
4
,
"Wrong number of normals %d (must be 4)
\n
"
,
val2
);
ok
(
val2
==
4
,
"Wrong number of normals %d (must be 4)
\n
"
,
val2
);
ok
(
val3
==
22
,
"Wrong number of face data bytes %d (must be 22)
\n
"
,
val3
);
/* Check that Load method generated default texture coordinates (0.0f, 0.0f) for each vertex */
...
...
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