X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sv_main.c;h=edb040364985f235995cb6b9fcfdd2dc597a2d29;hp=5e886884e58078a6e9e3c750982827221cc63add;hb=ef12f815c93e72a119837d2ff37d6258d78bf45e;hpb=79efa45bf0cdbb4507d29c6cfa32851789b283b6 diff --git a/sv_main.c b/sv_main.c index 5e886884..edb04036 100644 --- a/sv_main.c +++ b/sv_main.c @@ -35,6 +35,9 @@ static mempool_t *sv_edicts_mempool = NULL; //============================================================================ +extern void SV_Phys_Init (void); +extern void SV_World_Init (void); + /* =============== SV_Init @@ -61,6 +64,9 @@ void SV_Init (void) 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); @@ -246,7 +252,7 @@ void SV_SendServerinfo (client_t *client) 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) @@ -333,10 +339,14 @@ void SV_ConnectClient (int clientnum) 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 } @@ -511,29 +521,19 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) int e, clentnum, bits, alpha, glowcolor, glowsize, scale, effects; 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; @@ -651,7 +651,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) } // 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; @@ -665,22 +665,22 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) 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; @@ -690,23 +690,23 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) 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; @@ -778,9 +778,6 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) 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; @@ -868,14 +865,13 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) { int e, clentnum, flags, alpha, glowcolor, glowsize, scale, effects; int culled_pvs, culled_portal, culled_trace, visibleentities, totalentities; + float alphaf; 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; @@ -885,10 +881,19 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) 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; @@ -961,10 +966,6 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) VectorCopy(ent->v.origin, origin); } - // don't send an entity if it's coordinates would wrap around - if (origin[0] < -32768 || origin[1] < -32768 || origin[2] < -32768 || origin[0] > 32767 || origin[1] > 32767 || origin[2] > 32767) - continue; - // ent has survived every check so far, check if it is visible // always send embedded brush models, they don't generate much traffic if (ent != clent && ((flags & RENDER_VIEWMODEL) == 0) && (model == NULL || model->type != mod_brush || model->name[0] != '*')) @@ -1006,7 +1007,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) } // 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; @@ -1019,16 +1020,7 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) 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; @@ -1044,23 +1036,23 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) 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; @@ -1095,6 +1087,9 @@ void SV_WriteEntitiesToClient (client_t *client, edict_t *clent, sizebuf_t *msg) 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 @@ -1185,7 +1180,7 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) 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) @@ -1243,8 +1238,7 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) if (ent->v.armorvalue) bits |= SU_ARMOR; -// if (ent->v.weapon) - bits |= SU_WEAPON; + bits |= SU_WEAPON; if (bits >= 65536) bits |= SU_EXTEND1; @@ -1261,8 +1255,7 @@ void SV_WriteClientdataToMessage (edict_t *ent, sizebuf_t *msg) 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); @@ -1331,7 +1324,7 @@ qboolean SV_SendClientDatagram (client_t *client) 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); @@ -1434,11 +1427,13 @@ void SV_SendClientMessages (void) if (!host_client->active) continue; +#ifndef NOROUTINGFIX if (host_client->sendserverinfo) { host_client->sendserverinfo = false; SV_SendServerinfo (host_client); } +#endif if (host_client->spawned) { @@ -1473,10 +1468,7 @@ void SV_SendClientMessages (void) 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 @@ -1565,7 +1557,7 @@ void SV_CreateBaseline (void) 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; @@ -1782,7 +1774,7 @@ void SV_SpawnServer (char *server) // 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); @@ -1812,3 +1804,4 @@ void SV_SpawnServer (char *server) Con_DPrintf ("Server spawned.\n"); } +