X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fdebug.qh;h=9aca8e774c34a669cf3439f6656914c703b7a0a3;hb=8ba1f6c672361186033b8bebc3be677ac94bd4da;hp=4a75c50fd2a214a61eb4ff0c67e1469b4b3aa787;hpb=7f5ad47610dc8b5580cc96ae961a57cca96e6975;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/debug.qh b/qcsrc/common/debug.qh
index 4a75c50fd..9aca8e774 100644
--- a/qcsrc/common/debug.qh
+++ b/qcsrc/common/debug.qh
@@ -1,5 +1,8 @@
-#ifndef DEBUG_H
-#define DEBUG_H
+#pragma once
+
+#ifdef CSQC
+.entity tag_entity;
+#endif
 
 #ifndef MENUQC
 .bool debug;
@@ -19,8 +22,7 @@ REGISTER_NET_TEMP(net_debug)
 		setorigin(this, this.origin);
 		this.debug = true;  // identify server entities by this
 		this.classname = strzone(ReadString());
-		this.sourceLocFile = strzone(ReadString());
-		this.sourceLocLine = ReadInt24_t();
+		this.sourceLoc = strzone(ReadString());
 		return true;
 	}
 #endif
@@ -33,17 +35,28 @@ REGISTER_NET_TEMP(net_debug)
 		WriteHeader(channel, net_debug);
 		WriteShort(channel, etof(this));
 		WriteByte(channel, is_pure(this));
-		WriteCoord(channel, this.origin.x);
-		WriteCoord(channel, this.origin.y);
-		WriteCoord(channel, this.origin.z);
+		vector o = this.origin;
+		if (o == '0 0 0') // brushes
+			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);
 		WriteString(channel, this.classname);
-		WriteString(channel, this.sourceLocFile);
-		WriteInt24_t(channel, this.sourceLocLine);
+		WriteString(channel, this.sourceLoc);
 		return true;
 	}
 #endif
 
 #ifndef MENUQC
+/**
+ * 0: off
+ * 1: on
+ * 2: on (pure)
+ * 3: on (.entnum != 0)
+ * 4: on (.origin == '0 0 0')
+ * 5: on (.debug != 0), server only
+ * 6: on (.solid != 0)
+ */
 bool autocvar_debugdraw;
 #endif
 
@@ -57,80 +70,85 @@ 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;
 				}
-				else if (autocvar_debugdraw > 4)
+				if (autocvar_debugdraw == 5)
+				{
+					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.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 pos = project_3d_to_2d(e.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:%d", (e.debug ? e.sv_entnum : etof(e)),
-					e.classname, e.sourceLocFile, e.sourceLocLine),
+				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
 
@@ -147,7 +165,7 @@ bool autocvar_debugdraw;
 				for (entity e = NULL; (e = findfloat(e, debug, 0)) && rem > 0; )
 				{
 					if (autocvar_debugdraw < 2 && is_pure(e)) continue;
-					debug_send(e, nextent(NULL), 0);
+					debug_send(e, caller, 0);
 					e.debug = true;
 					--rem;
 				}
@@ -171,8 +189,8 @@ GENERIC_COMMAND(bufstr_get, "Examine a string buffer object")
 	{
 		case CMD_REQUEST_COMMAND:
 		{
-		    int bufhandle = stof(argv(1));
-		    int string_index = stof(argv(2));
+			int bufhandle = stof(argv(1));
+			int string_index = stof(argv(2));
 			string s = bufstr_get(bufhandle, string_index);
 			LOG_INFOF("%s\n", s);
 			return;
@@ -187,4 +205,119 @@ GENERIC_COMMAND(bufstr_get, "Examine a string buffer object")
 	}
 }
 
+GENERIC_COMMAND(version, "Print the current version")
+{
+	switch (request)
+	{
+		case CMD_REQUEST_COMMAND:
+		{
+			LOG_INFO(WATERMARK "\n");
+			return;
+		}
+		default:
+		case CMD_REQUEST_USAGE:
+		{
+			LOG_INFO(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " version"));
+			return;
+		}
+	}
+}
+
+REGISTER_STAT(TRACE_ENT, int)
+#ifdef SVQC
+bool autocvar_debugtrace;
+
+REGISTER_MUTATOR(trace, autocvar_debugtrace);
+
+.bool debug_trace_button;
+.int solid_prev;
+MUTATOR_HOOKFUNCTION(trace, SV_StartFrame)
+{
+	FOREACH_CLIENT(true, {
+		bool skip = false;
+		bool btn = PHYS_INPUT_BUTTON_HOOK(it);
+		if (btn == it.debug_trace_button) skip = true;
+		it.debug_trace_button = btn;
+		if (!btn || skip) continue;
+		FOREACH_ENTITY(true, {
+		    it.solid_prev = it.solid;
+			it.solid = SOLID_BBOX;
+		});
+		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);
+		FOREACH_ENTITY(true, {
+		    it.solid = it.solid_prev;
+            it.solid_prev = 0;
+		});
+		entity e = trace_ent;
+		int i = etof(e);
+		STAT(TRACE_ENT, it) = i;
+		if (!e) continue;
+		setorigin(e, e.origin + '0 0 100');
+		stuffcmd(it, sprintf("prvm_edict server %d\n", i));
+	});
+}
+#endif
+#ifdef CSQC
+entity TRACE_ENT;
+void Trace_draw2d(entity this)
+{
+	int e = STAT(TRACE_ENT);
+	if (!e) return;
+	vector pos = '0 0 0';
+	pos.y += vid_conheight / 2;
+	drawstring(pos, sprintf("prvm_edict server %d", e), '10 10 0', '1 1 1', 1, DRAWFLAG_NORMAL);
+}
+
+STATIC_INIT(TRACE_ENT)
+{
+	entity e = TRACE_ENT = new_pure(TRACE_ENT);
+	e.draw2d = Trace_draw2d;
+}
 #endif
+
+GENERIC_COMMAND(find, "Search through entities for matching classname")
+{
+	switch (request)
+	{
+		case CMD_REQUEST_COMMAND:
+		{
+			FOREACH_ENTITY_CLASS_ORDERED(argv(1), true, LOG_INFOF("%i (%s)\n", it, it.classname));
+			return;
+		}
+
+		default:
+		{
+			LOG_INFO("Incorrect parameters for ^2find^7\n");
+        }
+		case CMD_REQUEST_USAGE:
+		{
+			LOG_INFO("\nUsage:^3 " GetProgramCommandPrefix() " find classname\n");
+			LOG_INFO("  Where 'classname' is the classname to search for.\n");
+			return;
+		}
+	}
+}
+
+GENERIC_COMMAND(findat, "Search through entities for matching origin")
+{
+	switch (request)
+	{
+		case CMD_REQUEST_COMMAND:
+		{
+		    vector match = stov(argv(1));
+		    FOREACH_ENTITY_ORDERED(it.origin == match, LOG_INFOF("%i (%s)\n", it, it.classname));
+			return;
+		}
+
+		default:
+			LOG_INFO("Incorrect parameters for ^2findat^7\n");
+		case CMD_REQUEST_USAGE:
+		{
+			LOG_INFO("\nUsage:^3 " GetProgramCommandPrefix() " findat \"0 0 0\"\n");
+			return;
+		}
+	}
+}