X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fdebug.qh;h=ab4e6f2e950fffc5e5ce489d27e26acf004f61c1;hp=10a69a70685ebdfdc79c481295410179215fe40d;hb=f8fe0e4aa8dad544f243ae997dfeb9cdccd55ee2;hpb=762a3c2e6e3cefba632282c37130581efa663de5

diff --git a/qcsrc/common/debug.qh b/qcsrc/common/debug.qh
index 10a69a7068..ab4e6f2e95 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;
@@ -16,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());
@@ -40,13 +45,15 @@ 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
 
+
+#if ENABLE_DEBUGDRAW
 #ifdef GAMEQC
 /**
  * 0: off
@@ -152,6 +159,7 @@ bool autocvar_debugdraw;
 	}
 #endif
 
+
 #ifdef SVQC
 	COMMON_COMMAND(debugdraw_sv, "Dump all server entities")
 	{
@@ -169,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")
 {
@@ -192,37 +202,39 @@ 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
@@ -251,12 +263,14 @@ GENERIC_COMMAND(cvar_localchanges, "Print locally changed cvars")
 		default:
 		case CMD_REQUEST_USAGE:
 		{
-			LOG_INFO(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " cvar_localchanges"));
+			LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " cvar_localchanges");
 			return;
 		}
 	}
 }
 
+
+#if ENABLE_DEBUGTRACE
 REGISTER_STAT(TRACE_ENT, int)
 #ifdef SVQC
 bool autocvar_debugtrace;
@@ -312,6 +326,8 @@ STATIC_INIT(TRACE_ENT)
 	IL_PUSH(g_drawables_2d, e);
 }
 #endif
+#endif
+
 
 GENERIC_COMMAND(find, "Search through entities for matching classname")
 {
@@ -319,23 +335,31 @@ GENERIC_COMMAND(find, "Search through entities for matching classname")
 	{
 		case CMD_REQUEST_COMMAND:
 		{
-			FOREACH_ENTITY_CLASS_ORDERED(argv(1), true, 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)
@@ -343,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, 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);
+		SetResourceAmount(this, RESOURCE_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 = GetResourceAmount(this, RESOURCE_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