From 04a9c527a0337e0c404f25ff5926c84ce056e979 Mon Sep 17 00:00:00 2001 From: Martin Taibr Date: Fri, 23 Feb 2018 17:18:21 +0000 Subject: [PATCH] Stuff useful for debugging --- qcsrc/common/debug.qh | 103 ++++++++++++++++++++++++++++++++++++ qcsrc/server/spawnpoints.qc | 10 ++-- xonotic-server.cfg | 3 ++ 3 files changed, 109 insertions(+), 7 deletions(-) diff --git a/qcsrc/common/debug.qh b/qcsrc/common/debug.qh index 2d0c4e911..cdba3af6e 100644 --- a/qcsrc/common/debug.qh +++ b/qcsrc/common/debug.qh @@ -1,9 +1,16 @@ #pragma once + +// 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; @@ -45,6 +52,7 @@ REGISTER_NET_TEMP(net_debug) } #endif + #if ENABLE_DEBUGDRAW #ifdef GAMEQC /** @@ -151,6 +159,7 @@ bool autocvar_debugdraw; } #endif + #ifdef SVQC COMMON_COMMAND(debugdraw_sv, "Dump all server entities") { @@ -183,6 +192,7 @@ bool autocvar_debugdraw; #endif #endif + GENERIC_COMMAND(bufstr_get, "Examine a string buffer object") { switch (request) @@ -205,6 +215,7 @@ GENERIC_COMMAND(bufstr_get, "Examine a string buffer object") } } + GENERIC_COMMAND(version, "Print the current version") { switch (request) @@ -223,6 +234,7 @@ GENERIC_COMMAND(version, "Print the current version") } } + #ifdef CSQC void(float bufhandle, string pattern, string antipattern) buf_cvarlist = #517; #endif @@ -257,6 +269,7 @@ GENERIC_COMMAND(cvar_localchanges, "Print locally changed cvars") } } + #if ENABLE_DEBUGTRACE REGISTER_STAT(TRACE_ENT, int) #ifdef SVQC @@ -315,6 +328,7 @@ STATIC_INIT(TRACE_ENT) #endif #endif + GENERIC_COMMAND(find, "Search through entities for matching classname") { switch (request) @@ -345,6 +359,7 @@ GENERIC_COMMAND(find, "Search through entities for matching classname") } } + GENERIC_COMMAND(findat, "Search through entities for matching origin") { switch (request) @@ -365,3 +380,91 @@ GENERIC_COMMAND(findat, "Search through entities for matching origin") } } } + + +// 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, 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 fade_rate_, vector vel) { + CONSTRUCT(DebugText3d); + this.origin = pos; + this.message = strzone(msg); + this.hit_time = time; + this.fade_rate = fade_rate_; + this.velocity = vel; + IL_PUSH(g_drawables_2d, this); + } + + DESTRUCTOR(DebugText3d) { + strunzone(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; + } + + vector screen_pos = project_3d_to_2d(this.origin) + since_created * this.velocity; + if (screen_pos.z < 0) return; // behind camera + screen_pos.z = 0; + + vector rgb = '1 1 0'; + int size = 8; + 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 duration = ReadFloat(); + vector vel = ReadVector(); + make_impure(NEW(DebugText3d, pos, msg, 1 / duration, vel)); + return true; +} + +#endif // CSQC + +#ifdef SVQC + +AUTOCVAR(debug_text_3d_default_duration, float, 10, "Default duration for debug_text_3d()"); +AUTOCVAR(debug_text_3d_default_velocity, vector, '0 -10 0', "Default velocity for debug_text_3d() in screen coords (X and Y from top left)"); + +STATIC_INIT(debug_text_3d) { + // HACK: these cvars are only used in macros so they give unused warning unless the macros are expanded + autocvar_debug_text_3d_default_duration = autocvar_debug_text_3d_default_duration; + autocvar_debug_text_3d_default_velocity = autocvar_debug_text_3d_default_velocity; +} + +#define debug_text_3d(...) EVAL(OVERLOAD(debug_text_3d, __VA_ARGS__)) +#define debug_text_3d_2(pos, msg) debug_text_3d_3(pos, msg, autocvar_debug_text_3d_default_duration); +#define debug_text_3d_3(pos, msg, dur) debug_text_3d_4(pos, msg, dur, autocvar_debug_text_3d_default_velocity); +#define debug_text_3d_4(pos, msg, dur, vel) debug_text_3d_fn(pos, msg, dur, vel); + +void debug_text_3d_fn(vector pos, string msg, float duration, vector velocity) { + WriteHeader(MSG_BROADCAST, debug_text_3d); + WriteVector(MSG_BROADCAST, pos); + WriteString(MSG_BROADCAST, msg); + WriteFloat(MSG_BROADCAST, duration); + WriteVector(MSG_BROADCAST, velocity); +} + +#endif // SVQC diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc index 9164b4feb..e48840883 100644 --- a/qcsrc/server/spawnpoints.qc +++ b/qcsrc/server/spawnpoints.qc @@ -213,11 +213,6 @@ spawnfunc(info_player_team4) // _y: weight vector Spawn_Score(entity this, entity spot, float mindist, float teamcheck) { - float shortest, thisdist; - float prio; - - prio = 0; - // filter out spots for the wrong team if(teamcheck >= 0) if(spot.team != teamcheck) @@ -238,9 +233,10 @@ vector Spawn_Score(entity this, entity spot, float mindist, float teamcheck) return '-1 0 0'; } - shortest = vlen(world.maxs - world.mins); + float prio = 0; + float shortest = vlen(world.maxs - world.mins); FOREACH_CLIENT(IS_PLAYER(it) && it != this, { - thisdist = vlen(it.origin - spot.origin); + float thisdist = vlen(it.origin - spot.origin); if (thisdist < shortest) shortest = thisdist; }); diff --git a/xonotic-server.cfg b/xonotic-server.cfg index 09f9702da..d8310d5f7 100644 --- a/xonotic-server.cfg +++ b/xonotic-server.cfg @@ -469,6 +469,9 @@ set sv_accuracy_data_send 1 "1 send weapon accuracy data statistics and improved set _independent_players 0 "DO NOT TOUCH" set _notarget 0 "NO, REALLY, DON'T" +set debug_text_3d_default_duration 10 +set debug_text_3d_default_velocity "0 -10 0" + // otherwise, antilag breaks sv_gameplayfix_consistentplayerprethink 1 -- 2.39.2