X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Ffft-normalmap-to-heightmap.c;h=0c06f3dc74e06da915937bd95ef9054edd13ed2b;hp=dfbacde85c83e1ecbf5dc246cf9f82a452503432;hb=e75800ae0e008b79c013bf8cf45840baceca2a8f;hpb=71e33d08cb89414ca4b399f395814253bf4f90fc diff --git a/misc/tools/fft-normalmap-to-heightmap.c b/misc/tools/fft-normalmap-to-heightmap.c index dfbacde8..0c06f3dc 100644 --- a/misc/tools/fft-normalmap-to-heightmap.c +++ b/misc/tools/fft-normalmap-to-heightmap.c @@ -33,7 +33,9 @@ #include -void nmap_to_hmap(unsigned char *map, int w, int h, double scale, double offset) +#define TWO_PI (4*atan2(1,1) * 2) + +void nmap_to_hmap(unsigned char *map, const unsigned char *refmap, int w, int h, double scale, double offset) { int x, y; double nx, ny, nz; @@ -60,14 +62,14 @@ void nmap_to_hmap(unsigned char *map, int w, int h, double scale, double offset) * n_z = -dh/dh = -1 * BUT: darkplaces uses inverted normals, n_y actually is dh/dy by image pixel coordinates */ - nx = (int)map[(w*y+x)*4+2] - 127.5; - ny = (int)map[(w*y+x)*4+1] - 127.5; - nz = (int)map[(w*y+x)*4+0] - 127.5; + nx = ((int)map[(w*y+x)*4+2] - 127.5) / 128; + ny = ((int)map[(w*y+x)*4+1] - 127.5) / 128; + nz = ((int)map[(w*y+x)*4+0] - 127.5) / 128; /* reconstruct the derivatives from here */ #ifdef C99 - imgspace1[(w*y+x)] = nx / nz; /* = dz/dx */ - imgspace2[(w*y+x)] = -ny / nz; /* = dz/dy */ + imgspace1[(w*y+x)] = nx / nz * w; /* = dz/dx */ + imgspace2[(w*y+x)] = -ny / nz * h; /* = dz/dy */ #else imgspace1[(w*y+x)][0] = nx / nz; /* = dz/dx */ imgspace1[(w*y+x)][1] = 0; @@ -92,15 +94,15 @@ void nmap_to_hmap(unsigned char *map, int w, int h, double scale, double offset) fy -= h; #ifdef C99 if(fx||fy) - freqspace1[(w*y+x)] = I * (fx * freqspace1[(w*y+x)] + fy * freqspace2[(w*y+x)]) / (fx*fx + fy*fy); + freqspace1[(w*y+x)] = _Complex_I * (fx * freqspace1[(w*y+x)] + fy * freqspace2[(w*y+x)]) / (fx*fx + fy*fy) / TWO_PI; else freqspace1[(w*y+x)] = 0; #else if(fx||fy) { save = freqspace1[(w*y+x)][0]; - freqspace1[(w*y+x)][0] = -(fx * freqspace1[(w*y+x)][1] + fy * freqspace2[(w*y+x)][1]) / (fx*fx + fy*fy); - freqspace1[(w*y+x)][1] = (fx * save + fy * freqspace2[(w*y+x)][0]) / (fx*fx + fy*fy); + freqspace1[(w*y+x)][0] = -(fx * freqspace1[(w*y+x)][1] + fy * freqspace2[(w*y+x)][1]) / (fx*fx + fy*fy) / TWO_PI; + freqspace1[(w*y+x)][1] = (fx * save + fy * freqspace2[(w*y+x)][0]) / (fx*fx + fy*fy) / TWO_PI; } else { @@ -112,7 +114,73 @@ void nmap_to_hmap(unsigned char *map, int w, int h, double scale, double offset) fftw_execute(f12i1); - if(scale == 0) + /* renormalize */ + for(y = 0; y < h; ++y) + for(x = 0; x < w; ++x) + { +#ifdef C99 + imgspace1[(w*y+x)] /= (w*h); +#else + imgspace1[(w*y+x)][0] /= (w*h); + imgspace1[(w*y+x)][1] /= (w*h); +#endif + } + + if(refmap) + { + double f, a; + double o, s; + double sa, sfa, sffa, sfva, sva; + double mi, ma; + sa = sfa = sffa = sfva = sva = 0; + mi = 1; + ma = -1; + for(y = 0; y < h; ++y) + for(x = 0; x < w; ++x) + { + a = (int)refmap[(w*y+x)*4+3]; + v = (refmap[(w*y+x)*4+0]*0.114 + refmap[(w*y+x)*4+1]*0.587 + refmap[(w*y+x)*4+2]*0.299); + v = (v - 128.0) / 127.0; +#ifdef C99 + f = creal(imgspace1[(w*y+x)]); +#else + f = imgspace1[(w*y+x)][0]; +#endif + if(a <= 0) + continue; + if(v < mi) + mi = v; + if(v > ma) + ma = v; + sa += a; + sfa += f*a; + sffa += f*f*a; + sfva += f*v*a; + sva += v*a; + } + if(mi < ma) + { + /* linear regression ftw */ + o = (sfa*sfva - sffa*sva) / (sfa*sfa-sa*sffa); + s = (sfa*sva - sa*sfva) / (sfa*sfa-sa*sffa); + } + else /* all values of v are equal, so we cannot get scale; we can still get offset */ + { + o = ((sva - sfa) / sa); + s = 1; + } + + printf("Ref-computed scale: %f\nRef-computed offset: %f\n", s, o); + + /* + * now apply user-given offset and scale to these values + * (x * s + o) * scale + offset + * x * s * scale + o * scale + offset + */ + offset += o * scale; + scale *= s; + } + else if(scale == 0) { #ifdef C99 vmin = vmax = creal(imgspace1[0]); @@ -133,9 +201,6 @@ void nmap_to_hmap(unsigned char *map, int w, int h, double scale, double offset) vmax = v; } - vmin /= (w*h); - vmax /= (w*h); - /* * map vmin to -1 * map vmax to +1 @@ -146,8 +211,6 @@ void nmap_to_hmap(unsigned char *map, int w, int h, double scale, double offset) printf("Autocomputed scale: %f\nAutocomputed offset: %f\n", scale, offset); } - scale /= (w*h); - for(y = 0; y < h; ++y) for(x = 0; x < w; ++x) { @@ -178,7 +241,7 @@ void hmap_to_nmap(unsigned char *map, int w, int h, int src_chan, double scale) { int x, y; double nx, ny, nz; - double v, vmin, vmax; + double v; #ifndef C99 double save; #endif @@ -237,8 +300,8 @@ void hmap_to_nmap(unsigned char *map, int w, int h, int src_chan, double scale) freqspace1[(w*y+x)] *= 1 - pow(abs(fx) / (double)(w/2), 1); freqspace1[(w*y+x)] *= 1 - pow(abs(fy) / (double)(h/2), 1); - freqspace2[(w*y+x)] = I * fy * freqspace1[(w*y+x)]; /* y derivative */ - freqspace1[(w*y+x)] = I * fx * freqspace1[(w*y+x)]; /* x derivative */ + freqspace2[(w*y+x)] = TWO_PI*_Complex_I * fy * freqspace1[(w*y+x)]; /* y derivative */ + freqspace1[(w*y+x)] = TWO_PI*_Complex_I * fx * freqspace1[(w*y+x)]; /* x derivative */ #else /* a lowpass to prevent the worst */ freqspace1[(w*y+x)][0] *= 1 - pow(abs(fx) / (double)(w/2), 1); @@ -246,11 +309,11 @@ void hmap_to_nmap(unsigned char *map, int w, int h, int src_chan, double scale) freqspace1[(w*y+x)][0] *= 1 - pow(abs(fy) / (double)(h/2), 1); freqspace1[(w*y+x)][1] *= 1 - pow(abs(fy) / (double)(h/2), 1); - freqspace2[(w*y+x)][0] = -fy * freqspace1[(w*y+x)][1]; /* y derivative */ - freqspace2[(w*y+x)][1] = fy * freqspace1[(w*y+x)][0]; + freqspace2[(w*y+x)][0] = -TWO_PI * fy * freqspace1[(w*y+x)][1]; /* y derivative */ + freqspace2[(w*y+x)][1] = TWO_PI * fy * freqspace1[(w*y+x)][0]; save = freqspace1[(w*y+x)][0]; - freqspace1[(w*y+x)][0] = -fx * freqspace1[(w*y+x)][1]; /* x derivative */ - freqspace1[(w*y+x)][1] = fx * save; + freqspace1[(w*y+x)][0] = -TWO_PI * fx * freqspace1[(w*y+x)][1]; /* x derivative */ + freqspace1[(w*y+x)][1] = TWO_PI * fx * save; #endif } @@ -269,15 +332,17 @@ void hmap_to_nmap(unsigned char *map, int w, int h, int src_chan, double scale) nx = imgspace1[(w*y+x)][0]; ny = imgspace2[(w*y+x)][0]; #endif - nz = 1 / scale; - v = sqrt(nx*nx + ny*ny + nz*nz); + nx /= w; + ny /= h; + nz = -1 / scale; + v = -sqrt(nx*nx + ny*ny + nz*nz); nx /= v; ny /= v; nz /= v; ny = -ny; /* DP inverted normals */ - map[(w*y+x)*4+2] = floor(127.5 + 127.5 * nx); - map[(w*y+x)*4+1] = floor(127.5 + 127.5 * ny); - map[(w*y+x)*4+0] = floor(127.5 + 127.5 * nz); + map[(w*y+x)*4+2] = floor(128 + 127.5 * nx); + map[(w*y+x)*4+1] = floor(128 + 127.5 * ny); + map[(w*y+x)*4+0] = floor(128 + 127.5 * nz); } fftw_destroy_plan(i12f1); @@ -290,6 +355,69 @@ void hmap_to_nmap(unsigned char *map, int w, int h, int src_chan, double scale) fftw_free(imgspace1); } +void hmap_to_nmap_local(unsigned char *map, int w, int h, int src_chan, double scale) +{ + int x, y; + double nx, ny, nz; + double v; + int i, j; + double *img_reduced = malloc(w*h * sizeof(double)); + static const double filter[3][3] = { /* filter to derive one component */ + { -1, 0, 1 }, + { -2, 0, 2 }, + { -1, 0, 1 } + }; + static const double filter_mult = 0.125; + + for(y = 0; y < h; ++y) + for(x = 0; x < w; ++x) + { + switch(src_chan) + { + case 0: + case 1: + case 2: + case 3: + v = map[(w*y+x)*4+src_chan]; + break; + case 4: + v = (map[(w*y+x)*4+0] + map[(w*y+x)*4+1] + map[(w*y+x)*4+2]) / 3; + break; + default: + case 5: + v = (map[(w*y+x)*4+0]*0.114 + map[(w*y+x)*4+1]*0.587 + map[(w*y+x)*4+2]*0.299); + break; + } + img_reduced[(w*y+x)] = (v - 128.0) / 127.0; + map[(w*y+x)*4+3] = floor(v + 0.5); + } + + for(y = 0; y < h; ++y) + for(x = 0; x < w; ++x) + { + nz = -1 / (scale * filter_mult); + nx = ny = 0; + + for(i = -(int)(sizeof(filter) / sizeof(*filter)) / 2; i <= (int)(sizeof(filter) / sizeof(*filter)) / 2; ++i) + for(j = -(int)(sizeof(*filter) / sizeof(**filter)) / 2; j <= (int)(sizeof(*filter) / sizeof(**filter)) / 2; ++j) + { + nx += img_reduced[w*((y+i+h)%h)+(x+j+w)%w] * filter[i+(sizeof(filter) / sizeof(*filter)) / 2][j+(sizeof(*filter) / sizeof(**filter)) / 2]; + ny += img_reduced[w*((y+j+h)%h)+(x+i+w)%w] * filter[i+(sizeof(filter) / sizeof(*filter)) / 2][j+(sizeof(*filter) / sizeof(**filter)) / 2]; + } + + v = -sqrt(nx*nx + ny*ny + nz*nz); + nx /= v; + ny /= v; + nz /= v; + ny = -ny; /* DP inverted normals */ + map[(w*y+x)*4+2] = floor(128 + 127.5 * nx); + map[(w*y+x)*4+1] = floor(128 + 127.5 * ny); + map[(w*y+x)*4+0] = floor(128 + 127.5 * nz); + } + + free(img_reduced); +} + unsigned char *FS_LoadFile(const char *fn, int *len) { unsigned char *buf = NULL; @@ -773,22 +901,28 @@ int Image_WriteTGABGRA (const char *filename, int width, int height, const unsig int usage(const char *me) { - printf("Usage: %s [ []] (get heightmap from normalmap)\n", me); - printf("or: %s -1 [] (read from R)\n", me); - printf("or: %s -2 [] (read from G)\n", me); - printf("or: %s -3 [] (read from R)\n", me); - printf("or: %s -4 [] (read from A)\n", me); - printf("or: %s -5 [] (read from (R+G+B)/3)\n", me); - printf("or: %s -6 [] (read from Y)\n", me); + printf("Usage: %s [ [ []]] (get heightmap from normalmap)\n", me); + printf("or: %s -1 [] (read from B, Diff)\n", me); + printf("or: %s -2 [] (read from G, Diff)\n", me); + printf("or: %s -3 [] (read from R, Diff)\n", me); + printf("or: %s -4 [] (read from A, Diff)\n", me); + printf("or: %s -5 [] (read from (R+G+B)/3, Diff)\n", me); + printf("or: %s -6 [] (read from Y, Diff)\n", me); + printf("or: %s -7 [] (read from B, FFT)\n", me); + printf("or: %s -8 [] (read from G, FFT)\n", me); + printf("or: %s -9 [] (read from R, FFT)\n", me); + printf("or: %s -10 [] (read from A, FFT)\n", me); + printf("or: %s -11 [] (read from (R+G+B)/3, FFT)\n", me); + printf("or: %s -12 [] (read from Y, FFT)\n", me); return 1; } int main(int argc, char **argv) { - const char *infile, *outfile; + const char *infile, *outfile, *reffile; double scale, offset; - int nmaplen; - unsigned char *nmapdata, *nmap; + int nmaplen, w, h; + unsigned char *nmapdata, *nmap, *refmap; if(argc > 1) infile = argv[1]; @@ -808,7 +942,12 @@ int main(int argc, char **argv) if(argc > 4) offset = atof(argv[4]); else - offset = 0; + offset = (scale<0) ? 1 : 0; + + if(argc > 5) + reffile = argv[5]; + else + reffile = NULL; nmapdata = FS_LoadFile(infile, &nmaplen); if(!nmapdata) @@ -823,10 +962,39 @@ int main(int argc, char **argv) printf("LoadTGA_BGRA failed\n"); return 2; } - if(scale < 0) - hmap_to_nmap(nmap, image_width, image_height, -scale-1, offset); + w = image_width; + h = image_height; + + if(reffile) + { + nmapdata = FS_LoadFile(reffile, &nmaplen); + if(!nmapdata) + { + printf("FS_LoadFile failed\n"); + return 2; + } + refmap = LoadTGA_BGRA(nmapdata, nmaplen); + free(nmapdata); + if(!refmap) + { + printf("LoadTGA_BGRA failed\n"); + return 2; + } + if(image_width != w || image_height != h) + { + printf("reference map must have same size as input normalmap\n"); + return 2; + } + } + else + refmap = NULL; + + if(scale < -6) + hmap_to_nmap(nmap, image_width, image_height, -scale-7, offset); + else if(scale < 0) + hmap_to_nmap_local(nmap, image_width, image_height, -scale-1, offset); else - nmap_to_hmap(nmap, image_width, image_height, scale, offset); + nmap_to_hmap(nmap, refmap, image_width, image_height, scale, offset); if(!Image_WriteTGABGRA(outfile, image_width, image_height, nmap)) { printf("Image_WriteTGABGRA failed\n");