-
#include "quakedef.h"
+#define ENTITYSIZEPROFILING_START(msg, num) \
+ int entityprofiling_startsize = msg->cursize
+
+#define ENTITYSIZEPROFILING_END(msg, num) \
+ if(developer_networkentities.integer >= 2) \
+ { \
+ prvm_edict_t *ed = prog->edicts + num; \
+ Con_Printf("sent entity update of size %d for a %s\n", (msg->cursize - entityprofiling_startsize), PRVM_serveredictstring(ed, classname) ? PRVM_GetString(PRVM_serveredictstring(ed, classname)) : "(no classname)"); \
+ }
+
// this is 88 bytes (must match entity_state_t in protocol.h)
entity_state_t defaultstate =
{
0,//unsigned short exteriormodelforclient; // ! not shown if first person viewing from this entity, shown in all other cases
0,//unsigned short nodrawtoclient; // !
0,//unsigned short drawonlytoclient; // !
+ 0,//unsigned short traileffectnum;
{0,0,0,0},//unsigned short light[4]; // color*256 (0.00 to 255.996), and radius*1
- 0,//unsigned char active; // true if a valid state
+ ACTIVE_NOT,//unsigned char active; // true if a valid state
0,//unsigned char lightstyle;
0,//unsigned char lightpflags;
0,//unsigned char colormap;
0,//unsigned char internaleffects; // INTEF_FLAG1QW and so on
0,//unsigned char tagindex;
{32, 32, 32},//unsigned char colormod[3];
- // padding to a multiple of 8 bytes (to align the double time)
- {0,0,0,0,0}//unsigned char unused[5]; // !
+ {32, 32, 32},//unsigned char glowmod[3];
};
// LordHavoc: I own protocol ranges 96, 97, 3500-3599
struct protocolversioninfo_s
{
int number;
+ protocolversion_t version;
const char *name;
}
protocolversioninfo[] =
{
- {0, "UNKNOWN"},
- {3504, "DP7"},
- {3503, "DP6"},
- {3502, "DP5"},
- {3501, "DP4"},
- {3500, "DP3"},
- {97, "DP2"},
- {96, "DP1"},
- {15, "QUAKEDP"},
- {250, "NEHAHRAMOVIE"},
- {15, "QUAKE"},
- {28, "QW"},
- {10000, "NEHAHRABJP"},
- {10001, "NEHAHRABJP2"},
- {10002, "NEHAHRABJP3"},
- {0, NULL}
+ { 3504, PROTOCOL_DARKPLACES7 , "DP7"},
+ { 3503, PROTOCOL_DARKPLACES6 , "DP6"},
+ { 3502, PROTOCOL_DARKPLACES5 , "DP5"},
+ { 3501, PROTOCOL_DARKPLACES4 , "DP4"},
+ { 3500, PROTOCOL_DARKPLACES3 , "DP3"},
+ { 97, PROTOCOL_DARKPLACES2 , "DP2"},
+ { 96, PROTOCOL_DARKPLACES1 , "DP1"},
+ { 15, PROTOCOL_QUAKEDP , "QUAKEDP"},
+ { 15, PROTOCOL_QUAKE , "QUAKE"},
+ { 28, PROTOCOL_QUAKEWORLD , "QW"},
+ { 250, PROTOCOL_NEHAHRAMOVIE, "NEHAHRAMOVIE"},
+ {10000, PROTOCOL_NEHAHRABJP , "NEHAHRABJP"},
+ {10001, PROTOCOL_NEHAHRABJP2 , "NEHAHRABJP2"},
+ {10002, PROTOCOL_NEHAHRABJP3 , "NEHAHRABJP3"},
+ { 0, PROTOCOL_UNKNOWN , NULL}
};
protocolversion_t Protocol_EnumForName(const char *s)
{
int i;
- for (i = 1;protocolversioninfo[i].name;i++)
+ for (i = 0;protocolversioninfo[i].name;i++)
if (!strcasecmp(s, protocolversioninfo[i].name))
- return (protocolversion_t)i;
+ return protocolversioninfo[i].version;
return PROTOCOL_UNKNOWN;
}
const char *Protocol_NameForEnum(protocolversion_t p)
{
- return protocolversioninfo[p].name;
+ int i;
+ for (i = 0;protocolversioninfo[i].name;i++)
+ if (protocolversioninfo[i].version == p)
+ return protocolversioninfo[i].name;
+ return "UNKNOWN";
}
protocolversion_t Protocol_EnumForNumber(int n)
{
int i;
- for (i = 1;protocolversioninfo[i].name;i++)
+ for (i = 0;protocolversioninfo[i].name;i++)
if (protocolversioninfo[i].number == n)
- return (protocolversion_t)i;
+ return protocolversioninfo[i].version;
return PROTOCOL_UNKNOWN;
}
int Protocol_NumberForEnum(protocolversion_t p)
{
- return protocolversioninfo[p].number;
+ int i;
+ for (i = 0;protocolversioninfo[i].name;i++)
+ if (protocolversioninfo[i].version == p)
+ return protocolversioninfo[i].number;
+ return 0;
}
void Protocol_Names(char *buffer, size_t buffersize)
if (buffersize < 1)
return;
buffer[0] = 0;
- for (i = 1;protocolversioninfo[i].name;i++)
+ for (i = 0;protocolversioninfo[i].name;i++)
{
if (i > 1)
strlcat(buffer, " ", buffersize);
else
{
s = ent->state_baseline;
- s.active = true;
+ s.active = ACTIVE_NETWORK;
}
cl.isquakeentity[num] = true;
ent->state_previous = ent->state_current;
ent->state_current = s;
- if (ent->state_current.active)
+ if (ent->state_current.active == ACTIVE_NETWORK)
{
CL_MoveLerpEntityStates(ent);
cl.entities_active[ent->state_current.number] = true;
else
{
cl.isquakeentity[num] = false;
- cl.entities_active[num] = false;
+ cl.entities_active[num] = ACTIVE_NOT;
cl.entities[num].state_current = defaultstate;
cl.entities[num].state_current.number = num;
}
}
}
-// FIXME FIXME FIXME: at this time the CSQC entity writing does not store
-// packet logs and thus if an update is lost it is never repeated, this makes
-// csqc entities useless at the moment.
+// NOTE: this only works with DP5 protocol and upwards. For lower protocols
+// (including QUAKE), no packet loss handling for CSQC is done, which makes
+// CSQC basically useless.
+// Always use the DP5 protocol, or a higher one, when using CSQC entities.
+static void EntityFrameCSQC_LostAllFrames(client_t *client)
+{
+ // mark ALL csqc entities as requiring a FULL resend!
+ // I know this is a bad workaround, but better than nothing.
+ int i, n;
+ prvm_edict_t *ed;
-void EntityFrameCSQC_WriteState (sizebuf_t *msg, int maxsize, int number, qboolean doupdate, qboolean *sectionstarted)
+ n = client->csqcnumedicts;
+ for(i = 0; i < n; ++i)
+ {
+ if(client->csqcentityglobalhistory[i])
+ {
+ ed = prog->edicts + i;
+ if (PRVM_serveredictfunction(ed, SendEntity))
+ client->csqcentitysendflags[i] |= 0xFFFFFF; // FULL RESEND
+ else // if it was ever sent to that client as a CSQC entity
+ {
+ client->csqcentityscope[i] = 1; // REMOVE
+ client->csqcentitysendflags[i] |= 0xFFFFFF;
+ }
+ }
+ }
+}
+void EntityFrameCSQC_LostFrame(client_t *client, int framenum)
{
- int version;
- prvm_eval_t *val, *val2;
- version = 0;
- if (doupdate)
+ // marks a frame as lost
+ int i, j;
+ qboolean valid;
+ int ringfirst, ringlast;
+ 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
+
+ valid = false;
+
+ for(j = 0; j < NUM_CSQCENTITYDB_FRAMES; ++j)
+ {
+ d = &client->csqcentityframehistory[(ringfirst + j) % NUM_CSQCENTITYDB_FRAMES];
+ if(d->framenum < 0)
+ continue;
+ if(d->framenum == framenum)
+ break;
+ else if(d->framenum < framenum)
+ valid = true;
+ }
+ if(j == NUM_CSQCENTITYDB_FRAMES)
{
- if (msg->cursize + !*sectionstarted + 2 + 1 + 2 > maxsize)
+ if(valid) // got beaten, i.e. there is a frame < framenum
+ {
+ // a non-csqc frame got lost... great
return;
- val2 = PRVM_EDICTFIELDVALUE((&prog->edicts[number]), prog->fieldoffsets.Version);
- version = (int)val2->_float;
- // LordHavoc: do some validity checks on self.Version
- // if self.Version reaches 255, it will soon exceed the byte used to
- // store an entity version in the client struct, so we need to reset
- // all the version to 1 and force all the existing clients' version of
- // it to 255 (which we're not allowing to actually occur)
- if (version < 0)
- val2->_float = 0;
- if (version >= 255)
- {
- int i;
- val2->_float = version = 1;
- // since we just reset the Version field to 1, it may accidentally
- // end up being equal to an existing client version now or in the
- // future, so to fix this situation we have to loop over all
- // clients and change their versions for this entity to be -1
- // which never matches, thus causing them to receive the update
- // soon, as they should
- for (i = 0;i < svs.maxclients;i++)
- if (svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[number])
- svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[number] = 255;
- }
- }
- // if the version already matches, we don't need to do anything as the
- // latest version has already been sent.
- if (svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[number] == version)
+ }
+ else
+ {
+ // a too old frame got lost... sorry, cannot handle this
+ Con_DPrintf("CSQC entity DB: lost a frame too early to do any handling (resending ALL)...\n");
+ 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;
- if (version)
+ }
+
+ // so j is the frame that got lost
+ // ringlast is the frame that we have to go to
+ ringfirst = (ringfirst + j) % NUM_CSQCENTITYDB_FRAMES;
+ if(ringlast < ringfirst)
+ ringlast += NUM_CSQCENTITYDB_FRAMES;
+
+ memset(recoversendflags, 0, sizeof(recoversendflags));
+
+ for(j = ringfirst; j <= ringlast; ++j)
{
- // if there's no SendEntity function, treat it as a remove
- val = PRVM_EDICTFIELDVALUE((&prog->edicts[number]), prog->fieldoffsets.SendEntity);
- if (val->function)
+ d = &client->csqcentityframehistory[j % NUM_CSQCENTITYDB_FRAMES];
+ if(d->framenum < 0)
{
- // there is a function to call, save the cursize value incase we
- // have to do a rollback due to overflow
- int oldcursize = msg->cursize;
- if(!*sectionstarted)
- MSG_WriteByte(msg, svc_csqcentities);
- MSG_WriteShort(msg, number);
- msg->allowoverflow = true;
- PRVM_G_INT(OFS_PARM0) = sv.writeentitiestoclient_cliententitynumber;
- prog->globals.server->self = number;
- PRVM_ExecuteProgram(val->function, "Null SendEntity\n");
- msg->allowoverflow = false;
- if(PRVM_G_FLOAT(OFS_RETURN))
+ // deleted frame
+ }
+ else if(d->framenum < framenum)
+ {
+ // a frame in the past... should never happen
+ Con_Printf("CSQC entity DB encountered a frame from the past when recovering from PL...?\n");
+ }
+ else if(d->framenum == framenum)
+ {
+ // handling the actually lost frame now
+ for(i = 0; i < d->num; ++i)
{
- if (msg->cursize + 2 > maxsize)
- {
- // if the packet no longer has enough room to write the
- // final index code that ends the message, rollback to the
- // state before we tried to write anything and then return
- msg->cursize = oldcursize;
- msg->overflowed = false;
- return;
- }
- // an update has been successfully written, update the version
- svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[number] = version;
- // and take note that we have begun the svc_csqcentities
- // section of the packet
- *sectionstarted = 1;
- return;
+ int sf = d->sendflags[i];
+ int ent = d->entno[i];
+ if(sf < 0) // remove
+ recoversendflags[ent] |= -1; // all bits, including sign
+ else if(sf > 0)
+ recoversendflags[ent] |= sf;
}
- else
+ }
+ else
+ {
+ // handling the frames that followed it now
+ for(i = 0; i < d->num; ++i)
{
- // rollback the buffer to its state before the writes
- msg->cursize = oldcursize;
- msg->overflowed = false;
- // if the function returned FALSE, simply write a remove
- // this is done by falling through to the remove code below
- version = 0;
+ int sf = d->sendflags[i];
+ int ent = d->entno[i];
+ if(sf < 0) // remove
+ {
+ recoversendflags[ent] = 0; // no need to update, we got a more recent remove (and will fix it THEN)
+ break; // no flags left to remove...
+ }
+ else if(sf > 0)
+ recoversendflags[ent] &= ~sf; // no need to update these bits, we already got them later
}
}
}
- // write a remove message if needed
- // if already removed, do nothing
- if (!svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[number])
- return;
- // if there isn't enough room to write the remove message, just return, as
- // it will be handled in a later packet
- if (msg->cursize + !*sectionstarted + 2 + 2 > maxsize)
- return;
- // first write the message identifier if needed
- if(!*sectionstarted)
+
+ for(i = 0; i < client->csqcnumedicts; ++i)
{
- *sectionstarted = 1;
- MSG_WriteByte(msg, svc_csqcentities);
+ if(recoversendflags[i] < 0)
+ {
+ // a remove got lost, then either send a remove or - if it was
+ // recreated later - a FULL update to make totally sure
+ client->csqcentityscope[i] = 1;
+ client->csqcentitysendflags[i] = 0xFFFFFF;
+ }
+ else
+ client->csqcentitysendflags[i] |= recoversendflags[i];
}
- // write the remove message
- MSG_WriteShort(msg, (unsigned short)number | 0x8000);
- svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[number] = 0;
+}
+static int EntityFrameCSQC_AllocFrame(client_t *client, int framenum)
+{
+ int ringfirst = client->csqcentityframehistory_next; // oldest entry
+ client->csqcentityframehistory_next += 1;
+ client->csqcentityframehistory_next %= NUM_CSQCENTITYDB_FRAMES;
+ client->csqcentityframehistory[ringfirst].framenum = framenum;
+ client->csqcentityframehistory[ringfirst].num = 0;
+ return ringfirst;
+}
+static void EntityFrameCSQC_DeallocFrame(client_t *client, int framenum)
+{
+ int ringfirst = client->csqcentityframehistory_next; // oldest entry
+ int ringlast = (ringfirst + NUM_CSQCENTITYDB_FRAMES - 1) % NUM_CSQCENTITYDB_FRAMES; // most recently added entry
+ if(framenum == client->csqcentityframehistory[ringlast].framenum)
+ {
+ client->csqcentityframehistory[ringlast].framenum = -1;
+ client->csqcentityframehistory[ringlast].num = 0;
+ client->csqcentityframehistory_next = ringlast;
+ }
+ else
+ Con_Printf("Trying to dealloc the wrong entity frame\n");
}
//[515]: we use only one array per-client for SendEntity feature
-void EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int maxsize, int numstates, const entity_state_t *states)
+// TODO: add some handling for entity send priorities, to better deal with huge
+// amounts of csqc networked entities
+qboolean EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int maxsize, int numnumbers, const unsigned short *numbers, int framenum)
{
- int i, num;
+ int num, number, end, sendflags;
qboolean sectionstarted = false;
- const entity_state_t *n;
+ const unsigned short *n;
+ prvm_edict_t *ed;
+ client_t *client = svs.clients + sv.writeentitiestoclient_clientnumber;
+ 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
- if(prog->fieldoffsets.SendEntity < 0 || prog->fieldoffsets.Version < 0)
- return;
// make sure there is enough room to store the svc_csqcentities byte,
// the terminator (0x0000) and at least one entity update
if (msg->cursize + 32 >= maxsize)
- return;
+ return false;
- num = 1;
- for (i = 0, n = states;i < numstates;i++, n++)
+ if (client->csqcnumedicts < prog->num_edicts)
+ client->csqcnumedicts = prog->num_edicts;
+
+ number = 1;
+ for (num = 0, n = numbers;num < numnumbers;num++, n++)
{
- // all entities between the previous entity state and this one are dead
- for (;num < n->number;num++)
- if(svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[num])
- EntityFrameCSQC_WriteState(msg, maxsize, num, false, §ionstarted);
- // update this entity
- EntityFrameCSQC_WriteState(msg, maxsize, num, true, §ionstarted);
- // advance to next entity so the next iteration doesn't immediately remove it
- num++;
+ end = *n;
+ for (;number < end;number++)
+ {
+ if (client->csqcentityscope[number])
+ {
+ client->csqcentityscope[number] = 1;
+ client->csqcentitysendflags[number] = 0xFFFFFF;
+ }
+ }
+ ed = prog->edicts + number;
+ if (PRVM_serveredictfunction(ed, SendEntity))
+ client->csqcentityscope[number] = 2;
+ else if (client->csqcentityscope[number])
+ {
+ client->csqcentityscope[number] = 1;
+ client->csqcentitysendflags[number] = 0xFFFFFF;
+ }
+ number++;
+ }
+ end = client->csqcnumedicts;
+ for (;number < end;number++)
+ {
+ if (client->csqcentityscope[number])
+ {
+ client->csqcentityscope[number] = 1;
+ client->csqcentitysendflags[number] = 0xFFFFFF;
+ }
+ }
+
+ /*
+ // mark all scope entities as remove
+ for (number = 1;number < client->csqcnumedicts;number++)
+ if (client->csqcentityscope[number])
+ client->csqcentityscope[number] = 1;
+ // keep visible entities
+ for (i = 0, n = numbers;i < numnumbers;i++, n++)
+ {
+ number = *n;
+ ed = prog->edicts + number;
+ if (PRVM_serveredictfunction(ed, SendEntity))
+ client->csqcentityscope[number] = 2;
+ }
+ */
+
+ // now try to emit the entity updates
+ // (FIXME: prioritize by distance?)
+ end = client->csqcnumedicts;
+ for (number = 1;number < end;number++)
+ {
+ if (!client->csqcentityscope[number])
+ continue;
+ sendflags = client->csqcentitysendflags[number];
+ if (!sendflags)
+ continue;
+ if(db->num >= NUM_CSQCENTITIES_PER_FRAME)
+ break;
+ ed = prog->edicts + number;
+ // entity scope is either update (2) or remove (1)
+ if (client->csqcentityscope[number] == 1)
+ {
+ // write a remove message
+ // first write the message identifier if needed
+ if(!sectionstarted)
+ {
+ sectionstarted = 1;
+ MSG_WriteByte(msg, svc_csqcentities);
+ }
+ // write the remove message
+ {
+ ENTITYSIZEPROFILING_START(msg, number);
+ MSG_WriteShort(msg, (unsigned short)number | 0x8000);
+ client->csqcentityscope[number] = 0;
+ client->csqcentitysendflags[number] = 0xFFFFFF; // resend completely if it becomes active again
+ db->entno[db->num] = number;
+ db->sendflags[db->num] = -1;
+ db->num += 1;
+ client->csqcentityglobalhistory[number] = 1;
+ ENTITYSIZEPROFILING_END(msg, number);
+ }
+ if (msg->cursize + 17 >= maxsize)
+ break;
+ }
+ else
+ {
+ // write an update
+ // save the cursize value in case we overflow and have to rollback
+ int oldcursize = msg->cursize;
+ client->csqcentityscope[number] = 1;
+ if (PRVM_serveredictfunction(ed, SendEntity))
+ {
+ if(!sectionstarted)
+ MSG_WriteByte(msg, svc_csqcentities);
+ {
+ ENTITYSIZEPROFILING_START(msg, number);
+ MSG_WriteShort(msg, number);
+ msg->allowoverflow = true;
+ PRVM_G_INT(OFS_PARM0) = sv.writeentitiestoclient_cliententitynumber;
+ PRVM_G_FLOAT(OFS_PARM1) = sendflags;
+ PRVM_serverglobaledict(self) = number;
+ PRVM_ExecuteProgram(PRVM_serveredictfunction(ed, SendEntity), "Null SendEntity\n");
+ msg->allowoverflow = false;
+ if(PRVM_G_FLOAT(OFS_RETURN) && msg->cursize + 2 <= maxsize)
+ {
+ // an update has been successfully written
+ client->csqcentitysendflags[number] = 0;
+ db->entno[db->num] = number;
+ db->sendflags[db->num] = sendflags;
+ db->num += 1;
+ client->csqcentityglobalhistory[number] = 1;
+ // and take note that we have begun the svc_csqcentities
+ // section of the packet
+ sectionstarted = 1;
+ ENTITYSIZEPROFILING_END(msg, number);
+ if (msg->cursize + 17 >= maxsize)
+ break;
+ continue;
+ }
+ }
+ }
+ // self.SendEntity returned false (or does not exist) or the
+ // update was too big for this packet - rollback the buffer to its
+ // state before the writes occurred, we'll try again next frame
+ msg->cursize = oldcursize;
+ msg->overflowed = false;
+ }
}
- // all remaining entities are dead
- for (;num < prog->num_edicts;num++)
- if(svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[num])
- EntityFrameCSQC_WriteState(msg, maxsize, num, false, §ionstarted);
if (sectionstarted)
{
// write index 0 to end the update (0 is never used by real entities)
MSG_WriteShort(msg, 0);
}
+
+ if(db->num == 0)
+ // if no single ent got added, remove the frame from the DB again, to allow
+ // for a larger history
+ EntityFrameCSQC_DeallocFrame(client, framenum);
+
+ return sectionstarted;
}
void Protocol_UpdateClientStats(const int *stats)
}
-void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int maxsize, int numstates, const entity_state_t *states)
+qboolean EntityFrameQuake_WriteFrame(sizebuf_t *msg, int maxsize, int numstates, const entity_state_t **states)
{
const entity_state_t *s;
entity_state_t baseline;
int i, bits;
sizebuf_t buf;
unsigned char data[128];
- prvm_eval_t *val;
+ qboolean success = false;
// prepare the buffer
memset(&buf, 0, sizeof(buf));
buf.data = data;
buf.maxsize = sizeof(data);
- for (i = 0, s = states;i < numstates;i++, s++)
+ for (i = 0;i < numstates;i++)
{
- val = PRVM_EDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.SendEntity);
- if(val && val->function)
+ ENTITYSIZEPROFILING_START(msg, states[i]->number);
+ s = states[i];
+ if(PRVM_serveredictfunction((&prog->edicts[s->number]), SendEntity))
continue;
// prepare the buffer
}
// write the message to the packet
SZ_Write(msg, buf.data, buf.cursize);
+ success = true;
+ ENTITYSIZEPROFILING_END(msg, s->number);
}
+ return success;
}
int EntityState_DeltaBits(const entity_state_t *o, const entity_state_t *n)
{
unsigned int bits;
// if o is not active, delta from default
- if (!o->active)
+ if (o->active != ACTIVE_NETWORK)
o = &defaultstate;
bits = 0;
if (fabs(n->origin[0] - o->origin[0]) > (1.0f / 256.0f))
void EntityState_WriteUpdate(const entity_state_t *ent, sizebuf_t *msg, const entity_state_t *delta)
{
unsigned int bits;
- if (ent->active)
+ ENTITYSIZEPROFILING_START(msg, ent->number);
+ if (ent->active == ACTIVE_NETWORK)
{
// entity is active, check for changes from the delta
if ((bits = EntityState_DeltaBits(delta, ent)))
else
{
// entity is inactive, check if the delta was active
- if (delta->active)
+ if (delta->active == ACTIVE_NETWORK)
{
// write the remove number
MSG_WriteShort(msg, ent->number | 0x8000);
}
}
+ ENTITYSIZEPROFILING_END(msg, ent->number);
}
int EntityState_ReadExtendBits(void)
}
}
+extern void CL_NewFrameReceived(int num);
+
// (client and server) allocates a new empty database
entityframe_database_t *EntityFrame_AllocDatabase(mempool_t *mempool)
{
}
}
-// (server and client) adds a entity_frame to the database, for future reference
-void EntityFrame_AddFrame(entityframe_database_t *d, vec3_t eye, int framenum, int numentities, const entity_state_t *entitydata)
+// (client) adds a entity_frame to the database, for future reference
+void EntityFrame_AddFrame_Client(entityframe_database_t *d, vec3_t eye, int framenum, int numentities, const entity_state_t *entitydata)
+{
+ int n, e;
+ entity_frameinfo_t *info;
+
+ VectorCopy(eye, d->eye);
+
+ // figure out how many entity slots are used already
+ if (d->numframes)
+ {
+ n = d->frames[d->numframes - 1].endentity - d->frames[0].firstentity;
+ if (n + numentities > MAX_ENTITY_DATABASE || d->numframes >= MAX_ENTITY_HISTORY)
+ {
+ // ran out of room, dump database
+ EntityFrame_ClearDatabase(d);
+ }
+ }
+
+ info = &d->frames[d->numframes];
+ info->framenum = 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 == framenum)
+ Con_Print("EntityFrame_AddFrame: tried to add out of sequence frame to database\n");
+ else
+ Con_Print("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 + numentities;
+ d->numframes++;
+
+ n = info->firstentity % MAX_ENTITY_DATABASE;
+ e = MAX_ENTITY_DATABASE - n;
+ if (e > numentities)
+ e = numentities;
+ memcpy(d->entitydata + n, entitydata, sizeof(entity_state_t) * e);
+ if (numentities > e)
+ memcpy(d->entitydata, entitydata + e, sizeof(entity_state_t) * (numentities - e));
+}
+
+// (server) adds a entity_frame to the database, for future reference
+void EntityFrame_AddFrame_Server(entityframe_database_t *d, vec3_t eye, int framenum, int numentities, const entity_state_t **entitydata)
{
int n, e;
entity_frameinfo_t *info;
}
// (server) writes a frame to network stream
-void EntityFrame_WriteFrame(sizebuf_t *msg, int maxsize, entityframe_database_t *d, int numstates, const entity_state_t *states, int viewentnum)
+qboolean EntityFrame_WriteFrame(sizebuf_t *msg, int maxsize, entityframe_database_t *d, int numstates, const entity_state_t **states, int viewentnum)
{
int i, onum, number;
entity_frame_t *o = &d->deltaframe;
const entity_state_t *ent, *delta;
vec3_t eye;
- prvm_eval_t *val;
d->latestframenum++;
VectorClear(eye);
for (i = 0;i < numstates;i++)
{
- if (states[i].number == viewentnum)
+ ent = states[i];
+ if (ent->number == viewentnum)
{
- VectorSet(eye, states[i].origin[0], states[i].origin[1], states[i].origin[2] + 22);
+ VectorSet(eye, ent->origin[0], ent->origin[1], ent->origin[2] + 22);
break;
}
}
- EntityFrame_AddFrame(d, eye, d->latestframenum, numstates, states);
+ EntityFrame_AddFrame_Server(d, eye, d->latestframenum, numstates, states);
EntityFrame_FetchFrame(d, d->ackframenum, o);
onum = 0;
for (i = 0;i < numstates;i++)
{
- ent = states + i;
+ ent = states[i];
number = ent->number;
- val = PRVM_EDICTFIELDVALUE((&prog->edicts[number]), prog->fieldoffsets.SendEntity);
- if(val && val->function)
- continue;
+ if (PRVM_serveredictfunction((&prog->edicts[number]), SendEntity))
+ continue;
for (;onum < o->numentities && o->entitydata[onum].number < number;onum++)
{
// write remove message
MSG_WriteShort(msg, o->entitydata[onum].number | 0x8000);
}
MSG_WriteShort(msg, 0xFFFF);
+
+ return true;
}
// (client) reads a frame from network stream
// read the frame header info
f->time = cl.mtime[0];
number = MSG_ReadLong();
- for (i = 0;i < LATESTFRAMENUMS-1;i++)
- cl.latestframenums[i] = cl.latestframenums[i+1];
- cl.latestframenums[LATESTFRAMENUMS-1] = f->framenum = MSG_ReadLong();
+ f->framenum = MSG_ReadLong();
+ CL_NewFrameReceived(f->framenum);
f->eye[0] = MSG_ReadFloat();
f->eye[1] = MSG_ReadFloat();
f->eye[2] = MSG_ReadFloat();
CL_ExpandEntities(number);
}
cl.entities_active[number] = true;
- e->active = true;
+ e->active = ACTIVE_NETWORK;
e->time = cl.mtime[0];
e->number = number;
EntityState_ReadFields(e, EntityState_ReadExtendBits());
f->entitydata[f->numentities] = *old++;
f->entitydata[f->numentities++].time = cl.mtime[0];
}
- EntityFrame_AddFrame(d, f->eye, f->framenum, f->numentities, f->entitydata);
+ EntityFrame_AddFrame_Client(d, f->eye, f->framenum, f->numentities, f->entitydata);
memset(cl.entities_active, 0, cl.num_entities * sizeof(unsigned char));
number = 1;
if (cl.entities_active[number])
{
cl.entities_active[number] = false;
- cl.entities[number].state_current.active = false;
+ cl.entities[number].state_current.active = ACTIVE_NOT;
}
}
if (number >= cl.num_entities)
if (cl.entities_active[number])
{
cl.entities_active[number] = false;
- cl.entities[number].state_current.active = false;
+ cl.entities[number].state_current.active = ACTIVE_NOT;
}
}
}
entity_state_t *s = EntityFrame4_GetReferenceEntity(d, commit->entity[j].number);
if (commit->entity[j].active != s->active)
{
- if (commit->entity[j].active)
+ if (commit->entity[j].active == ACTIVE_NETWORK)
Con_Printf("commit entity %i has become active (modelindex %i)\n", commit->entity[j].number, commit->entity[j].modelindex);
else
Con_Printf("commit entity %i has become inactive (modelindex %i)\n", commit->entity[j].number, commit->entity[j].modelindex);
// read the number of the frame this refers to
referenceframenum = MSG_ReadLong();
// read the number of this frame
- for (i = 0;i < LATESTFRAMENUMS-1;i++)
- cl.latestframenums[i] = cl.latestframenums[i+1];
- cl.latestframenums[LATESTFRAMENUMS-1] = framenum = MSG_ReadLong();
+ framenum = MSG_ReadLong();
+ CL_NewFrameReceived(framenum);
// read the start number
enumber = (unsigned short) MSG_ReadShort();
if (developer_networkentities.integer >= 10)
// read the changes
if (developer_networkentities.integer >= 2)
Con_Printf("entity %i: update\n", enumber);
- s->active = true;
+ s->active = ACTIVE_NETWORK;
EntityState_ReadFields(s, EntityState_ReadExtendBits());
}
}
else if (developer_networkentities.integer >= 4)
Con_Printf("entity %i: copy\n", enumber);
// set the cl.entities_active flag
- cl.entities_active[enumber] = s->active;
+ cl.entities_active[enumber] = (s->active == ACTIVE_NETWORK);
// set the update time
s->time = cl.mtime[0];
// fix the number (it gets wiped occasionally by copying from defaultstate)
s->number = enumber;
// check if we need to update the lerp stuff
- if (s->active)
+ if (s->active == ACTIVE_NETWORK)
CL_MoveLerpEntityStates(&cl.entities[enumber]);
// add this to the commit entry whether it is modified or not
if (d->currentcommit)
// print extra messages if desired
if (developer_networkentities.integer >= 2 && cl.entities[enumber].state_current.active != cl.entities[enumber].state_previous.active)
{
- if (cl.entities[enumber].state_current.active)
+ if (cl.entities[enumber].state_current.active == ACTIVE_NETWORK)
Con_Printf("entity #%i has become active\n", enumber);
else if (cl.entities[enumber].state_previous.active)
Con_Printf("entity #%i has become inactive\n", enumber);
EntityFrame4_ResetDatabase(d);
}
-void EntityFrame4_WriteFrame(sizebuf_t *msg, int maxsize, entityframe4_database_t *d, int numstates, const entity_state_t *states)
+qboolean EntityFrame4_WriteFrame(sizebuf_t *msg, int maxsize, entityframe4_database_t *d, int numstates, const entity_state_t **states)
{
const entity_state_t *e, *s;
entity_state_t inactiveentitystate;
int i, n, startnumber;
sizebuf_t buf;
unsigned char data[128];
- prvm_eval_t *val;
// if there isn't enough space to accomplish anything, skip it
if (msg->cursize + 24 > maxsize)
- return;
+ return false;
// prepare the buffer
memset(&buf, 0, sizeof(buf));
break;
// if commit buffer full, just don't bother writing an update this frame
if (i == MAX_ENTITY_HISTORY)
- return;
+ return false;
d->currentcommit = d->commit + i;
// this state's number gets played around with later
d->currententitynumber = 1;
for (i = 0, n = startnumber;n < prog->max_edicts;n++)
{
- val = PRVM_EDICTFIELDVALUE((&prog->edicts[n]), prog->fieldoffsets.SendEntity);
- if(val && val->function)
+ if (PRVM_serveredictfunction((&prog->edicts[n]), SendEntity))
continue;
// find the old state to delta from
e = EntityFrame4_GetReferenceEntity(d, n);
SZ_Clear(&buf);
// entity exists, build an update (if empty there is no change)
// find the state in the list
- for (;i < numstates && states[i].number < n;i++);
+ for (;i < numstates && states[i]->number < n;i++);
// make the message
- s = states + i;
+ s = states[i];
if (s->number == n)
{
// build the update
{
inactiveentitystate.number = n;
s = &inactiveentitystate;
- if (e->active)
+ if (e->active == ACTIVE_NETWORK)
{
// entity used to exist but doesn't anymore, send remove
MSG_WriteShort(&buf, n | 0x8000);
MSG_WriteShort(msg, d->currententitynumber);
// just to be sure
d->currentcommit = NULL;
+
+ return true;
}
Mem_Free(d);
}
-void EntityFrame5_ExpandEdicts(entityframe5_database_t *d, int newmax)
+static void EntityFrame5_ExpandEdicts(entityframe5_database_t *d, int newmax)
{
if (d->maxedicts < newmax)
{
}
}
-int EntityState5_Priority(entityframe5_database_t *d, int stateindex)
+static int EntityState5_Priority(entityframe5_database_t *d, int stateindex)
{
int limit, priority;
- entity_state_t *s;
+ entity_state_t *s = NULL; // hush compiler warning by initializing this
// if it is the player, update urgently
if (stateindex == d->viewentnum)
return ENTITYFRAME5_PRIORITYLEVELS - 1;
if (stateindex <= svs.maxclients)
priority++;
// remove dead entities very quickly because they are just 2 bytes
- if (!d->states[stateindex].active)
+ if (d->states[stateindex].active != ACTIVE_NETWORK)
{
priority++;
return bound(1, priority, ENTITYFRAME5_PRIORITYLEVELS - 1);
void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbits, sizebuf_t *msg)
{
unsigned int bits = 0;
+ //dp_model_t *model;
+ ENTITYSIZEPROFILING_START(msg, s->number);
- prvm_eval_t *val;
- val = PRVM_EDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.SendEntity);
- if(val && val->function)
- return;
-
- if (!s->active)
+ if (s->active != ACTIVE_NETWORK)
MSG_WriteShort(msg, number | 0x8000);
else
{
+ if (PRVM_serveredictfunction((&prog->edicts[s->number]), SendEntity))
+ return;
+
bits = changedbits;
- if ((bits & E5_ORIGIN) && ((s->flags & RENDER_EXTERIORMODEL) || s->origin[0] <= -4096.0625 || s->origin[0] >= 4095.9375 || s->origin[1] <= -4096.0625 || s->origin[1] >= 4095.9375 || s->origin[2] <= -4096.0625 || s->origin[2] >= 4095.9375))
+ if ((bits & E5_ORIGIN) && (!(s->flags & RENDER_LOWPRECISION) || s->exteriormodelforclient || s->tagentity || s->viewmodelforclient || (s->number >= 1 && s->number <= svs.maxclients) || s->origin[0] <= -4096.0625 || s->origin[0] >= 4095.9375 || s->origin[1] <= -4096.0625 || s->origin[1] >= 4095.9375 || s->origin[2] <= -4096.0625 || s->origin[2] >= 4095.9375))
+ // maybe also add: ((model = SV_GetModelByIndex(s->modelindex)) != NULL && model->name[0] == '*')
bits |= E5_ORIGIN32;
// possible values:
// negative origin:
MSG_WriteByte(msg, s->colormod[1]);
MSG_WriteByte(msg, s->colormod[2]);
}
+ if (bits & E5_GLOWMOD)
+ {
+ MSG_WriteByte(msg, s->glowmod[0]);
+ 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));
+ }
+ }
+ if (bits & E5_TRAILEFFECTNUM)
+ MSG_WriteShort(msg, s->traileffectnum);
}
+
+ ENTITYSIZEPROFILING_END(msg, s->number);
}
-void EntityState5_ReadUpdate(entity_state_t *s, int number)
+extern dp_model_t *CL_GetModelByIndex(int modelindex);
+
+static void EntityState5_ReadUpdate(entity_state_t *s, int number)
{
int bits;
bits = MSG_ReadByte();
if (bits & E5_FULLUPDATE)
{
*s = defaultstate;
- s->active = true;
+ s->active = ACTIVE_NETWORK;
}
if (bits & E5_FLAGS)
s->flags = MSG_ReadByte();
s->colormod[1] = MSG_ReadByte();
s->colormod[2] = MSG_ReadByte();
}
+ if (bits & E5_GLOWMOD)
+ {
+ s->glowmod[0] = MSG_ReadByte();
+ 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 (bits & E5_TRAILEFFECTNUM)
+ s->traileffectnum = (unsigned short) MSG_ReadShort();
if (developer_networkentities.integer >= 2)
Con_Printf(" E5_GLOW %i:%i", s->glowsize * 4, s->glowcolor);
if (bits & E5_COLORMOD)
Con_Printf(" E5_COLORMOD %f:%f:%f", s->colormod[0] / 32.0f, s->colormod[1] / 32.0f, s->colormod[2] / 32.0f);
+ if (bits & E5_GLOWMOD)
+ Con_Printf(" E5_GLOWMOD %f:%f:%f", s->glowmod[0] / 32.0f, s->glowmod[1] / 32.0f, s->glowmod[2] / 32.0f);
Con_Print("\n");
}
}
-int EntityState5_DeltaBits(const entity_state_t *o, const entity_state_t *n)
+static int EntityState5_DeltaBits(const entity_state_t *o, const entity_state_t *n)
{
unsigned int bits = 0;
- if (n->active)
+ if (n->active == ACTIVE_NETWORK)
{
- if (!o->active)
+ if (o->active != ACTIVE_NETWORK)
bits |= E5_FULLUPDATE;
if (!VectorCompare(o->origin, n->origin))
bits |= E5_ORIGIN;
bits |= E5_GLOW;
if (o->colormod[0] != n->colormod[0] || o->colormod[1] != n->colormod[1] || o->colormod[2] != n->colormod[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;
+ if (o->traileffectnum != n->traileffectnum)
+ bits |= E5_TRAILEFFECTNUM;
}
else
- if (o->active)
+ if (o->active == ACTIVE_NETWORK)
bits |= E5_FULLUPDATE;
return bits;
}
void EntityFrame5_CL_ReadFrame(void)
{
- int i, n, enumber;
+ int n, enumber, framenum;
entity_t *ent;
entity_state_t *s;
// read the number of this frame to echo back in next input packet
- for (i = 0;i < LATESTFRAMENUMS-1;i++)
- cl.latestframenums[i] = cl.latestframenums[i+1];
- cl.latestframenums[LATESTFRAMENUMS-1] = MSG_ReadLong();
- if (developer_networkentities.integer >= 10)
- Con_Printf("recv: svc_entities %i\n", cl.latestframenums[LATESTFRAMENUMS-1]);
+ framenum = MSG_ReadLong();
+ CL_NewFrameReceived(framenum);
if (cls.protocol != PROTOCOL_QUAKE && cls.protocol != PROTOCOL_QUAKEDP && cls.protocol != PROTOCOL_NEHAHRAMOVIE && cls.protocol != PROTOCOL_DARKPLACES1 && cls.protocol != PROTOCOL_DARKPLACES2 && cls.protocol != PROTOCOL_DARKPLACES3 && cls.protocol != PROTOCOL_DARKPLACES4 && cls.protocol != PROTOCOL_DARKPLACES5 && cls.protocol != PROTOCOL_DARKPLACES6)
cls.servermovesequence = MSG_ReadLong();
// read entity numbers until we find a 0x8000
EntityState5_ReadUpdate(s, enumber);
}
// set the cl.entities_active flag
- cl.entities_active[enumber] = s->active;
+ cl.entities_active[enumber] = (s->active == ACTIVE_NETWORK);
// set the update time
s->time = cl.mtime[0];
// fix the number (it gets wiped occasionally by copying from defaultstate)
s->number = enumber;
// check if we need to update the lerp stuff
- if (s->active)
+ if (s->active == ACTIVE_NETWORK)
CL_MoveLerpEntityStates(&cl.entities[enumber]);
// print extra messages if desired
if (developer_networkentities.integer >= 2 && cl.entities[enumber].state_current.active != cl.entities[enumber].state_previous.active)
{
- if (cl.entities[enumber].state_current.active)
+ if (cl.entities[enumber].state_current.active == ACTIVE_NETWORK)
Con_Printf("entity #%i has become active\n", enumber);
else if (cl.entities[enumber].state_previous.active)
Con_Printf("entity #%i has become inactive\n", enumber);
}
}
+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)
d->packetlog[i].packetnumber = 0;
}
-void EntityFrame5_WriteFrame(sizebuf_t *msg, int maxsize, entityframe5_database_t *d, int numstates, const entity_state_t *states, int viewentnum, int movesequence)
+qboolean EntityFrame5_WriteFrame(sizebuf_t *msg, int maxsize, entityframe5_database_t *d, int numstates, const entity_state_t **states, int viewentnum, int movesequence, qboolean need_empty)
{
const entity_state_t *n;
int i, num, l, framenum, packetlognumber, priority;
// detect changes in states
num = 1;
- for (i = 0, n = states;i < numstates;i++, n++)
+ for (i = 0;i < numstates;i++)
{
+ n = states[i];
// mark gaps in entity numbering as removed entities
for (;num < n->number;num++)
{
// if there isn't at least enough room for an empty svc_entities,
// don't bother trying...
if (buf.cursize + 11 > buf.maxsize)
- return;
+ return false;
// build lists of entities by priority level
memset(d->prioritychaincounts, 0, sizeof(d->prioritychaincounts));
}
}
- // add packetlog entry
- packetlog = d->packetlog + packetlognumber;
- packetlog->packetnumber = framenum;
- packetlog->numstates = 0;
+ packetlog = NULL;
// write stat updates
if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE && sv.protocol != PROTOCOL_NEHAHRABJP && sv.protocol != PROTOCOL_NEHAHRABJP2 && sv.protocol != PROTOCOL_NEHAHRABJP3 && sv.protocol != PROTOCOL_DARKPLACES1 && sv.protocol != PROTOCOL_DARKPLACES2 && sv.protocol != PROTOCOL_DARKPLACES3 && sv.protocol != PROTOCOL_DARKPLACES4 && sv.protocol != PROTOCOL_DARKPLACES5)
{
if (host_client->statsdeltabits[i>>3] & (1<<(i&7)))
{
host_client->statsdeltabits[i>>3] &= ~(1<<(i&7));
+ // add packetlog entry now that we have something for it
+ if (!packetlog)
+ {
+ packetlog = d->packetlog + packetlognumber;
+ packetlog->packetnumber = framenum;
+ packetlog->numstates = 0;
+ memset(packetlog->statsdeltabits, 0, sizeof(packetlog->statsdeltabits));
+ }
packetlog->statsdeltabits[i>>3] |= (1<<(i&7));
if (host_client->stats[i] >= 0 && host_client->stats[i] < 256)
{
MSG_WriteByte(msg, svc_updatestatubyte);
MSG_WriteByte(msg, i);
MSG_WriteByte(msg, host_client->stats[i]);
+ l = 1;
}
else
{
MSG_WriteByte(msg, svc_updatestat);
MSG_WriteByte(msg, i);
MSG_WriteLong(msg, host_client->stats[i]);
+ l = 1;
}
}
}
}
+
+ // only send empty svc_entities frame if needed
+ if(!l && !need_empty)
+ return false;
+
+ // add packetlog entry now that we have something for it
+ if (!packetlog)
+ {
+ packetlog = d->packetlog + packetlognumber;
+ packetlog->packetnumber = framenum;
+ packetlog->numstates = 0;
+ memset(packetlog->statsdeltabits, 0, sizeof(packetlog->statsdeltabits));
+ }
+
// write state updates
if (developer_networkentities.integer >= 10)
Con_Printf("send: svc_entities %i\n", framenum);
}
}
MSG_WriteShort(msg, 0x8000);
+
+ return true;
}
// read the update
s = &ent->state_current;
*s = defaultstate;
- s->active = true;
+ s->active = ACTIVE_NETWORK;
s->number = enumber;
s->colormap = enumber;
playerflags = MSG_ReadShort();
if (bits & QW_CM_UP)
MSG_ReadShort(); // cmd->upmove
if (bits & QW_CM_BUTTONS)
- MSG_ReadByte(); // cmd->buttons
+ (void) MSG_ReadByte(); // cmd->buttons
if (bits & QW_CM_IMPULSE)
- MSG_ReadByte(); // cmd->impulse
- MSG_ReadByte(); // cmd->msec
+ (void) MSG_ReadByte(); // cmd->impulse
+ (void) MSG_ReadByte(); // cmd->msec
}
if (playerflags & QW_PF_VELOCITY1)
velocity[0] = MSG_ReadShort();
}
// set the cl.entities_active flag
- cl.entities_active[enumber] = s->active;
+ cl.entities_active[enumber] = (s->active == ACTIVE_NETWORK);
// set the update time
s->time = cl.mtime[0] - msec * 0.001; // qw has no clock
// check if we need to update the lerp stuff
- if (s->active)
+ if (s->active == ACTIVE_NETWORK)
CL_MoveLerpEntityStates(&cl.entities[enumber]);
}
static void EntityStateQW_ReadEntityUpdate(entity_state_t *s, int bits)
{
int qweffects = 0;
- s->active = true;
+ s->active = ACTIVE_NETWORK;
s->number = bits & 511;
bits &= ~511;
if (bits & QW_U_MOREBITS)
if (cl.entities_active[number])
{
cl.entities_active[number] = false;
- cl.entities[number].state_current.active = false;
+ cl.entities[number].state_current.active = ACTIVE_NOT;
}
}
if (number >= cl.num_entities)