X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=cl_main.c;h=b9ce01a39e95b66e0654305745adbfd8f82be3e7;hb=31fadfa8c3a18ab29507b8aae0a9c973931e069b;hp=f01040391e931c570a04eaff68daf4be00b331f0;hpb=b203ec61258693fa76622ec7e6ff843c78de13b3;p=xonotic%2Fdarkplaces.git diff --git a/cl_main.c b/cl_main.c index f0104039..b9ce01a3 100644 --- a/cl_main.c +++ b/cl_main.c @@ -116,7 +116,7 @@ void CL_ClearState(void) cl_max_static_entities = 256; cl_max_temp_entities = 512; cl_max_effects = 256; - cl_max_beams = 24; + cl_max_beams = 256; cl_max_dlights = MAX_DLIGHTS; cl_max_lightstyle = MAX_LIGHTSTYLES; cl_max_brushmodel_entities = MAX_EDICTS; @@ -159,6 +159,8 @@ void CL_Disconnect(void) if (cls.state == ca_dedicated) return; + Con_DPrintf("CL_Disconnect\n"); + // stop sounds (especially looping!) S_StopAllSounds (true); @@ -177,20 +179,13 @@ void CL_Disconnect(void) if (cls.demorecording) CL_Stop_f(); - Con_DPrintf("Sending clc_disconnect\n"); + Con_DPrint("Sending clc_disconnect\n"); SZ_Clear(&cls.message); MSG_WriteByte(&cls.message, clc_disconnect); NetConn_SendUnreliableMessage(cls.netcon, &cls.message); SZ_Clear(&cls.message); NetConn_Close(cls.netcon); cls.netcon = NULL; - // if running a local server, shut it down - if (sv.active) - { - // prevent this code from executing again during Host_ShutdownServer - cls.state = ca_disconnected; - Host_ShutdownServer(false); - } } cls.state = ca_disconnected; @@ -224,11 +219,13 @@ void CL_EstablishConnection(const char *host) m_return_reason[0] = 0; cls.demonum = -1; + // stop demo loop in case this fails + CL_Disconnect(); + NetConn_ClientFrame(); + NetConn_ServerFrame(); + if (LHNETADDRESS_FromString(&cls.connect_address, host, 26000) && (cls.connect_mysocket = NetConn_ChooseClientSocketForAddress(&cls.connect_address))) { - // stop demo loop in case this fails - CL_Disconnect(); - cls.connect_trying = true; cls.connect_remainingtries = 3; cls.connect_nextsendtime = 0; @@ -246,7 +243,7 @@ void CL_EstablishConnection(const char *host) } else { - Con_Printf("Unable to find a suitable network socket to connect to server.\n"); + Con_Print("Unable to find a suitable network socket to connect to server.\n"); strcpy(m_return_reason, "No network"); } } @@ -273,7 +270,7 @@ static void CL_PrintEntities_f(void) strcpy(name, "--no model--"); for (j = strlen(name);j < 25;j++) name[j] = ' '; - Con_Printf ("%3i: %s:%04i (%5i %5i %5i) [%3i %3i %3i] %4.2f %5.3f\n", i, name, ent->render.frame, (int) ent->render.origin[0], (int) ent->render.origin[1], (int) ent->render.origin[2], (int) ent->render.angles[0] % 360, (int) ent->render.angles[1] % 360, (int) ent->render.angles[2] % 360, ent->render.scale, ent->render.alpha); + Con_Printf("%3i: %s:%04i (%5i %5i %5i) [%3i %3i %3i] %4.2f %5.3f\n", i, name, ent->render.frame, (int) ent->render.origin[0], (int) ent->render.origin[1], (int) ent->render.origin[2], (int) ent->render.angles[0] % 360, (int) ent->render.angles[1] % 360, (int) ent->render.angles[2] % 360, ent->render.scale, ent->render.alpha); } } @@ -412,7 +409,7 @@ void CL_Effect(vec3_t org, int modelindex, int startframe, int framecount, float } } -void CL_AllocDlight(entity_render_t *ent, vec3_t org, float radius, float red, float green, float blue, float decay, float lifetime) +void CL_AllocDlight(entity_render_t *ent, matrix4x4_t *matrix, float radius, float red, float green, float blue, float decay, float lifetime, int cubemapnum, int style, int shadowenable, vec_t corona) { int i; dlight_t *dl; @@ -440,9 +437,15 @@ void CL_AllocDlight(entity_render_t *ent, vec3_t org, float radius, float red, f dlightsetup: //Con_Printf("dlight %i : %f %f %f : %f %f %f\n", i, org[0], org[1], org[2], red * radius, green * radius, blue * radius); memset (dl, 0, sizeof(*dl)); + dl->matrix = *matrix; dl->ent = ent; - CL_FindNonSolidLocation(org, dl->origin, 6); - //VectorCopy(org, dl->origin); + dl->origin[0] = dl->matrix.m[0][3]; + dl->origin[1] = dl->matrix.m[1][3]; + dl->origin[2] = dl->matrix.m[2][3]; + CL_FindNonSolidLocation(dl->origin, dl->origin, 6); + dl->matrix.m[0][3] = dl->origin[0]; + dl->matrix.m[1][3] = dl->origin[1]; + dl->matrix.m[2][3] = dl->origin[2]; dl->radius = radius; dl->color[0] = red; dl->color[1] = green; @@ -452,6 +455,10 @@ dlightsetup: dl->die = cl.time + lifetime; else dl->die = 0; + dl->cubemapnum = cubemapnum; + dl->style = style; + dl->shadow = shadowenable; + dl->corona = corona; } void CL_DecayLights(void) @@ -484,9 +491,9 @@ extern void V_CalcRefdef(void); // note this is a recursive function, but it can never get in a runaway loop (because of the delayedlink flags) void CL_LinkNetworkEntity(entity_t *e) { - matrix4x4_t *matrix, blendmatrix, tempmatrix, matrix2; + matrix4x4_t *matrix, blendmatrix, tempmatrix, matrix2, dlightmatrix; int j, k, l, trailtype, temp; - float origin[3], angles[3], delta[3], lerp, dlightcolor[3], mins[3], maxs[3], v[3], v2[3], d; + float origin[3], angles[3], delta[3], lerp, dlightcolor[3], dlightradius, mins[3], maxs[3], v[3], v2[3], d; entity_t *t; model_t *model; //entity_persistent_t *p = &e->persistent; @@ -590,6 +597,10 @@ void CL_LinkNetworkEntity(entity_t *e) e->render.frame = e->render.frame2 = e->state_current.frame; e->render.frame2time = cl.time; e->render.framelerp = 0; + // make sure frame lerp won't last longer than 100ms + // (this mainly helps with models that use framegroups and + // switch between them infrequently) + e->render.frame1time = max(e->render.frame1time, e->render.frame2time - 0.1f); } } else @@ -606,9 +617,10 @@ void CL_LinkNetworkEntity(entity_t *e) if (e->render.model) { Mod_CheckLoaded(e->render.model); - if (e->render.model->type == mod_alias || e->render.model->type == mod_sprite) + // if model is alias or this is a tenebrae-like dlight, reverse pitch direction + if (e->render.model->type == mod_alias || (e->state_current.lightpflags & PFLAGS_FULLDYNAMIC)) angles[0] = -angles[0]; - if (e->render.model->flags & EF_ROTATE) + if ((e->render.model->flags & EF_ROTATE) && (!e->state_current.tagentity && !(e->render.flags & RENDER_VIEWMODEL))) { angles[1] = ANGLEMOD(100*cl.time); if (cl_itembobheight.value) @@ -631,6 +643,7 @@ void CL_LinkNetworkEntity(entity_t *e) origin[1] = e->render.matrix.m[1][3]; origin[2] = e->render.matrix.m[2][3]; trailtype = -1; + dlightradius = 0; dlightcolor[0] = 0; dlightcolor[1] = 0; dlightcolor[2] = 0; @@ -641,40 +654,45 @@ void CL_LinkNetworkEntity(entity_t *e) { if (gamemode == GAME_NEXUIZ) { - dlightcolor[0] += 100.0f; - dlightcolor[1] += 200.0f; - dlightcolor[2] += 400.0f; + dlightradius = max(dlightradius, 200); + dlightcolor[0] += 0.75f; + dlightcolor[1] += 1.50f; + dlightcolor[2] += 3.00f; trailtype = 8; } else CL_EntityParticles(e); } if (e->render.effects & EF_MUZZLEFLASH) - e->persistent.muzzleflash = 100.0f; + e->persistent.muzzleflash = 1.0f; if (e->render.effects & EF_DIMLIGHT) { - dlightcolor[0] += 200.0f; - dlightcolor[1] += 200.0f; - dlightcolor[2] += 200.0f; + dlightradius = max(dlightradius, 200); + dlightcolor[0] += 1.50f; + dlightcolor[1] += 1.50f; + dlightcolor[2] += 1.50f; } if (e->render.effects & EF_BRIGHTLIGHT) { - dlightcolor[0] += 400.0f; - dlightcolor[1] += 400.0f; - dlightcolor[2] += 400.0f; + dlightradius = max(dlightradius, 400); + dlightcolor[0] += 3.00f; + dlightcolor[1] += 3.00f; + dlightcolor[2] += 3.00f; } // LordHavoc: more effects if (e->render.effects & EF_RED) // red { - dlightcolor[0] += 200.0f; - dlightcolor[1] += 20.0f; - dlightcolor[2] += 20.0f; + dlightradius = max(dlightradius, 200); + dlightcolor[0] += 1.50f; + dlightcolor[1] += 0.15f; + dlightcolor[2] += 0.15f; } if (e->render.effects & EF_BLUE) // blue { - dlightcolor[0] += 20.0f; - dlightcolor[1] += 20.0f; - dlightcolor[2] += 200.0f; + dlightradius = max(dlightradius, 200); + dlightcolor[0] += 0.15f; + dlightcolor[1] += 0.15f; + dlightcolor[2] += 1.50f; } if (e->render.effects & EF_FLAME) { @@ -687,10 +705,11 @@ void CL_LinkNetworkEntity(entity_t *e) // how many flames to make temp = (int) (cl.time * 300) - (int) (cl.oldtime * 300); CL_FlameCube(mins, maxs, temp); - d = lhrandom(200, 250); - dlightcolor[0] += d * 1.0f; - dlightcolor[1] += d * 0.7f; - dlightcolor[2] += d * 0.3f; + d = lhrandom(0.75f, 1); + dlightradius = max(dlightradius, 200); + dlightcolor[0] += d * 2.0f; + dlightcolor[1] += d * 1.5f; + dlightcolor[2] += d * 0.5f; } if (e->render.effects & EF_STARDUST) { @@ -703,10 +722,10 @@ void CL_LinkNetworkEntity(entity_t *e) // how many particles to make temp = (int) (cl.time * 200) - (int) (cl.oldtime * 200); CL_Stardust(mins, maxs, temp); - d = 100; - dlightcolor[0] += d * 1.0f; - dlightcolor[1] += d * 0.7f; - dlightcolor[2] += d * 0.3f; + dlightradius = max(dlightradius, 200); + dlightcolor[0] += 1.0f; + dlightcolor[1] += 0.7f; + dlightcolor[2] += 0.3f; } } // muzzleflash fades over time, and is offset a bit @@ -714,11 +733,15 @@ void CL_LinkNetworkEntity(entity_t *e) { Matrix4x4_Transform(&e->render.matrix, muzzleflashorigin, v2); CL_TraceLine(origin, v2, v, NULL, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_SKY); - CL_AllocDlight(NULL, v, e->persistent.muzzleflash, 1, 1, 1, 0, 0); - e->persistent.muzzleflash -= cl.frametime * 1000; + tempmatrix = e->render.matrix; + tempmatrix.m[0][3] = v[0]; + tempmatrix.m[1][3] = v[1]; + tempmatrix.m[2][3] = v[2]; + CL_AllocDlight(NULL, &tempmatrix, 100, e->persistent.muzzleflash, e->persistent.muzzleflash, e->persistent.muzzleflash, 0, 0, 0, 0, true, 0); + e->persistent.muzzleflash -= cl.frametime * 10; } // LordHavoc: if the model has no flags, don't check each - if (e->render.model && e->render.model->flags) + if (e->render.model && e->render.model->flags && (!e->state_current.tagentity && !(e->render.flags & RENDER_VIEWMODEL))) { if (e->render.model->flags & EF_GIB) trailtype = 2; @@ -727,23 +750,26 @@ void CL_LinkNetworkEntity(entity_t *e) else if (e->render.model->flags & EF_TRACER) { trailtype = 3; - dlightcolor[0] += 0x10; - dlightcolor[1] += 0x40; - dlightcolor[2] += 0x10; + dlightradius = max(dlightradius, 100); + dlightcolor[0] += 0.12f; + dlightcolor[1] += 0.50f; + dlightcolor[2] += 0.12f; } else if (e->render.model->flags & EF_TRACER2) { trailtype = 5; - dlightcolor[0] += 0x50; - dlightcolor[1] += 0x30; - dlightcolor[2] += 0x10; + dlightradius = max(dlightradius, 100); + dlightcolor[0] += 0.50f; + dlightcolor[1] += 0.30f; + dlightcolor[2] += 0.10f; } else if (e->render.model->flags & EF_ROCKET) { trailtype = 0; - dlightcolor[0] += 200.0f; - dlightcolor[1] += 160.0f; - dlightcolor[2] += 80.0f; + dlightradius = max(dlightradius, 200); + dlightcolor[0] += 1.50f; + dlightcolor[1] += 1.20f; + dlightcolor[2] += 0.60f; } else if (e->render.model->flags & EF_GRENADE) { @@ -753,9 +779,10 @@ void CL_LinkNetworkEntity(entity_t *e) else if (e->render.model->flags & EF_TRACER3) { trailtype = 6; - dlightcolor[0] += 0x50; - dlightcolor[1] += 0x20; - dlightcolor[2] += 0x40; + dlightradius = max(dlightradius, 200); + dlightcolor[0] += 0.60f; + dlightcolor[1] += 0.25f; + dlightcolor[2] += 0.50f; } } // LordHavoc: customizable glow @@ -763,16 +790,28 @@ void CL_LinkNetworkEntity(entity_t *e) { // * 4 for the expansion from 0-255 to 0-1023 range, // / 255 to scale down byte colors - VectorMA(dlightcolor, e->state_current.glowsize * (4.0f / 255.0f), (qbyte *)&palette_complete[e->state_current.glowcolor], dlightcolor); + dlightradius = max(dlightradius, e->state_current.glowsize * 4); + VectorMA(dlightcolor, (1.0f / 255.0f), (qbyte *)&palette_complete[e->state_current.glowcolor], dlightcolor); + } + if (e->state_current.lightpflags & PFLAGS_FULLDYNAMIC) + { + if (e->state_current.light[3]) + dlightradius = max(dlightradius, e->state_current.light[3]); + else + dlightradius = max(dlightradius, 350); + if (VectorLength2(dlightcolor) == 0) + (dlightcolor[0] += 1, dlightcolor[1] += 1, dlightcolor[2] += 1); + else + VectorMA(dlightcolor, (1.0f/256.0f), e->state_current.light, dlightcolor); } // make the dlight - if ((dlightcolor[0] || dlightcolor[1] || dlightcolor[2]) && !(e->render.flags & RENDER_VIEWMODEL) && !e->state_current.tagentity) + if (dlightradius > 0 && (dlightcolor[0] || dlightcolor[1] || dlightcolor[2]) && !(e->render.flags & RENDER_VIEWMODEL)) { - VectorCopy(origin, v); + dlightmatrix = e->render.matrix; // hack to make glowing player light shine on their gun - if ((e - cl_entities) == cl.viewentity/* && !chase_active.integer*/) - v[2] += 30; - CL_AllocDlight(&e->render, v, 1, dlightcolor[0], dlightcolor[1], dlightcolor[2], 0, 0); + //if ((e - cl_entities) == cl.viewentity/* && !chase_active.integer*/) + // dlightmatrix.m[2][3] += 30; + CL_AllocDlight(&e->render, &dlightmatrix, dlightradius, dlightcolor[0], dlightcolor[1], dlightcolor[2], 0, 0, e->state_current.skin >= 16 ? e->state_current.skin : 0, e->state_current.lightstyle, !(e->state_current.lightpflags & PFLAGS_NOSHADOW), (e->state_current.lightpflags & PFLAGS_FULLDYNAMIC) ? ((e->state_current.lightpflags & PFLAGS_CORONA) != 0) : 1); } // trails need the previous frame if (e->state_previous.active && e->state_previous.modelindex == e->state_current.modelindex) @@ -791,17 +830,23 @@ void CL_LinkNetworkEntity(entity_t *e) && !(e->render.flags & RENDER_VIEWMODEL) && ((e - cl_entities) != cl.viewentity || (!cl.intermission && cl.protocol != PROTOCOL_NEHAHRAMOVIE && !cl_noplayershadow.integer))) e->render.flags |= RENDER_SHADOW; + if (!(e->render.effects & EF_FULLBRIGHT)) + e->render.flags |= RENDER_LIGHT; // as soon as player is known we can call V_CalcRefDef if ((e - cl_entities) == cl.viewentity) V_CalcRefdef(); if (e->render.model && e->render.model->name[0] == '*' && e->render.model->TraceBox) cl_brushmodel_entities[cl_num_brushmodel_entities++] = &e->render; + if (gamemode == GAME_TENEBRAE && e->render.model && e->render.model->type == mod_sprite) + e->render.effects |= EF_ADDITIVE; // don't show entities with no modelindex (note: this still shows // entities which have a modelindex that resolved to a NULL model) if (e->render.model && !(e->render.effects & EF_NODRAW) && r_refdef.numentities < r_refdef.maxentities) r_refdef.entities[r_refdef.numentities++] = &e->render; if (cl_num_entities < e->state_current.number + 1) cl_num_entities = e->state_current.number + 1; + //if (cl.viewentity && e - cl_entities == cl.viewentity) + // Matrix4x4_Print(&e->render.matrix); } } @@ -846,12 +891,12 @@ static void CL_RelinkNetworkEntities(void) ent->state_current.modelindex = cl.stats[STAT_WEAPON]; ent->state_current.frame = cl.stats[STAT_WEAPONFRAME]; ent->state_current.flags = RENDER_VIEWMODEL; - if (cl.stats[STAT_HEALTH] <= 0) + if (cl.stats[STAT_HEALTH] <= 0 || cl.intermission) ent->state_current.modelindex = 0; else if (cl.items & IT_INVISIBILITY) { if (gamemode == GAME_TRANSFUSION) - ent->state_current.alpha = 0.5; + ent->state_current.alpha = 128; else ent->state_current.modelindex = 0; } @@ -933,6 +978,7 @@ void CL_RelinkBeams(void) entity_t *ent; float yaw, pitch; float forward; + matrix4x4_t tempmatrix; for (i = 0, b = cl_beams;i < cl_max_beams;i++, b++) { @@ -980,7 +1026,11 @@ void CL_RelinkBeams(void) if (b->lightning) { if (cl_beams_lightatend.integer) - CL_AllocDlight (NULL, b->end, 200, 0.3, 0.7, 1, 0, 0); + { + // FIXME: create a matrix from the beam start/end orientation + Matrix4x4_CreateTranslate(&tempmatrix, b->end[0], b->end[1], b->end[2]); + CL_AllocDlight (NULL, &tempmatrix, 200, 0.3, 0.7, 1, 0, 0, 0, 0, true, 1); + } if (cl_beams_polygons.integer) continue; } @@ -1085,6 +1135,7 @@ int CL_ReadFromServer(void) // move particles CL_MoveParticles(); + R_MoveExplosions(); // link stuff CL_RelinkWorld(); @@ -1107,27 +1158,10 @@ int CL_ReadFromServer(void) CL_SendCmd ================= */ -void CL_SendCmd(void) +void CL_SendCmd(usercmd_t *cmd) { - usercmd_t cmd; - if (cls.signon == SIGNONS) - { - // get basic movement from keyboard - CL_BaseMove(&cmd); - - // OS independent code - IN_PreMove(); - - // allow mice or other external controllers to add to the move - IN_Move(&cmd); - - // OS independent code - IN_PostMove(); - - // send the unreliable message - CL_SendMove(&cmd); - } + CL_SendMove(cmd); if (cls.demoplayback) { @@ -1140,7 +1174,7 @@ void CL_SendCmd(void) { if (developer.integer) { - Con_Printf("CL_SendCmd: sending reliable message:\n"); + Con_Print("CL_SendCmd: sending reliable message:\n"); SZ_HexDumpToConsole(&cls.message); } if (NetConn_SendReliableMessage(cls.netcon, &cls.message) == -1) @@ -1154,9 +1188,9 @@ static void CL_PauseDemo_f (void) { cls.demopaused = !cls.demopaused; if (cls.demopaused) - Con_Printf("Demo paused\n"); + Con_Print("Demo paused\n"); else - Con_Printf("Demo unpaused\n"); + Con_Print("Demo unpaused\n"); } /* @@ -1168,7 +1202,7 @@ static void CL_Fog_f (void) { if (Cmd_Argc () == 1) { - Con_Printf ("\"fog\" is \"%f %f %f %f\"\n", fog_density, fog_red, fog_green, fog_blue); + Con_Printf("\"fog\" is \"%f %f %f %f\"\n", fog_density, fog_red, fog_green, fog_blue); return; } fog_density = atof(Cmd_Argv(1));