// (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
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 (i < d->numframes && framenum == d->frames[i].framenum)
{
}
// (server) writes a frame to network stream
+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);
delta = &baseline;
}
bits = 0;
- 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;
- if ((byte) (ent->angles[0] * (256.0f / 360.0f)) != (byte) (delta->angles[0] * (256.0f / 360.0f)))
+ 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 ((byte) (ent->angles[1] * (256.0f / 360.0f)) != (byte) (delta->angles[1] * (256.0f / 360.0f)))
+ if ((qbyte) (ent->angles[1] * (256.0f / 360.0f)) != (qbyte) (delta->angles[1] * (256.0f / 360.0f)))
bits |= E_ANGLE2;
- if ((byte) (ent->angles[2] * (256.0f / 360.0f)) != (byte) (delta->angles[2] * (256.0f / 360.0f)))
+ 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_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]);
+ // 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 number, removed, bits;
- entity_frame_t framedata, *f = &framedata, deltaframedata, *delta = &deltaframedata;
+ 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];
number = MSG_ReadLong();
}
}
- 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();
+ 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 (old < oldend)
EntityFrame_AddFrame(d, f);
}
-/*
-// (client) reads (and interpolates) the eye location from the database,
-// given a current time
-int EntityFrame_FetchEye(entity_database_t *d, vec3_t eye, double time)
-{
- float frac;
- if (d->numframes == 0)
- return false;
-// 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);
- return true;
-}
-
-// (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)
-{
- if (index < 0 || index >= f->numentities)
- return false;
- memcpy(e, f->entitydata + index, sizeof(*e));
- return true;
-}
-
-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;
-}
-*/
// (client) returns the frame number of the most recent frame recieved
int EntityFrame_MostRecentlyRecievedFrameNum(entity_database_t *d)
else
return -1;
}
+
projects / xonotic / darkplaces.git / blobdiff