-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
- #include "../../dpdefs/progsdefs.qh"
- #include "../../dpdefs/dpextensions.qh"
- #include "../../common/util.qh"
- #include "../defs.qh"
- #include "radarmap.qh"
- #include "../../csqcmodellib/sv_model.qh"
-#endif
+#include <common/command/command.qh>
+#include "radarmap.qh"
+
+#include "../g_world.qh"
+#include "../g_subs.qh"
+
+#include <common/util.qh>
+
+#include <lib/csqcmodel/sv_model.qh>
// ===============================================
// Generates radar map images for use in the HUD
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);
++n;
- if(!trace_startsolid)
+ if (!trace_startsolid)
{
black += vlen(trace_endpos - c);
c = trace_endpos;
c = trace_endpos;
}
- if(n > 200)
- dprint("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\n");
return white / (black + white);
}
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;
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;
+ if (trace_startsolid || trace_fraction < 1) ++r;
}
return r / q;
}
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;
+ if (trace_startsolid) ++r;
}
return r / q;
}
{
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
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;
+ if (trace_startsolid) ++c;
}
return c / q;
{
sharpen_buffer[x + 2 * RADAR_WIDTH_MAX] = v;
}
-float sharpen_getpixel(float x, float y)
+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);
}
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];
}
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;
}
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);
}
void RadarMap_Think()
{
+ SELFPARAM();
// rough map entity
// cnt: current line
// size: pixel width/height
float i, x, l;
string si;
- if(self.frame == 0)
+ if (self.frame == 0)
{
// initialize
get_mi_min_max_texcoords(1);
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;
- print("Picture mins/maxs: ", ftos(self.maxs.x), " and ", ftos(self.maxs.y), " should match\n");
+ 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))
+ if (!(self.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)
+ 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)
{
fclose(self.cnt);
- print(self.netname, " already exists, aborting (you may want to specify --force)\n");
+ LOG_INFO(self.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)
+ if (self.cnt < 0)
{
- print("Error writing ", self.netname, "\n");
+ LOG_INFO("Error writing ", self.netname, "\n");
remove(self);
radarmapper = world;
return;
}
- print("Writing to ", self.netname, "...\n");
+ 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)
+ for (i = 0; i < 256; ++i)
{
- si = substring(doublehex, i*2, 2);
+ si = substring(doublehex, i * 2, 2);
fputs(self.cnt, strcat("\"", si, " c #", si, si, si, "\",\n"));
}
self.frame += 1;
self.nextthink = time;
sharpen_init(self.size.x);
}
- else if(self.frame <= self.size.y)
+ else if (self.frame <= self.size.y)
{
// fill the sharpen buffer with this line
sharpen_shift(self.size.x);
i = self.count & 24;
- switch(i)
+ switch (i)
{
case 0:
default:
- for(x = 0; x < self.size.x; ++x)
+ for (x = 0; x < self.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);
sharpen_set(x, l);
}
break;
case 8:
- for(x = 0; x < self.size.x; ++x)
+ for (x = 0; x < self.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);
sharpen_set(x, l);
}
break;
case 16:
- for(x = 0; x < self.size.x; ++x)
+ for (x = 0; x < self.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);
sharpen_set(x, l);
}
break;
case 24:
- for(x = 0; x < self.size.x; ++x)
+ for (x = 0; x < self.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);
sharpen_set(x, l);
}
// do we have enough lines?
- if(self.frame >= 2)
+ if (self.frame >= 2)
{
// write a pixel line
fputs(self.cnt, "\"");
- for(x = 0; x < self.size.x; ++x)
+ for (x = 0; x < self.size.x; ++x)
{
l = sharpen_get(x, self.ltime);
fputs(self.cnt, substring(doublehex, 2 * floor(l * 256.0), 2));
}
- if(self.frame == self.size.y)
+ if (self.frame == self.size.y)
+ {
fputs(self.cnt, "\"\n");
+ }
else
{
fputs(self.cnt, "\",\n");
- print(ftos(self.size.y - self.frame), " lines left\n");
+ LOG_INFO(ftos(self.size.y - self.frame), " lines left\n");
}
}
// is this the last line? then write back the missing line
- if(self.frame == self.size.y)
+ if (self.frame == self.size.y)
{
sharpen_shift(self.size.x);
// write a pixel line
fputs(self.cnt, "\"");
- for(x = 0; x < self.size.x; ++x)
+ for (x = 0; x < self.size.x; ++x)
{
l = sharpen_get(x, self.ltime);
fputs(self.cnt, substring(doublehex, 2 * floor(l * 256.0), 2));
}
- if(self.frame == self.size.y)
+ if (self.frame == self.size.y)
+ {
fputs(self.cnt, "\"\n");
+ }
else
{
fputs(self.cnt, "\",\n");
- print(ftos(self.size.y - self.frame), " lines left\n");
+ LOG_INFO(ftos(self.size.y - self.frame), " lines left\n");
}
}
// close the file
fputs(self.cnt, "};\n");
fclose(self.cnt);
- print("Finished. Please edit data/", self.netname, " with an image editing application and place it in the TGA format in the gfx folder.\n");
+ 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");
RadarMap_Next();
}
}
{
float i;
- if(!radarmapper)
+ if (!radarmapper)
{
- radarmapper = spawn();
- radarmapper.classname = "radarmapper";
+ radarmapper = new(radarmapper);
radarmapper.think = 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;
}
}
- if(radarmapper) // after doing the arguments, see if we successfully went forward.
+ if (radarmapper) // after doing the arguments, see if we successfully went forward.
{
- print("Radarmap entity spawned.\n");
- return true; // if so, don't print usage.
+ LOG_INFO("Radarmap entity spawned.\n");
+ return true; // if so, don't print usage.
}
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff