flip the X in normalmaps generated from heightmaps (according to FrikaC it was broken)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3471 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/image.c b/image.c
index c84b86323e1620bf09c112a1ef4eeccd0d94469f..92bfd18e9cd98a670fdd225915dcca4d3f5b5721 100644 (file)
--- a/image.c
+++ b/image.c
@@ -1395,7 +1395,7 @@ void Image_HeightmapToNormalmap(const unsigned char *inpixels, unsigned char *ou
                        /*
                        dv[0][0] = iwidth;
                        dv[0][1] = 0;
-                       dv[0][2] = ((p1[0] + p1[1] + p1[2]) * ibumpscale) - ((p0[0] + p0[1] + p0[2]) * ibumpscale);
+                       dv[0][2] = ((p0[0] + p0[1] + p0[2]) * ibumpscale) - ((p1[0] + p1[1] + p1[2]) * ibumpscale);
                        dv[1][0] = 0;
                        dv[1][1] = iheight;
                        dv[1][2] = ((p2[0] + p2[1] + p2[2]) * ibumpscale) - ((p0[0] + p0[1] + p0[2]) * ibumpscale);
@@ -1403,14 +1403,14 @@ 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[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);
                        /*
                        // this should work for the bottom right triangle if anyone wants
                        // code for that for some reason
-                       n[0] = ((p1[0] + p1[1] + p1[2]) - (p3[0] + p3[1] + p3[2]));
+                       n[0] = ((p3[0] + p3[1] + p3[2]) - (p1[0] + p1[1] + p1[2]));
                        n[1] = ((p2[0] + p2[1] + p2[2]) - (p3[0] + p3[1] + p3[2]));
                        n[2] = ibumpscale;
                        VectorNormalize(n);