X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=csprogs.c;h=7f67ecba54346f9bde86afe82c0f44759515382d;hb=4c7b42b047585a7e609ec241b0e9c7e14ee11103;hp=8f15c553c8ca7daef8baa88cf034b9f6cd159191;hpb=c4d580d4e1aba16739caa49c7910b54b06e7ab92;p=xonotic%2Fdarkplaces.git

diff --git a/csprogs.c b/csprogs.c
index 8f15c553..7f67ecba 100644
--- a/csprogs.c
+++ b/csprogs.c
@@ -13,6 +13,7 @@
 #define CSQC_RETURNVAL	prog->globals.generic[OFS_RETURN]
 #define CSQC_BEGIN		csqc_tmpprog=prog;prog=0;PRVM_SetProg(PRVM_CLIENTPROG);
 #define CSQC_END		prog=csqc_tmpprog;
+
 static prvm_prog_t *csqc_tmpprog;
 
 //[515]: these are required funcs
@@ -68,6 +69,22 @@ void CL_VM_UpdateDmgGlobals (int dmg_take, int dmg_save, vec3_t dmg_origin)
 		CSQC_END
 	}
 }
+
+void CSQC_UpdateNetworkTimes(double newtime, double oldtime)
+{
+	prvm_eval_t *val;
+	if(!cl.csqc_loaded)
+		return;
+	CSQC_BEGIN
+	if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.servertime)))
+		val->_float = newtime;
+	if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.serverprevtime)))
+		val->_float = oldtime;
+	if ((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.serverdeltatime)))
+		val->_float = newtime - oldtime;
+	CSQC_END
+}
+
 //[515]: set globals before calling R_UpdateView, WEIRD CRAP
 static void CSQC_SetGlobals (void)
 {
@@ -137,7 +154,7 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 	if (!model)
 		return false;
 
-	entrender = CL_NewTempEntity();
+	entrender = CL_NewTempEntity(0);
 	if (!entrender)
 		return false;
 
@@ -187,11 +204,24 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 	// 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
-	entrender->frame1 = entrender->frame2 = ed->fields.client->frame;
-	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2))) entrender->frame2 = val->_float;
-	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame1time))) entrender->frame2time = val->_float;
-	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2time))) entrender->frame1time = val->_float;
-	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.lerpfrac))) entrender->framelerp = val->_float;
+	// self.lerpfrac is the interpolation strength for self.frame
+	// 3+ are for additional blends (the main use for this feature is lerping
+	// pitch angle on a player model where the animator set up 5 sets of
+	// animations and the csqc simply lerps between sets)
+	entrender->framegroupblend[0].frame = entrender->framegroupblend[1].frame = (int) ed->fields.client->frame;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2))) entrender->framegroupblend[1].frame = (int) val->_float;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame3))) entrender->framegroupblend[2].frame = (int) val->_float;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame4))) entrender->framegroupblend[3].frame = (int) val->_float;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame1time))) entrender->framegroupblend[0].start = val->_float;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame2time))) entrender->framegroupblend[1].start = val->_float;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame3time))) entrender->framegroupblend[2].start = val->_float;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.frame4time))) entrender->framegroupblend[3].start = val->_float;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.lerpfrac))) entrender->framegroupblend[0].lerp = val->_float;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.lerpfrac3))) entrender->framegroupblend[2].lerp = val->_float;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.lerpfrac4))) entrender->framegroupblend[3].lerp = val->_float;
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.shadertime))) entrender->shadertime = val->_float;
+	// assume that the (missing) lerpfrac2 is whatever remains after lerpfrac+lerpfrac3+lerpfrac4 are summed
+	entrender->framegroupblend[1].lerp = 1 - entrender->framegroupblend[0].lerp - entrender->framegroupblend[2].lerp - entrender->framegroupblend[3].lerp;
 
 	// concat the matrices to make the entity relative to its tag
 	Matrix4x4_Concat(&entrender->matrix, &tagmatrix, &matrix2);
@@ -212,6 +242,7 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 	else
 		CL_SetEntityColormapColors(entrender, c);
 
+	entrender->flags &= ~(RENDER_SHADOW | RENDER_LIGHT | RENDER_NOSELFSHADOW);
 	// either fullbright or lit
 	if (!(entrender->effects & EF_FULLBRIGHT) && !r_fullbright.integer)
 		entrender->flags |= RENDER_LIGHT;
@@ -223,6 +254,8 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 		entrender->flags |= RENDER_SHADOW;
 	if (entrender->flags & RENDER_VIEWMODEL)
 		entrender->flags |= RENDER_NOSELFSHADOW;
+	if (entrender->effects & EF_NOSELFSHADOW)
+		entrender->flags |= RENDER_NOSELFSHADOW;
 
 	// make the other useful stuff
 	CL_UpdateRenderEntity(entrender);
@@ -349,6 +382,46 @@ void CL_VM_Parse_StuffCmd (const char *msg)
 		csqc_progsize.flags = sizeflags;
 		return;
 	}
+
+	if(cls.demoplayback)
+	if(!strncmp(msg, "curl --clear_autodownload\ncurl --pak --forthismap --as ", 55))
+	{
+		// special handling for map download commands
+		// run these commands IMMEDIATELY, instead of waiting for a client frame
+		// that way, there is no black screen when playing back demos
+		// I know this is a really ugly hack, but I can't think of any better way
+		// FIXME find the actual CAUSE of this, and make demo playback WAIT
+		// until all maps are loaded, then remove this hack
+
+		char buf[MAX_INPUTLINE];
+		const char *p, *q;
+		size_t l;
+
+		p = msg;
+
+		for(;;)
+		{
+			q = strchr(p, '\n');
+			if(q)
+				l = q - p;
+			else
+				l = strlen(p);
+			if(l > sizeof(buf) - 1)
+				l = sizeof(buf) - 1;
+			strlcpy(buf, p, l + 1); // strlcpy needs a + 1 as it includes the newline!
+
+			Cmd_ExecuteString(buf, src_command);
+
+			p += l;
+			if(*p == '\n')
+				++p; // skip the newline and continue
+			else
+				break; // end of string or overflow
+		}
+		Cmd_ExecuteString("curl --clear_autodownload", src_command); // don't inhibit CSQC loading
+		return;
+	}
+
 	if(!cl.csqc_loaded)
 	{
 		Cbuf_AddText(msg);
@@ -460,7 +533,7 @@ void CL_VM_UpdateShowingScoresState (int showingscores)
 		CSQC_END
 	}
 }
-qboolean CL_VM_Event_Sound(int sound_num, int volume, int channel, float attenuation, int ent, vec3_t pos)
+qboolean CL_VM_Event_Sound(int sound_num, float volume, int channel, float attenuation, int ent, vec3_t pos)
 {
 	qboolean r = false;
 	if(cl.csqc_loaded)
@@ -820,7 +893,7 @@ void CL_VM_Init (void)
 			sizebuf_t sb;
 			unsigned char *demobuf; fs_offset_t demofilesize;
 
-			sb.data = (void *) buf;
+			sb.data = (unsigned char *) buf;
 			sb.maxsize = sizeof(buf);
 			i = 0;
 
@@ -883,3 +956,32 @@ void CL_VM_ShutDown (void)
 	Con_Print("CSQC ^1unloaded\n");
 	cl.csqc_loaded = false;
 }
+
+qboolean CL_VM_GetEntitySoundOrigin(int entnum, vec3_t out)
+{
+	prvm_edict_t *ed;
+	dp_model_t *mod;
+	matrix4x4_t matrix;
+	qboolean r = 0;
+
+	CSQC_BEGIN;
+
+	// FIXME consider attachments here!
+
+	ed = PRVM_EDICT_NUM(entnum - 32768);
+
+	if(!ed->priv.required->free)
+	{
+		mod = CL_GetModelFromEdict(ed);
+		VectorCopy(ed->fields.client->origin, out);
+		if(CL_GetTagMatrix (&matrix, ed, 0) == 0)
+			Matrix4x4_OriginFromMatrix(&matrix, out);
+		if (mod && mod->soundfromcenter)
+			VectorMAMAM(1.0f, out, 0.5f, mod->normalmins, 0.5f, mod->normalmaxs, out);
+		r = 1;
+	}
+
+	CSQC_END;
+
+	return r;
+}