From ae10e9c5aae52cf524b5199c76bdcf765b679533 Mon Sep 17 00:00:00 2001 From: Lionel Ulmer Date: Thu, 2 Jan 2003 20:05:48 +0000 Subject: [PATCH] - removed some useless WARNs - fixed backface culling and material settings --- dlls/ddraw/d3ddevice/mesa.c | 10 +++++----- dlls/ddraw/d3dmaterial.c | 8 ++++---- dlls/ddraw/d3dvertexbuffer.c | 2 +- dlls/ddraw/mesa.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c index b62236cda97..b6dbe2ace59 100644 --- a/dlls/ddraw/d3ddevice/mesa.c +++ b/dlls/ddraw/d3ddevice/mesa.c @@ -1478,19 +1478,19 @@ GL_IDirect3DDeviceImpl_7_SetMaterial(LPDIRECT3DDEVICE7 iface, This->current_material = *lpMat; - glMaterialfv(GL_FRONT, + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float *) &(This->current_material.u.diffuse)); - glMaterialfv(GL_FRONT, + glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *) &(This->current_material.u1.ambient)); - glMaterialfv(GL_FRONT, + glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float *) &(This->current_material.u2.specular)); - glMaterialfv(GL_FRONT, + glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float *) &(This->current_material.u3.emissive)); - glMaterialf(GL_FRONT, + glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, This->current_material.u4.power); /* Not sure about this... */ diff --git a/dlls/ddraw/d3dmaterial.c b/dlls/ddraw/d3dmaterial.c index ed1acf0cc96..2c7346b1f18 100644 --- a/dlls/ddraw/d3dmaterial.c +++ b/dlls/ddraw/d3dmaterial.c @@ -290,19 +290,19 @@ static void activate(IDirect3DMaterialImpl* This) { /* Set the current Material */ _dump_colorvalue("Diffuse", This->mat.u.diffuse); - glMaterialfv(GL_FRONT, + glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float *) &(This->mat.u.diffuse)); _dump_colorvalue("Ambient", This->mat.u1.ambient); - glMaterialfv(GL_FRONT, + glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float *) &(This->mat.u1.ambient)); _dump_colorvalue("Specular", This->mat.u2.specular); - glMaterialfv(GL_FRONT, + glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, (float *) &(This->mat.u2.specular)); _dump_colorvalue("Emissive", This->mat.u3.emissive); - glMaterialfv(GL_FRONT, + glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, (float *) &(This->mat.u3.emissive)); diff --git a/dlls/ddraw/d3dvertexbuffer.c b/dlls/ddraw/d3dvertexbuffer.c index 03065b7eace..76a6bc22741 100644 --- a/dlls/ddraw/d3dvertexbuffer.c +++ b/dlls/ddraw/d3dvertexbuffer.c @@ -110,7 +110,7 @@ Main_IDirect3DVertexBufferImpl_7_1T_Unlock(LPDIRECT3DVERTEXBUFFER7 iface) { ICOM_THIS_FROM(IDirect3DVertexBufferImpl, IDirect3DVertexBuffer7, iface); TRACE("(%p/%p)->()\n", This, iface); - /* Nothing to do */ + /* Nothing to do here for now. Maybe some optimizations if ever we want to do some :-) */ return DD_OK; } diff --git a/dlls/ddraw/mesa.c b/dlls/ddraw/mesa.c index 653ba1b039b..3dfe0454f4a 100644 --- a/dlls/ddraw/mesa.c +++ b/dlls/ddraw/mesa.c @@ -312,12 +312,12 @@ void set_render_state(D3DRENDERSTATETYPE dwRenderStateType, /* Not sure about these... The DirectX doc is, well, pretty unclear :-) */ case D3DCULL_CW: glEnable(GL_CULL_FACE); - glFrontFace(GL_CW); + glFrontFace(GL_CCW); glCullFace(GL_BACK); break; case D3DCULL_CCW: glEnable(GL_CULL_FACE); - glFrontFace(GL_CCW); + glFrontFace(GL_CW); glCullFace(GL_BACK); break; default: -- 2.11.4.GIT