X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=clvm_cmds.c;h=0d30689c41dd3cc00780318b5825d155ef4d7e3a;hb=971ad66cc21064832305abca4e356213dd513d9b;hp=d00769327d90346fc0df844f5f83ed09ebc920c8;hpb=5a6cacc0b2909f2b0f3b777aad9d9b8bb0180d14;p=xonotic%2Fdarkplaces.git

diff --git a/clvm_cmds.c b/clvm_cmds.c
index d0076932..0d30689c 100644
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -4,6 +4,8 @@
 #include "csprogs.h"
 #include "cl_collision.h"
 #include "r_shadow.h"
+#include "jpeg.h"
+#include "image.h"
 
 //============================================================================
 // Client
@@ -751,31 +753,31 @@ void VM_CL_R_SetView (void)
 	switch(c)
 	{
 	case VF_MIN:
-		r_refdef.view.x = (int)(f[0] * vid.width / vid_conwidth.value);
-		r_refdef.view.y = (int)(f[1] * vid.height / vid_conheight.value);
+		r_refdef.view.x = (int)(f[0]);
+		r_refdef.view.y = (int)(f[1]);
 		break;
 	case VF_MIN_X:
-		r_refdef.view.x = (int)(k * vid.width / vid_conwidth.value);
+		r_refdef.view.x = (int)(k);
 		break;
 	case VF_MIN_Y:
-		r_refdef.view.y = (int)(k * vid.height / vid_conheight.value);
+		r_refdef.view.y = (int)(k);
 		break;
 	case VF_SIZE:
-		r_refdef.view.width = (int)(f[0] * vid.width / vid_conwidth.value);
-		r_refdef.view.height = (int)(f[1] * vid.height / vid_conheight.value);
+		r_refdef.view.width = (int)(f[0]);
+		r_refdef.view.height = (int)(f[1]);
 		break;
 	case VF_SIZE_X:
-		r_refdef.view.width = (int)(k * vid.width / vid_conwidth.value);
+		r_refdef.view.width = (int)(k);
 		break;
 	case VF_SIZE_Y:
-		r_refdef.view.height = (int)(k * vid.height / vid_conheight.value);
+		r_refdef.view.height = (int)(k);
 		break;
 	case VF_VIEWPORT:
-		r_refdef.view.x = (int)(f[0] * vid.width / vid_conwidth.value);
-		r_refdef.view.y = (int)(f[1] * vid.height / vid_conheight.value);
+		r_refdef.view.x = (int)(f[0]);
+		r_refdef.view.y = (int)(f[1]);
 		f = PRVM_G_VECTOR(OFS_PARM2);
-		r_refdef.view.width = (int)(f[0] * vid.width / vid_conwidth.value);
-		r_refdef.view.height = (int)(f[1] * vid.height / vid_conheight.value);
+		r_refdef.view.width = (int)(f[0]);
+		r_refdef.view.height = (int)(f[1]);
 		break;
 	case VF_FOV:
 		r_refdef.view.frustum_x = tan(f[0] * M_PI / 360.0);r_refdef.view.ortho_x = f[0];
@@ -914,7 +916,7 @@ static void VM_CL_unproject (void)
 
 	VM_SAFEPARMCOUNT(1, VM_CL_unproject);
 	f = PRVM_G_VECTOR(OFS_PARM0);
-	VectorSet(temp, f[2], f[0] * f[2] * -r_refdef.view.frustum_x * 2.0 / r_refdef.view.width, f[1] * f[2] * -r_refdef.view.frustum_y * 2.0 / r_refdef.view.height);
+	VectorSet(temp, f[2], (-1.0 + 2.0 * (f[0] - r_refdef.view.x)) / r_refdef.view.width * f[2] * -r_refdef.view.frustum_x, (-1.0 + 2.0 * (f[1] - r_refdef.view.y))  / r_refdef.view.height * f[2] * -r_refdef.view.frustum_y);
 	Matrix4x4_Transform(&r_refdef.view.matrix, temp, PRVM_G_VECTOR(OFS_RETURN));
 }
 
@@ -929,7 +931,7 @@ static void VM_CL_project (void)
 	f = PRVM_G_VECTOR(OFS_PARM0);
 	Matrix4x4_Invert_Simple(&m, &r_refdef.view.matrix);
 	Matrix4x4_Transform(&m, f, v);
-	VectorSet(PRVM_G_VECTOR(OFS_RETURN), v[1]/v[0]/-r_refdef.view.frustum_x*0.5*r_refdef.view.width, v[2]/v[0]/-r_refdef.view.frustum_y*r_refdef.view.height*0.5, v[0]);
+	VectorSet(PRVM_G_VECTOR(OFS_RETURN), r_refdef.view.x + r_refdef.view.width*0.5*(1.0+v[1]/v[0]/-r_refdef.view.frustum_x), r_refdef.view.y + r_refdef.view.height*0.5*(1.0+v[2]/v[0]/-r_refdef.view.frustum_y), v[0]);
 }
 
 //#330 float(float stnum) getstatf (EXT_CSQC)
@@ -1076,6 +1078,8 @@ static void VM_CL_trailparticles (void)
 	start	= PRVM_G_VECTOR(OFS_PARM2);
 	end		= PRVM_G_VECTOR(OFS_PARM3);
 
+	if (i < 0)
+		return;
 	CL_ParticleEffect(i, VectorDistance(start, end), start, end, t->fields.client->velocity, t->fields.client->velocity, NULL, prog->argc >= 5 ? (int)PRVM_G_FLOAT(OFS_PARM4) : 0);
 }
 
@@ -1089,6 +1093,8 @@ static void VM_CL_pointparticles (void)
 	f = PRVM_G_VECTOR(OFS_PARM1);
 	v = PRVM_G_VECTOR(OFS_PARM2);
 	n = (int)PRVM_G_FLOAT(OFS_PARM3);
+	if (i < 0)
+		return;
 	CL_ParticleEffect(i, n, f, f, v, v, NULL, prog->argc >= 5 ? (int)PRVM_G_FLOAT(OFS_PARM4) : 0);
 }
 
@@ -1187,28 +1193,28 @@ static void VM_CL_getplayerkey (void)
 		strlcpy(t, cl.scores[i].name, sizeof(t));
 	else
 		if(!strcasecmp(c, "frags"))
-			sprintf(t, "%i", cl.scores[i].frags);
+			dpsnprintf(t, sizeof(t), "%i", cl.scores[i].frags);
 	else
 		if(!strcasecmp(c, "ping"))
-			sprintf(t, "%i", cl.scores[i].qw_ping);
+			dpsnprintf(t, sizeof(t), "%i", cl.scores[i].qw_ping);
 	else
 		if(!strcasecmp(c, "pl"))
-			sprintf(t, "%i", cl.scores[i].qw_packetloss);
+			dpsnprintf(t, sizeof(t), "%i", cl.scores[i].qw_packetloss);
 	else
 		if(!strcasecmp(c, "entertime"))
-			sprintf(t, "%f", cl.scores[i].qw_entertime);
+			dpsnprintf(t, sizeof(t), "%f", cl.scores[i].qw_entertime);
 	else
 		if(!strcasecmp(c, "colors"))
-			sprintf(t, "%i", cl.scores[i].colors);
+			dpsnprintf(t, sizeof(t), "%i", cl.scores[i].colors);
 	else
 		if(!strcasecmp(c, "topcolor"))
-			sprintf(t, "%i", cl.scores[i].colors & 0xf0);
+			dpsnprintf(t, sizeof(t), "%i", cl.scores[i].colors & 0xf0);
 	else
 		if(!strcasecmp(c, "bottomcolor"))
-			sprintf(t, "%i", (cl.scores[i].colors &15)<<4);
+			dpsnprintf(t, sizeof(t), "%i", (cl.scores[i].colors &15)<<4);
 	else
 		if(!strcasecmp(c, "viewentity"))
-			sprintf(t, "%i", i+1);
+			dpsnprintf(t, sizeof(t), "%i", i+1);
 	if(!t[0])
 		return;
 	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(t);
@@ -1304,6 +1310,55 @@ static void VM_CL_ReadFloat (void)
 	PRVM_G_FLOAT(OFS_RETURN) = MSG_ReadFloat();
 }
 
+//#501 string() readpicture (DP_CSQC_READWRITEPICTURE)
+extern cvar_t cl_readpicture_force;
+static void VM_CL_ReadPicture (void)
+{
+	const char *name;
+	unsigned char *data;
+	unsigned char *buf;
+	int size;
+	int i;
+	cachepic_t *pic;
+
+	VM_SAFEPARMCOUNT(0, VM_CL_ReadPicture);
+
+	name = MSG_ReadString();
+	size = MSG_ReadShort();
+
+	// check if a texture of that name exists
+	// if yes, it is used and the data is discarded
+	// if not, the (low quality) data is used to build a new texture, whose name will get returned
+
+	pic = Draw_CachePic_Flags (name, CACHEPICFLAG_NOTPERSISTENT);
+
+	if(size)
+	{
+		if(pic->tex == r_texture_notexture)
+			pic->tex = NULL; // don't overwrite the notexture by Draw_NewPic
+		if(pic->tex && !cl_readpicture_force.integer)
+		{
+			// texture found and loaded
+			// skip over the jpeg as we don't need it
+			for(i = 0; i < size; ++i)
+				MSG_ReadByte();
+		}
+		else
+		{
+			// texture not found
+			// use the attached jpeg as texture
+			buf = Mem_Alloc(tempmempool, size);
+			MSG_ReadBytes(size, buf);
+			data = JPEG_LoadImage_BGRA(buf, size);
+			Mem_Free(buf);
+			Draw_NewPic(name, image_width, image_height, false, data);
+			Mem_Free(data);
+		}
+	}
+
+	PRVM_G_INT(OFS_RETURN) = PRVM_SetTempString(name);
+}
+
 //////////////////////////////////////////////////////////
 
 static void VM_CL_makestatic (void)
@@ -2318,6 +2373,7 @@ typedef struct vmpolygons_s
 {
 	mempool_t		*pool;
 	qboolean		initialized;
+	double          progstarttime;
 
 	int				max_vertices;
 	int				num_vertices;
@@ -2357,6 +2413,7 @@ void VM_CL_R_RenderScene (void)
 	R_RenderView();
 
 	polys->num_vertices = polys->num_triangles = 0;
+	polys->progstarttime = prog->starttime;
 }
 
 static void VM_ResizePolygons(vmpolygons_t *polys)
@@ -2408,23 +2465,31 @@ static void VM_DrawPolygonCallback (const entity_render_t *ent, const rtlight_t
 {
 	int surfacelistindex;
 	vmpolygons_t* polys = vmpolygons + PRVM_GetProgNr();
+	if(polys->progstarttime != prog->starttime) // from other progs? won't draw these (this can cause crashes!)
+		return;
+	R_Mesh_ResetTextureState();
 	R_Mesh_Matrix(&identitymatrix);
 	GL_CullFace(GL_NONE);
 	R_Mesh_VertexPointer(polys->data_vertex3f, 0, 0);
 	R_Mesh_ColorPointer(polys->data_color4f, 0, 0);
 	R_Mesh_TexCoordPointer(0, 2, polys->data_texcoord2f, 0, 0);
 	R_SetupGenericShader(true);
+
 	for (surfacelistindex = 0;surfacelistindex < numsurfaces;)
 	{
 		int numtriangles = 0;
 		rtexture_t *tex = polys->data_triangles[surfacelist[surfacelistindex]].texture;
 		int drawflag = polys->data_triangles[surfacelist[surfacelistindex]].drawflag;
+		// this can't call _DrawQ_ProcessDrawFlag, but should be in sync with it
+		// FIXME factor this out
 		if(drawflag == DRAWFLAG_ADDITIVE)
 			GL_BlendFunc(GL_SRC_ALPHA, GL_ONE);
 		else if(drawflag == DRAWFLAG_MODULATE)
 			GL_BlendFunc(GL_DST_COLOR, GL_ZERO);
 		else if(drawflag == DRAWFLAG_2XMODULATE)
 			GL_BlendFunc(GL_DST_COLOR,GL_SRC_COLOR);
+		else if(drawflag == DRAWFLAG_SCREEN)
+			GL_BlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE);
 		else
 			GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 		R_Mesh_TexBind(0, R_GetTexture(tex));
@@ -2517,20 +2582,53 @@ void VM_CL_AddPolygonsToMeshQueue (void)
 void VM_CL_R_PolygonBegin (void)
 {
 	const char		*picname;
+	skinframe_t     *sf;
 	vmpolygons_t* polys = vmpolygons + PRVM_GetProgNr();
+	int tf;
+
+	// TODO instead of using skinframes here (which provides the benefit of
+	// better management of flags, and is more suited for 3D rendering), what
+	// about supporting Q3 shaders?
 
 	VM_SAFEPARMCOUNT(2, VM_CL_R_PolygonBegin);
 
 	if (!polys->initialized)
 		VM_InitPolygons(polys);
+	if(polys->progstarttime != prog->starttime)
+	{
+		// from another progs? then reset the polys first (fixes crashes on map change, because that can make skinframe textures invalid)
+		polys->num_vertices = polys->num_triangles = 0;
+		polys->progstarttime = prog->starttime;
+	}
 	if (polys->begin_active)
 	{
 		VM_Warning("VM_CL_R_PolygonBegin: called twice without VM_CL_R_PolygonBegin after first\n");
 		return;
 	}
 	picname = PRVM_G_STRING(OFS_PARM0);
-	polys->begin_texture = picname[0] ? Draw_CachePic (picname)->tex : r_texture_white;
-	polys->begin_drawflag = (int)PRVM_G_FLOAT(OFS_PARM1);
+
+	sf = NULL;
+	if(*picname)
+	{
+		tf = TEXF_ALPHA;
+		if((int)PRVM_G_FLOAT(OFS_PARM1) & DRAWFLAG_MIPMAP)
+			tf |= TEXF_MIPMAP;
+
+		do
+		{
+			sf = R_SkinFrame_FindNextByName(sf, picname);
+		}
+		while(sf && sf->textureflags != tf);
+
+		if(!sf || !sf->base)
+			sf = R_SkinFrame_LoadExternal(picname, tf, true);
+
+		if(sf)
+			R_SkinFrame_MarkUsed(sf);
+	}
+
+	polys->begin_texture = (sf && sf->base) ? sf->base : r_texture_white;
+	polys->begin_drawflag = (int)PRVM_G_FLOAT(OFS_PARM1) & DRAWFLAG_MASK;
 	polys->begin_vertices = 0;
 	polys->begin_active = true;
 }
@@ -3243,8 +3341,8 @@ VM_drawfill,					// #323 float(vector position, vector size, vector rgb, float a
 VM_drawsetcliparea,				// #324 void(float x, float y, float width, float height) drawsetcliparea
 VM_drawresetcliparea,			// #325 void(void) drawresetcliparea
 VM_drawcolorcodedstring,		// #326 float drawcolorcodedstring(vector position, string text, vector scale, vector rgb, float alpha, float flag) (EXT_CSQC)
-NULL,							// #327 // FIXME add stringwidth() here?
-NULL,							// #328 // FIXME add drawsubpic() here?
+VM_stringwidth,                 // #327 // FIXME is this okay?
+VM_drawsubpic,					// #328 // FIXME is this okay?
 NULL,							// #329
 VM_CL_getstatf,					// #330 float(float stnum) getstatf (EXT_CSQC)
 VM_CL_getstati,					// #331 float(float stnum) getstati (EXT_CSQC)
@@ -3413,14 +3511,14 @@ VM_gecko_resize,					// #492 void gecko_resize( string name, float w, float h )
 VM_gecko_get_texture_extent,	// #493 vector gecko_get_texture_extent( string name )
 VM_crc16,						// #494 float(float caseinsensitive, string s, ...) crc16 = #494 (DP_QC_CRC16)
 VM_cvar_type,					// #495 float(string name) cvar_type = #495; (DP_QC_CVAR_TYPE)
-NULL,							// #496
-NULL,							// #497
-NULL,							// #498
-NULL,							// #499
-NULL,							// #500
-NULL,							// #501
+VM_numentityfields,				// #496 float() numentityfields = #496; (QP_QC_ENTITYDATA)
+VM_entityfieldname,				// #497 string(float fieldnum) entityfieldname = #497; (DP_QC_ENTITYDATA)
+VM_entityfieldtype,				// #498 float(float fieldnum) entityfieldtype = #498; (DP_QC_ENTITYDATA)
+VM_getentityfieldstring,		// #499 string(float fieldnum, entity ent) getentityfieldstring = #499; (DP_QC_ENTITYDATA)
+VM_putentityfieldstring,		// #500 float(float fieldnum, entity ent, string s) putentityfieldstring = #500; (DP_QC_ENTITYDATA)
+VM_CL_ReadPicture,				// #501 string() ReadPicture = #501;
 NULL,							// #502
-NULL,							// #503
+VM_whichpack,					// #503 string(string) whichpack = #503;
 NULL,							// #504
 NULL,							// #505
 NULL,							// #506
@@ -3430,13 +3528,15 @@ NULL,							// #509
 VM_uri_escape,					// #510 string(string in) uri_escape = #510;
 VM_uri_unescape,				// #511 string(string in) uri_unescape = #511;
 VM_etof,					// #512 float(entity ent) num_for_edict = #512 (DP_QC_NUM_FOR_EDICT)
-NULL,							// #513
+VM_uri_get,						// #513 float(string uril, float id) uri_get = #512; (DP_QC_URI_GET)
 NULL,							// #514
 NULL,							// #515
 NULL,							// #516
 NULL,							// #517
 NULL,							// #518
 NULL,							// #519
+VM_keynumtostring,				// #520 string keynumtostring(float keynum)
+VM_findkeysforcommand,		// #521 string findkeysforcommand(string command)
 };
 
 const int vm_cl_numbuiltins = sizeof(vm_cl_builtins) / sizeof(prvm_builtin_t);