From 12887ff89736977ff55397336f663446222b804a Mon Sep 17 00:00:00 2001 From: havoc Date: Sun, 23 Jan 2005 22:10:02 +0000 Subject: [PATCH] fixed backwards normalmaps generated from bumpmaps (... weird!), and now stores bumpmap into alpha channel of normalmap for use by shaders git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4952 d7cf8633-e32d-0410-b094-e92efae38249 --- image.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/image.c b/image.c index 7ef2326b..02ac9233 100644 --- a/image.c +++ b/image.c @@ -1503,8 +1503,8 @@ void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *ou n[1] = dv[0][2]*dv[1][0]-dv[0][0]*dv[1][2]; n[2] = dv[0][0]*dv[1][1]-dv[0][1]*dv[1][0]; */ - n[0] = ((p0[0] + p0[1] + p0[2]) - (p1[0] + p1[1] + p1[2])); - n[1] = ((p2[0] + p2[1] + p2[2]) - (p0[0] + p0[1] + p0[2])); + n[0] = ((p1[0] + p1[1] + p1[2]) - (p0[0] + p0[1] + p0[2])); + n[1] = ((p0[0] + p0[1] + p0[2]) - (p2[0] + p2[1] + p2[2])); n[2] = ibumpscale; VectorNormalize(n); /* @@ -1518,7 +1518,7 @@ void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *ou out[0] = 128.0f + n[0] * 127.0f; out[1] = 128.0f + n[1] * 127.0f; out[2] = 128.0f + n[2] * 127.0f; - out[3] = 255; + out[3] = (p0[0] + p0[1] + p0[2]) / 3; out += 4; } } -- 2.39.2