//============================================================================
+extern void SV_Phys_Init (void);
+extern void SV_World_Init (void);
+
/*
===============
SV_Init
Cvar_RegisterVariable (&sv_cullentities_trace);
Cvar_RegisterVariable (&sv_cullentities_stats);
+ SV_Phys_Init();
+ SV_World_Init();
+
for (i = 0;i < MAX_MODELS;i++)
sprintf (localmodels[i], "*%i", i);
MSG_WriteString (&client->message,message);
MSG_WriteByte (&client->message, svc_serverinfo);
- MSG_WriteLong (&client->message, DPPROTOCOL_VERSION2);
+ MSG_WriteLong (&client->message, DPPROTOCOL_VERSION3);
MSG_WriteByte (&client->message, svs.maxclients);
if (!coop.integer && deathmatch.integer)
client->spawn_parms[i] = (&pr_global_struct->parm1)[i];
}
+#if NOROUTINGFIX
+ SV_SendServerinfo (client);
+#else
// send serverinfo on first nop
client->waitingforconnect = true;
client->sendsignon = true;
client->spawned = false; // need prespawn, spawn, etc
+#endif
}
SV_ConnectClient (i);
net_activeconnections++;
+ NET_Heartbeat ();
}
}
}
// node - recurse down the BSP tree
- switch (BOX_ON_PLANE_SIDE(mins, maxs, node->plane))
+ switch (BoxOnPlaneSide(mins, maxs, node->plane))
{
case 1: // front
node = node->children[0];
#ifdef QUAKEENTITIES
void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
{
- int e, clentnum, bits, alpha, glowcolor, glowsize, scale, effects;
+ int e, clentnum, bits, alpha, glowcolor, glowsize, scale, effects, lightsize;
int culled_pvs, culled_portal, culled_trace, visibleentities, totalentities;
qbyte *pvs;
- vec3_t org, origin, angles, entmins, entmaxs;
- float nextfullupdate;
+ vec3_t origin, angles, entmins, entmaxs, testorigin, testeye;
+ float nextfullupdate, alphaf;
edict_t *ent;
eval_t *val;
entity_state_t *baseline; // LordHavoc: delta or startup baseline
trace_t trace;
model_t *model;
- double testeye[3];
- double testorigin[3];
Mod_CheckLoaded(sv.worldmodel);
// find the client's PVS
- VectorAdd (clent->v.origin, clent->v.view_ofs, org);
- VectorCopy (org, testeye);
- pvs = SV_FatPVS (org);
- /*
- // dp protocol
- MSG_WriteByte(msg, svc_playerposition);
- MSG_WriteFloat(msg, org[0]);
- MSG_WriteFloat(msg, org[1]);
- MSG_WriteFloat(msg, org[2]);
- */
+ VectorAdd (clent->v.origin, clent->v.view_ofs, testeye);
+ pvs = SV_FatPVS (testeye);
culled_pvs = 0;
culled_portal = 0;
}
// or not visible through the portals
- if (sv_cullentities_portal.integer && !Portal_CheckBox(sv.worldmodel, org, entmins, entmaxs))
+ if (sv_cullentities_portal.integer && !Portal_CheckBox(sv.worldmodel, testeye, entmins, entmaxs))
{
culled_portal++;
continue;
testorigin[1] = lhrandom(entmins[1], entmaxs[1]);
testorigin[2] = lhrandom(entmins[2], entmaxs[2]);
- memset (&trace, 0, sizeof(trace_t));
- trace.fraction = 1;
- trace.allsolid = true;
- VectorCopy(testorigin, trace.endpos);
-
- VectorCopy(org, RecursiveHullCheckInfo.start);
- VectorSubtract(testorigin, testeye, RecursiveHullCheckInfo.dist);
- RecursiveHullCheckInfo.hull = sv.worldmodel->hulls;
- RecursiveHullCheckInfo.trace = &trace;
- SV_RecursiveHullCheck (sv.worldmodel->hulls->firstclipnode, 0, 1, testeye, testorigin);
+ Collision_ClipTrace(&trace, NULL, sv.worldmodel, vec3_origin, vec3_origin, vec3_origin, testeye, vec3_origin, vec3_origin, testorigin);
if (trace.fraction == 1)
client->visibletime[e] = realtime + 1;
else
{
- if (realtime > client->visibletime[e])
+ //test nearest point on bbox
+ testorigin[0] = bound(entmins[0], testeye[0], entmaxs[0]);
+ testorigin[1] = bound(entmins[1], testeye[1], entmaxs[1]);
+ testorigin[2] = bound(entmins[2], testeye[2], entmaxs[2]);
+
+ Collision_ClipTrace(&trace, NULL, sv.worldmodel, vec3_origin, vec3_origin, vec3_origin, testeye, vec3_origin, vec3_origin, testorigin);
+
+ if (trace.fraction == 1)
+ client->visibletime[e] = realtime + 1;
+ else if (realtime > client->visibletime[e])
{
culled_trace++;
continue;
visibleentities++;
}
- alpha = 255;
+ alphaf = 255.0f;
scale = 16;
glowcolor = 254;
effects = ent->v.effects;
if ((val = GETEDICTFIELDVALUE(ent, eval_alpha)))
if (val->_float != 0)
- alpha = (int) (val->_float * 255.0);
+ alphaf = val->_float * 255.0f;
// HalfLife support
if ((val = GETEDICTFIELDVALUE(ent, eval_renderamt)))
if (val->_float != 0)
- alpha = (int) val->_float;
+ alphaf = val->_float;
- if (alpha == 0)
- alpha = 255;
- alpha = bound(0, alpha, 255);
+ if (alphaf == 0.0f)
+ alphaf = 255.0f;
+ alpha = bound(0, alphaf, 255);
if ((val = GETEDICTFIELDVALUE(ent, eval_scale)))
if ((scale = (int) (val->_float * 16.0)) == 0) scale = 16;
bits |= U_STEP;
// LordHavoc: old stuff, but rewritten to have more exact tolerances
-// if ((int)(origin[0]*8.0) != (int)(baseline->origin[0]*8.0)) bits |= U_ORIGIN1;
-// if ((int)(origin[1]*8.0) != (int)(baseline->origin[1]*8.0)) bits |= U_ORIGIN2;
-// if ((int)(origin[2]*8.0) != (int)(baseline->origin[2]*8.0)) bits |= U_ORIGIN3;
if (origin[0] != baseline->origin[0]) bits |= U_ORIGIN1;
if (origin[1] != baseline->origin[1]) bits |= U_ORIGIN2;
if (origin[2] != baseline->origin[2]) bits |= U_ORIGIN3;
#else
void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg)
{
- int e, clentnum, flags, alpha, glowcolor, glowsize, scale, effects;
+ int e, clentnum, flags, alpha, glowcolor, glowsize, scale, effects, modelindex;
int culled_pvs, culled_portal, culled_trace, visibleentities, totalentities;
+ float alphaf, lightsize;
qbyte *pvs;
- vec3_t org, origin, angles, entmins, entmaxs;
+ vec3_t origin, angles, entmins, entmaxs, testorigin, testeye;
edict_t *ent;
eval_t *val;
trace_t trace;
model_t *model;
- double testeye[3];
- double testorigin[3];
entity_frame_t entityframe;
entity_state_t *s;
Mod_CheckLoaded(sv.worldmodel);
// find the client's PVS
+ // the real place being tested from
VectorAdd (clent->v.origin, clent->v.view_ofs, testeye);
- VectorCopy (testeye, org);
- pvs = SV_FatPVS (org);
- EntityFrame_Clear(&entityframe, org);
+ pvs = SV_FatPVS (testeye);
+
+ // the place being reported (to consider the fact the client still
+ // applies the view_ofs[2], so we have to only send the fractional part
+ // of view_ofs[2], undoing what the client will redo)
+ VectorCopy (testeye, testorigin);
+ e = (int) clent->v.view_ofs[2] & 255;
+ if (e >= 128)
+ e -= 256;
+ testorigin[2] -= (float) e;
+ EntityFrame_Clear(&entityframe, testorigin);
culled_pvs = 0;
culled_portal = 0;
}
glowsize = 0;
-
+ effects = ent->v.effects;
if ((val = GETEDICTFIELDVALUE(ent, eval_glow_size)))
glowsize = (int) val->_float >> 2;
glowsize = bound(0, glowsize, 255);
+ lightsize = 0;
+ if (effects & (EF_BRIGHTFIELD | EF_MUZZLEFLASH | EF_BRIGHTLIGHT | EF_DIMLIGHT | EF_RED | EF_BLUE | EF_FLAME | EF_STARDUST))
+ {
+ if (effects & EF_BRIGHTFIELD)
+ lightsize = max(lightsize, 80);
+ if (effects & EF_MUZZLEFLASH)
+ lightsize = max(lightsize, 100);
+ if (effects & EF_BRIGHTLIGHT)
+ lightsize = max(lightsize, 400);
+ if (effects & EF_DIMLIGHT)
+ lightsize = max(lightsize, 200);
+ if (effects & EF_RED)
+ lightsize = max(lightsize, 200);
+ if (effects & EF_BLUE)
+ lightsize = max(lightsize, 200);
+ if (effects & EF_FLAME)
+ lightsize = max(lightsize, 250);
+ if (effects & EF_STARDUST)
+ lightsize = max(lightsize, 100);
+ }
+ if (glowsize)
+ lightsize = max(lightsize, glowsize << 2);
+
if ((val = GETEDICTFIELDVALUE(ent, eval_glow_trail)))
if (val->_float != 0)
+ {
flags |= RENDER_GLOWTRAIL;
+ lightsize = max(lightsize, 100);
+ }
+ modelindex = 0;
if (ent->v.modelindex >= 0 && ent->v.modelindex < MAX_MODELS && pr_strings[ent->v.model])
{
+ modelindex = ent->v.modelindex;
model = sv.models[(int)ent->v.modelindex];
Mod_CheckLoaded(model);
}
{
model = NULL;
if (ent != clent) // LordHavoc: always send player
- if (glowsize == 0 && (flags & RENDER_GLOWTRAIL) == 0) // no effects
+ if (lightsize == 0) // no effects
continue;
}
VectorAdd(entmaxs, model->normalmaxs, entmaxs);
}
}
+ if (lightsize)
+ {
+ entmins[0] = min(entmins[0], origin[0] - lightsize);
+ entmins[1] = min(entmins[1], origin[1] - lightsize);
+ entmins[2] = min(entmins[2], origin[2] - lightsize);
+ entmaxs[0] = min(entmaxs[0], origin[0] + lightsize);
+ entmaxs[1] = min(entmaxs[1], origin[1] + lightsize);
+ entmaxs[2] = min(entmaxs[2], origin[2] + lightsize);
+ }
totalentities++;
}
// or not visible through the portals
- if (sv_cullentities_portal.integer && !Portal_CheckBox(sv.worldmodel, org, entmins, entmaxs))
+ if (sv_cullentities_portal.integer && !Portal_CheckBox(sv.worldmodel, testeye, entmins, entmaxs))
{
culled_portal++;
continue;
testorigin[1] = lhrandom(entmins[1], entmaxs[1]);
testorigin[2] = lhrandom(entmins[2], entmaxs[2]);
- memset (&trace, 0, sizeof(trace_t));
- trace.fraction = 1;
- trace.allsolid = true;
- VectorCopy(testorigin, trace.endpos);
-
- VectorCopy(org, RecursiveHullCheckInfo.start);
- VectorSubtract(testorigin, testeye, RecursiveHullCheckInfo.dist);
- RecursiveHullCheckInfo.hull = sv.worldmodel->hulls;
- RecursiveHullCheckInfo.trace = &trace;
- SV_RecursiveHullCheck (sv.worldmodel->hulls->firstclipnode, 0, 1, testeye, testorigin);
+ Collision_ClipTrace(&trace, NULL, sv.worldmodel, vec3_origin, vec3_origin, vec3_origin, vec3_origin, testeye, vec3_origin, vec3_origin, testorigin);
if (trace.fraction == 1)
client->visibletime[e] = realtime + 1;
visibleentities++;
}
- alpha = 255;
+ alphaf = 255.0f;
scale = 16;
glowcolor = 254;
effects = ent->v.effects;
if ((val = GETEDICTFIELDVALUE(ent, eval_alpha)))
if (val->_float != 0)
- alpha = (int) (val->_float * 255.0);
+ alphaf = val->_float * 255.0;
// HalfLife support
if ((val = GETEDICTFIELDVALUE(ent, eval_renderamt)))
if (val->_float != 0)
- alpha = (int) val->_float;
+ alphaf = val->_float;
- if (alpha == 0)
- alpha = 255;
- alpha = bound(0, alpha, 255);
+ if (alphaf == 0.0f)
+ alphaf = 255.0f;
+ alpha = bound(0, alphaf, 255);
if ((val = GETEDICTFIELDVALUE(ent, eval_scale)))
if ((scale = (int) (val->_float * 16.0)) == 0) scale = 16;
if (ent != clent)
{
- if (glowsize == 0 && (flags & RENDER_GLOWTRAIL) == 0) // no effects
+ if (lightsize == 0) // no effects
{
if (model) // model
{
if (ent->v.movetype == MOVETYPE_STEP)
flags |= RENDER_STEP;
+ // don't send an entity if it's coordinates would wrap around
+ if ((effects & EF_LOWPRECISION) && origin[0] >= -32768 && origin[1] >= -32768 && origin[2] >= -32768 && origin[0] <= 32767 && origin[1] <= 32767 && origin[2] <= 32767)
+ flags |= RENDER_LOWPRECISION;
s = EntityFrame_NewEntity(&entityframe, e);
// if we run out of space, abort
break;
VectorCopy(origin, s->origin);
VectorCopy(angles, s->angles);
+ if (ent->v.colormap >= 1024)
+ flags |= RENDER_COLORMAPPED;
s->colormap = ent->v.colormap;
s->skin = ent->v.skin;
s->frame = ent->v.frame;
- s->modelindex = ent->v.modelindex;
+ s->modelindex = modelindex;
s->effects = effects;
s->alpha = alpha;
s->scale = scale;
bits = 0;
- //if (ent->v.view_ofs[2] != DEFAULT_VIEWHEIGHT)
+ if (ent->v.view_ofs[2] != DEFAULT_VIEWHEIGHT)
bits |= SU_VIEWHEIGHT;
if (ent->v.idealpitch)
if (ent->v.armorvalue)
bits |= SU_ARMOR;
-// if (ent->v.weapon)
- bits |= SU_WEAPON;
+ bits |= SU_WEAPON;
if (bits >= 65536)
bits |= SU_EXTEND1;
MSG_WriteByte(msg, bits >> 24);
if (bits & SU_VIEWHEIGHT)
- //MSG_WriteChar (msg, ent->v.view_ofs[2]);
- MSG_WriteChar (msg, 0);
+ MSG_WriteChar (msg, ent->v.view_ofs[2]);
if (bits & SU_IDEALPITCH)
MSG_WriteChar (msg, ent->v.idealpitch);
MSG_WriteByte (&msg, svc_time);
MSG_WriteFloat (&msg, sv.time);
- if (!client->waitingforconnect)
+ if (client->spawned)
{
// add the client specific data to the datagram
SV_WriteClientdataToMessage (client->edict, &msg);
if (!host_client->active)
continue;
+#ifndef NOROUTINGFIX
if (host_client->sendserverinfo)
{
host_client->sendserverinfo = false;
SV_SendServerinfo (host_client);
}
+#endif
if (host_client->spawned)
{
if (host_client->message.cursize || host_client->dropasap)
{
if (!NET_CanSendMessage (host_client->netconnection))
- {
-// I_Printf ("can't write\n");
continue;
- }
if (host_client->dropasap)
SV_DropClient (false); // went to another level
================
*/
-int SV_ModelIndex (char *name)
+int SV_ModelIndex (const char *name)
{
- int i;
+ int i;
if (!name || !name[0])
return 0;
else
{
svent->baseline.colormap = 0;
- svent->baseline.modelindex = svent->v.modelindex; //SV_ModelIndex(pr_strings + svent->v.model);
+ svent->baseline.modelindex = svent->v.modelindex;
}
large = false;
*/
extern float scr_centertime_off;
-void SV_SpawnServer (char *server)
+void SV_SpawnServer (const char *server)
{
edict_t *ent;
int i;
// serverflags are for cross level information (sigils)
pr_global_struct->serverflags = svs.serverflags;
-
+
ED_LoadFromFile (sv.worldmodel->entities);
// LordHavoc: clear world angles (to fix e3m3.bsp)
VectorClear(sv.edicts->v.angles);
// run two frames to allow everything to settle
sv.frametime = pr_global_struct->frametime = host_frametime = 0.1;
SV_Physics ();
+ sv.frametime = pr_global_struct->frametime = host_frametime = 0.1;
SV_Physics ();
Mod_PurgeUnused();
SV_SendServerinfo (host_client);
Con_DPrintf ("Server spawned.\n");
+ NET_Heartbeat ();
}
+
projects / xonotic / darkplaces.git / blobdiff