X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=csprogs.c;h=fefd0f4e72a00a67dd00e17f7072c25b997e0138;hb=8fa4371cdf157b4e20228ab3a83111333ee56321;hp=c4b5e479cd7df16f31ae71937a7ff814613eb80b;hpb=5fbf1b000aeab4cc583f562a35cf0dddef63aa52;p=xonotic%2Fdarkplaces.git

diff --git a/csprogs.c b/csprogs.c
index c4b5e479..fefd0f4e 100644
--- a/csprogs.c
+++ b/csprogs.c
@@ -2,6 +2,7 @@
 #include "progsvm.h"
 #include "clprogdefs.h"
 #include "csprogs.h"
+#include "cl_collision.h"
 
 //============================================================================
 // Client prog handling
@@ -24,16 +25,6 @@ static char *cl_required_func[] =
 
 static int cl_numrequiredfunc = sizeof(cl_required_func) / sizeof(char*);
 
-static char				*csqc_printtextbuf = NULL;
-static unsigned short	*csqc_sv2csqcents;	//[515]: server entities numbers on client side. FIXME : make pointers instead of numbers ?
-
-qboolean csqc_loaded = false;
-
-vec3_t csqc_origin, csqc_angles;
-static double csqc_frametime = 0;
-
-static mempool_t *csqc_mempool;
-
 void CL_VM_Error (const char *format, ...) DP_FUNC_PRINTF(1);
 void CL_VM_Error (const char *format, ...)	//[515]: hope it will be never executed =)
 {
@@ -46,8 +37,7 @@ void CL_VM_Error (const char *format, ...)	//[515]: hope it will be never execut
 //	Con_Printf( "CL_VM_Error: %s\n", errorstring );
 
 	PRVM_Crash();
-	csqc_loaded = false;
-	Mem_FreePool(&csqc_mempool);
+	cl.csqc_loaded = false;
 
 	Cvar_SetValueQuick(&csqc_progcrc, -1);
 	Cvar_SetValueQuick(&csqc_progsize, -1);
@@ -56,49 +46,21 @@ void CL_VM_Error (const char *format, ...)	//[515]: hope it will be never execut
 	Host_Error(va("CL_VM_Error: %s", errorstring));
 }
 
-model_t *CSQC_GetModelByIndex(int modelindex)
-{
-	if(!modelindex)
-		return NULL;
-	if (modelindex < 0)
-	{
-		modelindex = -(modelindex+1);
-		if (modelindex < MAX_MODELS)
-			return cl.csqc_model_precache[modelindex];
-	}
-	else
-	{
-		if(modelindex < MAX_MODELS)
-			return cl.model_precache[modelindex];
-	}
-	return NULL;
-}
-
-model_t *CSQC_GetModelFromEntity(prvm_edict_t *ed)
-{
-	if (!ed || ed->priv.server->free)
-		return NULL;
-	return CSQC_GetModelByIndex((int)ed->fields.client->modelindex);
-}
-
 //[515]: set globals before calling R_UpdateView, WEIRD CRAP
 static void CSQC_SetGlobals (void)
 {
-	//extern cvar_t sv_accelerate, sv_friction, sv_gravity, sv_stopspeed, sv_maxspeed;
-
 	CSQC_BEGIN
 		prog->globals.client->time = cl.time;
-		prog->globals.client->frametime = cl.time - csqc_frametime;
-		csqc_frametime = cl.time;
-		prog->globals.client->servercommandframe = cl.servermovesequence;
-		prog->globals.client->clientcommandframe = cl.movesequence;
+		prog->globals.client->frametime = max(0, cl.time - cl.oldtime);
+		prog->globals.client->servercommandframe = cls.servermovesequence;
+		prog->globals.client->clientcommandframe = cl.movecmd[0].sequence;
 		VectorCopy(cl.viewangles, prog->globals.client->input_angles);
-		VectorCopy(cl.viewangles, csqc_angles);
-		prog->globals.client->input_buttons = cl.cmd.buttons;
-		VectorSet(prog->globals.client->input_movevalues, cl.cmd.forwardmove, cl.cmd.sidemove, cl.cmd.upmove);
-		//VectorCopy(cl.movement_origin, csqc_origin);
-		Matrix4x4_OriginFromMatrix(&cl.entities[cl.viewentity].render.matrix, csqc_origin);
-		VectorCopy(csqc_origin, prog->globals.client->pmove_org);
+		VectorCopy(cl.viewangles, cl.csqc_angles);
+		prog->globals.client->input_buttons = cl.movecmd[0].buttons;
+		VectorSet(prog->globals.client->input_movevalues, cl.movecmd[0].forwardmove, cl.movecmd[0].sidemove, cl.movecmd[0].upmove);
+		//VectorCopy(cl.movement_origin, cl.csqc_origin);
+		Matrix4x4_OriginFromMatrix(&cl.entities[cl.viewentity].render.matrix, cl.csqc_origin);
+		VectorCopy(cl.csqc_origin, prog->globals.client->pmove_org);
 		prog->globals.client->maxclients = cl.maxclients;
 		//VectorCopy(cl.movement_velocity, prog->globals.client->pmove_vel);
 		VectorCopy(cl.velocity, prog->globals.client->pmove_vel);
@@ -133,14 +95,14 @@ void CSQC_Think (prvm_edict_t *ed)
 extern cvar_t cl_noplayershadow;
 qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 {
-	int i, renderflags;
+	int renderflags;
 	float scale;
 	prvm_eval_t *val;
 	entity_t *e;
 	model_t *model;
 	matrix4x4_t tagmatrix, matrix2;
 
-	model = CSQC_GetModelFromEntity(ed);
+	model = CL_GetModelFromEdict(ed);
 	if (!model)
 		return false;
 
@@ -152,26 +114,20 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 	e->render.colormap = (int)ed->fields.client->colormap;
 	e->render.frame = (int)ed->fields.client->frame;
 	e->render.skinnum = (int)ed->fields.client->skin;
-	e->render.effects |= e->render.model->flags2 & (EF_FULLBRIGHT | EF_ADDITIVE);
+	e->render.effects |= e->render.model->effects;
 	scale = 1;
-	// FIXME: renderflags should be in the cl_entvars_t
-#if 1
 	renderflags = 0;
-	if((val = PRVM_GETEDICTFIELDVALUE(ed, prog->fieldoffsets.renderflags)) && val->_float)	renderflags = (int)val->_float;
-#else
-	renderflags = (int)ed->fields.client->renderflags;
-#endif
-
-	if((val = PRVM_GETEDICTFIELDVALUE(ed, prog->fieldoffsets.alpha)) && val->_float)		e->render.alpha = val->_float;
-	if((val = PRVM_GETEDICTFIELDVALUE(ed, prog->fieldoffsets.scale)) && val->_float)		e->render.scale = scale = val->_float;
-	if((val = PRVM_GETEDICTFIELDVALUE(ed, prog->fieldoffsets.colormod)) && VectorLength2(val->vector))	VectorCopy(val->vector, e->render.colormod);
-	if((val = PRVM_GETEDICTFIELDVALUE(ed, prog->fieldoffsets.effects)) && val->_float)	e->render.effects = (int)val->_float;
-	if((val = PRVM_GETEDICTFIELDVALUE(ed, prog->fieldoffsets.tag_entity)) && val->edict)
+	if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.renderflags)) && val->_float)	renderflags = (int)val->_float;
+	if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.alpha)) && val->_float)		e->render.alpha = val->_float;
+	if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.scale)) && val->_float)		e->render.scale = scale = val->_float;
+	if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.colormod)) && VectorLength2(val->vector))	VectorCopy(val->vector, e->render.colormod);
+	if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.effects)) && val->_float)	e->render.effects |= (int)val->_float;
+	if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.tag_entity)) && val->edict)
 	{
 		int tagentity;
 		int tagindex = 0;
 		tagentity = val->edict;
-		if((val = PRVM_GETEDICTFIELDVALUE(ed, prog->fieldoffsets.tag_index)) && val->_float)
+		if((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.tag_index)) && val->_float)
 			tagindex = (int)val->_float;
 		// FIXME: calculate tag matrix
 		Matrix4x4_CreateIdentity(&tagmatrix);
@@ -184,6 +140,7 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 		vec3_t left;
 		VectorNegate(prog->globals.client->v_right, left);
 		Matrix4x4_FromVectors(&matrix2, prog->globals.client->v_forward, left, prog->globals.client->v_up, ed->fields.client->origin);
+		Matrix4x4_Scale(&matrix2, scale, 1);
 	}
 	else
 	{
@@ -197,41 +154,41 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 		Matrix4x4_CreateFromQuakeEntity(&matrix2, ed->fields.client->origin[0], ed->fields.client->origin[1], ed->fields.client->origin[2], angles[0], angles[1], angles[2], scale);
 	}
 
-	// FIXME: csqc has frame1/frame2/frame1time/frame2time/lerpfrac but this implementation's cl_entvars_t lacks those fields
+	// set up the animation data
+	// self.frame is the interpolation target (new frame)
+	// self.frame1time is the animation base time for the interpolation target
+	// self.frame2 is the interpolation start (previous frame)
+	// self.frame2time is the animation base time for the interpolation start
 	e->render.frame1 = e->render.frame = ed->fields.client->frame;
-	e->render.frame1time = e->render.frame2time = 0;
-	e->render.framelerp = 0;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2))) e->render.frame1 = val->_float;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame1time))) e->render.frame2time = val->_float;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2time))) e->render.frame1time = val->_float;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.lerpfrac))) e->render.framelerp = val->_float;
 
 	// concat the matrices to make the entity relative to its tag
 	Matrix4x4_Concat(&e->render.matrix, &tagmatrix, &matrix2);
 	// make the other useful stuff
 	CL_UpdateRenderEntity(&e->render);
 
-	i = 0;
-	if((val = PRVM_GETEDICTFIELDVALUE(ed, prog->fieldoffsets.renderflags)) && val->_float)
+	if(renderflags)
 	{
-		i = (int)val->_float;
-		if(i & RF_VIEWMODEL)	e->render.flags |= RENDER_VIEWMODEL;
-		if(i & RF_EXTERNALMODEL)e->render.flags |= RENDER_EXTERIORMODEL;
-		if(i & RF_DEPTHHACK)	e->render.effects |= EF_NODEPTHTEST;
-		if(i & RF_ADDITIVE)		e->render.effects |= EF_ADDITIVE;
+		if(renderflags & RF_VIEWMODEL)	e->render.flags |= RENDER_VIEWMODEL;
+		if(renderflags & RF_EXTERNALMODEL)e->render.flags |= RENDER_EXTERIORMODEL;
+		if(renderflags & RF_DEPTHHACK)	e->render.effects |= EF_NODEPTHTEST;
+		if(renderflags & RF_ADDITIVE)		e->render.effects |= EF_ADDITIVE;
 	}
 
-	// transparent stuff can't be lit during the opaque stage
-	if (e->render.effects & (EF_ADDITIVE | EF_NODEPTHTEST) || e->render.alpha < 1)
-		e->render.flags |= RENDER_TRANSPARENT;
-	// double sided rendering mode causes backfaces to be visible
-	// (mostly useful on transparent stuff)
-	if (e->render.effects & EF_DOUBLESIDED)
-		e->render.flags |= RENDER_NOCULLFACE;
 	// either fullbright or lit
 	if (!(e->render.effects & EF_FULLBRIGHT) && !r_fullbright.integer)
 		e->render.flags |= RENDER_LIGHT;
 	// hide player shadow during intermission or nehahra movie
-	if (!(e->render.effects & EF_NOSHADOW)
-	 && !(e->render.flags & (RENDER_VIEWMODEL | RENDER_TRANSPARENT))
+	if (!(e->render.effects & (EF_NOSHADOW | EF_ADDITIVE | EF_NODEPTHTEST))
+	 &&  (e->render.alpha >= 1)
+	 && !(e->render.flags & RENDER_VIEWMODEL)
 	 && (!(e->render.flags & RENDER_EXTERIORMODEL) || (!cl.intermission && cls.protocol != PROTOCOL_NEHAHRAMOVIE && !cl_noplayershadow.integer)))
 		e->render.flags |= RENDER_SHADOW;
+	if (e->render.flags & RENDER_VIEWMODEL)
+		e->render.flags |= RENDER_NOSELFSHADOW;
 
 	return true;
 }
@@ -239,7 +196,7 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 qboolean CL_VM_InputEvent (qboolean pressed, int key)
 {
 	qboolean r;
-	if(!csqc_loaded)
+	if(!cl.csqc_loaded)
 		return false;
 	CSQC_BEGIN
 		prog->globals.client->time = cl.time;
@@ -254,7 +211,7 @@ qboolean CL_VM_InputEvent (qboolean pressed, int key)
 qboolean CL_VM_UpdateView (void)
 {
 //	vec3_t oldangles;
-	if(!csqc_loaded)
+	if(!cl.csqc_loaded)
 		return false;
 	CSQC_BEGIN
 		//VectorCopy(cl.viewangles, oldangles);
@@ -275,7 +232,7 @@ qboolean CL_VM_ConsoleCommand (const char *cmd)
 {
 	int restorevm_tempstringsbuf_cursize;
 	qboolean r;
-	if(!csqc_loaded)
+	if(!cl.csqc_loaded)
 		return false;
 	CSQC_BEGIN
 		prog->globals.client->time = cl.time;
@@ -292,7 +249,7 @@ qboolean CL_VM_Parse_TempEntity (void)
 {
 	int			t;
 	qboolean	r = false;
-	if(!csqc_loaded)
+	if(!cl.csqc_loaded)
 		return false;
 	CSQC_BEGIN
 	if(prog->funcoffsets.CSQC_Parse_TempEntity)
@@ -331,7 +288,7 @@ void CL_VM_Parse_StuffCmd (const char *msg)
 		csqc_progsize.flags = sizeflags;
 		return;
 	}
-	if(!csqc_loaded)
+	if(!cl.csqc_loaded)
 	{
 		Cbuf_AddText(msg);
 		return;
@@ -363,7 +320,7 @@ static void CL_VM_Parse_Print (const char *msg)
 void CSQC_AddPrintText (const char *msg)
 {
 	size_t i;
-	if(!csqc_loaded)
+	if(!cl.csqc_loaded)
 	{
 		Con_Print(msg);
 		return;
@@ -375,18 +332,18 @@ void CSQC_AddPrintText (const char *msg)
 		i = strlen(msg)-1;
 		if(msg[i] != '\n' && msg[i] != '\r')
 		{
-			if(strlen(csqc_printtextbuf)+i >= MAX_INPUTLINE)
+			if(strlen(cl.csqc_printtextbuf)+i >= MAX_INPUTLINE)
 			{
-				CL_VM_Parse_Print(csqc_printtextbuf);
-				csqc_printtextbuf[0] = 0;
+				CL_VM_Parse_Print(cl.csqc_printtextbuf);
+				cl.csqc_printtextbuf[0] = 0;
 			}
 			else
-				strlcat(csqc_printtextbuf, msg, MAX_INPUTLINE);
+				strlcat(cl.csqc_printtextbuf, msg, MAX_INPUTLINE);
 			return;
 		}
-		strlcat(csqc_printtextbuf, msg, MAX_INPUTLINE);
-		CL_VM_Parse_Print(csqc_printtextbuf);
-		csqc_printtextbuf[0] = 0;
+		strlcat(cl.csqc_printtextbuf, msg, MAX_INPUTLINE);
+		CL_VM_Parse_Print(cl.csqc_printtextbuf);
+		cl.csqc_printtextbuf[0] = 0;
 	}
 	else
 		Con_Print(msg);
@@ -396,7 +353,7 @@ void CSQC_AddPrintText (const char *msg)
 void CL_VM_Parse_CenterPrint (const char *msg)
 {
 	int restorevm_tempstringsbuf_cursize;
-	if(!csqc_loaded)
+	if(!cl.csqc_loaded)
 	{
 		SCR_CenterPrint((char*)msg);
 		return;
@@ -417,8 +374,8 @@ void CL_VM_Parse_CenterPrint (const char *msg)
 
 float CL_VM_Event (float event)		//[515]: needed ? I'd say "YES", but don't know for what :D
 {
-	float r;
-	if(!csqc_loaded)
+	float r = 0;
+	if(!cl.csqc_loaded)
 		return 0;
 	CSQC_BEGIN
 	if(prog->funcoffsets.CSQC_Event)
@@ -444,13 +401,13 @@ void CSQC_ReadEntities (void)
 			if(!entnum)
 				return;
 			realentnum = entnum & 0x7FFF;
-			prog->globals.client->self = csqc_sv2csqcents[realentnum];
+			prog->globals.client->self = cl.csqc_server2csqcentitynumber[realentnum];
 			if(entnum & 0x8000)
 			{
 				if(prog->globals.client->self)
 				{
 					PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Ent_Remove, "QC function CSQC_Ent_Remove is missing");
-					csqc_sv2csqcents[realentnum] = 0;
+					cl.csqc_server2csqcentitynumber[realentnum] = 0;
 				}
 				else
 					Con_Printf("Smth bad happens in csqc...\n");	//[515]: never happens ?
@@ -462,7 +419,7 @@ void CSQC_ReadEntities (void)
 					prvm_edict_t	*ed;
 					ed = PRVM_ED_Alloc();
 					ed->fields.client->entnum = realentnum;
-					prog->globals.client->self = csqc_sv2csqcents[realentnum] = PRVM_EDICT_TO_PROG(ed);
+					prog->globals.client->self = cl.csqc_server2csqcentitynumber[realentnum] = PRVM_EDICT_TO_PROG(ed);
 					PRVM_G_FLOAT(OFS_PARM0) = 1;
 				}
 				else
@@ -474,20 +431,6 @@ void CSQC_ReadEntities (void)
 	CSQC_END
 }
 
-void CL_LinkEdict(prvm_edict_t *ent)
-{
-	if (ent == prog->edicts)
-		return;		// don't add the world
-
-	if (ent->priv.server->free)
-		return;
-
-	VectorAdd(ent->fields.client->origin, ent->fields.client->mins, ent->fields.client->absmin);
-	VectorAdd(ent->fields.client->origin, ent->fields.client->maxs, ent->fields.client->absmax);
-
-	World_LinkEdict(&cl.world, ent, ent->fields.client->absmin, ent->fields.client->absmax);
-}
-
 void CL_VM_CB_BeginIncreaseEdicts(void)
 {
 	int i;
@@ -570,7 +513,7 @@ void CL_VM_Init (void)
 	Cvar_SetValueQuick(&csqc_progcrc, -1);
 	Cvar_SetValueQuick(&csqc_progsize, -1);
 
-	csqc_loaded = false;
+	cl.csqc_loaded = false;
 	memset(cl.csqc_model_precache, 0, sizeof(cl.csqc_model_precache));
 	memset(&cl.csqc_vidvars, true, sizeof(csqc_vidvars_t));
 
@@ -618,8 +561,6 @@ void CL_VM_Init (void)
 	PRVM_Begin;
 	PRVM_InitProg(PRVM_CLIENTPROG);
 
-	csqc_mempool = Mem_AllocPool("CSQC", 0, NULL);
-
 	// allocate the mempools
 	prog->progs_mempool = Mem_AllocPool(csqc_progname.string, 0, NULL);
 	prog->headercrc = CL_PROGHEADER_CRC;
@@ -630,7 +571,7 @@ void CL_VM_Init (void)
 	prog->limit_edicts = CL_MAX_EDICTS;
 	prog->reserved_edicts = 0;
 	prog->edictprivate_size = sizeof(edict_engineprivate_t);
-	prog->extensionstring = vm_cl_extensions;
+	prog->extensionstring = vm_sv_extensions;
 	prog->builtins = vm_cl_builtins;
 	prog->numbuiltins = vm_cl_numbuiltins;
 	prog->begin_increase_edicts = CL_VM_CB_BeginIncreaseEdicts;
@@ -645,9 +586,7 @@ void CL_VM_Init (void)
 
 	PRVM_LoadProgs(csqc_progname.string, cl_numrequiredfunc, cl_required_func, 0, NULL, 0, NULL);
 
-	if(prog->loaded)
-		Con_Printf("CSQC ^5loaded (crc=%i, size=%i)\n", csprogsdatacrc, (int)csprogsdatasize);
-	else
+	if (!prog->loaded)
 	{
 		CL_VM_Error("CSQC ^2failed to load\n");
 		if(!sv.active)
@@ -655,12 +594,11 @@ void CL_VM_Init (void)
 		return;
 	}
 
-	//[515]: optional fields & funcs
-	if(prog->funcoffsets.CSQC_Parse_Print)
-	{
-		csqc_printtextbuf = (char *)Mem_Alloc(csqc_mempool, MAX_INPUTLINE);
-		csqc_printtextbuf[0] = 0;
-	}
+	Con_Printf("CSQC ^5loaded (crc=%i, size=%i)\n", csprogsdatacrc, (int)csprogsdatasize);
+
+	// check if OP_STATE animation is possible in this dat file
+	if (prog->fieldoffsets.nextthink >= 0 && prog->fieldoffsets.frame >= 0 && prog->fieldoffsets.think >= 0 && prog->globaloffsets.self >= 0)
+		prog->flag |= PRVM_OP_STATE;
 
 	if (cl.worldmodel)
 	{
@@ -676,7 +614,6 @@ void CL_VM_Init (void)
 
 	// set time
 	prog->globals.client->time = cl.time;
-	csqc_frametime = 0;
 
 	prog->globals.client->mapname = PRVM_SetEngineString(cl.worldmodel->name);
 	prog->globals.client->player_localentnum = cl.playerentity;
@@ -685,10 +622,7 @@ void CL_VM_Init (void)
 	PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Init, "QC function CSQC_Init is missing");
 
 	PRVM_End;
-	csqc_loaded = true;
-
-	csqc_sv2csqcents = (unsigned short *)Mem_Alloc(csqc_mempool, MAX_EDICTS*sizeof(unsigned short));
-	memset(csqc_sv2csqcents, 0, MAX_EDICTS*sizeof(unsigned short));
+	cl.csqc_loaded = true;
 
 	cl.csqc_vidvars.drawcrosshair = false;
 	cl.csqc_vidvars.drawenginesbar = false;
@@ -699,7 +633,7 @@ void CL_VM_ShutDown (void)
 	Cmd_ClearCsqcFuncs();
 	Cvar_SetValueQuick(&csqc_progcrc, -1);
 	Cvar_SetValueQuick(&csqc_progsize, -1);
-	if(!csqc_loaded)
+	if(!cl.csqc_loaded)
 		return;
 	CSQC_BEGIN
 		prog->globals.client->time = cl.time;
@@ -707,6 +641,5 @@ void CL_VM_ShutDown (void)
 		PRVM_ResetProg();
 	CSQC_END
 	Con_Print("CSQC ^1unloaded\n");
-	csqc_loaded = false;
-	Mem_FreePool(&csqc_mempool);
+	cl.csqc_loaded = false;
 }