X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_lerpanim.c;h=7e44e373f3e3bd7f1d082ef6b88608548e4b93e8;hp=7ac1c62e0154bdc64a17f346ab88b4ffcd8359d0;hb=45982a9894c5bff60ff494a0f82865ec267d52f7;hpb=933d8c9fea47bcfa7c506d9f97fde60251eb1afd

diff --git a/r_lerpanim.c b/r_lerpanim.c
index 7ac1c62e..7e44e373 100644
--- a/r_lerpanim.c
+++ b/r_lerpanim.c
@@ -1,183 +1,165 @@
-
 #include "quakedef.h"
 
 // LordHavoc: quite tempting to break apart this function to reuse the
 //            duplicated code, but I suspect it is better for performance
 //            this way
-void R_LerpAnimation(model_t *mod, int frame1, int frame2, double frame1start, double frame2start, double framelerp, frameblend_t *blend)
+// LordHavoc: later note: made FRAMEBLENDINSERT macro
+void R_LerpAnimation(entity_render_t *r)
 {
 	int sub1, sub2, numframes, f, i, data;
-	double sublerp, lerp, l;
+	double sublerp, lerp, d;
 	animscene_t *scene, *scenes;
+	frameblend_t *blend;
+	blend = r->frameblend;
 
-	data = (int) Mod_Extradata(mod);
-	if (!data)
-		Host_Error("R_LerpAnimation: model not loaded\n");
-	scenes = (animscene_t *) (mod->ofs_scenes + data);
-
-	numframes = mod->numframes;
+	numframes = r->model->numframes;
 
-	if ((frame1 >= numframes))
+	if ((r->frame1 >= numframes))
 	{
-		Con_Printf ("R_LerpAnimation: no such frame %d\n", frame1);
-		frame1 = 0;
+		Con_Printf ("CL_LerpAnimation: no such frame %d\n", r->frame1);
+		r->frame1 = 0;
 	}
 
-	if ((frame2 >= numframes))
+	if ((r->frame2 >= numframes))
 	{
-		Con_Printf ("R_LerpAnimation: no such frame %d\n", frame2);
-		frame2 = 0;
+		Con_Printf ("CL_LerpAnimation: no such frame %d\n", r->frame2);
+		r->frame2 = 0;
 	}
 
-	if (frame1 < 0)
-		Host_Error ("R_LerpAnimation: frame1 is NULL\n");
+	// note: this could be removed, if the rendering code allows an empty blend array
+	if (r->frame1 < 0)
+		Host_Error ("CL_LerpAnimation: frame1 is NULL\n");
 
 	// round off very close blend percentages
-	if (framelerp < (1.0f / 65536.0f))
-		framelerp = 0;
-	if (framelerp >= (65535.0f / 65536.0f))
-		framelerp = 1;
+	if (r->framelerp < (1.0f / 65536.0f))
+		r->framelerp = 0;
+	if (r->framelerp >= (65535.0f / 65536.0f))
+		r->framelerp = 1;
 
 	blend[0].frame = blend[1].frame = blend[2].frame = blend[3].frame = -1;
 	blend[0].lerp = blend[1].lerp = blend[2].lerp = blend[3].lerp = 0;
-	if (framelerp < 1)
+	if (r->model->ofs_scenes)
 	{
-		scene = scenes + frame1;
-		lerp = 1 - framelerp;
+		if (r->model->cachesize)
+		{
+			data = (int) Mod_Extradata(r->model);
+			if (!data)
+				Host_Error("CL_LerpAnimation: model not loaded\n");
+			scenes = (animscene_t *) (r->model->ofs_scenes + data);
+		}
+		else
+			scenes = (animscene_t *) r->model->ofs_scenes;
 
-		if (scene->framecount > 1)
+		if (r->framelerp < 1 && r->frame1 >= 0)
 		{
-			sublerp = scene->framerate * (cl.time - frame1start);
-			sub1 = (int) (sublerp);
-			sub2 = sub1 + 1;
-			sublerp -= sub1;
-			if (sublerp < (1.0f / 65536.0f))
-				sublerp = 0;
-			if (sublerp >= (65535.0f / 65536.0f))
-				sublerp = 1;
-			if (scene->loop)
+			scene = scenes + r->frame1;
+			lerp = 1 - r->framelerp;
+
+			if (scene->framecount > 1)
 			{
-				sub1 = (sub1 % scene->framecount) + scene->firstframe;
-				sub2 = (sub2 % scene->framecount) + scene->firstframe;
+				sublerp = scene->framerate * (cl.time - r->frame1time);
+				sub1 = (int) (sublerp);
+				sub2 = sub1 + 1;
+				sublerp -= sub1;
+				if (sublerp < (1.0f / 65536.0f))
+					sublerp = 0;
+				if (sublerp >= (65535.0f / 65536.0f))
+					sublerp = 1;
+				if (scene->loop)
+				{
+					sub1 = (sub1 % scene->framecount) + scene->firstframe;
+					sub2 = (sub2 % scene->framecount) + scene->firstframe;
+				}
+				else
+				{
+					sub1 = bound(0, sub1, (scene->framecount - 1)) + scene->firstframe;
+					sub2 = bound(0, sub2, (scene->framecount - 1)) + scene->firstframe;
+				}
+				f = sub1;
+				d = (1 - sublerp) * lerp;
+#define FRAMEBLENDINSERT\
+				if (d > 0)\
+				{\
+					for (i = 0;i < 4;i++)\
+					{\
+						if (blend[i].frame == f)\
+						{\
+							blend[i].lerp += d;\
+							break;\
+						}\
+						if (blend[i].lerp <= 0)\
+						{\
+							blend[i].frame = f;\
+							blend[i].lerp = d;\
+							break;\
+						}\
+					}\
+				}
+				FRAMEBLENDINSERT
+				f = sub2;
+				d = sublerp * lerp;
 			}
 			else
 			{
-				sub1 = bound(0, sub1, (scene->framecount - 1)) + scene->firstframe;
-				sub2 = bound(0, sub2, (scene->framecount - 1)) + scene->firstframe;
-			}
-			f = sub1;
-			l = (1 - sublerp) * lerp;
-			if (l > 0)
-			{
-				for (i = 0;i < 4;i++)
-				{
-					if (blend[i].frame == f)
-					{
-						blend[i].lerp += l;
-						break;
-					}
-					if (blend[i].lerp <= 0)
-					{
-						blend[i].frame = f;
-						blend[i].lerp = l;
-						break;
-					}
-				}
+				f = scene->firstframe;
+				d = lerp;
 			}
-			f = sub2;
-			l = sublerp * lerp;
+			FRAMEBLENDINSERT
 		}
-		else
-		{
-			f = scene->firstframe;
-			l = lerp;
-		}
-		if (l > 0)
+		if (r->framelerp > 0 && r->frame2 >= 0)
 		{
-			for (i = 0;i < 4;i++)
+			scene = scenes + r->frame2;
+			lerp = r->framelerp;
+
+			if (scene->framecount > 1)
 			{
-				if (blend[i].frame == f)
+				sublerp = scene->framerate * (cl.time - r->frame1time);
+				sub1 = (int) (sublerp);
+				sub2 = sub1 + 1;
+				sublerp -= sub1;
+				if (sublerp < (1.0f / 65536.0f))
+					sublerp = 0;
+				if (sublerp >= (65535.0f / 65536.0f))
+					sublerp = 1;
+				if (scene->loop)
 				{
-					blend[i].lerp += l;
-					break;
+					sub1 = (sub1 % scene->framecount) + scene->firstframe;
+					sub2 = (sub2 % scene->framecount) + scene->firstframe;
 				}
-				if (blend[i].lerp <= 0)
+				else
 				{
-					blend[i].frame = f;
-					blend[i].lerp = l;
-					break;
+					sub1 = bound(0, sub1, (scene->framecount - 1)) + scene->firstframe;
+					sub2 = bound(0, sub2, (scene->framecount - 1)) + scene->firstframe;
 				}
-			}
-		}
-	}
-	if (framelerp > 0 && frame2 >= 0)
-	{
-		scene = scenes + frame2;
-		lerp = framelerp;
-
-		if (scene->framecount > 1)
-		{
-			sublerp = scene->framerate * (cl.time - frame1start);
-			sub1 = (int) (sublerp);
-			sub2 = sub1 + 1;
-			sublerp -= sub1;
-			if (sublerp < (1.0f / 65536.0f))
-				sublerp = 0;
-			if (sublerp >= (65535.0f / 65536.0f))
-				sublerp = 1;
-			if (scene->loop)
-			{
-				sub1 = (sub1 % scene->framecount) + scene->firstframe;
-				sub2 = (sub2 % scene->framecount) + scene->firstframe;
+				f = sub1;
+				d = (1 - sublerp) * lerp;
+				FRAMEBLENDINSERT
+				f = sub2;
+				d = sublerp * lerp;
 			}
 			else
 			{
-				sub1 = bound(0, sub1, (scene->framecount - 1)) + scene->firstframe;
-				sub2 = bound(0, sub2, (scene->framecount - 1)) + scene->firstframe;
-			}
-			f = sub1;
-			l = (1 - sublerp) * lerp;
-			if (l > 0)
-			{
-				for (i = 0;i < 4;i++)
-				{
-					if (blend[i].frame == f)
-					{
-						blend[i].lerp += l;
-						break;
-					}
-					if (blend[i].lerp <= 0)
-					{
-						blend[i].frame = f;
-						blend[i].lerp = l;
-						break;
-					}
-				}
+				f = scene->firstframe;
+				d = lerp;
 			}
-			f = sub2;
-			l = sublerp * lerp;
+			FRAMEBLENDINSERT
 		}
-		else
+	}
+	else
+	{
+		// if there are no scenes, assume it is all single-frame groups
+		if (r->framelerp < 1 && r->frame1 >= 0)
 		{
-			f = scene->firstframe;
-			l = lerp;
+			f = r->frame1;
+			d = 1 - r->framelerp;
+			FRAMEBLENDINSERT
 		}
-		if (l > 0)
+		if (r->framelerp > 0 && r->frame2 >= 0)
 		{
-			for (i = 0;i < 4;i++)
-			{
-				if (blend[i].frame == f)
-				{
-					blend[i].lerp += l;
-					break;
-				}
-				if (blend[i].lerp <= 0)
-				{
-					blend[i].frame = f;
-					blend[i].lerp = l;
-					break;
-				}
-			}
+			f = r->frame2;
+			d = r->framelerp;
+			FRAMEBLENDINSERT
 		}
 	}
 }
+