static int recoversendflags[MAX_EDICTS];
csqcentityframedb_t *d;
+ if(client->csqcentityframe_lastreset < 0)
+ return;
+ if(framenum < client->csqcentityframe_lastreset)
+ return; // no action required, as we resent that data anyway
+
// is our frame out of history?
ringfirst = client->csqcentityframehistory_next; // oldest entry
ringlast = (ringfirst + NUM_CSQCENTITYDB_FRAMES - 1) % NUM_CSQCENTITYDB_FRAMES; // most recently added entry
Con_DPrintf("Lost frame = %d\n", framenum);
Con_DPrintf("Entity DB = %d to %d\n", client->csqcentityframehistory[ringfirst].framenum, client->csqcentityframehistory[ringlast].framenum);
EntityFrameCSQC_LostAllFrames(client);
+ client->csqcentityframe_lastreset = -1;
}
return;
}
int dbframe = EntityFrameCSQC_AllocFrame(client, framenum);
csqcentityframedb_t *db = &client->csqcentityframehistory[dbframe];
+ if(client->csqcentityframe_lastreset < 0)
+ client->csqcentityframe_lastreset = framenum;
+
maxsize -= 24; // always fit in an empty svc_entities message (for packet loss detection!)
// if this server progs is not CSQC-aware, return early
MSG_WriteByte(msg, s->glowmod[1]);
MSG_WriteByte(msg, s->glowmod[2]);
}
+ if (bits & E5_COMPLEXANIMATION)
+ {
+ if (s->skeletonobject.model && s->skeletonobject.relativetransforms)
+ {
+ int numbones = s->skeletonobject.model->num_bones;
+ int bonenum;
+ short pose6s[6];
+ MSG_WriteByte(msg, 4);
+ MSG_WriteShort(msg, s->modelindex);
+ MSG_WriteByte(msg, numbones);
+ for (bonenum = 0;bonenum < numbones;bonenum++)
+ {
+ Matrix4x4_ToBonePose6s(s->skeletonobject.relativetransforms + bonenum, 64, pose6s);
+ MSG_WriteShort(msg, pose6s[0]);
+ MSG_WriteShort(msg, pose6s[1]);
+ MSG_WriteShort(msg, pose6s[2]);
+ MSG_WriteShort(msg, pose6s[3]);
+ MSG_WriteShort(msg, pose6s[4]);
+ MSG_WriteShort(msg, pose6s[5]);
+ }
+ }
+ else if (s->framegroupblend[3].lerp > 0)
+ {
+ MSG_WriteByte(msg, 3);
+ MSG_WriteShort(msg, s->framegroupblend[0].frame);
+ MSG_WriteShort(msg, s->framegroupblend[1].frame);
+ MSG_WriteShort(msg, s->framegroupblend[2].frame);
+ MSG_WriteShort(msg, s->framegroupblend[3].frame);
+ MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[0].start) * 1000.0));
+ MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[1].start) * 1000.0));
+ MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[2].start) * 1000.0));
+ MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[3].start) * 1000.0));
+ MSG_WriteByte(msg, s->framegroupblend[0].lerp * 255.0f);
+ MSG_WriteByte(msg, s->framegroupblend[1].lerp * 255.0f);
+ MSG_WriteByte(msg, s->framegroupblend[2].lerp * 255.0f);
+ MSG_WriteByte(msg, s->framegroupblend[3].lerp * 255.0f);
+ }
+ else if (s->framegroupblend[2].lerp > 0)
+ {
+ MSG_WriteByte(msg, 2);
+ MSG_WriteShort(msg, s->framegroupblend[0].frame);
+ MSG_WriteShort(msg, s->framegroupblend[1].frame);
+ MSG_WriteShort(msg, s->framegroupblend[2].frame);
+ MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[0].start) * 1000.0));
+ MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[1].start) * 1000.0));
+ MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[2].start) * 1000.0));
+ MSG_WriteByte(msg, s->framegroupblend[0].lerp * 255.0f);
+ MSG_WriteByte(msg, s->framegroupblend[1].lerp * 255.0f);
+ MSG_WriteByte(msg, s->framegroupblend[2].lerp * 255.0f);
+ }
+ else if (s->framegroupblend[1].lerp > 0)
+ {
+ MSG_WriteByte(msg, 1);
+ MSG_WriteShort(msg, s->framegroupblend[0].frame);
+ MSG_WriteShort(msg, s->framegroupblend[1].frame);
+ MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[0].start) * 1000.0));
+ MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[1].start) * 1000.0));
+ MSG_WriteByte(msg, s->framegroupblend[0].lerp * 255.0f);
+ MSG_WriteByte(msg, s->framegroupblend[1].lerp * 255.0f);
+ }
+ else
+ {
+ MSG_WriteByte(msg, 0);
+ MSG_WriteShort(msg, s->framegroupblend[0].frame);
+ MSG_WriteShort(msg, (int)((sv.time - s->framegroupblend[0].start) * 1000.0));
+ }
+ }
}
ENTITYSIZEPROFILING_END(msg, s->number);
}
+extern dp_model_t *CL_GetModelByIndex(int modelindex);
+
static void EntityState5_ReadUpdate(entity_state_t *s, int number)
{
int bits;
s->glowmod[1] = MSG_ReadByte();
s->glowmod[2] = MSG_ReadByte();
}
+ if (bits & E5_COMPLEXANIMATION)
+ {
+ skeleton_t *skeleton;
+ const dp_model_t *model;
+ int modelindex;
+ int type;
+ int bonenum;
+ int numbones;
+ short pose6s[6];
+ type = MSG_ReadByte();
+ switch(type)
+ {
+ case 0:
+ s->framegroupblend[0].frame = MSG_ReadShort();
+ s->framegroupblend[1].frame = 0;
+ s->framegroupblend[2].frame = 0;
+ s->framegroupblend[3].frame = 0;
+ s->framegroupblend[0].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f);
+ s->framegroupblend[1].start = 0;
+ s->framegroupblend[2].start = 0;
+ s->framegroupblend[3].start = 0;
+ s->framegroupblend[0].lerp = 1;
+ s->framegroupblend[1].lerp = 0;
+ s->framegroupblend[2].lerp = 0;
+ s->framegroupblend[3].lerp = 0;
+ break;
+ case 1:
+ s->framegroupblend[0].frame = MSG_ReadShort();
+ s->framegroupblend[1].frame = MSG_ReadShort();
+ s->framegroupblend[2].frame = 0;
+ s->framegroupblend[3].frame = 0;
+ s->framegroupblend[0].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f);
+ s->framegroupblend[1].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f);
+ s->framegroupblend[2].start = 0;
+ s->framegroupblend[3].start = 0;
+ s->framegroupblend[0].lerp = MSG_ReadByte() * (1.0f / 255.0f);
+ s->framegroupblend[1].lerp = MSG_ReadByte() * (1.0f / 255.0f);
+ s->framegroupblend[2].lerp = 0;
+ s->framegroupblend[3].lerp = 0;
+ break;
+ case 2:
+ s->framegroupblend[0].frame = MSG_ReadShort();
+ s->framegroupblend[1].frame = MSG_ReadShort();
+ s->framegroupblend[2].frame = MSG_ReadShort();
+ s->framegroupblend[3].frame = 0;
+ s->framegroupblend[0].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f);
+ s->framegroupblend[1].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f);
+ s->framegroupblend[2].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f);
+ s->framegroupblend[3].start = 0;
+ s->framegroupblend[0].lerp = MSG_ReadByte() * (1.0f / 255.0f);
+ s->framegroupblend[1].lerp = MSG_ReadByte() * (1.0f / 255.0f);
+ s->framegroupblend[2].lerp = MSG_ReadByte() * (1.0f / 255.0f);
+ s->framegroupblend[3].lerp = 0;
+ break;
+ case 3:
+ s->framegroupblend[0].frame = MSG_ReadShort();
+ s->framegroupblend[1].frame = MSG_ReadShort();
+ s->framegroupblend[2].frame = MSG_ReadShort();
+ s->framegroupblend[3].frame = MSG_ReadShort();
+ s->framegroupblend[0].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f);
+ s->framegroupblend[1].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f);
+ s->framegroupblend[2].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f);
+ s->framegroupblend[3].start = cl.time - (short)MSG_ReadShort() * (1.0f / 1000.0f);
+ s->framegroupblend[0].lerp = MSG_ReadByte() * (1.0f / 255.0f);
+ s->framegroupblend[1].lerp = MSG_ReadByte() * (1.0f / 255.0f);
+ s->framegroupblend[2].lerp = MSG_ReadByte() * (1.0f / 255.0f);
+ s->framegroupblend[3].lerp = MSG_ReadByte() * (1.0f / 255.0f);
+ break;
+ case 4:
+ if (!cl.engineskeletonobjects)
+ cl.engineskeletonobjects = (skeleton_t *) Mem_Alloc(cls.levelmempool, sizeof(*cl.engineskeletonobjects) * MAX_EDICTS);
+ skeleton = &cl.engineskeletonobjects[number];
+ modelindex = MSG_ReadShort();
+ model = CL_GetModelByIndex(modelindex);
+ numbones = MSG_ReadByte();
+ if (model && numbones != model->num_bones)
+ Host_Error("E5_COMPLEXANIMATION: model has different number of bones than network packet describes\n");
+ if (!skeleton->relativetransforms || skeleton->model != model)
+ {
+ skeleton->model = model;
+ skeleton->relativetransforms = (matrix4x4_t *) Mem_Realloc(cls.levelmempool, skeleton->relativetransforms, sizeof(*skeleton->relativetransforms) * skeleton->model->num_bones);
+ for (bonenum = 0;bonenum < model->num_bones;bonenum++)
+ skeleton->relativetransforms[bonenum] = identitymatrix;
+ }
+ for (bonenum = 0;bonenum < numbones;bonenum++)
+ {
+ pose6s[0] = (short)MSG_ReadShort();
+ pose6s[1] = (short)MSG_ReadShort();
+ pose6s[2] = (short)MSG_ReadShort();
+ pose6s[3] = (short)MSG_ReadShort();
+ pose6s[4] = (short)MSG_ReadShort();
+ pose6s[5] = (short)MSG_ReadShort();
+ Matrix4x4_FromBonePose6s(skeleton->relativetransforms + bonenum, 1.0f / 64.0f, pose6s);
+ }
+ s->skeletonobject = *skeleton;
+ break;
+ default:
+ Host_Error("E5_COMPLEXANIMATION: Parse error - unknown type %i\n", type);
+ break;
+ }
+ }
if (developer_networkentities.integer >= 2)
bits |= E5_COLORMOD;
if (o->glowmod[0] != n->glowmod[0] || o->glowmod[1] != n->glowmod[1] || o->glowmod[2] != n->glowmod[2])
bits |= E5_GLOWMOD;
+ if (n->flags & RENDER_COMPLEXANIMATION)
+ bits |= E5_COMPLEXANIMATION;
}
else
if (o->active == ACTIVE_NETWORK)
}
}
+static int packetlog5cmp(const void *a_, const void *b_)
+{
+ const entityframe5_packetlog_t *a = (const entityframe5_packetlog_t *) a_;
+ const entityframe5_packetlog_t *b = (const entityframe5_packetlog_t *) b_;
+ return a->packetnumber - b->packetnumber;
+}
+
void EntityFrame5_LostFrame(entityframe5_database_t *d, int framenum)
{
- int i, j, k, l, bits;
- entityframe5_changestate_t *s, *s2;
- entityframe5_packetlog_t *p, *p2;
- unsigned char statsdeltabits[(MAX_CL_STATS+7)/8];
- // scan for packets that were lost
+ int i, j, l, bits;
+ entityframe5_changestate_t *s;
+ entityframe5_packetlog_t *p;
+ static unsigned char statsdeltabits[(MAX_CL_STATS+7)/8];
+ static int deltabits[MAX_EDICTS];
+ entityframe5_packetlog_t *packetlogs[ENTITYFRAME5_MAXPACKETLOGS];
+
for (i = 0, p = d->packetlog;i < ENTITYFRAME5_MAXPACKETLOGS;i++, p++)
+ packetlogs[i] = p;
+ qsort(packetlogs, sizeof(*packetlogs), ENTITYFRAME5_MAXPACKETLOGS, packetlog5cmp);
+
+ memset(deltabits, 0, sizeof(deltabits));
+ memset(statsdeltabits, 0, sizeof(statsdeltabits));
+ for (i = 0; i < ENTITYFRAME5_MAXPACKETLOGS; i++)
{
- if (p->packetnumber && p->packetnumber <= framenum)
+ p = packetlogs[i];
+
+ if (!p->packetnumber)
+ continue;
+
+ if (p->packetnumber <= framenum)
{
- // packet was lost - merge deltabits into the main array so they
- // will be re-sent, but only if there is no newer update of that
- // bit in the logs (as those will arrive before this update)
for (j = 0, s = p->states;j < p->numstates;j++, s++)
- {
- // check for any newer updates to this entity and mask off any
- // overlapping bits (we don't need to send something again if
- // it has already been sent more recently)
- bits = s->bits & ~d->deltabits[s->number];
- for (k = 0, p2 = d->packetlog;k < ENTITYFRAME5_MAXPACKETLOGS && bits;k++, p2++)
- {
- if (p2->packetnumber > framenum)
- {
- for (l = 0, s2 = p2->states;l < p2->numstates;l++, s2++)
- {
- if (s2->number == s->number)
- {
- bits &= ~s2->bits;
- break;
- }
- }
- }
- }
- // if the bits haven't all been cleared, there were some bits
- // lost with this packet, so set them again now
- if (bits)
- {
- d->deltabits[s->number] |= bits;
- // if it was a very important update, set priority higher
- if (bits & (E5_FULLUPDATE | E5_ATTACHMENT | E5_MODEL | E5_COLORMAP))
- d->priorities[s->number] = max(d->priorities[s->number], 4);
- else
- d->priorities[s->number] = max(d->priorities[s->number], 1);
- }
- }
- // mark lost stats
- for (j = 0;j < MAX_CL_STATS;j++)
- {
- for (l = 0;l < (MAX_CL_STATS+7)/8;l++)
- statsdeltabits[l] = p->statsdeltabits[l] & ~host_client->statsdeltabits[l];
- for (k = 0, p2 = d->packetlog;k < ENTITYFRAME5_MAXPACKETLOGS;k++, p2++)
- if (p2->packetnumber > framenum)
- for (l = 0;l < (MAX_CL_STATS+7)/8;l++)
- statsdeltabits[l] = p->statsdeltabits[l] & ~p2->statsdeltabits[l];
- for (l = 0;l < (MAX_CL_STATS+7)/8;l++)
- host_client->statsdeltabits[l] |= statsdeltabits[l];
- }
- // delete this packet log as it is now obsolete
+ deltabits[s->number] |= s->bits;
+
+ for (l = 0;l < (MAX_CL_STATS+7)/8;l++)
+ statsdeltabits[l] |= p->statsdeltabits[l];
+
p->packetnumber = 0;
}
+ else
+ {
+ for (j = 0, s = p->states;j < p->numstates;j++, s++)
+ deltabits[s->number] &= ~s->bits;
+ for (l = 0;l < (MAX_CL_STATS+7)/8;l++)
+ statsdeltabits[l] &= ~p->statsdeltabits[l];
+ }
+ }
+
+ for(i = 0; i < d->maxedicts; ++i)
+ {
+ bits = deltabits[i] & ~d->deltabits[i];
+ if(bits)
+ {
+ d->deltabits[i] |= bits;
+ // if it was a very important update, set priority higher
+ if (bits & (E5_FULLUPDATE | E5_ATTACHMENT | E5_MODEL | E5_COLORMAP))
+ d->priorities[i] = max(d->priorities[i], 4);
+ else
+ d->priorities[i] = max(d->priorities[i], 1);
+ }
}
+
+ for (l = 0;l < (MAX_CL_STATS+7)/8;l++)
+ host_client->statsdeltabits[l] |= statsdeltabits[l];
+ // no need to mask out the already-set bits here, as we do not
+ // do that priorities stuff
}
void EntityFrame5_AckFrame(entityframe5_database_t *d, int framenum)
projects / xonotic / darkplaces.git / blobdiff