X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=csprogs.c;h=966a12ceb8de4e75baef83ff9af03728e85d6503;hb=f1f794cceaae1a0687140f9a0c88eff3e858271a;hp=5392ae07e5f078da3ee9c399ef9133427a94d9bd;hpb=d5333c415c0c6b4d8204ced0089d740c28f35537;p=xonotic%2Fdarkplaces.git

diff --git a/csprogs.c b/csprogs.c
index 5392ae07..966a12ce 100644
--- a/csprogs.c
+++ b/csprogs.c
@@ -154,7 +154,7 @@ void CSQC_Think (prvm_edict_t *ed)
 
 extern cvar_t cl_noplayershadow;
 extern cvar_t r_equalize_entities_fullbright;
-qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
+qboolean CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum)
 {
 	int renderflags;
 	int c;
@@ -168,9 +168,27 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 	if (!model)
 		return false;
 
-	entrender = CL_NewTempEntity(0);
-	if (!entrender)
-		return false;
+	if (edictnum)
+	{
+		if (r_refdef.scene.numentities >= r_refdef.scene.maxentities)
+			return false;
+		entrender = cl.csqcrenderentities + edictnum;
+		r_refdef.scene.entities[r_refdef.scene.numentities++] = entrender;
+		entrender->entitynumber = edictnum;
+		//entrender->shadertime = 0; // shadertime was set by spawn()
+		entrender->flags = 0;
+		entrender->alpha = 1;
+		entrender->scale = 1;
+		VectorSet(entrender->colormod, 1, 1, 1);
+		VectorSet(entrender->glowmod, 1, 1, 1);
+		entrender->allowdecals = true;
+	}
+	else
+	{
+		entrender = CL_NewTempEntity(0);
+		if (!entrender)
+			return false;
+	}
 
 	entrender->model = model;
 	entrender->skinnum = (int)ed->fields.client->skin;
@@ -219,7 +237,10 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 	}
 
 	// set up the animation data
-	CL_LoadFrameGroupBlend(ed, entrender);
+	VM_GenerateFrameGroupBlend(ed->priv.server->framegroupblend, ed);
+	VM_FrameBlendFromFrameGroupBlend(ed->priv.server->frameblend, ed->priv.server->framegroupblend, model);
+	VM_UpdateEdictSkeleton(ed, model, ed->priv.server->frameblend);
+	if ((val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.shadertime))) entrender->shadertime = val->_float;
 
 	// concat the matrices to make the entity relative to its tag
 	Matrix4x4_Concat(&entrender->matrix, &tagmatrix, &matrix2);
@@ -235,7 +256,6 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 		if(renderflags & RF_NOCULL)		entrender->flags |= RENDER_NOCULL;
 		if(renderflags & RF_DEPTHHACK)	entrender->flags |= RENDER_NODEPTHTEST;
 		if(renderflags & RF_ADDITIVE)		entrender->flags |= RENDER_ADDITIVE;
-
 	}
 
 	c = (int)ed->fields.client->colormap;
@@ -250,7 +270,7 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 	// either fullbright or lit
 	if(!r_fullbright.integer)
 	{
-		if (!(entrender->effects & EF_FULLBRIGHT))
+		if (!(entrender->effects & EF_FULLBRIGHT) && !(renderflags & RF_FULLBRIGHT))
 			entrender->flags |= RENDER_LIGHT;
 		else if(r_equalize_entities_fullbright.integer)
 			entrender->flags |= RENDER_LIGHT | RENDER_EQUALIZE;
@@ -258,6 +278,7 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 	// hide player shadow during intermission or nehahra movie
 	if (!(entrender->effects & (EF_NOSHADOW | EF_ADDITIVE | EF_NODEPTHTEST))
 	 &&  (entrender->alpha >= 1)
+	 && !(renderflags & RF_NOSHADOW)
 	 && !(entrender->flags & RENDER_VIEWMODEL)
 	 && (!(entrender->flags & RENDER_EXTERIORMODEL) || (!cl.intermission && cls.protocol != PROTOCOL_NEHAHRAMOVIE && !cl_noplayershadow.integer)))
 		entrender->flags |= RENDER_SHADOW;
@@ -273,7 +294,14 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 		entrender->flags |= RENDER_DOUBLESIDED;
 
 	// make the other useful stuff
+	memcpy(entrender->framegroupblend, ed->priv.server->framegroupblend, sizeof(ed->priv.server->framegroupblend));
 	CL_UpdateRenderEntity(entrender);
+	// override animation data with full control
+	memcpy(entrender->frameblend, ed->priv.server->frameblend, sizeof(ed->priv.server->frameblend));
+	if (ed->priv.server->skeleton.relativetransforms)
+		entrender->skeleton = &ed->priv.server->skeleton;
+	else
+		entrender->skeleton = NULL;
 
 	return true;
 }
@@ -311,6 +339,7 @@ qboolean CL_VM_UpdateView (void)
 //	vec3_t oldangles;
 	if(!cl.csqc_loaded)
 		return false;
+	R_TimeReport("pre-UpdateView");
 	CSQC_BEGIN
 		//VectorCopy(cl.viewangles, oldangles);
 		prog->globals.client->time = cl.time;
@@ -328,6 +357,7 @@ qboolean CL_VM_UpdateView (void)
 		// Dresk : Reset Dmg Globals Here
 		CL_VM_UpdateDmgGlobals(0, 0, emptyvector);
 	CSQC_END
+	R_TimeReport("UpdateView");
 	return true;
 }
 
@@ -643,7 +673,7 @@ void CSQC_ReadEntities (void)
 		{
 			entnum = MSG_ReadShort();
 			if(!entnum || msg_badread)
-				return;
+				break;
 			realentnum = entnum & 0x7FFF;
 			prog->globals.client->self = cl.csqc_server2csqcentitynumber[realentnum];
 			if(entnum & 0x8000)
@@ -715,13 +745,25 @@ void CL_VM_CB_EndIncreaseEdicts(void)
 
 void CL_VM_CB_InitEdict(prvm_edict_t *e)
 {
+	int edictnum = PRVM_NUM_FOR_EDICT(e);
+	entity_render_t *entrender;
+	CL_ExpandCSQCRenderEntities(edictnum);
+	entrender = cl.csqcrenderentities + edictnum;
 	e->priv.server->move = false; // don't move on first frame
+	memset(entrender, 0, sizeof(*entrender));
+	entrender->shadertime = cl.time;
 }
 
+extern void R_DecalSystem_Reset(decalsystem_t *decalsystem);
+
 void CL_VM_CB_FreeEdict(prvm_edict_t *ed)
 {
+	entity_render_t *entrender = cl.csqcrenderentities + PRVM_NUM_FOR_EDICT(ed);
+	R_DecalSystem_Reset(&entrender->decalsystem);
+	memset(entrender, 0, sizeof(*entrender));
 	World_UnlinkEdict(ed);
 	memset(ed->fields.client, 0, sizeof(*ed->fields.client));
+	VM_RemoveEdictSkeleton(ed);
 	World_Physics_RemoveFromEntity(&cl.world, ed);
 	World_Physics_RemoveJointFromEntity(&cl.world, ed);
 }
@@ -759,7 +801,7 @@ void Cmd_ClearCsqcFuncs (void);
 
 // returns true if the packet is valid, false if end of file is reached
 // used for dumping the CSQC download into demo files
-qboolean MakeDownloadPacket(const char *filename, unsigned char *data, unsigned long len, int crc, int cnt, sizebuf_t *buf, int protocol)
+qboolean MakeDownloadPacket(const char *filename, unsigned char *data, size_t len, int crc, int cnt, sizebuf_t *buf, int protocol)
 {
 	int packetsize = buf->maxsize - 7; // byte short long
 	int npackets = (len + packetsize - 1) / (packetsize);
@@ -771,7 +813,7 @@ qboolean MakeDownloadPacket(const char *filename, unsigned char *data, unsigned
 	if(cnt == 0)
 	{
 		MSG_WriteByte(buf, svc_stufftext);
-		MSG_WriteString(buf, va("\ncl_downloadbegin %lu %s\n", len, filename));
+		MSG_WriteString(buf, va("\ncl_downloadbegin %lu %s\n", (unsigned long)len, filename));
 		return true;
 	}
 	else if(cnt >= 1 && cnt <= npackets)
@@ -791,7 +833,7 @@ qboolean MakeDownloadPacket(const char *filename, unsigned char *data, unsigned
 	else if(cnt == npackets + 1)
 	{
 		MSG_WriteByte(buf, svc_stufftext);
-		MSG_WriteString(buf, va("\ncl_downloadfinished %lu %d\n", len, crc));
+		MSG_WriteString(buf, va("\ncl_downloadfinished %lu %d\n", (unsigned long)len, crc));
 		return true;
 	}
 	return false;
@@ -828,7 +870,7 @@ void CL_VM_Init (void)
 	}
 	if (csprogsdata)
 	{
-		csprogsdatacrc = CRC_Block(csprogsdata, csprogsdatasize);
+		csprogsdatacrc = CRC_Block(csprogsdata, (size_t)csprogsdatasize);
 		if (csprogsdatacrc != requiredcrc || csprogsdatasize != requiredsize)
 		{
 			if (cls.demoplayback)
@@ -900,14 +942,14 @@ void CL_VM_Init (void)
 		return;
 	}
 
-	Con_Printf("CSQC %s ^5loaded (crc=%i, size=%i)\n", csprogsfn, csprogsdatacrc, (int)csprogsdatasize);
+	Con_DPrintf("CSQC %s ^5loaded (crc=%i, size=%i)\n", csprogsfn, csprogsdatacrc, (int)csprogsdatasize);
 
 	if(cls.demorecording)
 	{
 		if(cls.demo_lastcsprogssize != csprogsdatasize || cls.demo_lastcsprogscrc != csprogsdatacrc)
 		{
 			int i;
-			char buf[NET_MAXMESSAGE];
+			static char buf[NET_MAXMESSAGE];
 			sizebuf_t sb;
 			unsigned char *demobuf; fs_offset_t demofilesize;
 
@@ -916,7 +958,7 @@ void CL_VM_Init (void)
 			i = 0;
 
 			CL_CutDemo(&demobuf, &demofilesize);
-			while(MakeDownloadPacket(csqc_progname.string, csprogsdata, csprogsdatasize, csprogsdatacrc, i++, &sb, cls.protocol))
+			while(MakeDownloadPacket(csqc_progname.string, csprogsdata, (size_t)csprogsdatasize, csprogsdatacrc, i++, &sb, cls.protocol))
 				CL_WriteDemoMessage(&sb);
 			CL_PasteDemo(&demobuf, &demofilesize);
 
@@ -971,7 +1013,7 @@ void CL_VM_ShutDown (void)
 			PRVM_ExecuteProgram(prog->funcoffsets.CSQC_Shutdown, "QC function CSQC_Shutdown is missing");
 		PRVM_ResetProg();
 	CSQC_END
-	Con_Print("CSQC ^1unloaded\n");
+	Con_DPrint("CSQC ^1unloaded\n");
 	cl.csqc_loaded = false;
 }
 
@@ -986,7 +1028,7 @@ qboolean CL_VM_GetEntitySoundOrigin(int entnum, vec3_t out)
 
 	// FIXME consider attachments here!
 
-	ed = PRVM_EDICT_NUM(entnum - 32768);
+	ed = PRVM_EDICT_NUM(entnum - MAX_EDICTS);
 
 	if(!ed->priv.required->free)
 	{
@@ -1003,52 +1045,3 @@ qboolean CL_VM_GetEntitySoundOrigin(int entnum, vec3_t out)
 
 	return r;
 }
-
-void CL_LoadFrameGroupBlend(prvm_edict_t *ed, entity_render_t *entrender)
-{
-	prvm_eval_t *val;
-	// 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
-	// 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;
-}
-
-qboolean CL_BlendTagMatrix(entity_render_t *entrender, int tagindex, matrix4x4_t *blendmatrix)
-{
-	int j, l, k;
-	float d;
-	dp_model_t *model = entrender->model;
-	if(!model)
-		return false;
-	// blend the matrices
-	memset(blendmatrix, 0, sizeof(*blendmatrix));
-	for (j = 0;j < MAX_FRAMEBLENDS && entrender->frameblend[j].lerp > 0;j++)
-	{
-		matrix4x4_t tagmatrix;
-		if(Mod_Alias_GetTagMatrix(model, entrender->frameblend[j].subframe, tagindex, &tagmatrix))
-			return false;
-		d = entrender->frameblend[j].lerp;
-		for (l = 0;l < 4;l++)
-			for (k = 0;k < 4;k++)
-				blendmatrix->m[l][k] += d * tagmatrix.m[l][k];
-	}
-	return true;
-}