Sam Edwards : opengl32: Apply correct normals to text rendered with wglUseFontOutlines.
Alexandre Julliard
julliard at winehq.org
Thu Nov 8 15:39:55 CST 2012
Module: wine
Branch: master
Commit: 001726fcbda1765cf9226cf6e98d85f5ea48b282
URL: http://source.winehq.org/git/wine.git/?a=commit;h=001726fcbda1765cf9226cf6e98d85f5ea48b282
Author: Sam Edwards <CFSworks at gmail.com>
Date: Wed Nov 7 16:06:09 2012 -0700
opengl32: Apply correct normals to text rendered with wglUseFontOutlines.
---
dlls/opengl32/wgl.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index d8719ad..798a0e5 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -1215,6 +1215,7 @@ typedef void (WINAPI *_GLUfuncptr)(void);
static GLUtesselator * (WINAPI *pgluNewTess)(void);
static void (WINAPI *pgluDeleteTess)(GLUtesselator *tess);
+static void (WINAPI *pgluTessNormal)(GLUtesselator *tess, GLdouble x, GLdouble y, GLdouble z);
static void (WINAPI *pgluTessBeginPolygon)(GLUtesselator *tess, void *polygon_data);
static void (WINAPI *pgluTessEndPolygon)(GLUtesselator *tess);
static void (WINAPI *pgluTessCallback)(GLUtesselator *tess, GLenum which, _GLUfuncptr fn);
@@ -1242,6 +1243,7 @@ static HMODULE load_libglu(void)
LOAD_FUNCPTR(gluNewTess);
LOAD_FUNCPTR(gluDeleteTess);
LOAD_FUNCPTR(gluTessBeginContour);
+ LOAD_FUNCPTR(gluTessNormal);
LOAD_FUNCPTR(gluTessBeginPolygon);
LOAD_FUNCPTR(gluTessCallback);
LOAD_FUNCPTR(gluTessEndContour);
@@ -1442,9 +1444,13 @@ static BOOL wglUseFontOutlines_common(HDC hdc,
}
funcs->gl.p_glNewList(listBase++, GL_COMPILE);
- funcs->gl.p_glFrontFace(GL_CW);
+ funcs->gl.p_glFrontFace(GL_CCW);
if(format == WGL_FONT_POLYGONS)
+ {
+ funcs->gl.p_glNormal3d(0.0, 0.0, 1.0);
+ pgluTessNormal(tess, 0, 0, 1);
pgluTessBeginPolygon(tess, NULL);
+ }
while(!vertices)
{
More information about the wine-cvs
mailing list