X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fcsqcmodel_hooks.qc;h=99368d39370e37aa31eea427c12d944616d1c3b3;hb=9e63dc38df3fe296521afd864ae6d63a5e898fe4;hp=1d4fec3f1f2649bf1595660a4fcd00adb00d0123;hpb=d0723d5dc8d2e92262cfe895b9dbfb4241c68d9c;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index 1d4fec3f1..99368d393 100644 --- a/qcsrc/client/csqcmodel_hooks.qc +++ b/qcsrc/client/csqcmodel_hooks.qc @@ -23,10 +23,14 @@ .int lodmodelindex0; .int lodmodelindex1; .int lodmodelindex2; -void CSQCPlayer_LOD_Apply(entity this) +.float loddistance1; +.float loddistance2; +void CSQCModel_LOD_Apply(entity this, bool isplayer) { + int detailreduction = ((isplayer) ? autocvar_cl_playerdetailreduction : autocvar_cl_modeldetailreduction); + // LOD model loading - if(this.lodmodelindex0 != this.modelindex) + if(this.lodmodelindex0 != this.modelindex && this.lodmodelindex1 != this.modelindex && this.lodmodelindex2 != this.modelindex) { string modelname = this.model; string s; @@ -46,7 +50,7 @@ void CSQCPlayer_LOD_Apply(entity this) precache_model(s); _setmodel(this, s); if(this.modelindex) - this.lodmodelindex1 = this.modelindex; + this.lodmodelindex2 = this.lodmodelindex1 = this.modelindex; } s = strcat(substring(modelname, 0, strlen(modelname)-4), "_lod2", substring(modelname, -4, 4)); @@ -63,23 +67,25 @@ void CSQCPlayer_LOD_Apply(entity this) } // apply LOD - if(autocvar_cl_playerdetailreduction <= 0) + if(detailreduction <= 0) { - if(autocvar_cl_playerdetailreduction <= -2) + if(detailreduction <= -2) this.modelindex = this.lodmodelindex2; - else if(autocvar_cl_playerdetailreduction <= -1) + else if(detailreduction <= -1) this.modelindex = this.lodmodelindex1; else this.modelindex = this.lodmodelindex0; } else { - float distance = vlen(this.origin - view_origin); - float f = (distance * current_viewzoom + 100.0) * autocvar_cl_playerdetailreduction; + float distance = vlen(((isplayer) ? this.origin : NearestPointOnBox(this, view_origin)) - view_origin); // TODO: perhaps it should just use NearestPointOnBox all the time, player hitbox can potentially be huge + float dist1 = (this.loddistance1 > 0) ? this.loddistance1 : autocvar_cl_loddistance1; + float dist2 = (this.loddistance2 > 0) ? this.loddistance2 : autocvar_cl_loddistance2; + float f = (distance * current_viewzoom + 100.0) * detailreduction; f *= 1.0 / bound(0.01, view_quality, 1); - if(f > autocvar_cl_loddistance2) + if(f > dist2) this.modelindex = this.lodmodelindex2; - else if(f > autocvar_cl_loddistance1) + else if(f > dist1) this.modelindex = this.lodmodelindex1; else this.modelindex = this.lodmodelindex0; @@ -234,17 +240,35 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer) if(MUTATOR_CALLHOOK(ForcePlayercolors_Skip, this, islocalplayer)) goto skipforcecolors; + bool forceplayercolors_enabled = false; + #define fpc autocvar_cl_forceplayercolors + if (gametype.m_1v1) + { + if ((myteam != NUM_SPECTATOR) && (fpc == 1 || fpc == 2 || fpc == 3 || fpc == 5)) + forceplayercolors_enabled = true; + } + else if (teamplay) + { + if ((team_count == 2) && (myteam != NUM_SPECTATOR) && (fpc == 2 || fpc == 4 || fpc == 5)) + forceplayercolors_enabled = true; + } + else + { + if (fpc == 1 || fpc == 2) + forceplayercolors_enabled = true; + } + // forceplayercolors too if(teamplay) { // own team's color is never forced - int forcecolor_friend = 0; - int forcecolor_enemy = 0; + int forcecolor_friend = 0, forcecolor_enemy = 0; entity tm; if(autocvar_cl_forcemyplayercolors) forcecolor_friend = 1024 + autocvar_cl_forcemyplayercolors; - if(autocvar_cl_forceplayercolors == 2 && team_count == 2 && myteam != NUM_SPECTATOR) + + if(forceplayercolors_enabled) forcecolor_enemy = 1024 + autocvar__cl_color; if(forcecolor_enemy && !forcecolor_friend) @@ -283,23 +307,24 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer) { if(autocvar_cl_forcemyplayercolors && islocalplayer) this.colormap = 1024 + autocvar_cl_forcemyplayercolors; - else if (autocvar_cl_forceuniqueplayercolors && !islocalplayer && !ISGAMETYPE(DUEL)) + else if (autocvar_cl_forceuniqueplayercolors && !islocalplayer && !gametype.m_1v1) { - // Assign each enemy unique colors + // Assign each enemy an unique color combination // pick colors from 0 to 14 since 15 is the rainbow color // pl01 0 1, pl02 1 2, ..., pl14 13 14, pl15 14 0 // pl16 0 2, pl17 1 3, ..., pl29 13 0, pl30 14 1 - int num = this.entnum - 1; + int num; + if (this.isplayermodel & ISPLAYER_CLIENT) + num = this.entnum - 1; + else + num = this.sv_entnum - 1; int c1 = num % 15; int q = floor(num / 15); int c2 = (c1 + 1 + q) % 15; this.colormap = 1024 + (c1 << 4) + c2; } - else if(autocvar_cl_forceplayercolors && (autocvar_cl_forceplayercolors != 3 || ISGAMETYPE(DUEL))) - { - if (!ISGAMETYPE(DUEL) || myteam != NUM_SPECTATOR) - this.colormap = player_localnum + 1; - } + else if(forceplayercolors_enabled) + this.colormap = player_localnum + 1; } LABEL(skipforcecolors) @@ -313,7 +338,7 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer) // GLOWMOD AND DEATH FADING if(this.colormap > 0) - this.glowmod = colormapPaletteColor(((this.colormap >= 1024) ? this.colormap : entcs_GetClientColors(this.colormap - 1)) & 0x0F, true) * 2; + this.glowmod = colormapPaletteColor(((this.colormap >= 1024) ? this.colormap : entcs_GetClientColors(this.colormap - 1)) & 0x0F, true); else this.glowmod = '1 1 1'; @@ -331,6 +356,10 @@ void CSQCPlayer_ModelAppearance_Apply(entity this, bool islocalplayer) } } + // don't let the engine increase player's glowmod + if (autocvar_r_hdr_glowintensity > 1) + this.glowmod /= autocvar_r_hdr_glowintensity; + //printf("CSQCPlayer_ModelAppearance_Apply(): state = %s, colormap = %f, glowmod = %s\n", (this.csqcmodel_isdead ? "DEAD" : "ALIVE"), this.colormap, vtos(this.glowmod)); } @@ -546,6 +575,11 @@ void CSQCModel_Effects_Apply(entity this) boxparticles(particleeffectnum(EFFECT_EF_FLAME), this, this.absmin, this.absmax, this.velocity, this.velocity, bound(0, frametime, 0.1), 0); //pointparticles(EFFECT_EF_FLAME, this.origin, '0 0 0', bound(0, frametime, 0.1)); } + if(eff & EF_SHOCK) + { + boxparticles(particleeffectnum(EFFECT_ARC_LIGHTNING), this, this.absmin, this.absmax, '0 0 0', '0 0 0', bound(0, frametime, 0.1), 0); + //pointparticles(EFFECT_ARC_LIGHTNING, this.origin, '0 0 0', bound(0, frametime, 0.1)); + } if(eff & EF_STARDUST) { boxparticles(particleeffectnum(EFFECT_EF_STARDUST), this, this.absmin, this.absmax, this.velocity, this.velocity, bound(0, frametime, 0.1), 0); @@ -648,7 +682,7 @@ void CSQCModel_Hook_PreDraw(entity this, bool isplayer) if((this.isplayermodel & ISPLAYER_MODEL) && this.drawmask) // this checks if it's a player MODEL! { CSQCPlayer_ModelAppearance_Apply(this, (this.isplayermodel & ISPLAYER_LOCAL)); - CSQCPlayer_LOD_Apply(this); + CSQCModel_LOD_Apply(this, true); if(!isplayer) { @@ -726,6 +760,8 @@ void CSQCModel_Hook_PreDraw(entity this, bool isplayer) } } } + else + CSQCModel_LOD_Apply(this, false); CSQCModel_AutoTagIndex_Apply(this);