X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_main.c;h=387dd63377e4c0f2de70910d2750fef2d9432ccf;hb=03e040262964d69c24733989c189dc60f40d2db2;hp=2898df656d8e9b2f7b8e1d0efea0cedb9c4d551d;hpb=71c88e4a876a4cfcccf312e3cd4ddbb1ced6d11f;p=xonotic%2Fdarkplaces.git diff --git a/cl_main.c b/cl_main.c index 2898df65..387dd633 100644 --- a/cl_main.c +++ b/cl_main.c @@ -53,7 +53,7 @@ cvar_t cl_explosions_size_end = {CVAR_SAVE, "cl_explosions_size_end", "128"}; cvar_t cl_explosions_lifetime = {CVAR_SAVE, "cl_explosions_lifetime", "0.5"}; cvar_t cl_stainmaps = {CVAR_SAVE, "cl_stainmaps", "1"}; -cvar_t cl_stainmapsclearonload = {CVAR_SAVE, "cl_stainmapsclearonload", "0"}; +cvar_t cl_stainmaps_clearonload = {CVAR_SAVE, "cl_stainmaps_clearonload", "1"}; cvar_t cl_beams_polygons = {CVAR_SAVE, "cl_beams_polygons", "1"}; cvar_t cl_beams_relative = {CVAR_SAVE, "cl_beams_relative", "1"}; @@ -112,7 +112,7 @@ void CL_ClearState(void) // wipe the entire cl structure memset (&cl, 0, sizeof(cl)); // reset the view zoom interpolation - cl.viewzoomold = cl.viewzoomnew = 1; + cl.mviewzoom[0] = cl.mviewzoom[1] = 1; SZ_Clear (&cls.message); @@ -233,7 +233,7 @@ void CL_EstablishConnection(const char *host) CL_Disconnect(); NetConn_ClientFrame(); NetConn_ServerFrame(); - + if (LHNETADDRESS_FromString(&cls.connect_address, host, 26000) && (cls.connect_mysocket = NetConn_ChooseClientSocketForAddress(&cls.connect_address))) { cls.connect_trying = true; @@ -893,6 +893,8 @@ void CL_RelinkWorld(void) if (!r_fullbright.integer) ent->render.flags |= RENDER_LIGHT; VectorSet(ent->render.colormod, 1, 1, 1); + r_refdef.worldentity = &ent->render; + r_refdef.worldmodel = cl.worldmodel; } static void CL_RelinkStaticEntities(void) @@ -947,12 +949,21 @@ static void CL_RelinkNetworkEntities(void) ent->state_current.modelindex = 0; } + // reset animation interpolation on weaponmodel if model changed + if (ent->state_previous.modelindex != ent->state_current.modelindex) + { + ent->render.frame = ent->render.frame1 = ent->render.frame2 = ent->state_current.frame; + ent->render.frame1time = ent->render.frame2time = cl.time; + ent->render.framelerp = 1; + } + // start on the entity after the world entitylinkframenumber++; - for (i = 1, ent = cl_entities + 1;i < MAX_EDICTS;i++, ent++) + for (i = 1;i < MAX_EDICTS;i++) { if (cl_entities_active[i]) { + ent = cl_entities + i; if (ent->state_current.active) CL_LinkNetworkEntity(ent); else @@ -1135,10 +1146,13 @@ void CL_LerpPlayer(float frac) int i; float d; - cl.viewzoom = cl.viewzoomold + frac * (cl.viewzoomnew - cl.viewzoomold); - + cl.viewzoom = cl.mviewzoom[1] + frac * (cl.mviewzoom[0] - cl.mviewzoom[1]); for (i = 0;i < 3;i++) + { + cl.punchangle[i] = cl.mpunchangle[1][i] + frac * (cl.mpunchangle[0][i] - cl.mpunchangle[1][i]); + cl.punchvector[i] = cl.mpunchvector[1][i] + frac * (cl.mpunchvector[0][i] - cl.mpunchvector[1][i]); cl.velocity[i] = cl.mvelocity[1][i] + frac * (cl.mvelocity[0][i] - cl.mvelocity[1][i]); + } if (cls.demoplayback) { @@ -1166,6 +1180,8 @@ int CL_ReadFromServer(void) { CL_ReadDemoMessage(); + r_refdef.time = cl.time; + r_refdef.extraupdate = !r_speeds.integer; r_refdef.numentities = 0; cl_num_entities = 0; cl_num_brushmodel_entities = 0; @@ -1260,37 +1276,56 @@ static void CL_Fog_f (void) fog_blue = atof(Cmd_Argv(4)); } +/* +==================== +CL_TimeRefresh_f + +For program optimization +==================== +*/ +static void CL_TimeRefresh_f (void) +{ + int i; + float timestart, timedelta, oldangles[3]; + + r_refdef.extraupdate = false; + VectorCopy(cl.viewangles, oldangles); + VectorClear(cl.viewangles); + + timestart = Sys_DoubleTime(); + for (i = 0;i < 128;i++) + { + Matrix4x4_CreateFromQuakeEntity(&r_refdef.viewentitymatrix, r_vieworigin[0], r_vieworigin[1], r_vieworigin[2], 0, i / 128.0 * 360.0, 0, 1); + CL_UpdateScreen(); + } + timedelta = Sys_DoubleTime() - timestart; + + VectorCopy(oldangles, cl.viewangles); + Con_Printf("%f seconds (%f fps)\n", timedelta, 128/timedelta); +} + +/* +=========== +CL_Shutdown +=========== +*/ +void CL_Shutdown (void) +{ + CL_CGVM_Shutdown(); + CL_Particles_Shutdown(); + CL_Parse_Shutdown(); + + SZ_Free (&cls.message); + + Mem_FreePool (&cl_entities_mempool); + Mem_FreePool (&cl_refdef_mempool); +} + /* ================= CL_Init ================= */ -//VorteX: cvars for GAME_NETHERWORLD -cvar_t cl_playermodel = {CVAR_SAVE, "cl_playermodel", "ranger"}; -cvar_t cl_footsteps = {CVAR_SAVE, "cl_footsteps", "1"}; -cvar_t cl_weapon_ofs = {CVAR_SAVE, "cl_weapon_ofs", "0 0 0"}; -cvar_t cl_weapon_bstep = {CVAR_SAVE, "cl_weapon_bstep", "100 0 0"}; -cvar_t cl_weapon_bborder = {CVAR_SAVE, "cl_weapon_bborder", "2 0 0"}; -cvar_t cl_weapon_bphase = {CVAR_SAVE, "cl_weapon_bphase", "0 0 0"}; -cvar_t cl_weapon_bphasescale = {CVAR_SAVE, "cl_weapon_bphasescale", "1 1 1"}; -cvar_t cl_weapon_bphasescissor = {CVAR_SAVE, "cl_weapon_bphasescissor", "-1 -1 -1 1 1 1"}; -cvar_t cl_deathcam = {CVAR_SAVE, "cl_deathcam", "0"}; -cvar_t cl_askonresave = {CVAR_SAVE, "cl_askonresave", "1"}; //Asking on saving to full saveslot in savegame menu -cvar_t sv_corpses_solid = {CVAR_SAVE, "sv_corpses_solid", "1"}; -cvar_t sv_corpses_removetime = {CVAR_SAVE, "sv_corpses_removetime", "0"}; -cvar_t sv_monsters_healthscale = {CVAR_SAVE, "sv_monsters_healthscale", "1"}; -cvar_t sv_monsters_damagescale = {CVAR_SAVE, "sv_monsters_damagescale", "1"}; -cvar_t sv_monsters_multiply = {CVAR_SAVE, "sv_monsters_multiply", "1"}; -cvar_t sv_monsters_randomize = {CVAR_SAVE, "sv_monsters_randomize", "0"}; -cvar_t sv_monsters_multiply_radius = {CVAR_SAVE, "sv_monsters_multiply_radius", "5"}; -cvar_t sv_monsters_ai_skillmod = {CVAR_SAVE, "sv_monsters_ai_skillmod", "1"}; -cvar_t sv_monsters_ai_agrmod = {CVAR_SAVE, "sv_monsters_ai_agrmod", "1"}; -cvar_t sv_monsters_ai_dexmod = {CVAR_SAVE, "sv_monsters_ai_dexmod", "1"}; -cvar_t sv_monsters_deathmatch = {CVAR_SAVE, "sv_monsters_deathmatch", "0"}; -cvar_t sv_monsters_deathmatch_maxnum = {CVAR_SAVE, "sv_monsters_deathmatch_maxnum", "20"}; -cvar_t sv_monsters_deathmatch_spawntime = {CVAR_SAVE, "sv_monsters_deathmatch_spawntime", "5"}; -cvar_t sv_monsters_deathmatch_fragpermonster = {CVAR_SAVE, "sv_monsters_deathmatch_fragpermonster", "0"}; - void CL_Init (void) { cl_entities_mempool = Mem_AllocPool("client entities", 0, NULL); @@ -1353,7 +1388,7 @@ void CL_Init (void) Cvar_RegisterVariable(&cl_explosions_size_end); Cvar_RegisterVariable(&cl_explosions_lifetime); Cvar_RegisterVariable(&cl_stainmaps); - Cvar_RegisterVariable(&cl_stainmapsclearonload); + Cvar_RegisterVariable(&cl_stainmaps_clearonload); Cvar_RegisterVariable(&cl_beams_polygons); Cvar_RegisterVariable(&cl_beams_relative); Cvar_RegisterVariable(&cl_beams_lightatend); @@ -1361,33 +1396,7 @@ void CL_Init (void) Cvar_RegisterVariable(&cl_prydoncursor); - if (gamemode == GAME_NETHERWORLD) - { - Cvar_RegisterVariable (&cl_playermodel); - Cvar_RegisterVariable (&cl_footsteps); - Cvar_RegisterVariable (&cl_weapon_ofs); - Cvar_RegisterVariable (&cl_weapon_bstep); - Cvar_RegisterVariable (&cl_weapon_bborder); - Cvar_RegisterVariable (&cl_weapon_bphase); - Cvar_RegisterVariable (&cl_weapon_bphasescale); - Cvar_RegisterVariable (&cl_weapon_bphasescissor); - Cvar_RegisterVariable (&cl_deathcam); //Hack for q3-style death - Cvar_RegisterVariable (&cl_askonresave); //Every time ask if saving to "full" saveslot - //This must be server-side cvars, after complete finishing of subsystems whitch uses this, they must be moved to server-side - Cvar_RegisterVariable (&sv_monsters_healthscale); - Cvar_RegisterVariable (&sv_monsters_damagescale); - Cvar_RegisterVariable (&sv_monsters_randomize); - Cvar_RegisterVariable (&sv_monsters_multiply); - Cvar_RegisterVariable (&sv_monsters_multiply_radius); - Cvar_RegisterVariable (&sv_monsters_ai_skillmod); - Cvar_RegisterVariable (&sv_monsters_ai_agrmod); - Cvar_RegisterVariable (&sv_monsters_ai_dexmod); - Cvar_RegisterVariable (&sv_monsters_deathmatch); //Keeping RPG mod - Cvar_RegisterVariable (&sv_monsters_deathmatch_maxnum); - Cvar_RegisterVariable (&sv_monsters_deathmatch_spawntime); - Cvar_RegisterVariable (&sv_monsters_deathmatch_fragpermonster); - Cvar_RegisterVariable (&sv_corpses_solid); - } + Cmd_AddCommand("timerefresh", CL_TimeRefresh_f); CL_Parse_Init(); CL_Particles_Init();