data/xonotic-data.pk3dir | | master |
data/xonotic-maps.pk3dir | | master |
data/xonotic-music.pk3dir | | master |
-data/xonotic-nexcompat.pk3dir | | master |
-mediasource | | master |
+data/xonotic-nexcompat.pk3dir | | master | no
+mediasource | | master | no
darkplaces | | div0-stable | svn
fteqcc | git://github.com/Blub/qclib.git | master |
-div0-gittools | | master |
+div0-gittools | | master | no
netradiant | | master |
d0_blind_id | http://github.com/divVerent/d0_blind_id.git | master |
"
echo "$repos_urls" | grep "^$1 " | cut -d '|' -f 4 | tr -d ' '
}
-repos=`for d in $repos; do
- p="${d%dir}"
- if [ x"$p" = x"$d" ] || [ -d "$d" ] || ! { [ -f "$d.no" ] || [ -f "$p" ]; }; then
+listrepos()
+{
+ for d in $repos; do
+ p="${d%dir}"
+ f="`repoflags "$d"`"
+ # if we have the dir, always keep it
+ if [ -d "$d" ]; then
+ msg "Repository $d enabled because it already exists"
+ echo "$d"
+ continue
+ fi
+ # if .yes file exists, always keep it
+ if [ -f "$d.yes" ]; then
+ msg "Repository $d enabled by a .yes file"
+ echo "$d"
+ continue
+ fi
+ # if we have .no file, skip
+ if [ -f "$d.no" ]; then
+ msg "Repository $d disabled by a .no file, delete $p.no to enable"
+ continue
+ fi
+ # if we have matching pk3, skip
+ if [ x"$p" != x"$d" ] && [ -f "$p" ]; then
+ msg "Repository $d disabled by matching .pk3 file, delete $p or create $d.yes to enable"
+ continue
+ fi
+ # if "no" flag is set, skip
+ case ",$f," in
+ *,no,*)
+ msg "Repository $d disabled by default, create $d.yes to enable"
+ continue
+ ;;
+ esac
+ # default: enable
+ msg "Repository $d enabled by default"
echo "$d"
- fi
-done`
+ done
+}
+
+repos=`listrepos`
if [ "$#" = 0 ]; then
set -- help
fix_upstream_rebase
}
+fix_git_config()
+{
+ verbose git config core.autocrlf input
+ if [ -z "`git config push.default`" ]; then
+ verbose git config push.default current # or is tracking better?
+ fi
+}
+
case "$cmd" in
fix_upstream_rebase)
for d in $repos; do
if [ -d "$d0/$d" ]; then
if $allow_pull; then
enter "$d0/$d" verbose
+ fix_git_config
verbose git config remote.origin.url "$url"
verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-
- verbose git config core.autocrlf input
-
r=`git symbolic-ref HEAD`
r=${r#refs/heads/}
if git config branch.$r.remote >/dev/null 2>&1; then
else
verbose git clone "$url" "$d0/$d"
enter "$d0/$d" verbose
+ fix_git_config
if [ "$branch" != "master" ]; then
verbose git checkout --track -b "$branch" origin/"$branch"
fi
makeflags=$4
srcdir=$5
targetfiles=$6
- case " $HOSTS_THAT_ARE_MYSELF " in
- *\ $host\ *)
- verbose rsync --delete -zvaSHP "$srcdir"/ "$buildpath/"
- verbose eval make -C "$buildpath" clean $maketargets $makeflags
- for f in $targetfiles; do
- verbose mv "$buildpath/${f%:*}" "${f##*:}" || true
- done
- ;;
- *)
- verbose rsync --delete -zvaSHP "$srcdir"/ "$host:$buildpath/"
- verbose ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags"
- for f in $targetfiles; do
- verbose rsync -zvaSHP "$host:$buildpath/${f%:*}" "${f##*:}" || true
- done
- ;;
- esac
- # now rebrand the binaries...
- for f in $targetfiles; do
- verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "$d0/misc/tools/xonotic.brand" "${f##*:}" || true
- done
+ if [ -n "$targetfiles" ]; then
+ case " $HOSTS_THAT_ARE_MYSELF " in
+ *\ $host\ *)
+ verbose rsync --delete -zvaSHP "$srcdir"/ "$buildpath/"
+ verbose eval make -C "$buildpath" clean $maketargets $makeflags
+ for f in $targetfiles; do
+ verbose mv "$buildpath/${f%:*}" "${f##*:}" || true
+ done
+ ;;
+ *)
+ verbose rsync --delete -zvaSHP "$srcdir"/ "$host:$buildpath/"
+ verbose ssh "$host" ". ~/.profile && cd $buildpath && make clean $maketargets $makeflags"
+ for f in $targetfiles; do
+ verbose rsync -zvaSHP "$host:$buildpath/${f%:*}" "${f##*:}" || true
+ done
+ ;;
+ esac
+ # now rebrand the binaries...
+ for f in $targetfiles; do
+ verbose "$d0/misc/tools/rebrand-darkplaces-engine.sh" "${XONOTIC_BRAND:-$d0/misc/tools/xonotic.brand}" "${f##*:}" || true
+ done
+ fi
;;
release-compile)
suffix=$1
'sv-release cl-release' 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-x64.exe'
# release 'darkplaces.exe:Xonotic/xonotic-x64.exe darkplaces-sdl.exe:Xonotic/xonotic-sdl-x64.exe darkplaces-dedicated.exe:Xonotic/xonotic-dedicated-x64.exe'
;;
- release-engine-osx)
+ release-engine-osx-sv-sdl)
# gcc on OSX is buggy, needs -fno-reorder-blocks for a release build to succeed
verbose "$SELF" release-compile osx \
- 'STRIP=: CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks" LIB_JPEG= CFLAGS_LIBJPEG=' \
+ 'STRIP=: CC="gcc -g -arch i386 -arch ppc -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \
all 'fteqcc.bin:Xonotic/fteqcc/fteqcc.osx' \
- 'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin' 'darkplaces-dedicated:xonotic-osx-dedicated'
+ 'sv-release sdl-release' 'darkplaces-sdl:Xonotic/Xonotic-SDL.app/Contents/MacOS/xonotic-osx-sdl-bin darkplaces-dedicated:Xonotic/xonotic-osx-dedicated'
+ ;;
+ release-engine-osx-agl)
+ # gcc on OSX is buggy, needs -fno-reorder-blocks for a release build to succeed
+ verbose "$SELF" release-compile osx \
+ 'STRIP=: CC="gcc -g -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.4 -I$HOME/dp.osx/include -L$HOME/dp.osx/lib -fno-reorder-blocks"' \
+ '' '' \
+ 'cl-release' 'darkplaces-glx:Xonotic/Xonotic.app/Contents/MacOS/xonotic-osx-agl-bin'
+ ;;
+ release-engine-osx)
+ verbose "$SELF" release-engine-osx-sv-sdl
+ verbose "$SELF" release-engine-osx-agl
;;
release-engine-linux32)
verbose "$SELF" release-compile linux32 \
--- /dev/null
+/*
+ * FFT based normalmap to heightmap converter
+ * Copyright (C) 2010 Rudolf Polzer
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#undef C99
+#if __STDC_VERSION__ >= 199901L
+#define C99
+#endif
+
+#ifdef C99
+#include <complex.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include <fftw3.h>
+
+#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;
+ double v, vmin, vmax;
+#ifndef C99
+ double save;
+#endif
+
+ fftw_complex *imgspace1 = fftw_malloc(w*h * sizeof(fftw_complex));
+ fftw_complex *imgspace2 = fftw_malloc(w*h * sizeof(fftw_complex));
+ fftw_complex *freqspace1 = fftw_malloc(w*h * sizeof(fftw_complex));
+ fftw_complex *freqspace2 = fftw_malloc(w*h * sizeof(fftw_complex));
+ fftw_plan i12f1 = fftw_plan_dft_2d(w, h, imgspace1, freqspace1, FFTW_FORWARD, FFTW_ESTIMATE);
+ fftw_plan i22f2 = fftw_plan_dft_2d(w, h, imgspace2, freqspace2, FFTW_FORWARD, FFTW_ESTIMATE);
+ fftw_plan f12i1 = fftw_plan_dft_2d(w, h, freqspace1, imgspace1, FFTW_BACKWARD, FFTW_ESTIMATE);
+
+ for(y = 0; y < h; ++y)
+ for(x = 0; x < w; ++x)
+ {
+ /*
+ * unnormalized normals:
+ * n_x = -dh/dx
+ * n_y = -dh/dy
+ * 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) / 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 * 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;
+ imgspace2[(w*y+x)][0] = -ny / nz; /* = dz/dy */
+ imgspace2[(w*y+x)][1] = 0;
+#endif
+ }
+
+ /* see http://www.gamedev.net/community/forums/topic.asp?topic_id=561430 */
+
+ fftw_execute(i12f1);
+ fftw_execute(i22f2);
+
+ for(y = 0; y < h; ++y)
+ for(x = 0; x < w; ++x)
+ {
+ int fx = x;
+ int fy = y;
+ if(fx > w/2)
+ fx -= w;
+ if(fy > h/2)
+ fy -= h;
+#ifdef C99
+ if(fx||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) / TWO_PI;
+ freqspace1[(w*y+x)][1] = (fx * save + fy * freqspace2[(w*y+x)][0]) / (fx*fx + fy*fy) / TWO_PI;
+ }
+ else
+ {
+ freqspace1[(w*y+x)][0] = 0;
+ freqspace1[(w*y+x)][1] = 0;
+ }
+#endif
+ }
+
+ fftw_execute(f12i1);
+
+ /* renormalize, find min/max */
+ vmin = vmax = 0;
+ for(y = 0; y < h; ++y)
+ for(x = 0; x < w; ++x)
+ {
+#ifdef C99
+ v = creal(imgspace1[(w*y+x)] /= (w*h));
+#else
+ v = (imgspace1[(w*y+x)][0] /= (w*h));
+ imgspace1[(w*y+x)][1] /= (w*h);
+#endif
+ if(v < vmin || (x == 0 && y == 0))
+ vmin = v;
+ if(v > vmax || (x == 0 && y == 0))
+ vmax = v;
+ }
+
+ 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;
+ }
+
+ /*
+ * 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)
+ {
+ /*
+ * map vmin to -1
+ * map vmax to +1
+ */
+ scale = 2 / (vmax - vmin);
+ offset = -(vmax + vmin) / (vmax - vmin);
+ }
+
+ printf("Min: %f\nAvg: %f\nMax: %f\nScale: %f\nOffset: %f\nScaled-Min: %f\nScaled-Avg: %f\nScaled-Max: %f\n",
+ vmin, 0.0, vmax, scale, offset, vmin * scale + offset, offset, vmax * scale + offset);
+
+ for(y = 0; y < h; ++y)
+ for(x = 0; x < w; ++x)
+ {
+#ifdef C99
+ v = creal(imgspace1[(w*y+x)]);
+#else
+ v = imgspace1[(w*y+x)][0];
+#endif
+ v = v * scale + offset;
+ if(v < -1)
+ v = -1;
+ if(v > 1)
+ v = 1;
+ map[(w*y+x)*4+3] = floor(128.5 + 127 * v);
+ }
+
+ fftw_destroy_plan(i12f1);
+ fftw_destroy_plan(i22f2);
+ fftw_destroy_plan(f12i1);
+
+ fftw_free(freqspace2);
+ fftw_free(freqspace1);
+ fftw_free(imgspace2);
+ fftw_free(imgspace1);
+}
+
+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;
+#ifndef C99
+ double save;
+#endif
+
+ fftw_complex *imgspace1 = fftw_malloc(w*h * sizeof(fftw_complex));
+ fftw_complex *imgspace2 = fftw_malloc(w*h * sizeof(fftw_complex));
+ fftw_complex *freqspace1 = fftw_malloc(w*h * sizeof(fftw_complex));
+ fftw_complex *freqspace2 = fftw_malloc(w*h * sizeof(fftw_complex));
+ fftw_plan i12f1 = fftw_plan_dft_2d(w, h, imgspace1, freqspace1, FFTW_FORWARD, FFTW_ESTIMATE);
+ fftw_plan f12i1 = fftw_plan_dft_2d(w, h, freqspace1, imgspace1, FFTW_BACKWARD, FFTW_ESTIMATE);
+ fftw_plan f22i2 = fftw_plan_dft_2d(w, h, freqspace2, imgspace2, FFTW_BACKWARD, FFTW_ESTIMATE);
+
+ 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;
+ }
+#ifdef C99
+ imgspace1[(w*y+x)] = (v - 128.0) / 127.0;
+#else
+ imgspace1[(w*y+x)][0] = (v - 128.0) / 127.0;
+ imgspace1[(w*y+x)][1] = 0;
+#endif
+ map[(w*y+x)*4+3] = floor(v + 0.5);
+ }
+
+ /* see http://www.gamedev.net/community/forums/topic.asp?topic_id=561430 */
+
+ fftw_execute(i12f1);
+
+ for(y = 0; y < h; ++y)
+ for(x = 0; x < w; ++x)
+ {
+ int fx = x;
+ int fy = y;
+ if(fx > w/2)
+ fx -= w;
+ if(fy > h/2)
+ fy -= h;
+#ifdef C99
+ /* a lowpass to prevent the worst */
+ 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)] = 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);
+ freqspace1[(w*y+x)][1] *= 1 - pow(abs(fx) / (double)(w/2), 1);
+ 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] = -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] = -TWO_PI * fx * freqspace1[(w*y+x)][1]; /* x derivative */
+ freqspace1[(w*y+x)][1] = TWO_PI * fx * save;
+#endif
+ }
+
+ fftw_execute(f12i1);
+ fftw_execute(f22i2);
+
+ scale /= (w*h);
+
+ for(y = 0; y < h; ++y)
+ for(x = 0; x < w; ++x)
+ {
+#ifdef C99
+ nx = creal(imgspace1[(w*y+x)]);
+ ny = creal(imgspace2[(w*y+x)]);
+#else
+ nx = imgspace1[(w*y+x)][0];
+ ny = imgspace2[(w*y+x)][0];
+#endif
+ 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(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);
+ fftw_destroy_plan(f12i1);
+ fftw_destroy_plan(f22i2);
+
+ fftw_free(freqspace2);
+ fftw_free(freqspace1);
+ fftw_free(imgspace2);
+ 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;
+ int n;
+ FILE *f = fopen(fn, "rb");
+ *len = 0;
+ if(!f)
+ return NULL;
+ for(;;)
+ {
+ buf = realloc(buf, *len + 65536);
+ if(!buf)
+ {
+ fclose(f);
+ free(buf);
+ *len = 0;
+ return NULL;
+ }
+ n = fread(buf + *len, 1, 65536, f);
+ if(n < 0)
+ {
+ fclose(f);
+ free(buf);
+ *len = 0;
+ return NULL;
+ }
+ *len += n;
+ if(n < 65536)
+ break;
+ }
+ return buf;
+}
+
+int FS_WriteFile(const char *fn, unsigned char *data, int len)
+{
+ FILE *f = fopen(fn, "wb");
+ if(!f)
+ return 0;
+ if(fwrite(data, len, 1, f) != 1)
+ {
+ fclose(f);
+ return 0;
+ }
+ if(fclose(f))
+ return 0;
+ return 1;
+}
+
+/* START stuff that originates from image.c in DarkPlaces */
+int image_width, image_height;
+
+typedef struct _TargaHeader
+{
+ unsigned char id_length, colormap_type, image_type;
+ unsigned short colormap_index, colormap_length;
+ unsigned char colormap_size;
+ unsigned short x_origin, y_origin, width, height;
+ unsigned char pixel_size, attributes;
+}
+TargaHeader;
+
+void PrintTargaHeader(TargaHeader *t)
+{
+ printf("TargaHeader:\nuint8 id_length = %i;\nuint8 colormap_type = %i;\nuint8 image_type = %i;\nuint16 colormap_index = %i;\nuint16 colormap_length = %i;\nuint8 colormap_size = %i;\nuint16 x_origin = %i;\nuint16 y_origin = %i;\nuint16 width = %i;\nuint16 height = %i;\nuint8 pixel_size = %i;\nuint8 attributes = %i;\n", t->id_length, t->colormap_type, t->image_type, t->colormap_index, t->colormap_length, t->colormap_size, t->x_origin, t->y_origin, t->width, t->height, t->pixel_size, t->attributes);
+}
+
+unsigned char *LoadTGA_BGRA (const unsigned char *f, int filesize)
+{
+ int x, y, pix_inc, row_inci, runlen, alphabits;
+ unsigned char *image_buffer;
+ unsigned int *pixbufi;
+ const unsigned char *fin, *enddata;
+ TargaHeader targa_header;
+ unsigned int palettei[256];
+ union
+ {
+ unsigned int i;
+ unsigned char b[4];
+ }
+ bgra;
+
+ if (filesize < 19)
+ return NULL;
+
+ enddata = f + filesize;
+
+ targa_header.id_length = f[0];
+ targa_header.colormap_type = f[1];
+ targa_header.image_type = f[2];
+
+ targa_header.colormap_index = f[3] + f[4] * 256;
+ targa_header.colormap_length = f[5] + f[6] * 256;
+ targa_header.colormap_size = f[7];
+ targa_header.x_origin = f[8] + f[9] * 256;
+ targa_header.y_origin = f[10] + f[11] * 256;
+ targa_header.width = image_width = f[12] + f[13] * 256;
+ targa_header.height = image_height = f[14] + f[15] * 256;
+ targa_header.pixel_size = f[16];
+ targa_header.attributes = f[17];
+
+ if (image_width > 32768 || image_height > 32768 || image_width <= 0 || image_height <= 0)
+ {
+ printf("LoadTGA: invalid size\n");
+ PrintTargaHeader(&targa_header);
+ return NULL;
+ }
+
+ /* advance to end of header */
+ fin = f + 18;
+
+ /* skip TARGA image comment (usually 0 bytes) */
+ fin += targa_header.id_length;
+
+ /* read/skip the colormap if present (note: according to the TARGA spec it */
+ /* can be present even on 1color or greyscale images, just not used by */
+ /* the image data) */
+ if (targa_header.colormap_type)
+ {
+ if (targa_header.colormap_length > 256)
+ {
+ printf("LoadTGA: only up to 256 colormap_length supported\n");
+ PrintTargaHeader(&targa_header);
+ return NULL;
+ }
+ if (targa_header.colormap_index)
+ {
+ printf("LoadTGA: colormap_index not supported\n");
+ PrintTargaHeader(&targa_header);
+ return NULL;
+ }
+ if (targa_header.colormap_size == 24)
+ {
+ for (x = 0;x < targa_header.colormap_length;x++)
+ {
+ bgra.b[0] = *fin++;
+ bgra.b[1] = *fin++;
+ bgra.b[2] = *fin++;
+ bgra.b[3] = 255;
+ palettei[x] = bgra.i;
+ }
+ }
+ else if (targa_header.colormap_size == 32)
+ {
+ memcpy(palettei, fin, targa_header.colormap_length*4);
+ fin += targa_header.colormap_length * 4;
+ }
+ else
+ {
+ printf("LoadTGA: Only 32 and 24 bit colormap_size supported\n");
+ PrintTargaHeader(&targa_header);
+ return NULL;
+ }
+ }
+
+ /* check our pixel_size restrictions according to image_type */
+ switch (targa_header.image_type & ~8)
+ {
+ case 2:
+ if (targa_header.pixel_size != 24 && targa_header.pixel_size != 32)
+ {
+ printf("LoadTGA: only 24bit and 32bit pixel sizes supported for type 2 and type 10 images\n");
+ PrintTargaHeader(&targa_header);
+ return NULL;
+ }
+ break;
+ case 3:
+ /* set up a palette to make the loader easier */
+ for (x = 0;x < 256;x++)
+ {
+ bgra.b[0] = bgra.b[1] = bgra.b[2] = x;
+ bgra.b[3] = 255;
+ palettei[x] = bgra.i;
+ }
+ /* fall through to colormap case */
+ case 1:
+ if (targa_header.pixel_size != 8)
+ {
+ printf("LoadTGA: only 8bit pixel size for type 1, 3, 9, and 11 images supported\n");
+ PrintTargaHeader(&targa_header);
+ return NULL;
+ }
+ break;
+ default:
+ printf("LoadTGA: Only type 1, 2, 3, 9, 10, and 11 targa RGB images supported, image_type = %i\n", targa_header.image_type);
+ PrintTargaHeader(&targa_header);
+ return NULL;
+ }
+
+ if (targa_header.attributes & 0x10)
+ {
+ printf("LoadTGA: origin must be in top left or bottom left, top right and bottom right are not supported\n");
+ return NULL;
+ }
+
+ /* number of attribute bits per pixel, we only support 0 or 8 */
+ alphabits = targa_header.attributes & 0x0F;
+ if (alphabits != 8 && alphabits != 0)
+ {
+ printf("LoadTGA: only 0 or 8 attribute (alpha) bits supported\n");
+ return NULL;
+ }
+
+ image_buffer = (unsigned char *)malloc(image_width * image_height * 4);
+ if (!image_buffer)
+ {
+ printf("LoadTGA: not enough memory for %i by %i image\n", image_width, image_height);
+ return NULL;
+ }
+
+ /* If bit 5 of attributes isn't set, the image has been stored from bottom to top */
+ if ((targa_header.attributes & 0x20) == 0)
+ {
+ pixbufi = (unsigned int*)image_buffer + (image_height - 1)*image_width;
+ row_inci = -image_width*2;
+ }
+ else
+ {
+ pixbufi = (unsigned int*)image_buffer;
+ row_inci = 0;
+ }
+
+ x = 0;
+ y = 0;
+ pix_inc = 1;
+ if ((targa_header.image_type & ~8) == 2)
+ pix_inc = (targa_header.pixel_size + 7) / 8;
+ switch (targa_header.image_type)
+ {
+ case 1: /* colormapped, uncompressed */
+ case 3: /* greyscale, uncompressed */
+ if (fin + image_width * image_height * pix_inc > enddata)
+ break;
+ for (y = 0;y < image_height;y++, pixbufi += row_inci)
+ for (x = 0;x < image_width;x++)
+ *pixbufi++ = palettei[*fin++];
+ break;
+ case 2:
+ /* BGR or BGRA, uncompressed */
+ if (fin + image_width * image_height * pix_inc > enddata)
+ break;
+ if (targa_header.pixel_size == 32 && alphabits)
+ {
+ for (y = 0;y < image_height;y++)
+ memcpy(pixbufi + y * (image_width + row_inci), fin + y * image_width * pix_inc, image_width*4);
+ }
+ else
+ {
+ for (y = 0;y < image_height;y++, pixbufi += row_inci)
+ {
+ for (x = 0;x < image_width;x++, fin += pix_inc)
+ {
+ bgra.b[0] = fin[0];
+ bgra.b[1] = fin[1];
+ bgra.b[2] = fin[2];
+ bgra.b[3] = 255;
+ *pixbufi++ = bgra.i;
+ }
+ }
+ }
+ break;
+ case 9: /* colormapped, RLE */
+ case 11: /* greyscale, RLE */
+ for (y = 0;y < image_height;y++, pixbufi += row_inci)
+ {
+ for (x = 0;x < image_width;)
+ {
+ if (fin >= enddata)
+ break; /* error - truncated file */
+ runlen = *fin++;
+ if (runlen & 0x80)
+ {
+ /* RLE - all pixels the same color */
+ runlen += 1 - 0x80;
+ if (fin + pix_inc > enddata)
+ break; /* error - truncated file */
+ if (x + runlen > image_width)
+ break; /* error - line exceeds width */
+ bgra.i = palettei[*fin++];
+ for (;runlen--;x++)
+ *pixbufi++ = bgra.i;
+ }
+ else
+ {
+ /* uncompressed - all pixels different color */
+ runlen++;
+ if (fin + pix_inc * runlen > enddata)
+ break; /* error - truncated file */
+ if (x + runlen > image_width)
+ break; /* error - line exceeds width */
+ for (;runlen--;x++)
+ *pixbufi++ = palettei[*fin++];
+ }
+ }
+
+ if (x != image_width)
+ {
+ /* pixbufi is useless now */
+ printf("LoadTGA: corrupt file\n");
+ break;
+ }
+ }
+ break;
+ case 10:
+ /* BGR or BGRA, RLE */
+ if (targa_header.pixel_size == 32 && alphabits)
+ {
+ for (y = 0;y < image_height;y++, pixbufi += row_inci)
+ {
+ for (x = 0;x < image_width;)
+ {
+ if (fin >= enddata)
+ break; /* error - truncated file */
+ runlen = *fin++;
+ if (runlen & 0x80)
+ {
+ /* RLE - all pixels the same color */
+ runlen += 1 - 0x80;
+ if (fin + pix_inc > enddata)
+ break; /* error - truncated file */
+ if (x + runlen > image_width)
+ break; /* error - line exceeds width */
+ bgra.b[0] = fin[0];
+ bgra.b[1] = fin[1];
+ bgra.b[2] = fin[2];
+ bgra.b[3] = fin[3];
+ fin += pix_inc;
+ for (;runlen--;x++)
+ *pixbufi++ = bgra.i;
+ }
+ else
+ {
+ /* uncompressed - all pixels different color */
+ runlen++;
+ if (fin + pix_inc * runlen > enddata)
+ break; /* error - truncated file */
+ if (x + runlen > image_width)
+ break; /* error - line exceeds width */
+ for (;runlen--;x++)
+ {
+ bgra.b[0] = fin[0];
+ bgra.b[1] = fin[1];
+ bgra.b[2] = fin[2];
+ bgra.b[3] = fin[3];
+ fin += pix_inc;
+ *pixbufi++ = bgra.i;
+ }
+ }
+ }
+
+ if (x != image_width)
+ {
+ /* pixbufi is useless now */
+ printf("LoadTGA: corrupt file\n");
+ break;
+ }
+ }
+ }
+ else
+ {
+ for (y = 0;y < image_height;y++, pixbufi += row_inci)
+ {
+ for (x = 0;x < image_width;)
+ {
+ if (fin >= enddata)
+ break; /* error - truncated file */
+ runlen = *fin++;
+ if (runlen & 0x80)
+ {
+ /* RLE - all pixels the same color */
+ runlen += 1 - 0x80;
+ if (fin + pix_inc > enddata)
+ break; /* error - truncated file */
+ if (x + runlen > image_width)
+ break; /* error - line exceeds width */
+ bgra.b[0] = fin[0];
+ bgra.b[1] = fin[1];
+ bgra.b[2] = fin[2];
+ bgra.b[3] = 255;
+ fin += pix_inc;
+ for (;runlen--;x++)
+ *pixbufi++ = bgra.i;
+ }
+ else
+ {
+ /* uncompressed - all pixels different color */
+ runlen++;
+ if (fin + pix_inc * runlen > enddata)
+ break; /* error - truncated file */
+ if (x + runlen > image_width)
+ break; /* error - line exceeds width */
+ for (;runlen--;x++)
+ {
+ bgra.b[0] = fin[0];
+ bgra.b[1] = fin[1];
+ bgra.b[2] = fin[2];
+ bgra.b[3] = 255;
+ fin += pix_inc;
+ *pixbufi++ = bgra.i;
+ }
+ }
+ }
+
+ if (x != image_width)
+ {
+ /* pixbufi is useless now */
+ printf("LoadTGA: corrupt file\n");
+ break;
+ }
+ }
+ }
+ break;
+ default:
+ /* unknown image_type */
+ break;
+ }
+
+ return image_buffer;
+}
+
+int Image_WriteTGABGRA (const char *filename, int width, int height, const unsigned char *data)
+{
+ int y;
+ unsigned char *buffer, *out;
+ const unsigned char *in, *end;
+ int ret;
+
+ buffer = (unsigned char *)malloc(width*height*4 + 18);
+
+ memset (buffer, 0, 18);
+ buffer[2] = 2; /* uncompressed type */
+ buffer[12] = (width >> 0) & 0xFF;
+ buffer[13] = (width >> 8) & 0xFF;
+ buffer[14] = (height >> 0) & 0xFF;
+ buffer[15] = (height >> 8) & 0xFF;
+
+ for (y = 3;y < width*height*4;y += 4)
+ if (data[y] < 255)
+ break;
+
+ if (y < width*height*4)
+ {
+ /* save the alpha channel */
+ buffer[16] = 32; /* pixel size */
+ buffer[17] = 8; /* 8 bits of alpha */
+
+ /* flip upside down */
+ out = buffer + 18;
+ for (y = height - 1;y >= 0;y--)
+ {
+ memcpy(out, data + y * width * 4, width * 4);
+ out += width*4;
+ }
+ }
+ else
+ {
+ /* save only the color channels */
+ buffer[16] = 24; /* pixel size */
+ buffer[17] = 0; /* 8 bits of alpha */
+
+ /* truncate bgra to bgr and flip upside down */
+ out = buffer + 18;
+ for (y = height - 1;y >= 0;y--)
+ {
+ in = data + y * width * 4;
+ end = in + width * 4;
+ for (;in < end;in += 4)
+ {
+ *out++ = in[0];
+ *out++ = in[1];
+ *out++ = in[2];
+ }
+ }
+ }
+ ret = FS_WriteFile (filename, buffer, out - buffer);
+
+ free(buffer);
+
+ return ret;
+}
+/* START stuff that originates from image.c in DarkPlaces */
+
+int usage(const char *me)
+{
+ printf("Usage: %s <infile_norm.tga> <outfile_normandheight.tga> [<scale> [<offset> [<infile_ref.tga>]]] (get heightmap from normalmap)\n", me);
+ printf("or: %s <infile_height.tga> <outfile_normandheight.tga> -1 [<scale>] (read from B, Diff)\n", me);
+ printf("or: %s <infile_height.tga> <outfile_normandheight.tga> -2 [<scale>] (read from G, Diff)\n", me);
+ printf("or: %s <infile_height.tga> <outfile_normandheight.tga> -3 [<scale>] (read from R, Diff)\n", me);
+ printf("or: %s <infile_height.tga> <outfile_normandheight.tga> -4 [<scale>] (read from A, Diff)\n", me);
+ printf("or: %s <infile_height.tga> <outfile_normandheight.tga> -5 [<scale>] (read from (R+G+B)/3, Diff)\n", me);
+ printf("or: %s <infile_height.tga> <outfile_normandheight.tga> -6 [<scale>] (read from Y, Diff)\n", me);
+ printf("or: %s <infile_height.tga> <outfile_normandheight.tga> -7 [<scale>] (read from B, FFT)\n", me);
+ printf("or: %s <infile_height.tga> <outfile_normandheight.tga> -8 [<scale>] (read from G, FFT)\n", me);
+ printf("or: %s <infile_height.tga> <outfile_normandheight.tga> -9 [<scale>] (read from R, FFT)\n", me);
+ printf("or: %s <infile_height.tga> <outfile_normandheight.tga> -10 [<scale>] (read from A, FFT)\n", me);
+ printf("or: %s <infile_height.tga> <outfile_normandheight.tga> -11 [<scale>] (read from (R+G+B)/3, FFT)\n", me);
+ printf("or: %s <infile_height.tga> <outfile_normandheight.tga> -12 [<scale>] (read from Y, FFT)\n", me);
+ return 1;
+}
+
+int main(int argc, char **argv)
+{
+ const char *infile, *outfile, *reffile;
+ double scale, offset;
+ int nmaplen, w, h;
+ unsigned char *nmapdata, *nmap, *refmap;
+
+ if(argc > 1)
+ infile = argv[1];
+ else
+ return usage(*argv);
+
+ if(argc > 2)
+ outfile = argv[2];
+ else
+ return usage(*argv);
+
+ if(argc > 3)
+ scale = atof(argv[3]);
+ else
+ scale = 0;
+
+ if(argc > 4)
+ offset = atof(argv[4]);
+ else
+ offset = (scale<0) ? 1 : 0;
+
+ if(argc > 5)
+ reffile = argv[5];
+ else
+ reffile = NULL;
+
+ nmapdata = FS_LoadFile(infile, &nmaplen);
+ if(!nmapdata)
+ {
+ printf("FS_LoadFile failed\n");
+ return 2;
+ }
+ nmap = LoadTGA_BGRA(nmapdata, nmaplen);
+ free(nmapdata);
+ if(!nmap)
+ {
+ printf("LoadTGA_BGRA failed\n");
+ return 2;
+ }
+ 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, refmap, image_width, image_height, scale, offset);
+ if(!Image_WriteTGABGRA(outfile, image_width, image_height, nmap))
+ {
+ printf("Image_WriteTGABGRA failed\n");
+ free(nmap);
+ return 2;
+ }
+ free(nmap);
+ return 0;
+}
projects / xonotic / xonotic.git / commitdiff