X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fdebug.qh;h=983b073b406c8cfb93de92a31002d5dd1359fa56;hb=bc50c2d7ca3e0a44ed1712400ef8e170e6df8210;hp=e1d43f34fefc2e18c9947ea563de7c27d20cfce3;hpb=5b5fbd7f5a8b82ebe39c30e3b20b90e84676fbf0;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/debug.qh b/qcsrc/common/debug.qh index e1d43f34f..983b073b4 100644 --- a/qcsrc/common/debug.qh +++ b/qcsrc/common/debug.qh @@ -1,6 +1,17 @@ #pragma once -#ifndef MENUQC + +// This includes some functions useful for debugging. +// Some more bot-specific ones are in server/pathlib/debug.qc. +// Look for other useful commands under prvm_* in console (apropos / search). + + +#ifdef CSQC +.entity tag_entity; +#endif + + +#ifdef GAMEQC .bool debug; .int sv_entnum; REGISTER_NET_TEMP(net_debug) @@ -12,9 +23,7 @@ REGISTER_NET_TEMP(net_debug) Net_Accept(net_debug); this.sv_entnum = ReadShort(); if (ReadByte()) make_pure(this); - this.origin_x = ReadCoord(); - this.origin_y = ReadCoord(); - this.origin_z = ReadCoord(); + this.origin = ReadVector(); setorigin(this, this.origin); this.debug = true; // identify server entities by this this.classname = strzone(ReadString()); @@ -36,14 +45,16 @@ REGISTER_NET_TEMP(net_debug) o = (this.absmin + this.absmax) / 2; if (this.tag_entity) o += this.tag_entity.origin; - WriteCoord(channel, o.x); WriteCoord(channel, o.y); WriteCoord(channel, o.z); + WriteVector(channel, o); WriteString(channel, this.classname); WriteString(channel, this.sourceLoc); return true; } #endif -#ifndef MENUQC + +#if ENABLE_DEBUGDRAW +#ifdef GAMEQC /** * 0: off * 1: on @@ -66,90 +77,89 @@ bool autocvar_debugdraw; static int debugdraw_frame; ++debugdraw_frame; const int sz = 8; - FOREACH_ENTITY(true, LAMBDA( + FOREACH_ENTITY(true, { if (it.debugdraw_last == debugdraw_frame) continue; int ofs = 0; - for (entity e = findradius(it.origin, 100); e; e = e.chain) - { - if (e.debugdraw_last == debugdraw_frame) continue; - e.debugdraw_last = debugdraw_frame; - vector rgb = (e.debug) ? '0 0 1' : '1 0 0'; - if (autocvar_debugdraw_filterout != "" && strhasword(autocvar_debugdraw_filterout, e.classname)) continue; - if (autocvar_debugdraw_filter != "" && !strhasword(autocvar_debugdraw_filter, e.classname)) continue; + FOREACH_ENTITY_RADIUS(it.origin, 100, it.debugdraw_last != debugdraw_frame, { + it.debugdraw_last = debugdraw_frame; + vector rgb = (it.debug) ? '0 0 1' : '1 0 0'; + if (autocvar_debugdraw_filterout != "" && strhasword(autocvar_debugdraw_filterout, it.classname)) continue; + if (autocvar_debugdraw_filter != "" && !strhasword(autocvar_debugdraw_filter, it.classname)) continue; if (autocvar_debugdraw == 3) { - if (!e.entnum) continue; + if (!it.entnum) continue; } if (autocvar_debugdraw == 4) { - if (e.origin) continue; + if (it.origin) continue; } if (autocvar_debugdraw == 5) { - if (!e.debug) continue; + if (!it.debug) continue; } else if (autocvar_debugdraw > 5) { bool flag = true; do { -// if (e.modelindex) break; -// if (e.absmin) break; -// if (e.absmax) break; -// if (e.entnum) break; -// if (e.drawmask) break; -// if (e.predraw) break; -// if (e.movetype) break; - if (e.solid) break; -// if (e.origin) break; -// if (e.oldorigin) break; -// if (e.velocity) break; -// if (e.angles) break; -// if (e.avelocity) break; -// if (e.classname) break; -// if (e.model) break; -// if (e.frame) break; -// if (e.skin) break; -// if (e.effects) break; -// if (e.mins) break; -// if (e.maxs) break; -// if (e.size) break; -// if (e.touch) break; -// if (e.use) break; -// if (e.think) break; -// if (e.blocked) break; -// if (e.nextthink) break; -// if (e.chain) break; -// if (e.netname) break; -// if (e.enemy) break; -// if (e.flags) break; -// if (e.colormap) break; -// if (e.owner) break; +// if (it.modelindex) break; +// if (it.absmin) break; +// if (it.absmax) break; +// if (it.entnum) break; +// if (it.drawmask) break; +// if (it.predraw) break; +// if (it.move_movetype) break; + if (it.solid) break; +// if (it.origin) break; +// if (it.oldorigin) break; +// if (it.velocity) break; +// if (it.angles) break; +// if (it.avelocity) break; +// if (it.classname) break; +// if (it.model) break; +// if (it.frame) break; +// if (it.skin) break; +// if (it.effects) break; +// if (it.mins) break; +// if (it.maxs) break; +// if (it.size) break; +// if (it.touch) break; +// if (it.use) break; +// if (it.think) break; +// if (it.blocked) break; +// if (it.nextthink) break; +// if (it.chain) break; +// if (it.netname) break; +// if (it.enemy) break; +// if (it.flags) break; +// if (it.colormap) break; +// if (it.owner) break; flag = false; } while (0); if (!flag) continue; } - else if (is_pure(e)) + else if (is_pure(it)) { if (autocvar_debugdraw < 2) continue; rgb.y = 1; } - vector o = e.origin; - if (e.tag_entity) - o += e.tag_entity.origin; + vector o = it.origin; + if (it.tag_entity) + o += it.tag_entity.origin; vector pos = project_3d_to_2d(o); if (pos.z < 0) continue; pos.z = 0; pos.y += ofs * sz; - drawcolorcodedstring2(pos, - sprintf("%d: '%s'@%s", (e.debug ? e.sv_entnum : etof(e)), - e.classname, e.sourceLoc), + drawcolorcodedstring2_builtin(pos, + sprintf("%d: '%s'@%s", (it.debug ? it.sv_entnum : etof(it)), + it.classname, it.sourceLoc), sz * '1 1 0', rgb, 0.5, DRAWFLAG_NORMAL); ++ofs; - } - )); + }); + }); } #endif + #ifdef SVQC COMMON_COMMAND(debugdraw_sv, "Dump all server entities") { @@ -167,19 +177,21 @@ bool autocvar_debugdraw; e.debug = true; --rem; } - LOG_INFOF("%d server entities sent\n", n - rem); + LOG_INFOF("%d server entities sent", n - rem); return; } default: case CMD_REQUEST_USAGE: { - LOG_INFO(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " debugdraw_sv")); + LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " debugdraw_sv"); return; } } } #endif +#endif + GENERIC_COMMAND(bufstr_get, "Examine a string buffer object") { @@ -190,37 +202,75 @@ GENERIC_COMMAND(bufstr_get, "Examine a string buffer object") int bufhandle = stof(argv(1)); int string_index = stof(argv(2)); string s = bufstr_get(bufhandle, string_index); - LOG_INFOF("%s\n", s); + LOG_INFOF("%s", s); return; } default: case CMD_REQUEST_USAGE: { - LOG_INFO(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " bufstr_get bufhandle string_index")); + LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " bufstr_get bufhandle string_index"); return; } } } + GENERIC_COMMAND(version, "Print the current version") { switch (request) { case CMD_REQUEST_COMMAND: { - LOG_INFO(WATERMARK "\n"); + LOG_INFO(WATERMARK); return; } default: case CMD_REQUEST_USAGE: { - LOG_INFO(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " version")); + LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " version"); return; } } } + +#ifdef CSQC +void(float bufhandle, string pattern, string antipattern) buf_cvarlist = #517; +#endif +GENERIC_COMMAND(cvar_localchanges, "Print locally changed cvars") +{ + switch (request) + { + case CMD_REQUEST_COMMAND: + { + string s = ""; + int h = buf_create(); + buf_cvarlist(h, "", "_"); // exclude all _ cvars as they are temporary + int n = buf_getsize(h); + for (int i = 0; i < n; ++i) { + string k = bufstr_get(h, i); + string v = cvar_string(k); + string d = cvar_defstring(k); + if (v == d) + continue; + s = strcat(s, k, " \"", v, "\" // \"", d, "\"\n"); + } + buf_del(h); + LOG_INFO(s); + return; + } + default: + case CMD_REQUEST_USAGE: + { + LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " cvar_localchanges"); + return; + } + } +} + + +#if ENABLE_DEBUGTRACE REGISTER_STAT(TRACE_ENT, int) #ifdef SVQC bool autocvar_debugtrace; @@ -241,10 +291,10 @@ MUTATOR_HOOKFUNCTION(trace, SV_StartFrame) it.solid_prev = it.solid; it.solid = SOLID_BBOX; }); - vector forward; vector right; vector up; + vector forward = '0 0 0'; vector right = '0 0 0'; vector up = '0 0 0'; MAKEVECTORS(makevectors, it.v_angle, forward, right, up); vector pos = it.origin + it.view_ofs; - traceline(pos, pos + forward * MAX_SHOT_DISTANCE, MOVE_NORMAL, it); + traceline(pos, pos + forward * max_shot_distance, MOVE_NORMAL, it); FOREACH_ENTITY(true, { it.solid = it.solid_prev; it.solid_prev = 0; @@ -273,8 +323,11 @@ STATIC_INIT(TRACE_ENT) { entity e = TRACE_ENT = new_pure(TRACE_ENT); e.draw2d = Trace_draw2d; + IL_PUSH(g_drawables_2d, e); } #endif +#endif + GENERIC_COMMAND(find, "Search through entities for matching classname") { @@ -282,23 +335,31 @@ GENERIC_COMMAND(find, "Search through entities for matching classname") { case CMD_REQUEST_COMMAND: { - FOREACH_ENTITY_CLASS_ORDERED(argv(1), true, LAMBDA(LOG_INFOF("%i (%s)\n", it, it.classname))); + int entcnt = 0; + FOREACH_ENTITY_CLASS_ORDERED(argv(1), true, + { + LOG_INFOF("%i (%s)", it, it.classname); + ++entcnt; + }); + if(entcnt) + LOG_INFOF("Found %d entities", entcnt); return; } default: { - LOG_INFO("Incorrect parameters for ^2find^7\n"); + LOG_INFO("Incorrect parameters for ^2find^7"); } case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 " GetProgramCommandPrefix() " find classname\n"); - LOG_INFO(" Where 'classname' is the classname to search for.\n"); + LOG_INFO("Usage:^3 " GetProgramCommandPrefix() " find classname"); + LOG_INFO(" Where 'classname' is the classname to search for."); return; } } } + GENERIC_COMMAND(findat, "Search through entities for matching origin") { switch (request) @@ -306,16 +367,105 @@ GENERIC_COMMAND(findat, "Search through entities for matching origin") case CMD_REQUEST_COMMAND: { vector match = stov(argv(1)); - FOREACH_ENTITY_ORDERED(it.origin == match, LAMBDA(LOG_INFOF("%i (%s)\n", it, it.classname))); + FOREACH_ENTITY_ORDERED(it.origin == match, LOG_INFOF("%i (%s)", it, it.classname)); return; } default: - LOG_INFO("Incorrect parameters for ^2findat^7\n"); + LOG_INFO("Incorrect parameters for ^2findat^7"); case CMD_REQUEST_USAGE: { - LOG_INFO("\nUsage:^3 " GetProgramCommandPrefix() " findat \"0 0 0\"\n"); + LOG_INFO("Usage:^3 " GetProgramCommandPrefix() " findat \"0 0 0\""); return; } } } + + +// debug_test() allows drawing text from server on the client anywhere in world coordinates. + +#ifdef GAMEQC +REGISTER_NET_TEMP(debug_text_3d); +#endif + +#ifdef CSQC + +CLASS(DebugText3d, Object) + // reusing existing fields + ATTRIB(DebugText3d, origin, vector); + ATTRIB(DebugText3d, message, string); // the text (i wanted to use the .text field but then this whole macro-based-inheritance thing shat itself) + ATTRIB(DebugText3d, health, float); // text alignment (recycled field) + ATTRIB(DebugText3d, hit_time, float); // when it was created + ATTRIB(DebugText3d, fade_rate, float); // how fast is should disappear + ATTRIB(DebugText3d, velocity, vector); + + CONSTRUCTOR(DebugText3d, vector pos, string msg, float align, float fade_rate_, vector vel) { + CONSTRUCT(DebugText3d); + this.origin = pos; + this.message = strzone(msg); + this.health = align; + this.hit_time = time; + this.fade_rate = fade_rate_; + this.velocity = vel; + IL_PUSH(g_drawables_2d, this); + } + + DESTRUCTOR(DebugText3d) { + strfree(this.message); + } + + void DebugText3d_draw2d(DebugText3d this) { + float since_created = time - this.hit_time; + float alpha_ = 1 - since_created * this.fade_rate; + + if (alpha_ < 0) { + delete(this); + return; + } + + int size = 8; + vector screen_pos = project_3d_to_2d(this.origin) + since_created * this.velocity; + float align = this.health; + if (align > 0) + screen_pos.x -= stringwidth(this.message, true, size * '1 1 0') * min(1, align); + if (screen_pos.z < 0) return; // behind camera + screen_pos.z = 0; + + vector rgb = '1 1 0'; + drawcolorcodedstring2_builtin(screen_pos, this.message, size * '1 1 0', rgb, alpha_, DRAWFLAG_NORMAL); + } + ATTRIB(DebugText3d, draw2d, void(DebugText3d), DebugText3d_draw2d); +ENDCLASS(DebugText3d) + +NET_HANDLE(debug_text_3d, bool is_new) { + vector pos = ReadVector(); + string msg = ReadString(); + float align = ReadFloat(); + float duration = ReadFloat(); + vector vel = ReadVector(); + make_impure(NEW(DebugText3d, pos, msg, align, 1 / duration, vel)); + return true; +} + +#endif // CSQC + +#ifdef SVQC + +// can't use autocvars because they give unused warning unless the macros are expanded +#define debug_text_3d(...) EVAL(OVERLOAD(debug_text_3d, __VA_ARGS__)) +#define debug_text_3d_2(pos, msg) debug_text_3d_3(pos, msg, cvar("debug_text_3d_default_align")) +#define debug_text_3d_3(pos, msg, align) debug_text_3d_4(pos, msg, align, cvar("debug_text_3d_default_duration")) +#define debug_text_3d_4(pos, msg, align, dur) debug_text_3d_5(pos, msg, align, dur, stov(cvar_string("debug_text_3d_default_velocity"))) +#define debug_text_3d_5(pos, msg, align, dur, vel) debug_text_3d_fn(pos, msg, align, dur, vel) + +ERASEABLE +void debug_text_3d_fn(vector pos, string msg, float align, float duration, vector vel) { + WriteHeader(MSG_BROADCAST, debug_text_3d); + WriteVector(MSG_BROADCAST, pos); + WriteString(MSG_BROADCAST, msg); + WriteFloat(MSG_BROADCAST, align); + WriteFloat(MSG_BROADCAST, duration); + WriteVector(MSG_BROADCAST, vel); +} + +#endif // SVQC