void ClearStateToDefault(entity_state_t *s)
{
+ s->active = 0;
s->time = 0;
VectorClear(s->origin);
VectorClear(s->angles);
s->glowsize = 0;
s->glowcolor = 254;
s->flags = 0;
- s->active = 0;
}
// (server) clears the database to contain no frames (thus delta compression compresses against nothing)
void EntityFrame_ClearDatabase(entity_database_t *d)
{
memset(d, 0, sizeof(*d));
- d->ackframe = -1;
}
// (server and client) removes frames older than 'frame' from database
void EntityFrame_AckFrame(entity_database_t *d, int frame)
{
int i;
- for (i = 0;i < d->numframes && d->frames[i].framenum >= frame;i++);
+ if (d->ackframe < frame)
+ d->ackframe = frame;
+ for (i = 0;i < d->numframes && d->frames[i].framenum < frame;i++);
// ignore outdated frame acks (out of order packets)
if (i == 0)
return;
- d->ackframe = frame;
d->numframes -= i;
// if some queue is left, slide it down to beginning of array
if (d->numframes)
- memcpy(&d->frames[0], &d->frames[i], sizeof(d->frames[0]) * d->numframes);
+ memmove(&d->frames[0], &d->frames[i], sizeof(d->frames[0]) * d->numframes);
}
// (server) clears frame, to prepare for adding entities
void EntityFrame_Clear(entity_frame_t *f, vec3_t eye)
{
- memset(f, 0, sizeof(*f));
- VectorCopy(eye, f->eye);
+ f->time = 0;
+ f->framenum = 0;
+ f->numentities = 0;
+ if (eye == NULL)
+ {
+ VectorClear(f->eye);
+ }
+ else
+ {
+ VectorCopy(eye, f->eye);
+ }
}
// (server) allocates an entity slot in frame, returns NULL if full
return e;
}
+// (server and client) reads a frame from the database
void EntityFrame_FetchFrame(entity_database_t *d, int framenum, entity_frame_t *f)
{
int i, n;
- memset(f, 0, sizeof(*f));
+ EntityFrame_Clear(f, NULL);
for (i = 0;i < d->numframes && d->frames[i].framenum < framenum;i++);
- if (framenum == d->frames[i].framenum)
+ if (i < d->numframes && framenum == d->frames[i].framenum)
{
f->framenum = framenum;
f->numentities = d->frames[i].endentity - d->frames[i].firstentity;
memcpy(f->entitydata, d->entitydata + d->frames[i].firstentity % MAX_ENTITY_DATABASE, sizeof(*f->entitydata) * n);
if (f->numentities > n)
memcpy(f->entitydata + n, d->entitydata, sizeof(*f->entitydata) * (f->numentities - n));
+ VectorCopy(d->eye, f->eye);
}
else
f->framenum = -1;
{
int n, e;
entity_frameinfo_t *info;
+
+ VectorCopy(f->eye, d->eye);
+
// figure out how many entity slots are used already
if (d->numframes)
{
info = &d->frames[d->numframes];
info->framenum = f->framenum;
+ e = -1000;
+ // make sure we check the newly added frame as well, but we haven't incremented numframes yet
+ for (n = 0;n <= d->numframes;n++)
+ {
+ if (e >= d->frames[n].framenum)
+ {
+ if (e == f->framenum)
+ Con_Printf("EntityFrame_AddFrame: tried to add out of sequence frame to database\n");
+ else
+ Con_Printf("EntityFrame_AddFrame: out of sequence frames in database\n");
+ return;
+ }
+ e = d->frames[n].framenum;
+ }
// if database still has frames after that...
if (d->numframes)
info->firstentity = d->frames[d->numframes - 1].endentity;
else
info->firstentity = 0;
info->endentity = info->firstentity + f->numentities;
+ d->numframes++;
n = info->firstentity % MAX_ENTITY_DATABASE;
e = MAX_ENTITY_DATABASE - n;
}
// (server) writes a frame to network stream
-void EntityFrame_Write(entity_database_t *d, entity_frame_t *f, int newframe, sizebuf_t *msg)
+static entity_frame_t deltaframe; // FIXME?
+void EntityFrame_Write(entity_database_t *d, entity_frame_t *f, sizebuf_t *msg)
{
int i, onum, bits, number;
- entity_frame_t deltaframe, *o = &deltaframe;
+ entity_frame_t *o = &deltaframe;
entity_state_t *ent, *delta, baseline;
EntityFrame_AddFrame(d, f);
ClearStateToDefault(&baseline);
- EntityFrame_FetchFrame(d, d->ackframe, o);
+ EntityFrame_FetchFrame(d, d->ackframe > 0 ? d->ackframe : -1, o);
MSG_WriteByte (msg, svc_entities);
MSG_WriteLong (msg, o->framenum);
- MSG_WriteLong (msg, newframe);
+ MSG_WriteLong (msg, f->framenum);
MSG_WriteFloat (msg, f->eye[0]);
MSG_WriteFloat (msg, f->eye[1]);
MSG_WriteFloat (msg, f->eye[2]);
delta = &baseline;
}
bits = 0;
- if (ent->origin[0] != delta->origin[0])
- bits |= E_ORIGIN1;
- if (ent->origin[1] != delta->origin[1])
- bits |= E_ORIGIN2;
- if (ent->origin[2] != delta->origin[2])
- bits |= E_ORIGIN3;
- if (ent->angles[0] != delta->angles[0])
+ if (ent->flags & RENDER_LOWPRECISION)
+ {
+ if ((int) ent->origin[0] != (int) delta->origin[0])
+ bits |= E_ORIGIN1;
+ if ((int) ent->origin[1] != (int) delta->origin[1])
+ bits |= E_ORIGIN2;
+ if ((int) ent->origin[2] != (int) delta->origin[2])
+ bits |= E_ORIGIN3;
+ }
+ else
+ {
+ if (fabs(ent->origin[0] - delta->origin[0]) > 0.01f)
+ bits |= E_ORIGIN1;
+ if (fabs(ent->origin[1] - delta->origin[1]) > 0.01f)
+ bits |= E_ORIGIN2;
+ if (fabs(ent->origin[2] - delta->origin[2]) > 0.01f)
+ bits |= E_ORIGIN3;
+ }
+ if ((qbyte) (ent->angles[0] * (256.0f / 360.0f)) != (qbyte) (delta->angles[0] * (256.0f / 360.0f)))
bits |= E_ANGLE1;
- if (ent->angles[1] != delta->angles[1])
+ if ((qbyte) (ent->angles[1] * (256.0f / 360.0f)) != (qbyte) (delta->angles[1] * (256.0f / 360.0f)))
bits |= E_ANGLE2;
- if (ent->angles[2] != delta->angles[2])
+ if ((qbyte) (ent->angles[2] * (256.0f / 360.0f)) != (qbyte) (delta->angles[2] * (256.0f / 360.0f)))
bits |= E_ANGLE3;
if ((ent->modelindex ^ delta->modelindex) & 0x00FF)
bits |= E_MODEL1;
MSG_WriteByte(msg, (bits >> 24) & 0xFF);
}
}
- if (bits & E_ORIGIN1)
- MSG_WriteFloat(msg, ent->origin[0]);
- if (bits & E_ORIGIN2)
- MSG_WriteFloat(msg, ent->origin[1]);
- if (bits & E_ORIGIN3)
- MSG_WriteFloat(msg, ent->origin[2]);
+ // LordHavoc: have to write flags first, as they can modify protocol
+ if (bits & E_FLAGS)
+ MSG_WriteByte(msg, ent->flags);
+ if (ent->flags & RENDER_LOWPRECISION)
+ {
+ if (bits & E_ORIGIN1)
+ MSG_WriteShort(msg, ent->origin[0]);
+ if (bits & E_ORIGIN2)
+ MSG_WriteShort(msg, ent->origin[1]);
+ if (bits & E_ORIGIN3)
+ MSG_WriteShort(msg, ent->origin[2]);
+ }
+ else
+ {
+ if (bits & E_ORIGIN1)
+ MSG_WriteFloat(msg, ent->origin[0]);
+ if (bits & E_ORIGIN2)
+ MSG_WriteFloat(msg, ent->origin[1]);
+ if (bits & E_ORIGIN3)
+ MSG_WriteFloat(msg, ent->origin[2]);
+ }
if (bits & E_ANGLE1)
MSG_WriteAngle(msg, ent->angles[0]);
if (bits & E_ANGLE2)
if (bits & E_ANGLE3)
MSG_WriteAngle(msg, ent->angles[2]);
if (bits & E_MODEL1)
- MSG_WriteByte(msg, ent->modelindex & 0x00FF);
+ MSG_WriteByte(msg, ent->modelindex & 0xFF);
if (bits & E_MODEL2)
- MSG_WriteByte(msg, ent->modelindex & 0xFF00);
+ MSG_WriteByte(msg, (ent->modelindex >> 8) & 0xFF);
if (bits & E_FRAME1)
- MSG_WriteByte(msg, ent->frame & 0x00FF);
+ MSG_WriteByte(msg, ent->frame & 0xFF);
if (bits & E_FRAME2)
- MSG_WriteByte(msg, ent->frame & 0xFF00);
+ MSG_WriteByte(msg, (ent->frame >> 8) & 0xFF);
if (bits & E_EFFECTS1)
- MSG_WriteByte(msg, ent->effects & 0x00FF);
+ MSG_WriteByte(msg, ent->effects & 0xFF);
if (bits & E_EFFECTS2)
- MSG_WriteByte(msg, ent->effects & 0xFF00);
+ MSG_WriteByte(msg, (ent->effects >> 8) & 0xFF);
if (bits & E_COLORMAP)
MSG_WriteByte(msg, ent->colormap);
if (bits & E_SKIN)
MSG_WriteByte(msg, ent->glowsize);
if (bits & E_GLOWCOLOR)
MSG_WriteByte(msg, ent->glowcolor);
- if (bits & E_FLAGS)
- MSG_WriteByte(msg, ent->flags);
}
}
for (;onum < o->numentities;onum++)
}
// (client) reads a frame from network stream
+static entity_frame_t framedata; // FIXME?
void EntityFrame_Read(entity_database_t *d)
{
- int newframenum, deltaframenum, onum, number, removed, bits;
- entity_frame_t framedata, *f = &framedata, deltaframedata, *delta = &deltaframedata;
- entity_state_t *e, baseline;
+ int number, removed, bits;
+ entity_frame_t *f = &framedata, *delta = &deltaframe;
+ entity_state_t *e, baseline, *old, *oldend;
ClearStateToDefault(&baseline);
- memset(f, 0, sizeof(*f));
+
+ EntityFrame_Clear(f, NULL);
+
// read the frame header info
f->time = cl.mtime[0];
- deltaframenum = MSG_ReadLong();
- newframenum = MSG_ReadLong();
+ number = MSG_ReadLong();
+ f->framenum = MSG_ReadLong();
f->eye[0] = MSG_ReadFloat();
f->eye[1] = MSG_ReadFloat();
f->eye[2] = MSG_ReadFloat();
- EntityFrame_AckFrame(d, deltaframenum);
- EntityFrame_FetchFrame(d, deltaframenum, delta);
- f->framenum = newframenum;
- onum = 0;
- f->numentities = 0;
+ EntityFrame_AckFrame(d, number);
+ EntityFrame_FetchFrame(d, number, delta);
+ old = delta->entitydata;
+ oldend = old + delta->numentities;
// read entities until we hit the magic 0xFFFF end tag
- while ((number = MSG_ReadShort()) != 0xFFFF)
+ while ((number = (unsigned short) MSG_ReadShort()) != 0xFFFF)
{
if (msg_badread)
Host_Error("EntityFrame_Read: read error\n");
Host_Error("EntityFrame_Read: number (%i) >= MAX_EDICTS (%i)\n", number, MAX_EDICTS);
// seek to entity, while copying any skipped entities (assume unchanged)
- while (onum < delta->numentities && delta->entitydata[onum].number < number)
+ while (old < oldend && old->number < number)
{
if (f->numentities >= MAX_ENTITY_DATABASE)
Host_Error("EntityFrame_Read: entity list too big\n");
- memcpy(f->entitydata + f->numentities, delta->entitydata + onum, sizeof(entity_state_t));
- onum++;
+ memcpy(f->entitydata + f->numentities, old, sizeof(entity_state_t));
+ f->entitydata[f->numentities].time = cl.mtime[0];
+ old++;
f->numentities++;
}
if (removed)
{
- if (onum < delta->numentities && delta->entitydata[onum].number == number)
- onum++;
+ if (old < oldend && old->number == number)
+ old++;
else
- Con_Printf("EntityFrame_Read: REMOVE on unused entity!\n");
+ Con_Printf("EntityFrame_Read: REMOVE on unused entity %i\n", number);
}
else
{
if (f->numentities >= MAX_ENTITY_DATABASE)
Host_Error("EntityFrame_Read: entity list too big\n");
- if (onum < delta->numentities && delta->entitydata[onum].number == number)
+
+ // reserve this slot
+ e = f->entitydata + f->numentities++;
+
+ if (old < oldend && old->number == number)
{
// delta from old entity
- memcpy(f->entitydata + f->numentities, delta->entitydata + onum++, sizeof(*e));
+ memcpy(e, old++, sizeof(*e));
}
else
{
// delta from baseline
- memcpy(f->entitydata + f->numentities, &baseline, sizeof(*e));
+ memcpy(e, &baseline, sizeof(*e));
}
- // reserve this slot
- e = f->entitydata + f->numentities++;
-
e->active = true;
e->time = cl.mtime[0];
+ e->number = number;
bits = MSG_ReadByte();
if (bits & E_EXTEND1)
}
}
- if (bits & E_ORIGIN1)
- e->origin[0] = MSG_ReadFloat();
- if (bits & E_ORIGIN2)
- e->origin[1] = MSG_ReadFloat();
- if (bits & E_ORIGIN3)
- e->origin[2] = MSG_ReadFloat();
+ if (dpprotocol == DPPROTOCOL_VERSION2)
+ {
+ if (bits & E_ORIGIN1)
+ e->origin[0] = (signed short) MSG_ReadShort();
+ if (bits & E_ORIGIN2)
+ e->origin[1] = (signed short) MSG_ReadShort();
+ if (bits & E_ORIGIN3)
+ e->origin[2] = (signed short) MSG_ReadShort();
+ }
+ else
+ {
+ if (bits & E_FLAGS)
+ e->flags = MSG_ReadByte();
+ if (e->flags & RENDER_LOWPRECISION || dpprotocol == DPPROTOCOL_VERSION2)
+ {
+ if (bits & E_ORIGIN1)
+ e->origin[0] = (signed short) MSG_ReadShort();
+ if (bits & E_ORIGIN2)
+ e->origin[1] = (signed short) MSG_ReadShort();
+ if (bits & E_ORIGIN3)
+ e->origin[2] = (signed short) MSG_ReadShort();
+ }
+ else
+ {
+ if (bits & E_ORIGIN1)
+ e->origin[0] = MSG_ReadFloat();
+ if (bits & E_ORIGIN2)
+ e->origin[1] = MSG_ReadFloat();
+ if (bits & E_ORIGIN3)
+ e->origin[2] = MSG_ReadFloat();
+ }
+ }
if (bits & E_ANGLE1)
e->angles[0] = MSG_ReadAngle();
if (bits & E_ANGLE2)
if (bits & E_ANGLE3)
e->angles[2] = MSG_ReadAngle();
if (bits & E_MODEL1)
- e->modelindex = (e->modelindex & 0xFF00) | MSG_ReadByte();
+ e->modelindex = (e->modelindex & 0xFF00) | (unsigned int) MSG_ReadByte();
if (bits & E_MODEL2)
- e->modelindex = (e->modelindex & 0x00FF) | (MSG_ReadByte() << 8);
+ e->modelindex = (e->modelindex & 0x00FF) | ((unsigned int) MSG_ReadByte() << 8);
if (bits & E_FRAME1)
- e->frame = (e->frame & 0xFF00) | MSG_ReadByte();
+ e->frame = (e->frame & 0xFF00) | (unsigned int) MSG_ReadByte();
if (bits & E_FRAME2)
- e->frame = (e->frame & 0x00FF) | (MSG_ReadByte() << 8);
+ e->frame = (e->frame & 0x00FF) | ((unsigned int) MSG_ReadByte() << 8);
if (bits & E_EFFECTS1)
- e->effects = (e->effects & 0xFF00) | MSG_ReadByte();
+ e->effects = (e->effects & 0xFF00) | (unsigned int) MSG_ReadByte();
if (bits & E_EFFECTS2)
- e->effects = (e->effects & 0x00FF) | (MSG_ReadByte() << 8);
+ e->effects = (e->effects & 0x00FF) | ((unsigned int) MSG_ReadByte() << 8);
if (bits & E_COLORMAP)
e->colormap = MSG_ReadByte();
if (bits & E_SKIN)
e->glowsize = MSG_ReadByte();
if (bits & E_GLOWCOLOR)
e->glowcolor = MSG_ReadByte();
- if (bits & E_FLAGS)
- e->flags = MSG_ReadByte();
+ if (dpprotocol == DPPROTOCOL_VERSION2)
+ if (bits & E_FLAGS)
+ e->flags = MSG_ReadByte();
}
}
- while (onum < delta->numentities)
+ while (old < oldend)
{
if (f->numentities >= MAX_ENTITY_DATABASE)
Host_Error("EntityFrame_Read: entity list too big\n");
- memcpy(f->entitydata + f->numentities, delta->entitydata + onum, sizeof(entity_state_t));
- onum++;
+ memcpy(f->entitydata + f->numentities, old, sizeof(entity_state_t));
+ f->entitydata[f->numentities].time = cl.mtime[0];
+ old++;
f->numentities++;
}
EntityFrame_AddFrame(d, f);
}
-void EntityFrame_FetchEye(entity_database_t *d, vec3_t eye, double time)
-{
- float frac;
- if (d->numframes == 0)
- Host_Error("EntityFrame_FetchEye: no frames\n");
- if (d->numframes > 1 && d->frames[d->numframes - 2].time != d->frames[d->numframes - 1].time)
- {
- frac = (time - d->frames[d->numframes - 2].time) / (d->frames[d->numframes - 1].time - d->frames[d->numframes - 2].time);
- frac = bound(0, frac, 1);
- VectorSubtract(d->frames[d->numframes - 2].eye, d->frames[d->numframes - 1].eye, eye);
- VectorMA(d->frames[d->numframes - 2].eye, frac, eye, eye);
- }
- else
- VectorCopy(d->frames[0].eye, eye);
-}
-// (client) fetchs an entity from a frame, index is the index into the frame's entity list, returns false if index is out of bounds
-int EntityFrame_FetchEntityByIndex(entity_frame_t *f, entity_state_t *e, int index)
+// (client) returns the frame number of the most recent frame recieved
+int EntityFrame_MostRecentlyRecievedFrameNum(entity_database_t *d)
{
- if (index < 0 || index >= f->numentities)
- return false;
- memcpy(e, f->entitydata + index, sizeof(*e));
- return true;
+ if (d->numframes)
+ return d->frames[d->numframes - 1].framenum;
+ else
+ return -1;
}
-int EntityFrame_FetchEntityByNumber(entity_frame_t *f, entity_state_t *e, int number)
-{
- int i;
- for (i = 0;i < f->numentities;i++)
- {
- if (f->entitydata[i].number == number)
- {
- memcpy(e, f->entitydata + i, sizeof(*e));
- return true;
- }
- }
- ClearStateToDefault(e);
- return false;
-}
projects / xonotic / darkplaces.git / blobdiff