ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3drm: Introduce a d3drm_matrix structure. 

Since D3DRMMATRIX4D is just a pain to work with.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2019-06-20 15:51:53 +04:30 committed by Alexandre Julliard
parent c9205f1761
commit 203230d149
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/d3drm/d3drm_private.h
View File

@ -33,6 +33,19 @@
#include "wine/heap.h" #include "wine/heap.h"
#include "wine/list.h" #include "wine/list.h"
struct d3drm_matrix
{
float _11, _12, _13, _14;
float _21, _22, _23, _24;
float _31, _32, _33, _34;
float _41, _42, _43, _44;
};
static inline struct d3drm_matrix *d3drm_matrix(D3DRMMATRIX4D m)
{
return (struct d3drm_matrix *)m;
}
struct d3drm_object struct d3drm_object
{ {
LONG ref; LONG ref;
@ -71,7 +84,7 @@ struct d3drm_frame
SIZE_T nb_lights; SIZE_T nb_lights;
SIZE_T lights_size; SIZE_T lights_size;
IDirect3DRMLight **lights; IDirect3DRMLight **lights;
D3DRMMATRIX4D transform; struct d3drm_matrix transform;
D3DCOLOR scenebackground; D3DCOLOR scenebackground;
DWORD traversal_options; DWORD traversal_options;
}; };

24
dlls/d3drm/frame.c
View File

@ -23,11 +23,12 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3drm); WINE_DEFAULT_DEBUG_CHANNEL(d3drm);
static D3DRMMATRIX4D identity = { static const struct d3drm_matrix identity =
{ 1.0f, 0.0f, 0.0f, 0.0f }, {
{ 0.0f, 1.0f, 0.0f, 0.0f }, 1.0f, 0.0f, 0.0f, 0.0f,
{ 0.0f, 0.0f, 1.0f, 0.0f }, 0.0f, 1.0f, 0.0f, 0.0f,
{ 0.0f, 0.0f, 0.0f, 1.0f } 0.0f, 0.0f, 1.0f, 0.0f,
0.0f, 0.0f, 0.0f, 1.0f,
}; };
struct d3drm_frame_array struct d3drm_frame_array
@ -941,13 +942,14 @@ static HRESULT WINAPI d3drm_frame3_AddTransform(IDirect3DRMFrame3 *iface,
D3DRMCOMBINETYPE type, D3DRMMATRIX4D matrix) D3DRMCOMBINETYPE type, D3DRMMATRIX4D matrix)
{ {
struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface);
const struct d3drm_matrix *m = d3drm_matrix(matrix);
TRACE("iface %p, type %#x, matrix %p.\n", iface, type, matrix); TRACE("iface %p, type %#x, matrix %p.\n", iface, type, matrix);
switch (type) switch (type)
{ {
case D3DRMCOMBINE_REPLACE: case D3DRMCOMBINE_REPLACE:
memcpy(frame->transform, matrix, sizeof(D3DRMMATRIX4D)); frame->transform = *m;
break; break;
case D3DRMCOMBINE_BEFORE: case D3DRMCOMBINE_BEFORE:
@ -1415,13 +1417,14 @@ static HRESULT WINAPI d3drm_frame3_GetTransform(IDirect3DRMFrame3 *iface,
IDirect3DRMFrame3 *reference, D3DRMMATRIX4D matrix) IDirect3DRMFrame3 *reference, D3DRMMATRIX4D matrix)
{ {
struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface);
struct d3drm_matrix *m = d3drm_matrix(matrix);
TRACE("iface %p, reference %p, matrix %p.\n", iface, reference, matrix); TRACE("iface %p, reference %p, matrix %p.\n", iface, reference, matrix);
if (reference) if (reference)
FIXME("Specifying a frame as the root of the scene different from the current root frame is not supported yet\n"); FIXME("Ignoring reference frame %p.\n", reference);
memcpy(matrix, frame->transform, sizeof(D3DRMMATRIX4D)); *m = frame->transform;
return D3DRM_OK; return D3DRM_OK;
} }
@ -1429,10 +1432,11 @@ static HRESULT WINAPI d3drm_frame3_GetTransform(IDirect3DRMFrame3 *iface,
static HRESULT WINAPI d3drm_frame2_GetTransform(IDirect3DRMFrame2 *iface, D3DRMMATRIX4D matrix) static HRESULT WINAPI d3drm_frame2_GetTransform(IDirect3DRMFrame2 *iface, D3DRMMATRIX4D matrix)
{ {
struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface);
struct d3drm_matrix *m = d3drm_matrix(matrix);
TRACE("iface %p, matrix %p.\n", iface, matrix); TRACE("iface %p, matrix %p.\n", iface, matrix);
memcpy(matrix, frame->transform, sizeof(D3DRMMATRIX4D)); *m = frame->transform;
return D3DRM_OK; return D3DRM_OK;
} }
@ -2950,7 +2954,7 @@ HRESULT d3drm_frame_create(struct d3drm_frame **frame, IUnknown *parent_frame, I
d3drm_object_init(&object->obj, classname); d3drm_object_init(&object->obj, classname);
memcpy(object->transform, identity, sizeof(D3DRMMATRIX4D)); object->transform = identity;
if (parent_frame) if (parent_frame)
{ {