X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcommand%2Fradarmap.qc;h=71f5e270b1e80cef9e8aa59d2c0285aa3aa84846;hp=8c15819e05ad174a0ea24f09e573b92061554048;hb=641c47df604de42c11c68a7d80813b29affcefb2;hpb=28305c2245f99ca5ae21ea8858e05c6bb0a2000b diff --git a/qcsrc/server/command/radarmap.qc b/qcsrc/server/command/radarmap.qc index 8c15819e0..71f5e270b 100644 --- a/qcsrc/server/command/radarmap.qc +++ b/qcsrc/server/command/radarmap.qc @@ -1,12 +1,13 @@ -#include "../../common/command/command.qh" #include "radarmap.qh" -#include "../_all.qh" +#include +#include "radarmap.qh" #include "../g_world.qh" +#include "../g_subs.qh" -#include "../../common/util.qh" +#include -#include "../../csqcmodellib/sv_model.qh" +#include // =============================================== // Generates radar map images for use in the HUD @@ -25,27 +26,26 @@ float FullTraceFraction(vector a, vector mi, vector ma, vector b) float n, m; n = m = 0; - while(vlen(c - b) > 1) + while (vlen(c - b) > 1) { ++m; - tracebox(c, mi, ma, b, MOVE_WORLDONLY, world); + tracebox(c, mi, ma, b, MOVE_WORLDONLY, NULL); ++n; - if(!trace_startsolid) + if (!trace_startsolid) { black += vlen(trace_endpos - c); c = trace_endpos; } - n += tracebox_inverted(c, mi, ma, b, MOVE_WORLDONLY, world, false, world); + n += tracebox_inverted(c, mi, ma, b, MOVE_WORLDONLY, NULL, false, NULL); white += vlen(trace_endpos - c); c = trace_endpos; } - if(n > 200) - LOG_TRACE("HOLY SHIT! FullTraceFraction: ", ftos(n), " total traces, ", ftos(m), " iterations\n"); + if (n > 200) LOG_TRACE("HOLY SHIT! FullTraceFraction: ", ftos(n), " total traces, ", ftos(m), " iterations"); return white / (black + white); } @@ -74,17 +74,13 @@ float RadarMapAtPoint_LineBlock(float x, float y, float w, float h, float zmin, ma = '1 0 0' * w + '0 1 0' * h + dz; o = '1 0 0' * x + '0 1 0' * y + '0 0 1' * zmin; - if(x < world.absmin.x - w) - return 0; - if(y < world.absmin.y - h) - return 0; - if(x > world.absmax.x) - return 0; - if(y > world.absmax.y) - return 0; + if (x < world.absmin.x - w) return 0; + if (y < world.absmin.y - h) return 0; + if (x > world.absmax.x) return 0; + if (y > world.absmax.y) return 0; r = 0; - for(i = 0; i < q; ++i) + for (i = 0; i < q; ++i) { vector v1, v2; v1 = v2 = o + dz * i + mi; @@ -94,9 +90,8 @@ float RadarMapAtPoint_LineBlock(float x, float y, float w, float h, float zmin, v2_x += random() * (ma.x - mi.x); v2_y += random() * (ma.y - mi.y); v2_z += random() * (ma.z - mi.z); - traceline(v1, v2, MOVE_WORLDONLY, world); - if(trace_startsolid || trace_fraction < 1) - ++r; + traceline(v1, v2, MOVE_WORLDONLY, NULL); + if (trace_startsolid || trace_fraction < 1) ++r; } return r / q; } @@ -114,21 +109,16 @@ float RadarMapAtPoint_Block(float x, float y, float w, float h, float zmin, floa ma = '1 0 0' * w + '0 1 0' * h + dz; o = '1 0 0' * x + '0 1 0' * y + '0 0 1' * zmin; - if(x < world.absmin.x - w) - return 0; - if(y < world.absmin.y - h) - return 0; - if(x > world.absmax.x) - return 0; - if(y > world.absmax.y) - return 0; + if (x < world.absmin.x - w) return 0; + if (y < world.absmin.y - h) return 0; + if (x > world.absmax.x) return 0; + if (y > world.absmax.y) return 0; r = 0; - for(i = 0; i < q; ++i) + for (i = 0; i < q; ++i) { - tracebox(o + dz * i, mi, ma, o + dz * i, MOVE_WORLDONLY, world); - if(trace_startsolid) - ++r; + tracebox(o + dz * i, mi, ma, o + dz * i, MOVE_WORLDONLY, NULL); + if (trace_startsolid) ++r; } return r / q; } @@ -136,7 +126,7 @@ float RadarMapAtPoint_Sample(float x, float y, float w, float h, float zmin, flo { vector a, b, mi, ma; - q *= 4; // choose q so it matches the regular algorithm in speed + q *= 4; // choose q so it matches the regular algorithm in speed q = 256 * q - 1; // 256q-1 is the ideal sample count to map equal amount of sample values to one pixel value @@ -149,15 +139,14 @@ float RadarMapAtPoint_Sample(float x, float y, float w, float h, float zmin, flo float c, i; c = 0; - for(i = 0; i < q; ++i) + for (i = 0; i < q; ++i) { vector v; v.x = a.x + random() * b.x; v.y = a.y + random() * b.y; v.z = a.z + random() * b.z; - traceline(v, v, MOVE_WORLDONLY, world); - if(trace_startsolid) - ++c; + traceline(v, v, MOVE_WORLDONLY, NULL); + if (trace_startsolid) ++c; } return c / q; @@ -168,22 +157,17 @@ void sharpen_set(int x, float v) } float sharpen_getpixel(int x, int y) { - if(x < 0) - return 0; - if(x >= RADAR_WIDTH_MAX) - return 0; - if(y < 0) - return 0; - if(y > 2) - return 0; + if (x < 0) return 0; + if (x >= RADAR_WIDTH_MAX) return 0; + if (y < 0) return 0; + if (y > 2) return 0; return sharpen_buffer[x + y * RADAR_WIDTH_MAX]; } float sharpen_get(float x, float a) { float sum = sharpen_getpixel(x, 1); - if(a == 0) - return sum; - sum *= (8 + 1/a); + if (a == 0) return sum; + sum *= (8 + 1 / a); sum -= sharpen_getpixel(x - 1, 0); sum -= sharpen_getpixel(x - 1, 1); sum -= sharpen_getpixel(x - 1, 2); @@ -196,7 +180,7 @@ float sharpen_get(float x, float a) } void sharpen_shift(int w) { - for(int i = 0; i < w; ++i) + for (int i = 0; i < w; ++i) { sharpen_buffer[i] = sharpen_buffer[i + RADAR_WIDTH_MAX]; sharpen_buffer[i + RADAR_WIDTH_MAX] = sharpen_buffer[i + 2 * RADAR_WIDTH_MAX]; @@ -205,7 +189,7 @@ void sharpen_shift(int w) } void sharpen_init(int w) { - for(int i = 0; i < w; ++i) + for (int i = 0; i < w; ++i) { sharpen_buffer[i] = 0; sharpen_buffer[i + RADAR_WIDTH_MAX] = 0; @@ -214,20 +198,20 @@ void sharpen_init(int w) } void RadarMap_Next() { - if(radarmapper.count & 4) + if (radarmapper.count & 4) { localcmd("quit\n"); } - else if(radarmapper.count & 2) + else if (radarmapper.count & 2) { localcmd(strcat("defer 1 \"sv_cmd radarmap --flags ", ftos(radarmapper.count), strcat(" --res ", ftos(radarmapper.size.x), " ", ftos(radarmapper.size.y), " --sharpen ", ftos(radarmapper.ltime), " --qual ", ftos(radarmapper.size.z)), "\"\n")); GotoNextMap(0); } - remove(radarmapper); - radarmapper = world; + delete(radarmapper); + radarmapper = NULL; } -void RadarMap_Think() -{SELFPARAM(); +void RadarMap_Think(entity this) +{ // rough map entity // cnt: current line // size: pixel width/height @@ -237,149 +221,147 @@ void RadarMap_Think() float i, x, l; string si; - if(self.frame == 0) + if (this.frame == 0) { // initialize get_mi_min_max_texcoords(1); - self.mins = mi_picmin; - self.maxs_x = (mi_picmax.x - mi_picmin.x) / self.size.x; - self.maxs_y = (mi_picmax.y - mi_picmin.y) / self.size.y; - self.maxs_z = mi_max.z - mi_min.z; - LOG_INFO("Picture mins/maxs: ", ftos(self.maxs.x), " and ", ftos(self.maxs.y), " should match\n"); - self.netname = strzone(strcat("gfx/", mi_shortname, "_radar.xpm")); - if(!(self.count & 1)) + this.mins = mi_picmin; + this.maxs_x = (mi_picmax.x - mi_picmin.x) / this.size.x; + this.maxs_y = (mi_picmax.y - mi_picmin.y) / this.size.y; + this.maxs_z = mi_max.z - mi_min.z; + LOG_INFO("Picture mins/maxs: ", ftos(this.maxs.x), " and ", ftos(this.maxs.y), " should match\n"); + this.netname = strzone(strcat("gfx/", mi_shortname, "_radar.xpm")); + if (!(this.count & 1)) { - self.cnt = fopen(self.netname, FILE_READ); - if(self.cnt < 0) - self.cnt = fopen(strcat("gfx/", mi_shortname, "_radar.tga"), FILE_READ); - if(self.cnt < 0) - self.cnt = fopen(strcat("gfx/", mi_shortname, "_radar.png"), FILE_READ); - if(self.cnt < 0) - self.cnt = fopen(strcat("gfx/", mi_shortname, "_radar.jpg"), FILE_READ); - if(self.cnt < 0) - self.cnt = fopen(strcat("gfx/", mi_shortname, "_mini.tga"), FILE_READ); - if(self.cnt < 0) - self.cnt = fopen(strcat("gfx/", mi_shortname, "_mini.png"), FILE_READ); - if(self.cnt < 0) - self.cnt = fopen(strcat("gfx/", mi_shortname, "_mini.jpg"), FILE_READ); - if(self.cnt >= 0) + this.cnt = fopen(this.netname, FILE_READ); + if (this.cnt < 0) this.cnt = fopen(strcat("gfx/", mi_shortname, "_radar.tga"), FILE_READ); + if (this.cnt < 0) this.cnt = fopen(strcat("gfx/", mi_shortname, "_radar.png"), FILE_READ); + if (this.cnt < 0) this.cnt = fopen(strcat("gfx/", mi_shortname, "_radar.jpg"), FILE_READ); + if (this.cnt < 0) this.cnt = fopen(strcat("gfx/", mi_shortname, "_mini.tga"), FILE_READ); + if (this.cnt < 0) this.cnt = fopen(strcat("gfx/", mi_shortname, "_mini.png"), FILE_READ); + if (this.cnt < 0) this.cnt = fopen(strcat("gfx/", mi_shortname, "_mini.jpg"), FILE_READ); + if (this.cnt >= 0) { - fclose(self.cnt); + fclose(this.cnt); - LOG_INFO(self.netname, " already exists, aborting (you may want to specify --force)\n"); + LOG_INFO(this.netname, " already exists, aborting (you may want to specify --force)\n"); RadarMap_Next(); return; } } - self.cnt = fopen(self.netname, FILE_WRITE); - if(self.cnt < 0) + this.cnt = fopen(this.netname, FILE_WRITE); + if (this.cnt < 0) { - LOG_INFO("Error writing ", self.netname, "\n"); - remove(self); - radarmapper = world; + LOG_INFO("Error writing ", this.netname, "\n"); + delete(this); + radarmapper = NULL; return; } - LOG_INFO("Writing to ", self.netname, "...\n"); - fputs(self.cnt, "/* XPM */\n"); - fputs(self.cnt, "static char *RadarMap[] = {\n"); - fputs(self.cnt, "/* columns rows colors chars-per-pixel */\n"); - fputs(self.cnt, strcat("\"", ftos(self.size.x), " ", ftos(self.size.y), " 256 2\",\n")); - for(i = 0; i < 256; ++i) + LOG_INFO("Writing to ", this.netname, "...\n"); + fputs(this.cnt, "/* XPM */\n"); + fputs(this.cnt, "static char *RadarMap[] = {\n"); + fputs(this.cnt, "/* columns rows colors chars-per-pixel */\n"); + fputs(this.cnt, strcat("\"", ftos(this.size.x), " ", ftos(this.size.y), " 256 2\",\n")); + for (i = 0; i < 256; ++i) { - si = substring(doublehex, i*2, 2); - fputs(self.cnt, strcat("\"", si, " c #", si, si, si, "\",\n")); + si = substring(doublehex, i * 2, 2); + fputs(this.cnt, strcat("\"", si, " c #", si, si, si, "\",\n")); } - self.frame += 1; - self.nextthink = time; - sharpen_init(self.size.x); + this.frame += 1; + this.nextthink = time; + sharpen_init(this.size.x); } - else if(self.frame <= self.size.y) + else if (this.frame <= this.size.y) { // fill the sharpen buffer with this line - sharpen_shift(self.size.x); - i = self.count & 24; + sharpen_shift(this.size.x); + i = this.count & 24; - switch(i) + switch (i) { case 0: default: - for(x = 0; x < self.size.x; ++x) + for (x = 0; x < this.size.x; ++x) { - l = RadarMapAtPoint_Block(self.mins.x + x * self.maxs.x, self.mins.y + (self.size.y - self.frame) * self.maxs.y, self.maxs.x, self.maxs.y, self.mins.z, self.maxs.z, self.size.z); + l = RadarMapAtPoint_Block(this.mins.x + x * this.maxs.x, this.mins.y + (this.size.y - this.frame) * this.maxs.y, this.maxs.x, this.maxs.y, this.mins.z, this.maxs.z, this.size.z); sharpen_set(x, l); } break; case 8: - for(x = 0; x < self.size.x; ++x) + for (x = 0; x < this.size.x; ++x) { - l = RadarMapAtPoint_Trace(self.mins.x + x * self.maxs.x, self.mins.y + (self.size.y - self.frame) * self.maxs.y, self.maxs.x, self.maxs.y, self.mins.z, self.maxs.z, self.size.z); + l = RadarMapAtPoint_Trace(this.mins.x + x * this.maxs.x, this.mins.y + (this.size.y - this.frame) * this.maxs.y, this.maxs.x, this.maxs.y, this.mins.z, this.maxs.z, this.size.z); sharpen_set(x, l); } break; case 16: - for(x = 0; x < self.size.x; ++x) + for (x = 0; x < this.size.x; ++x) { - l = RadarMapAtPoint_Sample(self.mins.x + x * self.maxs.x, self.mins.y + (self.size.y - self.frame) * self.maxs.y, self.maxs.x, self.maxs.y, self.mins.z, self.maxs.z, self.size.z); + l = RadarMapAtPoint_Sample(this.mins.x + x * this.maxs.x, this.mins.y + (this.size.y - this.frame) * this.maxs.y, this.maxs.x, this.maxs.y, this.mins.z, this.maxs.z, this.size.z); sharpen_set(x, l); } break; case 24: - for(x = 0; x < self.size.x; ++x) + for (x = 0; x < this.size.x; ++x) { - l = RadarMapAtPoint_LineBlock(self.mins.x + x * self.maxs.x, self.mins.y + (self.size.y - self.frame) * self.maxs.y, self.maxs.x, self.maxs.y, self.mins.z, self.maxs.z, self.size.z); + l = RadarMapAtPoint_LineBlock(this.mins.x + x * this.maxs.x, this.mins.y + (this.size.y - this.frame) * this.maxs.y, this.maxs.x, this.maxs.y, this.mins.z, this.maxs.z, this.size.z); sharpen_set(x, l); } break; } // do we have enough lines? - if(self.frame >= 2) + if (this.frame >= 2) { // write a pixel line - fputs(self.cnt, "\""); - for(x = 0; x < self.size.x; ++x) + fputs(this.cnt, "\""); + for (x = 0; x < this.size.x; ++x) + { + l = sharpen_get(x, this.ltime); + fputs(this.cnt, substring(doublehex, 2 * floor(l * 256.0), 2)); + } + if (this.frame == this.size.y) { - l = sharpen_get(x, self.ltime); - fputs(self.cnt, substring(doublehex, 2 * floor(l * 256.0), 2)); + fputs(this.cnt, "\"\n"); } - if(self.frame == self.size.y) - fputs(self.cnt, "\"\n"); else { - fputs(self.cnt, "\",\n"); - LOG_INFO(ftos(self.size.y - self.frame), " lines left\n"); + fputs(this.cnt, "\",\n"); + LOG_INFO(ftos(this.size.y - this.frame), " lines left\n"); } } // is this the last line? then write back the missing line - if(self.frame == self.size.y) + if (this.frame == this.size.y) { - sharpen_shift(self.size.x); + sharpen_shift(this.size.x); // write a pixel line - fputs(self.cnt, "\""); - for(x = 0; x < self.size.x; ++x) + fputs(this.cnt, "\""); + for (x = 0; x < this.size.x; ++x) { - l = sharpen_get(x, self.ltime); - fputs(self.cnt, substring(doublehex, 2 * floor(l * 256.0), 2)); + l = sharpen_get(x, this.ltime); + fputs(this.cnt, substring(doublehex, 2 * floor(l * 256.0), 2)); + } + if (this.frame == this.size.y) + { + fputs(this.cnt, "\"\n"); } - if(self.frame == self.size.y) - fputs(self.cnt, "\"\n"); else { - fputs(self.cnt, "\",\n"); - LOG_INFO(ftos(self.size.y - self.frame), " lines left\n"); + fputs(this.cnt, "\",\n"); + LOG_INFO(ftos(this.size.y - this.frame), " lines left\n"); } } - self.frame += 1; - self.nextthink = time; + this.frame += 1; + this.nextthink = time; } else { // close the file - fputs(self.cnt, "};\n"); - fclose(self.cnt); - LOG_INFO("Finished. Please edit data/", self.netname, " with an image editing application and place it in the TGA format in the gfx folder.\n"); + fputs(this.cnt, "};\n"); + fclose(this.cnt); + LOG_INFO("Finished. Please edit data/", this.netname, " with an image editing application and place it in the TGA format in the gfx folder.\n"); RadarMap_Next(); } } @@ -388,45 +370,85 @@ float RadarMap_Make(float argc) { float i; - if(!radarmapper) + if (!radarmapper) { - radarmapper = spawn(); - radarmapper.classname = "radarmapper"; - radarmapper.think = RadarMap_Think; + radarmapper = new(radarmapper); + setthink(radarmapper, RadarMap_Think); radarmapper.nextthink = time; - radarmapper.count = 8; // default to the --trace method, as it is faster now + radarmapper.count = 8; // default to the --trace method, as it is faster now radarmapper.ltime = 1; radarmapper.size = '512 512 1'; - for(i = 1; i < argc; ++i) + for (i = 1; i < argc; ++i) { - switch(argv(i)) + switch (argv(i)) { - case "--force": { radarmapper.count |= 1; break; } - case "--loop": { radarmapper.count |= 2; break; } - case "--quit": { radarmapper.count |= 4; break; } - case "--block": { radarmapper.count &= ~24; break; } - case "--trace": { radarmapper.count &= ~24; radarmapper.count |= 8; break; } - case "--sample": { radarmapper.count &= ~24; radarmapper.count |= 16; break; } - case "--lineblock": { radarmapper.count |= 24; break; } - case "--flags": { ++i; radarmapper.count = stof(argv(i)); break; } // for the recursive call - case "--sharpen": { ++i; radarmapper.ltime = stof(argv(i)); break; } // for the recursive call - case "--res": // minor alias - case "--resolution": { ++i; radarmapper.size_x = stof(argv(i)); ++i; radarmapper.size_y = stof(argv(i)); break; } - case "--qual": // minor alias - case "--quality": { ++i; radarmapper.size_z = stof(argv(i)); break; } + case "--force": + { radarmapper.count |= 1; + break; + } + case "--loop": + { radarmapper.count |= 2; + break; + } + case "--quit": + { radarmapper.count |= 4; + break; + } + case "--block": + { radarmapper.count &= ~24; + break; + } + case "--trace": + { radarmapper.count &= ~24; + radarmapper.count |= 8; + break; + } + case "--sample": + { radarmapper.count &= ~24; + radarmapper.count |= 16; + break; + } + case "--lineblock": + { radarmapper.count |= 24; + break; + } + case "--flags": + { ++i; + radarmapper.count = stof(argv(i)); + break; + } // for the recursive call + case "--sharpen": + { ++i; + radarmapper.ltime = stof(argv(i)); + break; + } // for the recursive call + case "--res": // minor alias + case "--resolution": + { ++i; + radarmapper.size_x = stof(argv(i)); + ++i; + radarmapper.size_y = stof(argv(i)); + break; + } + case "--qual": // minor alias + case "--quality": + { ++i; + radarmapper.size_z = stof(argv(i)); + break; + } default: i = argc; - remove(radarmapper); - radarmapper = world; + delete(radarmapper); + radarmapper = NULL; break; } } - if(radarmapper) // after doing the arguments, see if we successfully went forward. + if (radarmapper) // after doing the arguments, see if we successfully went forward. { LOG_INFO("Radarmap entity spawned.\n"); - return true; // if so, don't print usage. + return true; // if so, don't print usage. } }